[arch-commits] Commit in pcsx2/repos/community-x86_64 (8 files)
Maxime Gauduin
alucryd at gemini.archlinux.org
Fri Aug 19 07:35:21 UTC 2022
Date: Friday, August 19, 2022 @ 07:35:20
Author: alucryd
Revision: 1269504
archrelease: copy trunk to community-x86_64
Added:
pcsx2/repos/community-x86_64/PKGBUILD
(from rev 1269503, pcsx2/trunk/PKGBUILD)
pcsx2/repos/community-x86_64/pcsx2-resources-directory.patch
(from rev 1269503, pcsx2/trunk/pcsx2-resources-directory.patch)
pcsx2/repos/community-x86_64/pcsx2-system-libs.patch
(from rev 1269503, pcsx2/trunk/pcsx2-system-libs.patch)
pcsx2/repos/community-x86_64/pcsx2.install
(from rev 1269503, pcsx2/trunk/pcsx2.install)
Deleted:
pcsx2/repos/community-x86_64/PKGBUILD
pcsx2/repos/community-x86_64/pcsx2-resources-directory.patch
pcsx2/repos/community-x86_64/pcsx2-system-libs.patch
pcsx2/repos/community-x86_64/pcsx2.install
---------------------------------+
PKGBUILD | 250 +++++++++++++++++++-------------------
pcsx2-resources-directory.patch | 90 ++++++-------
pcsx2-system-libs.patch | 50 +++----
pcsx2.install | 22 +--
4 files changed, 206 insertions(+), 206 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-19 07:35:07 UTC (rev 1269503)
+++ PKGBUILD 2022-08-19 07:35:20 UTC (rev 1269504)
@@ -1,125 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: josephgbr <rafael.f.f1 at gmail.com>
-# Contributor: vEX <vex at niechift.com>
-
-pkgname=pcsx2
-pkgver=1.7.3221
-pkgrel=1
-pkgdesc='A Sony PlayStation 2 emulator'
-arch=(x86_64)
-url=https://www.pcsx2.net
-license=(
- GPL2
- GPL3
- LGPL2.1
- LGPL3
-)
-depends=(
- glibc
- libaio.so
- libasound.so
- libfmt.so
- libgl
- libharfbuzz.so
- libpcap.so
- libpng
- libpulse.so
- libryml.so
- libsamplerate.so
- libudev.so
- libx11
- libxcb
- libxrandr
- libzip.so
- libzstd.so
- qt6-base
- sdl2
- soundtouch
- xz
- zlib
-)
-makedepends=(
- cmake
- git
- glslang
- ninja
- png++
- qt6-tools
- qt6-wayland
- vulkan-headers
- zstd
-)
-optdepends=('qt6-wayland: Wayland support')
-_tag=7285eca24982c0562d47958022ac0dfdc3cebca5
-source=(
- git+https://github.com/PCSX2/pcsx2.git#tag=${_tag}
- git+https://github.com/mozilla/cubeb.git
- git+https://github.com/KhronosGroup/glslang.git
- git+https://github.com/ocornut/imgui.git
- git+https://github.com/rtissera/libchdr.git
- pcsx2-system-libs.patch
- pcsx2-resources-directory.patch
-)
-b2sums=('SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- '29c8f279f96c67b3a35eb39440c6dfa134ef1cda36026f69f7b9931c59700e61431d7b38002bd811f6e38089296128a16c737e1c0eb2120b342790089c1e4017'
- '7e9ea4915021d48a619c2e37cc01de15ae239bb08fef367a9903edefcbc362cd2537f741b89f6c09144319bf2228bea0c7c366e5f0a85f1f282ef95ee3f05321')
-install=pcsx2.install
-
-prepare() {
- cd pcsx2
- git apply -3 ../pcsx2-system-libs.patch
- git apply -3 ../pcsx2-resources-directory.patch
-
- local submodule
- for submodule in \
- 3rdparty/cubeb/cubeb \
- 3rdparty/glslang/glslang \
- 3rdparty/imgui/imgui \
- 3rdparty/libchdr/libchdr
- do
- git submodule init ${submodule}
- git submodule set-url ${submodule} "$srcdir/${submodule##*/}"
- git submodule update ${submodule}
- done
-}
-
-pkgver() {
- cd pcsx2
- git describe --tags | sed 's/^v//'
-}
-
-build() {
- # Speed up build
- CFLAGS+=" -flto=$(nproc)"
- CXXFLAGS+=" -flto=$(nproc)"
-
- cmake -S pcsx2 -B build -G Ninja \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
- -DDISABLE_ADVANCE_SIMD=ON \
- -DDISABLE_BUILD_DATE=ON \
- -DDISABLE_PCSX2_WRAPPER=ON \
- -DDISABLE_SETCAP=ON \
- -DENABLE_TESTS=OFF \
- -DPACKAGE_MODE=ON \
- -DQT_BUILD=ON \
- -DUSE_SYSTEM_LIBS=ON \
- -DUSE_VTUNE=OFF \
- -DWAYLAND_API=ON \
- -DX11_API=ON \
- -DXDG_STD=ON \
- -Wno-dev
- cmake --build build
-}
-
-package() {
- DESTDIR="${pkgdir}" cmake --install build
- sed -i 's/Exec=env GDK_BACKEND=x11 MESA_NO_ERROR=1 pcsx2/Exec=env QT_QPA_PLATFORM=xcb MESA_NO_ERROR=1 pcsx2-qt/g' "${pkgdir}"/usr/share/applications/PCSX2.desktop
-}
-
-# vim: ts=2 sw=2 et:
Copied: pcsx2/repos/community-x86_64/PKGBUILD (from rev 1269503, pcsx2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-08-19 07:35:20 UTC (rev 1269504)
@@ -0,0 +1,125 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: josephgbr <rafael.f.f1 at gmail.com>
+# Contributor: vEX <vex at niechift.com>
+
+pkgname=pcsx2
+pkgver=1.7.3223
+pkgrel=1
+pkgdesc='A Sony PlayStation 2 emulator'
+arch=(x86_64)
+url=https://www.pcsx2.net
+license=(
+ GPL2
+ GPL3
+ LGPL2.1
+ LGPL3
+)
+depends=(
+ glibc
+ libaio.so
+ libasound.so
+ libfmt.so
+ libgl
+ libharfbuzz.so
+ libpcap.so
+ libpng
+ libpulse.so
+ libryml.so
+ libsamplerate.so
+ libudev.so
+ libx11
+ libxcb
+ libxrandr
+ libzip.so
+ libzstd.so
+ qt6-base
+ sdl2
+ soundtouch
+ xz
+ zlib
+)
+makedepends=(
+ cmake
+ git
+ glslang
+ ninja
+ png++
+ qt6-tools
+ qt6-wayland
+ vulkan-headers
+ zstd
+)
+optdepends=('qt6-wayland: Wayland support')
+_tag=11c903a3e9acc3505d07f6b4d0dce2c374f2df7a
+source=(
+ git+https://github.com/PCSX2/pcsx2.git#tag=${_tag}
+ git+https://github.com/mozilla/cubeb.git
+ git+https://github.com/KhronosGroup/glslang.git
+ git+https://github.com/ocornut/imgui.git
+ git+https://github.com/rtissera/libchdr.git
+ pcsx2-system-libs.patch
+ pcsx2-resources-directory.patch
+)
+b2sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ '29c8f279f96c67b3a35eb39440c6dfa134ef1cda36026f69f7b9931c59700e61431d7b38002bd811f6e38089296128a16c737e1c0eb2120b342790089c1e4017'
+ '7e9ea4915021d48a619c2e37cc01de15ae239bb08fef367a9903edefcbc362cd2537f741b89f6c09144319bf2228bea0c7c366e5f0a85f1f282ef95ee3f05321')
+install=pcsx2.install
+
+prepare() {
+ cd pcsx2
+ git apply -3 ../pcsx2-system-libs.patch
+ git apply -3 ../pcsx2-resources-directory.patch
+
+ local submodule
+ for submodule in \
+ 3rdparty/cubeb/cubeb \
+ 3rdparty/glslang/glslang \
+ 3rdparty/imgui/imgui \
+ 3rdparty/libchdr/libchdr
+ do
+ git submodule init ${submodule}
+ git submodule set-url ${submodule} "$srcdir/${submodule##*/}"
+ git submodule update ${submodule}
+ done
+}
+
+pkgver() {
+ cd pcsx2
+ git describe --tags | sed 's/^v//'
+}
+
+build() {
+ # Speed up build
+ CFLAGS+=" -flto=$(nproc)"
+ CXXFLAGS+=" -flto=$(nproc)"
+
+ cmake -S pcsx2 -B build -G Ninja \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
+ -DDISABLE_ADVANCE_SIMD=ON \
+ -DDISABLE_BUILD_DATE=ON \
+ -DDISABLE_PCSX2_WRAPPER=ON \
+ -DDISABLE_SETCAP=ON \
+ -DENABLE_TESTS=OFF \
+ -DPACKAGE_MODE=ON \
+ -DQT_BUILD=ON \
+ -DUSE_SYSTEM_LIBS=ON \
+ -DUSE_VTUNE=OFF \
+ -DWAYLAND_API=ON \
+ -DX11_API=ON \
+ -DXDG_STD=ON \
+ -Wno-dev
+ cmake --build build
+}
+
+package() {
+ DESTDIR="${pkgdir}" cmake --install build
+ sed -i 's/Exec=env GDK_BACKEND=x11 MESA_NO_ERROR=1 pcsx2/Exec=env QT_QPA_PLATFORM=xcb MESA_NO_ERROR=1 pcsx2-qt/g' "${pkgdir}"/usr/share/applications/PCSX2.desktop
+}
+
+# vim: ts=2 sw=2 et:
Deleted: pcsx2-resources-directory.patch
===================================================================
--- pcsx2-resources-directory.patch 2022-08-19 07:35:07 UTC (rev 1269503)
+++ pcsx2-resources-directory.patch 2022-08-19 07:35:20 UTC (rev 1269504)
@@ -1,45 +0,0 @@
-From acc799798362dae3bb8eac694041663f4073af12 Mon Sep 17 00:00:00 2001
-From: kenshen112 <finalfantasytimothy at gmail.com>
-Date: Sun, 22 May 2022 16:44:51 -0700
-Subject: [PATCH] QtHost.cpp: Fixed Resources dir
-
-Fixed location of Resources Dir to proper usr/share location
----
- .gitignore | 1 +
- pcsx2-qt/QtHost.cpp | 8 +++++---
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/.gitignore b/.gitignore
-index 9cb112d2367a..67d4a5ee6831 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -74,6 +74,7 @@ oprofile_data/
- /bin/**/*.lib
- /bin/**/*.pdb
- /bin/pcsx2
-+/bin/pcsx2-qt
- /bin/PCSX2-linux.sh
- /bin/*ReplayLoader
- /bin/GS*.txt
-diff --git a/pcsx2-qt/QtHost.cpp b/pcsx2-qt/QtHost.cpp
-index c40c4dabcad5..c1328bc02fe5 100644
---- a/pcsx2-qt/QtHost.cpp
-+++ b/pcsx2-qt/QtHost.cpp
-@@ -130,12 +130,14 @@ void QtHost::SetAppRoot()
-
- void QtHost::SetResourcesDirectory()
- {
--#ifndef __APPLE__
-+#ifdef __APPLE__
-+ // On macOS, this is in the bundle resources directory.
-+ EmuFolders::Resources = Path::Canonicalize(Path::Combine(EmuFolders::AppRoot, "../Resources"));
-+#elif !defined(PCSX2_APP_DATADIR)
- // On Windows/Linux, these are in the binary directory.
- EmuFolders::Resources = Path::Combine(EmuFolders::AppRoot, "resources");
- #else
-- // On macOS, this is in the bundle resources directory.
-- EmuFolders::Resources = Path::Canonicalize(Path::Combine(EmuFolders::AppRoot, "../Resources"));
-+ EmuFolders::Resources = Path::Canonicalize(Path::Combine(EmuFolders::AppRoot, PCSX2_APP_DATADIR "/resources"));
- #endif
- }
-
Copied: pcsx2/repos/community-x86_64/pcsx2-resources-directory.patch (from rev 1269503, pcsx2/trunk/pcsx2-resources-directory.patch)
===================================================================
--- pcsx2-resources-directory.patch (rev 0)
+++ pcsx2-resources-directory.patch 2022-08-19 07:35:20 UTC (rev 1269504)
@@ -0,0 +1,45 @@
+From acc799798362dae3bb8eac694041663f4073af12 Mon Sep 17 00:00:00 2001
+From: kenshen112 <finalfantasytimothy at gmail.com>
+Date: Sun, 22 May 2022 16:44:51 -0700
+Subject: [PATCH] QtHost.cpp: Fixed Resources dir
+
+Fixed location of Resources Dir to proper usr/share location
+---
+ .gitignore | 1 +
+ pcsx2-qt/QtHost.cpp | 8 +++++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/.gitignore b/.gitignore
+index 9cb112d2367a..67d4a5ee6831 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -74,6 +74,7 @@ oprofile_data/
+ /bin/**/*.lib
+ /bin/**/*.pdb
+ /bin/pcsx2
++/bin/pcsx2-qt
+ /bin/PCSX2-linux.sh
+ /bin/*ReplayLoader
+ /bin/GS*.txt
+diff --git a/pcsx2-qt/QtHost.cpp b/pcsx2-qt/QtHost.cpp
+index c40c4dabcad5..c1328bc02fe5 100644
+--- a/pcsx2-qt/QtHost.cpp
++++ b/pcsx2-qt/QtHost.cpp
+@@ -130,12 +130,14 @@ void QtHost::SetAppRoot()
+
+ void QtHost::SetResourcesDirectory()
+ {
+-#ifndef __APPLE__
++#ifdef __APPLE__
++ // On macOS, this is in the bundle resources directory.
++ EmuFolders::Resources = Path::Canonicalize(Path::Combine(EmuFolders::AppRoot, "../Resources"));
++#elif !defined(PCSX2_APP_DATADIR)
+ // On Windows/Linux, these are in the binary directory.
+ EmuFolders::Resources = Path::Combine(EmuFolders::AppRoot, "resources");
+ #else
+- // On macOS, this is in the bundle resources directory.
+- EmuFolders::Resources = Path::Canonicalize(Path::Combine(EmuFolders::AppRoot, "../Resources"));
++ EmuFolders::Resources = Path::Canonicalize(Path::Combine(EmuFolders::AppRoot, PCSX2_APP_DATADIR "/resources"));
+ #endif
+ }
+
Deleted: pcsx2-system-libs.patch
===================================================================
--- pcsx2-system-libs.patch 2022-08-19 07:35:07 UTC (rev 1269503)
+++ pcsx2-system-libs.patch 2022-08-19 07:35:20 UTC (rev 1269504)
@@ -1,25 +0,0 @@
-diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
-index 1e4e07333..2e31bcf99 100644
---- a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -249,7 +249,6 @@ add_subdirectory(3rdparty/imgui EXCLUDE_FROM_ALL)
-
- if(USE_VULKAN)
- add_subdirectory(3rdparty/glslang EXCLUDE_FROM_ALL)
-- add_subdirectory(3rdparty/vulkan-headers EXCLUDE_FROM_ALL)
- endif()
-
- if(CUBEB_API)
-diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
-index 69a2728f3..5a9857d42 100644
---- a/common/CMakeLists.txt
-+++ b/common/CMakeLists.txt
-@@ -135,7 +135,7 @@ target_sources(common PRIVATE
-
- if(USE_VULKAN)
- target_link_libraries(common PUBLIC
-- Vulkan-Headers glslang
-+ glslang
- )
- target_sources(common PRIVATE
- Vulkan/ShaderCache.cpp
Copied: pcsx2/repos/community-x86_64/pcsx2-system-libs.patch (from rev 1269503, pcsx2/trunk/pcsx2-system-libs.patch)
===================================================================
--- pcsx2-system-libs.patch (rev 0)
+++ pcsx2-system-libs.patch 2022-08-19 07:35:20 UTC (rev 1269504)
@@ -0,0 +1,25 @@
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index 1e4e07333..2e31bcf99 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -249,7 +249,6 @@ add_subdirectory(3rdparty/imgui EXCLUDE_FROM_ALL)
+
+ if(USE_VULKAN)
+ add_subdirectory(3rdparty/glslang EXCLUDE_FROM_ALL)
+- add_subdirectory(3rdparty/vulkan-headers EXCLUDE_FROM_ALL)
+ endif()
+
+ if(CUBEB_API)
+diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
+index 69a2728f3..5a9857d42 100644
+--- a/common/CMakeLists.txt
++++ b/common/CMakeLists.txt
+@@ -135,7 +135,7 @@ target_sources(common PRIVATE
+
+ if(USE_VULKAN)
+ target_link_libraries(common PUBLIC
+- Vulkan-Headers glslang
++ glslang
+ )
+ target_sources(common PRIVATE
+ Vulkan/ShaderCache.cpp
Deleted: pcsx2.install
===================================================================
--- pcsx2.install 2022-08-19 07:35:07 UTC (rev 1269503)
+++ pcsx2.install 2022-08-19 07:35:20 UTC (rev 1269504)
@@ -1,11 +0,0 @@
-post_install() {
- echo 'Enabling networking capabilities'
- setcap 'CAP_NET_ADMIN+eip CAP_NET_RAW+eip' usr/bin/pcsx2-qt
-}
-
-post_upgrade() {
- echo 'Enabling networking capabilities'
- setcap 'CAP_NET_ADMIN+eip CAP_NET_RAW+eip' usr/bin/pcsx2-qt
-}
-
-# vim: ts=2 sw=2 et:
Copied: pcsx2/repos/community-x86_64/pcsx2.install (from rev 1269503, pcsx2/trunk/pcsx2.install)
===================================================================
--- pcsx2.install (rev 0)
+++ pcsx2.install 2022-08-19 07:35:20 UTC (rev 1269504)
@@ -0,0 +1,11 @@
+post_install() {
+ echo 'Enabling networking capabilities'
+ setcap 'CAP_NET_ADMIN+eip CAP_NET_RAW+eip' usr/bin/pcsx2-qt
+}
+
+post_upgrade() {
+ echo 'Enabling networking capabilities'
+ setcap 'CAP_NET_ADMIN+eip CAP_NET_RAW+eip' usr/bin/pcsx2-qt
+}
+
+# vim: ts=2 sw=2 et:
More information about the arch-commits
mailing list