From 62de181e976d9e99d4ee024aa13cb1cebd6de83a Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 26 Oct 2024 16:09:52 +1000 Subject: [PATCH] Flatpak: Build libzip --- ...libbacktrace.yaml => 10-libbacktrace.yaml} | 0 scripts/flatpak/modules/11-libzip.yaml | 37 +++++++++++++++++++ .../{22-shaderc.yaml => 21-shaderc.yaml} | 0 ...3-spirv-cross.yaml => 22-spirv-cross.yaml} | 0 .../{24-cpuinfo.yaml => 23-cpuinfo.yaml} | 0 ...5-discord-rpc.yaml => 24-discord-rpc.yaml} | 0 ...{26-soundtouch.yaml => 25-soundtouch.yaml} | 0 .../{27-lunasvg.yaml => 26-lunasvg.yaml} | 0 .../flatpak/org.duckstation.DuckStation.yaml | 15 ++++---- 9 files changed, 45 insertions(+), 7 deletions(-) rename scripts/flatpak/modules/{21-libbacktrace.yaml => 10-libbacktrace.yaml} (100%) create mode 100644 scripts/flatpak/modules/11-libzip.yaml rename scripts/flatpak/modules/{22-shaderc.yaml => 21-shaderc.yaml} (100%) rename scripts/flatpak/modules/{23-spirv-cross.yaml => 22-spirv-cross.yaml} (100%) rename scripts/flatpak/modules/{24-cpuinfo.yaml => 23-cpuinfo.yaml} (100%) rename scripts/flatpak/modules/{25-discord-rpc.yaml => 24-discord-rpc.yaml} (100%) rename scripts/flatpak/modules/{26-soundtouch.yaml => 25-soundtouch.yaml} (100%) rename scripts/flatpak/modules/{27-lunasvg.yaml => 26-lunasvg.yaml} (100%) diff --git a/scripts/flatpak/modules/21-libbacktrace.yaml b/scripts/flatpak/modules/10-libbacktrace.yaml similarity index 100% rename from scripts/flatpak/modules/21-libbacktrace.yaml rename to scripts/flatpak/modules/10-libbacktrace.yaml diff --git a/scripts/flatpak/modules/11-libzip.yaml b/scripts/flatpak/modules/11-libzip.yaml new file mode 100644 index 000000000..fe6cb16a7 --- /dev/null +++ b/scripts/flatpak/modules/11-libzip.yaml @@ -0,0 +1,37 @@ +# SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +# SPDX-License-Identifier: CC-BY-NC-ND-4.0 + +name: libzip +buildsystem: cmake-ninja +builddir: true +config-opts: + - "-DCMAKE_BUILD_TYPE=Release" + - "-DBUILD_SHARED_LIBS=ON" + - "-DENABLE_COMMONCRYPTO=OFF" + - "-DENABLE_GNUTLS=OFF" + - "-DENABLE_MBEDTLS=OFF" + - "-DENABLE_OPENSSL=OFF" + - "-DENABLE_WINDOWS_CRYPTO=OFF" + - "-DENABLE_BZIP2=OFF" + - "-DENABLE_LZMA=OFF" + - "-DENABLE_ZSTD=ON" + - "-DLIBZIP_DO_INSTALL=ON" + - "-DBUILD_TOOLS=OFF" + - "-DBUILD_REGRESS=OFF" + - "-DBUILD_OSSFUZZ=OFF" + - "-DBUILD_EXAMPLES=OFF" + - "-DBUILD_DOC=OFF" +build-options: + strip: true +sources: + - type: git + url: "https://github.com/nih-at/libzip.git" + commit: "9c8b818a1de143a4a8ee445351fb8f92115e33e1" +cleanup: + - /bin + - /include + - /lib/*.a + - /lib/*.la + - /lib/cmake + - /lib/pkgconfig + - /share diff --git a/scripts/flatpak/modules/22-shaderc.yaml b/scripts/flatpak/modules/21-shaderc.yaml similarity index 100% rename from scripts/flatpak/modules/22-shaderc.yaml rename to scripts/flatpak/modules/21-shaderc.yaml diff --git a/scripts/flatpak/modules/23-spirv-cross.yaml b/scripts/flatpak/modules/22-spirv-cross.yaml similarity index 100% rename from scripts/flatpak/modules/23-spirv-cross.yaml rename to scripts/flatpak/modules/22-spirv-cross.yaml diff --git a/scripts/flatpak/modules/24-cpuinfo.yaml b/scripts/flatpak/modules/23-cpuinfo.yaml similarity index 100% rename from scripts/flatpak/modules/24-cpuinfo.yaml rename to scripts/flatpak/modules/23-cpuinfo.yaml diff --git a/scripts/flatpak/modules/25-discord-rpc.yaml b/scripts/flatpak/modules/24-discord-rpc.yaml similarity index 100% rename from scripts/flatpak/modules/25-discord-rpc.yaml rename to scripts/flatpak/modules/24-discord-rpc.yaml diff --git a/scripts/flatpak/modules/26-soundtouch.yaml b/scripts/flatpak/modules/25-soundtouch.yaml similarity index 100% rename from scripts/flatpak/modules/26-soundtouch.yaml rename to scripts/flatpak/modules/25-soundtouch.yaml diff --git a/scripts/flatpak/modules/27-lunasvg.yaml b/scripts/flatpak/modules/26-lunasvg.yaml similarity index 100% rename from scripts/flatpak/modules/27-lunasvg.yaml rename to scripts/flatpak/modules/26-lunasvg.yaml diff --git a/scripts/flatpak/org.duckstation.DuckStation.yaml b/scripts/flatpak/org.duckstation.DuckStation.yaml index 32466e794..dc1369f03 100644 --- a/scripts/flatpak/org.duckstation.DuckStation.yaml +++ b/scripts/flatpak/org.duckstation.DuckStation.yaml @@ -30,14 +30,15 @@ finish-args: modules: # Dependencies. + - "modules/10-libbacktrace.yaml" + - "modules/11-libzip.yaml" - "modules/20-sdl2.yaml" - - "modules/21-libbacktrace.yaml" - - "modules/22-shaderc.yaml" - - "modules/23-spirv-cross.yaml" - - "modules/24-cpuinfo.yaml" - - "modules/25-discord-rpc.yaml" - - "modules/26-soundtouch.yaml" - - "modules/27-lunasvg.yaml" + - "modules/21-shaderc.yaml" + - "modules/22-spirv-cross.yaml" + - "modules/23-cpuinfo.yaml" + - "modules/24-discord-rpc.yaml" + - "modules/25-soundtouch.yaml" + - "modules/26-lunasvg.yaml" # Main module. - name: duckstation