From 986016567aa0057d814aee9f7aa2b92dad596374 Mon Sep 17 00:00:00 2001 From: Lctrs Date: Sun, 21 Feb 2021 01:29:48 +0100 Subject: [PATCH 1/4] bump shared-modules --- shared-modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-modules b/shared-modules index b177b99..6e38b30 160000 --- a/shared-modules +++ b/shared-modules @@ -1 +1 @@ -Subproject commit b177b99b966c8640e1788c9b8f4438c2993a2978 +Subproject commit 6e38b305567b8b947f8c0ebf4b30196a36b0eef8 From 36566790924839aaf56ae5127e8bb364b3cc4f4e Mon Sep 17 00:00:00 2001 From: Lctrs Date: Sun, 21 Feb 2021 01:34:10 +0100 Subject: [PATCH 2/4] libevdev: update to 1.11.0 and add fedc integration --- net.rpcs3.RPCS3.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index 94733c2..487ec2e 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -40,10 +40,13 @@ modules: - "/lib/pkgconfig" - "/share" sources: - - type: "git" - url: "https://gitlab.freedesktop.org/libevdev/libevdev.git" - tag: "libevdev-1.10.0" - commit: "e6f3141eb626f703796bd537469221c8261489b5" + - type: "archive" + url: "https://www.freedesktop.org/software/libevdev/libevdev-1.11.0.tar.xz" + sha256: "63f4ea1489858a109080e0b40bd43e4e0903a1e12ea888d581db8c495747c2d0" + x-checker-data: + type: "anitya" + project-id: 20540 + url-template: "https://www.freedesktop.org/software/libevdev/libevdev-$version.tar.xz" - name: "rpcs3-llvm" buildsystem: "cmake-ninja" From a5147a41adfa711139091bdb15de85869f101463 Mon Sep 17 00:00:00 2001 From: Lctrs Date: Sun, 21 Feb 2021 01:36:13 +0100 Subject: [PATCH 3/4] llvm: update to commit 716bb292ba3b4e5c0ceff72fee911ed2b53232cf --- net.rpcs3.RPCS3.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index 487ec2e..8147468 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -79,7 +79,8 @@ modules: sources: - type: "git" url: "https://github.com/RPCS3/llvm-mirror.git" - commit: "cb7748dfa0d615e9f5ea9f31e0ce40fe9aeac595" + branch: "master" + commit: "716bb292ba3b4e5c0ceff72fee911ed2b53232cf" - name: "rpcs3" buildsystem: "cmake-ninja" From 3c875eafcccf95af85a486a64bcfd020973370f9 Mon Sep 17 00:00:00 2001 From: Lctrs Date: Sun, 21 Feb 2021 01:40:28 +0100 Subject: [PATCH 4/4] rpcs3: update to commit a47bda026bf61999d6cecda0297c9154f51b090d and switch to GCC --- net.rpcs3.RPCS3.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index 8147468..bb43f35 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -85,12 +85,8 @@ modules: - name: "rpcs3" buildsystem: "cmake-ninja" build-options: - ldflags: "-fuse-ld=lld" - env: - AR: "llvm-ar" - CC: "clang" - CXX: "clang++" - RANLIB: "llvm-ranlib" + cflags: &optflags "-fuse-linker-plugin -fuse-ld=gold" + cxxflags: *optflags config-opts: - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" - "-DBUILD_LLVM_SUBMODULE=OFF" @@ -110,8 +106,9 @@ modules: COMM_TAG="$(grep 'version{.*}' rpcs3/rpcs3_version.cpp | awk -F[\{,] '{printf "%d.%d.%d", $2, $3, $4}')"; COMM_COUNT="$(git rev-list --count HEAD)"; COMM_HASH="$(git rev-parse --short=8 HEAD)"; - sed -i 's|||' ${FLATPAK_DEST}/share/metainfo/rpcs3.appdata.xml; + sed -i 's|||' ${FLATPAK_DEST}/share/metainfo/rpcs3.appdata.xml; sources: - type: "git" url: "https://github.com/RPCS3/rpcs3.git" - commit: "bd269bccaf68caff66324580c0417ca68fc5805c" + branch: "master" + commit: "a47bda026bf61999d6cecda0297c9154f51b090d"