From f4f3200acb698e67b2032058981bd60cfbe8f5b3 Mon Sep 17 00:00:00 2001 From: flathubbot Date: Thu, 10 Mar 2022 22:33:40 +0000 Subject: [PATCH 1/6] Update 4 modules Update 22.01.tar.gz to 22.03 Update flatbuffers.git to 2.0.6 Update pugixml-1.11.4.tar.gz to 1.12.1 Update rpcs3.git --- net.rpcs3.RPCS3.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index e47dd3e..43f6800 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -70,8 +70,8 @@ modules: - /lib/pkgconfig sources: - type: archive - url: https://github.com/FNA-XNA/FAudio/archive/refs/tags/22.01.tar.gz - sha256: e6b7c0ced90f5a3e1363f95ad990a99afee6784a35320719df48af45d1f07c7d + url: https://github.com/FNA-XNA/FAudio/archive/refs/tags/22.03.tar.gz + sha256: 91ea309417f6846fc097e06a0b4fb604bf4bdff67455fabc4820cf1dbe0e301e x-checker-data: type: anitya project-id: 20663 @@ -97,8 +97,8 @@ modules: sources: - type: git url: https://github.com/google/flatbuffers.git - tag: v2.0.5 - commit: d0cede9c90c5257537c293517a21376408b549fa + tag: v2.0.6 + commit: 615616cb5549a34bdf288c04bc1b94bd7a65c396 x-checker-data: type: git tag-pattern: ^v([\d.]+)$ @@ -114,8 +114,8 @@ modules: - /lib/pkgconfig sources: - type: archive - url: https://github.com/zeux/pugixml/releases/download/v1.11.4/pugixml-1.11.4.tar.gz - sha256: 8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 + url: https://github.com/zeux/pugixml/releases/download/v1.12.1/pugixml-1.12.1.tar.gz + sha256: dcf671a919cc4051210f08ffd3edf9e4247f79ad583c61577a13ee93af33afc7 x-checker-data: type: anitya project-id: 3728 @@ -220,4 +220,4 @@ modules: - type: git url: https://github.com/RPCS3/rpcs3.git branch: master - commit: 83026fd26356a6c4d2ec6b360a706cbb3632b2bb + commit: 78b8bd80e43b6ffa5ee169e7d84972fe03d8ee9b From 1060060defaa8e921dd460174e813aca63af0185 Mon Sep 17 00:00:00 2001 From: Lctrs Date: Thu, 10 Mar 2022 21:35:54 +0000 Subject: [PATCH 2/6] fix(faudio): remove removed GSTREAMER option --- net.rpcs3.RPCS3.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index 43f6800..47b2bc8 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -63,7 +63,6 @@ modules: builddir: true config-opts: - -DCMAKE_BUILD_TYPE=RelWithDebInfo - - -DGSTREAMER=ON cleanup: - /include - /lib/cmake From f617b502e8daf5a840a280e01e4c4f295726224d Mon Sep 17 00:00:00 2001 From: Lctrs Date: Thu, 10 Mar 2022 21:54:14 +0000 Subject: [PATCH 3/6] chore: build using llvm13 --- net.rpcs3.RPCS3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index 47b2bc8..cde5b10 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -3,7 +3,7 @@ runtime: org.kde.Platform runtime-version: 5.15-21.08 sdk: org.kde.Sdk sdk-extensions: - - org.freedesktop.Sdk.Extension.llvm12 + - org.freedesktop.Sdk.Extension.llvm13 command: rpcs3 rename-desktop-file: rpcs3.desktop rename-appdata-file: rpcs3.metainfo.xml @@ -31,8 +31,8 @@ add-extensions: cleanup-commands: - mkdir -p ${FLATPAK_DEST}/lib/ffmpeg build-options: - prepend-ld-library-path: /usr/lib/sdk/llvm12/lib - prepend-path: /usr/lib/sdk/llvm12/bin + prepend-ld-library-path: /usr/lib/sdk/llvm13/lib + prepend-path: /usr/lib/sdk/llvm13/bin modules: - shared-modules/glu/glu-9.json - shared-modules/glew/glew.json From 530d42b30db7a6290d3ab7e9b07f5c2d603d594b Mon Sep 17 00:00:00 2001 From: Lctrs Date: Fri, 11 Mar 2022 01:34:27 +0100 Subject: [PATCH 4/6] chore: silence cmake dev warnings --- net.rpcs3.RPCS3.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index cde5b10..28d947b 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -88,6 +88,7 @@ modules: - -DFLATBUFFERS_BUILD_TESTS=OFF - -DFLATBUFFERS_BUILD_FLATC=OFF - -DFLATBUFFERS_BUILD_SHAREDLIB=ON + - -Wno-dev cleanup: - /include - /lib/cmake @@ -169,6 +170,7 @@ modules: - -DLLVM_ENABLE_Z3_SOLVER=OFF - -DCMAKE_CXX_STANDARD=17 - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi + - -Wno-dev cleanup: - '*' sources: @@ -205,6 +207,7 @@ modules: - -DUSE_SYSTEM_PUGIXML=ON - -DUSE_SYSTEM_XXHASH=ON - -DUSE_SYSTEM_ZLIB=ON + - -Wno-dev post-install: - | set -eux; From 3052250871c4ac82ab17a8115174b273051494e2 Mon Sep 17 00:00:00 2001 From: Lctrs Date: Sat, 12 Mar 2022 11:23:38 +0100 Subject: [PATCH 5/6] fix(rpcs3): use bundled flatbuffers --- net.rpcs3.RPCS3.yaml | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index 28d947b..0db01a1 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -77,32 +77,6 @@ modules: stable-only: true url-template: https://github.com/FNA-XNA/FAudio/archive/refs/tags/$version.tar.gz - - name: flatbuffers - buildsystem: cmake-ninja - build-options: - env: - CC: clang - CXX: clang++ - config-opts: - - -DCMAKE_BUILD_TYPE=RelWithDebInfo - - -DFLATBUFFERS_BUILD_TESTS=OFF - - -DFLATBUFFERS_BUILD_FLATC=OFF - - -DFLATBUFFERS_BUILD_SHAREDLIB=ON - - -Wno-dev - cleanup: - - /include - - /lib/cmake - - /lib/pkgconfig - - /lib/*.a - sources: - - type: git - url: https://github.com/google/flatbuffers.git - tag: v2.0.6 - commit: 615616cb5549a34bdf288c04bc1b94bd7a65c396 - x-checker-data: - type: git - tag-pattern: ^v([\d.]+)$ - - name: pugixml buildsystem: cmake-ninja config-opts: @@ -201,7 +175,6 @@ modules: - -DUSE_SYSTEM_CURL=ON - -DUSE_SYSTEM_FAUDIO=ON - -DUSE_SYSTEM_FFMPEG=ON - - -DUSE_SYSTEM_FLATBUFFERS=ON - -DUSE_SYSTEM_LIBPNG=ON - -DUSE_SYSTEM_LIBUSB=ON - -DUSE_SYSTEM_PUGIXML=ON From b39eb55d9a11f7bd1fdb9504b58897d219f1d64e Mon Sep 17 00:00:00 2001 From: Lctrs Date: Sat, 12 Mar 2022 11:23:20 +0100 Subject: [PATCH 6/6] fix(rpcs3): append llvm's paths for rpcs3-llvm to take precedence --- net.rpcs3.RPCS3.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index 0db01a1..f63be85 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -30,9 +30,6 @@ add-extensions: autodelete: false cleanup-commands: - mkdir -p ${FLATPAK_DEST}/lib/ffmpeg -build-options: - prepend-ld-library-path: /usr/lib/sdk/llvm13/lib - prepend-path: /usr/lib/sdk/llvm13/bin modules: - shared-modules/glu/glu-9.json - shared-modules/glew/glew.json @@ -127,6 +124,8 @@ modules: CXX: clang++ RANLIB: llvm-ranlib ldflags: -fuse-ld=lld + prepend-ld-library-path: /usr/lib/sdk/llvm13/lib + prepend-path: /usr/lib/sdk/llvm13/bin config-opts: - -DCMAKE_BUILD_TYPE=Release - -DBUILD_SHARED_LIBS=OFF @@ -161,6 +160,8 @@ modules: buildsystem: cmake-ninja builddir: true build-options: + append-ld-library-path: /usr/lib/sdk/llvm13/lib + append-path: /usr/lib/sdk/llvm13/bin env: AR: llvm-ar CC: clang