[arch-commits] Commit in pcsx2/repos/community-x86_64 (6 files)

Maxime Gauduin alucryd at gemini.archlinux.org
Tue Apr 26 10:44:02 UTC 2022


    Date: Tuesday, April 26, 2022 @ 10:44:02
  Author: alucryd
Revision: 1190954

archrelease: copy trunk to community-x86_64

Added:
  pcsx2/repos/community-x86_64/PKGBUILD
    (from rev 1190953, pcsx2/trunk/PKGBUILD)
  pcsx2/repos/community-x86_64/pcsx2-system-libs.patch
    (from rev 1190953, pcsx2/trunk/pcsx2-system-libs.patch)
  pcsx2/repos/community-x86_64/pcsx2.install
    (from rev 1190953, pcsx2/trunk/pcsx2.install)
Deleted:
  pcsx2/repos/community-x86_64/PKGBUILD
  pcsx2/repos/community-x86_64/pcsx2-system-libs.patch
  pcsx2/repos/community-x86_64/pcsx2.install

-------------------------+
 PKGBUILD                |  256 +++++++++++++++++++++++-----------------------
 pcsx2-system-libs.patch |   50 ++++----
 pcsx2.install           |   22 +--
 3 files changed, 167 insertions(+), 161 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-26 10:43:54 UTC (rev 1190953)
+++ PKGBUILD	2022-04-26 10:44:02 UTC (rev 1190954)
@@ -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.2277
-pkgrel=2
-pkgdesc='A Sony PlayStation 2 emulator'
-arch=(x86_64)
-url=https://www.pcsx2.net
-license=(
-  GPL2
-  GPL3
-  LGPL2.1
-  LGPL3
-)
-depends=(
-  alsa-lib
-  gcc-libs
-  glibc
-  libaio
-  libcap
-  libfmt.so
-  libgdk-3.so
-  libgdk_pixbuf-2.0.so
-  libgl
-  libglib-2.0.so
-  libgobject-2.0.so
-  libgtk-3.so
-  libpcap.so
-  libpng
-  libpulse.so
-  libryml.so
-  libsamplerate.so
-  libudev.so
-  libx11
-  libxcb
-  libxml2
-  libxrandr
-  sdl2
-  soundtouch
-  wxgtk3
-  wxgtk-common
-  xz
-  zlib
-)
-makedepends=(
-  cmake
-  git
-  glslang
-  ninja
-  png++
-  vulkan-headers
-)
-_tag=ca55d861874b95959bd84a2f14b7e86303d63794
-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
-)
-b2sums=(
-  SKIP
-  SKIP
-  SKIP
-  SKIP
-  SKIP
-  29c8f279f96c67b3a35eb39440c6dfa134ef1cda36026f69f7b9931c59700e61431d7b38002bd811f6e38089296128a16c737e1c0eb2120b342790089c1e4017
-)
-install=pcsx2.install
-
-prepare() {
-  cd pcsx2
-  git apply -3 ../pcsx2-system-libs.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 \
-    -DCUBEB_API=ON \
-    -DDISABLE_ADVANCE_SIMD=ON \
-    -DDISABLE_BUILD_DATE=ON \
-    -DDISABLE_PCSX2_WRAPPER=ON \
-    -DDISABLE_SETCAP=ON \
-    -DENABLE_TESTS=OFF \
-    -DPACKAGE_MODE=ON \
-    -DUSE_SYSTEM_YAML=ON \
-    -DUSE_VTUNE=OFF \
-    -DUSE_VULKAN=ON \
-    -DXDG_STD=ON \
-    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \
-    -Wno-dev
-  cmake --build build
-}
-
-package() {
-  DESTDIR="${pkgdir}" cmake --install build
-}
-
-# vim: ts=2 sw=2 et:

