From 675be8f8f193c6e413168f92e51de60317ca61b7 Mon Sep 17 00:00:00 2001 From: guihkx <626206+guihkx@users.noreply.github.com> Date: Fri, 9 Jun 2023 03:15:03 -0300 Subject: [PATCH 1/4] Update x-checker-data source for Prism The previous source was Anitya, which doesn't make much sense, since we can query the GitHub repository directly for new versions instead. --- org.prismlauncher.PrismLauncher.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/org.prismlauncher.PrismLauncher.yml b/org.prismlauncher.PrismLauncher.yml index b6504e2..d11357d 100644 --- a/org.prismlauncher.PrismLauncher.yml +++ b/org.prismlauncher.PrismLauncher.yml @@ -31,6 +31,7 @@ modules: - shared-modules/libusb/libusb.json - name: prismlauncher buildsystem: cmake-ninja + builddir: true config-opts: - -DLauncher_BUILD_PLATFORM=flatpak - -DCMAKE_BUILD_TYPE=RelWithDebInfo @@ -44,11 +45,11 @@ modules: url: https://github.com/PrismLauncher/PrismLauncher/releases/download/7.0/PrismLauncher-7.0.tar.gz sha256: aef3d368aea8c5c65d6db0d258ef3d0a2965a009f1311568190d2b557ec01833 x-checker-data: - type: anitya - project-id: 301949 - stable-only: true - url-template: https://github.com/PrismLauncher/PrismLauncher/releases/download/$version/PrismLauncher-$version.tar.gz - builddir: true + type: json + url: https://api.github.com/repos/PrismLauncher/PrismLauncher/releases/latest + version-query: .tag_name + url-query: .assets[] | select(.name == "PrismLauncher-" + $version + ".tar.gz") | .browser_download_url + - name: openjdk buildsystem: simple build-commands: @@ -57,7 +58,9 @@ modules: - mv /app/jre /app/jdk/17 - /usr/lib/sdk/openjdk8/install.sh - mv /app/jre /app/jdk/8 - cleanup: [/jre] + cleanup: + - /jre + - name: xrandr buildsystem: autotools sources: From f0b2d493be00fc7768f66659384bfe123f62ac20 Mon Sep 17 00:00:00 2001 From: guihkx <626206+guihkx@users.noreply.github.com> Date: Fri, 9 Jun 2023 03:17:33 -0300 Subject: [PATCH 2/4] Update xrandr to 1.5.2 and add x-checker-data source --- org.prismlauncher.PrismLauncher.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/org.prismlauncher.PrismLauncher.yml b/org.prismlauncher.PrismLauncher.yml index d11357d..faabab4 100644 --- a/org.prismlauncher.PrismLauncher.yml +++ b/org.prismlauncher.PrismLauncher.yml @@ -65,9 +65,17 @@ modules: buildsystem: autotools sources: - type: archive - url: https://xorg.freedesktop.org/archive/individual/app/xrandr-1.5.1.tar.xz - sha256: 7bc76daf9d72f8aff885efad04ce06b90488a1a169d118dea8a2b661832e8762 - cleanup: [/share/man, /bin/xkeystone] + url: https://xorg.freedesktop.org/archive/individual/app/xrandr-1.5.2.tar.xz + sha256: c8bee4790d9058bacc4b6246456c58021db58a87ddda1a9d0139bf5f18f1f240 + x-checker-data: + type: anitya + project-id: 14957 + stable-only: true + url-template: https://xorg.freedesktop.org/archive/individual/app/xrandr-$version.tar.xz + cleanup: + - /share/man + - /bin/xkeystone + - name: gamemode buildsystem: meson config-opts: From 53bdf2eb72f3379ef1f75e09d4745509be5d7de7 Mon Sep 17 00:00:00 2001 From: guihkx <626206+guihkx@users.noreply.github.com> Date: Fri, 9 Jun 2023 03:19:16 -0300 Subject: [PATCH 3/4] Add x-checker-data source for gamemode And also: - Switch from the git source to the tarball one - Remove unused files: C header, pkg-config file, static library --- org.prismlauncher.PrismLauncher.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/org.prismlauncher.PrismLauncher.yml b/org.prismlauncher.PrismLauncher.yml index faabab4..7883a73 100644 --- a/org.prismlauncher.PrismLauncher.yml +++ b/org.prismlauncher.PrismLauncher.yml @@ -86,10 +86,20 @@ modules: # post-install is running inside the build dir, we need it from the source though - install -Dm755 ../data/gamemoderun -t /app/bin sources: - - type: git - url: https://github.com/FeralInteractive/gamemode - tag: "1.7" - commit: 4dc99dff76218718763a6b07fc1900fa6d1dafd9 + - type: archive + archive-type: tar-gzip + url: https://api.github.com/repos/FeralInteractive/gamemode/tarball/1.7 + sha256: 57ce73ba605d1cf12f8d13725006a895182308d93eba0f69f285648449641803 + x-checker-data: + type: json + url: https://api.github.com/repos/FeralInteractive/gamemode/releases/latest + version-query: .tag_name + url-query: .tarball_url + timestamp-query: .published_at + cleanup: + - /include + - /lib/pkgconfig + - /lib/libgamemodeauto.a - name: zlib buildsystem: cmake-ninja From bf25c73c819f9d18ed322db9190609a14a4a9c0f Mon Sep 17 00:00:00 2001 From: guihkx <626206+guihkx@users.noreply.github.com> Date: Fri, 9 Jun 2023 03:23:15 -0300 Subject: [PATCH 4/4] Remove zlib module This module was first added because version 22.08.9 of the Freedesktop runtime was using a problematic version of zlib (see issue #15). However, since then, zlib has been updated to v1.2.13 in the 22.08.10 version of the runtime: https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/commit/4fc255e155ef8d2f5a1ec593784b61527c1d829f Therefore, we can remove it from here. --- org.prismlauncher.PrismLauncher.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/org.prismlauncher.PrismLauncher.yml b/org.prismlauncher.PrismLauncher.yml index 7883a73..14c8373 100644 --- a/org.prismlauncher.PrismLauncher.yml +++ b/org.prismlauncher.PrismLauncher.yml @@ -100,14 +100,7 @@ modules: - /include - /lib/pkgconfig - /lib/libgamemodeauto.a - - - name: zlib - buildsystem: cmake-ninja - sources: - - type: git - url: https://github.com/madler/zlib.git - tag: v1.2.13 - commit: 04f42ceca40f73e2978b50e93806c2a18c1281fc + - name: enhance buildsystem: simple build-commands: