Skip to content

Commit

Permalink
Flatpak: add libinih
Browse files Browse the repository at this point in the history
Fix git revision, in "detached head" state is no prefix
  • Loading branch information
carstene1ns committed May 11, 2024
1 parent 1195518 commit 19a700c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -503,12 +503,12 @@ if(NOT GIT_TAG)
list(GET GIT_DESCRIPTION 2 GIT_HASH)
string(APPEND GIT_MESSAGE "${GIT_COMMITS} commits since tag \"${GIT_TAG}\", ")
string(PREPEND GIT_COMMITS "+")
# strip the g prefix
string(SUBSTRING ${GIT_HASH} 1 -1 GIT_HASH)
else()
# no tags found, only hash
list(GET GIT_DESCRIPTION 0 GIT_HASH)
endif()
# strip the g prefix
string(SUBSTRING ${GIT_HASH} 1 -1 GIT_HASH)
set(PLAYER_VERSION_GIT "git${GIT_COMMITS}@${GIT_HASH}")
string(APPEND GIT_MESSAGE "object hash is ${GIT_HASH}")
git_local_changes(GIT_DIRTY)
Expand Down
9 changes: 9 additions & 0 deletions builds/flatpak/org.easyrpg.player.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@ modules:
url: https://github.com/libxmp/libxmp.git
tag: libxmp-4.6.0
commit: 8201d26cf933688a8be64292457c429fd8e654ab
- name: libinih
buildsystem: meson
config-opts:
- --buildtype=debugoptimized
sources:
- type: git
url: https://github.com/benhoyt/inih.git
tag: 58
commit: 5cc5e2c24642513aaa5b19126aad42d0e4e0923e
# own libraries
- name: liblcf
buildsystem: cmake-ninja
Expand Down

0 comments on commit 19a700c

Please sign in to comment.