Skip to content

Commit 21c8985

Browse files
authored
Merge pull request #3517 from carstene1ns/update/flat-meta
Upate metainfo and flatpak manifest
2 parents df4e1ee + c9daa19 commit 21c8985

3 files changed

Lines changed: 43 additions & 56 deletions

File tree

.tx/config

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 32 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
app-id: org.easyrpg.player
22
runtime: org.freedesktop.Platform
3-
runtime-version: '24.08'
3+
runtime-version: '25.08'
44
sdk: org.freedesktop.Sdk
55
command: easyrpg-player
66
rename-desktop-file: easyrpg-player.desktop
@@ -15,42 +15,27 @@ finish-args:
1515
# - --filesystem=home # user can store games anywhere
1616
- --device=all # needed for gamepad access
1717
- --allow=devel
18-
cleanup-commands:
19-
# provide launcher and wizard
20-
- mv /app/bin/{easyrpg-player,org.easyrpg.player.real}
21-
- mv /app/bin/{firststart,easyrpg-firststart}
22-
- mv /app/bin/{launcher,easyrpg-player}
2318
cleanup:
2419
- /include
2520
- /lib/cmake
2621
- /lib/pkgconfig
2722
- /lib/*.so
23+
2824
modules:
2925
# external libraries
30-
# this is adapted from shared-modules to not add the dependency on it
26+
# this is in sync with flathub/shared-modules (and avoids the dependency on it)
3127
- name: libfluidsynth
3228
buildsystem: cmake-ninja
3329
config-opts:
3430
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
3531
sources:
36-
- type: git
37-
url: https://github.com/FluidSynth/fluidsynth.git
38-
tag: v2.3.5
39-
commit: 619fc5c3380513146cd05e17decf8d747b02bba4
32+
- type: archive
33+
url: https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v2.4.6.tar.gz
34+
sha256: a6be90fd4842b9e7246500597180af5cf213c11bfa3998a3236dd8ff47961ea8
4035
cleanup:
4136
- /bin
4237
- /share
43-
- name: libfmt
44-
buildsystem: cmake-ninja
45-
config-opts:
46-
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
47-
- -DFMT_TEST=OFF
48-
- -DBUILD_SHARED_LIBS=TRUE
49-
sources:
50-
- type: git
51-
url: https://github.com/fmtlib/fmt.git
52-
tag: 11.1.4
53-
commit: 123913715afeb8a437e6388b4473fcc4753e1c9a
38+
5439
- name: libxmp
5540
buildsystem: cmake-ninja
5641
config-opts:
@@ -59,11 +44,11 @@ modules:
5944
- -DLIBXMP_DISABLE_DEPACKERS=ON
6045
- -DLIBXMP_DISABLE_PROWIZARD=ON
6146
sources:
62-
- type: git
63-
url: https://github.com/libxmp/libxmp.git
64-
tag: libxmp-4.6.2
65-
commit: 828ef357943e1fbb13910e7a6fca21987c5c5827
66-
- name: libinih
47+
- type: archive
48+
url: https://github.com/libxmp/libxmp/releases/download/libxmp-4.6.3/libxmp-4.6.3.tar.gz
49+
sha256: b189a2ff3f3eef0008512e0fb27c2cdc27480bc1066b82590a84d02548fab96d
50+
51+
- name: inih
6752
buildsystem: meson
6853
config-opts:
6954
- --buildtype=debugoptimized
@@ -73,33 +58,35 @@ modules:
7358
sources:
7459
- type: git
7560
url: https://github.com/benhoyt/inih.git
76-
tag: r60
77-
commit: 9de2a5fe4956447a22a324e2efc0648c5aad5285
61+
tag: r62
62+
commit: 26254ee9de7681f8825433415443e7116ff24b98
63+
7864
- name: nlohmann_json
7965
buildsystem: cmake-ninja
8066
builddir: true
8167
config-opts:
8268
- -DJSON_BuildTests=OFF
8369
sources:
84-
- type: git
85-
url: https://github.com/nlohmann/json.git
86-
tag: v3.11.3
87-
commit: 9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03
70+
- type: archive
71+
url: https://github.com/nlohmann/json/releases/download/v3.12.0/json.tar.xz
72+
sha256: 42f6e95cad6ec532fd372391373363b62a14af6d771056dbfc86160e6dfff7aa
8873
cleanup:
8974
- /share
75+
9076
- name: lhasa
9177
config-opts:
9278
- --enable-shared
9379
- --disable-static
9480
sources:
9581
- type: git
9682
url: https://github.com/fragglet/lhasa.git
97-
tag: v0.4.0
98-
commit: 3b8f502c1480c5d9f2927e95d7e0f022b9cdd0a1
83+
tag: v0.5.0
84+
commit: 450172de282c8f8730696f4370a57cf49bfabf22
9985
cleanup:
10086
- /bin
10187
- /share/man
10288
- /lib/*.la
89+
10390
# own libraries
10491
- name: liblcf
10592
buildsystem: cmake-ninja
@@ -115,35 +102,41 @@ modules:
115102
url: https://github.com/EasyRPG/liblcf.git
116103
cleanup:
117104
- /share
105+
106+
# actual binary
118107
- name: player
119108
buildsystem: cmake-ninja
120109
builddir: true
121110
config-opts:
122111
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
123112
- -DPLAYER_VERSION_APPEND='(Flatpak)'
113+
post-install:
114+
- mv /app/bin/{easyrpg-player,org.easyrpg.player.real}
124115
sources:
125116
- type: git
126117
url: https://github.com/EasyRPG/Player.git
127118
cleanup:
128119
- /share/bash-completion
129120
- /share/pixmaps
121+
130122
- name: wizard
131123
buildsystem: cmake-ninja
132124
subdir: Flatpak/firststart
133125
config-opts:
134126
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
127+
post-install:
128+
- mv /app/bin/{firststart,easyrpg-firststart}
135129
sources:
136130
- type: git
137131
disable-submodules: true
138132
url: https://github.com/EasyRPG/packaging.git
139-
commit: a5f26c7243d24a690b2615dff4955148d3f79c14
133+
140134
- name: launcher
141135
buildsystem: simple
142136
subdir: Flatpak
137+
build-commands:
138+
- install -Dm755 flatpak-launcher.sh /app/bin/easyrpg-player
143139
sources:
144140
- type: git
145141
disable-submodules: true
146142
url: https://github.com/EasyRPG/packaging.git
147-
commit: a5f26c7243d24a690b2615dff4955148d3f79c14
148-
build-commands:
149-
- install -Dm755 flatpak-launcher.sh /app/bin/launcher

resources/unix/easyrpg-player.metainfo.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<developer_name>EasyRPG Team</developer_name>
77
<update_contact>easyrpg_AT_easyrpg.org</update_contact>
88

9-
<!-- Copyright 2022-2025 EasyRPG team -->
9+
<!-- Copyright 2022-2026 EasyRPG team -->
1010
<metadata_license>FSFAP</metadata_license>
1111
<project_license>GPL-3.0-or-later</project_license>
1212

@@ -67,6 +67,16 @@
6767
</content_rating>
6868

6969
<releases>
70+
<release version="0.8.1.1" date="2025-06-02">
71+
<description>
72+
<p>
73+
"Stun - Patch 1"
74+
</p>
75+
<p>
76+
https://blog.easyrpg.org/2025/06/easyrpg-player-0-8-1-1-stun-patch-1/
77+
</p>
78+
</description>
79+
</release>
7080
<release version="0.8.1" date="2025-04-07">
7181
<description>
7282
<p>

0 commit comments

Comments
 (0)