From 14f0d3bde6daf893f45c1a9ac80ace5940f75a21 Mon Sep 17 00:00:00 2001 From: Nikolai Vincent Vaags Date: Sun, 12 Nov 2023 21:34:12 +0100 Subject: [PATCH 1/3] template: update freedesktop runtime to 23.08 --- README.md | 12 ++++++------ com.gog.Template.json | 2 +- com.gog.i386-compat.Template.json | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 44e7afd..0ed9c2e 100644 --- a/README.md +++ b/README.md @@ -12,19 +12,19 @@ If you haven't already got it, add the repo like this: then install the runtime plus SDK: -`flatpak --user install flathub org.freedesktop.Platform/x86_64/22.08` +`flatpak --user install flathub org.freedesktop.Platform/x86_64/23.08` -`flatpak --user install flathub org.freedesktop.Sdk/x86_64/22.08` +`flatpak --user install flathub org.freedesktop.Sdk/x86_64/23.08` For x86 games additionally install the required compatibility packages: -`flatpak --user install flathub org.freedesktop.Platform.Compat.i386/x86_64/22.08` +`flatpak --user install flathub org.freedesktop.Platform.Compat.i386/x86_64/23.08` -`flatpak --user install flathub org.freedesktop.Platform.GL32.default/x86_64/22.08` +`flatpak --user install flathub org.freedesktop.Platform.GL32.default/x86_64/23.08` -`flatpak --user install flathub org.freedesktop.Sdk.Compat.i386/x86_64/22.08` +`flatpak --user install flathub org.freedesktop.Sdk.Compat.i386/x86_64/23.08` -`flatpak --user install flathub org.freedesktop.Sdk.Extension.toolchain-i386/x86_64/22.08` +`flatpak --user install flathub org.freedesktop.Sdk.Extension.toolchain-i386/x86_64/23.08` ## Usage First, clone the repo and then pull the submodules: diff --git a/com.gog.Template.json b/com.gog.Template.json index f75018d..51c9c14 100644 --- a/com.gog.Template.json +++ b/com.gog.Template.json @@ -1,7 +1,7 @@ { "app-id": "com.gog.GAMENAME", "runtime": "org.freedesktop.Platform", - "runtime-version": "22.08", + "runtime-version": "23.08", "sdk": "org.freedesktop.Sdk", "command": "starter", "rename-desktop-file": "Template.desktop", diff --git a/com.gog.i386-compat.Template.json b/com.gog.i386-compat.Template.json index 406a4f7..256a181 100644 --- a/com.gog.i386-compat.Template.json +++ b/com.gog.i386-compat.Template.json @@ -1,7 +1,7 @@ { "app-id": "com.gog.GAMENAME", "runtime": "org.freedesktop.Platform", - "runtime-version": "22.08", + "runtime-version": "23.08", "sdk": "org.freedesktop.Sdk", "command": "starter", "rename-desktop-file": "Template.desktop", @@ -21,16 +21,16 @@ "add-extensions": { "org.freedesktop.Platform.Compat.i386": { "directory": "lib/i386-linux-gnu", - "version": "22.08" + "version": "23.08" }, "org.freedesktop.Platform.Compat.i386.Debug": { "directory": "lib/debug/lib/i386-linux-gnu", - "version": "22.08", + "version": "23.08", "no-autodownload": true }, "org.freedesktop.Platform.GL32": { "directory": "lib/i386-linux-gnu/GL", - "version": "22.08", + "version": "23.08", "subdirectories": true, "no-autodownload": true, "autodelete": false, From 56b2b4485c5898bc653954d9dda67d6253c17887 Mon Sep 17 00:00:00 2001 From: Nikolai Vincent Vaags Date: Sun, 12 Nov 2023 21:34:48 +0100 Subject: [PATCH 2/3] modules: update sdl12-compat to 1.2.68 --- modules/sdl12-compat.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/sdl12-compat.json b/modules/sdl12-compat.json index 3a3858c..3c7d9f4 100644 --- a/modules/sdl12-compat.json +++ b/modules/sdl12-compat.json @@ -11,8 +11,8 @@ "sources": [ { "type": "archive", - "url": "https://github.com/libsdl-org/sdl12-compat/archive/refs/tags/release-1.2.56.tar.gz", - "sha256": "f62f3e15f95aade366ee6c03f291e8825c4689390a6be681535259a877259c58" + "url": "https://github.com/libsdl-org/sdl12-compat/archive/refs/tags/release-1.2.68.tar.gz", + "sha256": "63c6e4dcc1154299e6f363c872900be7f3dcb3e42b9f8f57e05442ec3d89d02d" } ] } From 856a40b077f05e53f6dbd52080531af065fd1b9f Mon Sep 17 00:00:00 2001 From: Nikolai Vincent Vaags Date: Sun, 12 Nov 2023 21:47:36 +0100 Subject: [PATCH 3/3] shared-modules: update to latest Also use shared-modules sdl12-compat since it is there now --- modules/sdl12-compat.json | 18 ------------------ overrides/modules-Psychonauts.json | 2 +- overrides/modules-SpacePiratesAndZombies.json | 2 +- shared-modules | 2 +- 4 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 modules/sdl12-compat.json diff --git a/modules/sdl12-compat.json b/modules/sdl12-compat.json deleted file mode 100644 index 3c7d9f4..0000000 --- a/modules/sdl12-compat.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "sdl12-compat", - "buildsystem": "simple", - "build-commands": [ - "sed -i 's|/usr/local/include/SDL2|/usr/include/SDL2|g' CMakeLists.txt", - "sed -i 's|/usr/X11/include|/usr/include/X11|g' CMakeLists.txt", - "cmake .", - "make SDL", - "install -Dm644 libSDL* /app/lib/" - ], - "sources": [ - { - "type": "archive", - "url": "https://github.com/libsdl-org/sdl12-compat/archive/refs/tags/release-1.2.68.tar.gz", - "sha256": "63c6e4dcc1154299e6f363c872900be7f3dcb3e42b9f8f57e05442ec3d89d02d" - } - ] -} diff --git a/overrides/modules-Psychonauts.json b/overrides/modules-Psychonauts.json index a289604..201d7fa 100644 --- a/overrides/modules-Psychonauts.json +++ b/overrides/modules-Psychonauts.json @@ -1,3 +1,3 @@ [ - "modules/sdl12-compat.json" + "shared-modules/SDL/sdl12-compat.json" ] diff --git a/overrides/modules-SpacePiratesAndZombies.json b/overrides/modules-SpacePiratesAndZombies.json index a289604..201d7fa 100644 --- a/overrides/modules-SpacePiratesAndZombies.json +++ b/overrides/modules-SpacePiratesAndZombies.json @@ -1,3 +1,3 @@ [ - "modules/sdl12-compat.json" + "shared-modules/SDL/sdl12-compat.json" ] diff --git a/shared-modules b/shared-modules index 0e7ce76..0176643 160000 --- a/shared-modules +++ b/shared-modules @@ -1 +1 @@ -Subproject commit 0e7ce768f176ff0cad2e378cf8bf652d826ee2c1 +Subproject commit 0176643830de56fbfc70e4e8d8c33c18ccdd9afd