Copied: pcsx2/repos/community-x86_64/PKGBUILD (from rev 1190953, pcsx2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-04-26 10:44:02 UTC (rev 1190954)
@@ -0,0 +1,131 @@
+# 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.2660
+pkgrel=1
+pkgdesc='A Sony PlayStation 2 emulator'
+arch=(x86_64)
+url=https://www.pcsx2.net
+license=(
+  GPL2
+  GPL3
+  LGPL2.1
+  LGPL3
+)
+depends=(
+  alsa-lib
+  gcc-libs
+  glibc
+  libaio
+  libcap
+  libfmt.so
+  libgdk-3.so
+  libgdk_pixbuf-2.0.so
+  libgl
+  libglib-2.0.so
+  libgobject-2.0.so
+  libgtk-3.so
+  libpcap.so
+  libpng
+  libpulse.so
+  libryml.so
+  libsamplerate.so
+  libudev.so
+  libx11
+  libxcb
+  libxml2
+  libxrandr
+  sdl2
+  soundtouch
+  wxgtk3
+  wxgtk-common
+  xz
+  zlib
+)
+makedepends=(
+  cmake
+  git
+  glslang
+  ninja
+  png++
+  vulkan-headers
+)
+_tag=fea58d2271ef776b1c17d9857694f14b71652ef7
+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
+  git+https://github.com/nih-at/libzip.git
+  git+https://github.com/facebook/zstd.git
+  pcsx2-system-libs.patch
+)
+b2sums=(
+  SKIP
+  SKIP
+  SKIP
+  SKIP
+  SKIP
+  SKIP
+  SKIP
+  29c8f279f96c67b3a35eb39440c6dfa134ef1cda36026f69f7b9931c59700e61431d7b38002bd811f6e38089296128a16c737e1c0eb2120b342790089c1e4017
+)
+install=pcsx2.install
+
+prepare() {
+  cd pcsx2
+  git apply -3 ../pcsx2-system-libs.patch
+
+  local submodule
+  for submodule in \
+    3rdparty/cubeb/cubeb \
+    3rdparty/glslang/glslang \
+    3rdparty/imgui/imgui \
+    3rdparty/libchdr/libchdr \
+    3rdparty/libzip/libzip \
+    3rdparty/zstd/zstd
+  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 \
+    -DCUBEB_API=ON \
+    -DDISABLE_ADVANCE_SIMD=ON \
+    -DDISABLE_BUILD_DATE=ON \
+    -DDISABLE_PCSX2_WRAPPER=ON \
+    -DDISABLE_SETCAP=ON \
+    -DENABLE_TESTS=OFF \
+    -DPACKAGE_MODE=ON \
+    -DUSE_SYSTEM_YAML=ON \
+    -DUSE_VTUNE=OFF \
+    -DUSE_VULKAN=ON \
+    -DXDG_STD=ON \
+    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \
+    -Wno-dev
+  cmake --build build
+}
+
+package() {
+  DESTDIR="${pkgdir}" cmake --install build
+}
+
+# vim: ts=2 sw=2 et:

Deleted: pcsx2-system-libs.patch
===================================================================
--- pcsx2-system-libs.patch	2022-04-26 10:43:54 UTC (rev 1190953)
+++ pcsx2-system-libs.patch	2022-04-26 10:44:02 UTC (rev 1190954)
@@ -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 1190953, pcsx2/trunk/pcsx2-system-libs.patch)
===================================================================
--- pcsx2-system-libs.patch	                        (rev 0)
+++ pcsx2-system-libs.patch	2022-04-26 10:44:02 UTC (rev 1190954)
@@ -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-04-26 10:43:54 UTC (rev 1190953)
+++ pcsx2.install	2022-04-26 10:44:02 UTC (rev 1190954)
@@ -1,11 +0,0 @@
-post_install() {
-  echo 'Enabling networking capabilities'
-  setcap 'CAP_NET_ADMIN+eip CAP_NET_RAW+eip' usr/bin/pcsx2
-}
-
-post_upgrade() {
-  echo 'Enabling networking capabilities'
-  setcap 'CAP_NET_ADMIN+eip CAP_NET_RAW+eip' usr/bin/pcsx2
-}
-
-# vim: ts=2 sw=2 et:

Copied: pcsx2/repos/community-x86_64/pcsx2.install (from rev 1190953, pcsx2/trunk/pcsx2.install)
===================================================================
--- pcsx2.install	                        (rev 0)
+++ pcsx2.install	2022-04-26 10:44:02 UTC (rev 1190954)
@@ -0,0 +1,11 @@
+post_install() {
+  echo 'Enabling networking capabilities'
+  setcap 'CAP_NET_ADMIN+eip CAP_NET_RAW+eip' usr/bin/pcsx2
+}
+
+post_upgrade() {
+  echo 'Enabling networking capabilities'
+  setcap 'CAP_NET_ADMIN+eip CAP_NET_RAW+eip' usr/bin/pcsx2
+}
+
+# vim: ts=2 sw=2 et:



More information about the arch-commits mailing list