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

Maxime Gauduin alucryd at archlinux.org
Mon Nov 9 07:47:44 UTC 2020


    Date: Monday, November 9, 2020 @ 07:47:44
  Author: alucryd
Revision: 746759

archrelease: copy trunk to community-x86_64

Added:
  pcsx2/repos/community-x86_64/PKGBUILD
    (from rev 746758, pcsx2/trunk/PKGBUILD)
  pcsx2/repos/community-x86_64/pcsx2-system-fmt.patch
    (from rev 746758, pcsx2/trunk/pcsx2-system-fmt.patch)
Deleted:
  pcsx2/repos/community-x86_64/PKGBUILD
  pcsx2/repos/community-x86_64/pcsx2-system-fmt.patch

------------------------+
 PKGBUILD               |  198 +++++++++++++++++++++++------------------------
 pcsx2-system-fmt.patch |   66 +++++++--------
 2 files changed, 132 insertions(+), 132 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-09 07:47:37 UTC (rev 746758)
+++ PKGBUILD	2020-11-09 07:47:44 UTC (rev 746759)
@@ -1,99 +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.0.r487.6ad8563c1
-pkgrel=1
-pkgdesc='A Sony PlayStation 2 emulator'
-arch=(x86_64)
-url=https://www.pcsx2.net
-license=(
-  GPL2
-  GPL3
-  LGPL2.1
-  LGPL3
-)
-depends=(
-  gdk-pixbuf2
-  glibc
-  libaio
-  libasound.so
-  libfmt.so
-  libfreetype.so
-  libgdk-3.so
-  libgio-2.0.so
-  libgl
-  libGLEW.so
-  libglib-2.0.so
-  libgobject-2.0.so
-  libgtk-3.so
-  libpcap
-  libpng
-  libportaudio.so
-  libudev.so
-  libx11
-  libxcb
-  libxml2
-  sdl2
-  soundtouch
-  wxgtk3
-  wxgtk-common
-  xz
-  zlib
-)
-makedepends=(
-  cmake
-  git
-  ninja
-  png++
-)
-_commit=6ad8563c1672c1e73869a83b4d83108cba183572
-source=(
-  git+https://github.com/PCSX2/pcsx2.git#commit=${_commit}
-  pcsx2-system-fmt.patch
-)
-b2sums=('SKIP'
-        'af63faeb85d79a99d05605b937f7ac2fe83a2b3bcfebb0ca20d9ead014fd076bb744ae90e75dc2083ccf02657b56414142e796f005d68f89e067ba0270cd54cd')
-
-pkgver() {
-  cd pcsx2
-
-  git describe --tags | sed 's/^v//; s/-dev//; s/-/.r/; s/-g/./'
-}
-
-prepare() {
-  cd pcsx2
-
-  patch -Np1 -i ../pcsx2-system-fmt.patch
-}
-
-build() {
-  cmake -S pcsx2 -B build -G Ninja \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DDOC_DIR=/usr/share/doc/pcsx2 \
-    -DGAMEINDEX_DIR=/usr/share/pcsx2 \
-    -DPLUGIN_DIR=/usr/lib/pcsx2 \
-    -DDISABLE_ADVANCE_SIMD=ON \
-    -DDISABLE_BUILD_DATE=ON \
-    -DDISABLE_PCSX2_WRAPPER=ON \
-    -DENABLE_TESTS=OFF \
-    -DEXTRA_PLUGINS=ON \
-    -DGTK3_API=ON \
-    -DSDL2_API=ON \
-    -DPACKAGE_MODE=ON \
-    -DREBUILD_SHADER=ON \
-    -DUSE_LTO=OFF \
-    -DUSE_VTUNE=OFF \
-    -DXDG_STD=ON \
-    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \
-    -Wno-dev
-  ninja -C build
-}
-
-package() {
-  DESTDIR="${pkgdir}" ninja -C build install
-}
-
-# vim: ts=2 sw=2 et:

Copied: pcsx2/repos/community-x86_64/PKGBUILD (from rev 746758, pcsx2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-09 07:47:44 UTC (rev 746759)
@@ -0,0 +1,99 @@
+# 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.0.r545.12c21de66
+pkgrel=1
+pkgdesc='A Sony PlayStation 2 emulator'
+arch=(x86_64)
+url=https://www.pcsx2.net
+license=(
+  GPL2
+  GPL3
+  LGPL2.1
+  LGPL3
+)
+depends=(
+  gdk-pixbuf2
+  glibc
+  libaio
+  libasound.so
+  libfmt.so
+  libfreetype.so
+  libgdk-3.so
+  libgio-2.0.so
+  libgl
+  libGLEW.so
+  libglib-2.0.so
+  libgobject-2.0.so
+  libgtk-3.so
+  libpcap
+  libpng
+  libportaudio.so
+  libudev.so
+  libx11
+  libxcb
+  libxml2
+  sdl2
+  soundtouch
+  wxgtk3
+  wxgtk-common
+  xz
+  zlib
+)
+makedepends=(
+  cmake
+  git
+  ninja
+  png++
+)
+_commit=12c21de66c7ea2fa326f7217ee662f443dcbe7f3
+source=(
+  git+https://github.com/PCSX2/pcsx2.git#commit=${_commit}
+  pcsx2-system-fmt.patch
+)
+b2sums=('SKIP'
+        'af63faeb85d79a99d05605b937f7ac2fe83a2b3bcfebb0ca20d9ead014fd076bb744ae90e75dc2083ccf02657b56414142e796f005d68f89e067ba0270cd54cd')
+
+pkgver() {
+  cd pcsx2
+
+  git describe --tags | sed 's/^v//; s/-dev//; s/-/.r/; s/-g/./'
+}
+
+prepare() {
+  cd pcsx2
+
+  patch -Np1 -i ../pcsx2-system-fmt.patch
+}
+
+build() {
+  cmake -S pcsx2 -B build -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DDOC_DIR=/usr/share/doc/pcsx2 \
+    -DGAMEINDEX_DIR=/usr/share/pcsx2 \
+    -DPLUGIN_DIR=/usr/lib/pcsx2 \
+    -DDISABLE_ADVANCE_SIMD=ON \
+    -DDISABLE_BUILD_DATE=ON \
+    -DDISABLE_PCSX2_WRAPPER=ON \
+    -DENABLE_TESTS=OFF \
+    -DEXTRA_PLUGINS=ON \
+    -DGTK3_API=ON \
+    -DSDL2_API=ON \
+    -DPACKAGE_MODE=ON \
+    -DREBUILD_SHADER=ON \
+    -DUSE_LTO=OFF \
+    -DUSE_VTUNE=OFF \
+    -DXDG_STD=ON \
+    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \
+    -Wno-dev
+  ninja -C build
+}
+
+package() {
+  DESTDIR="${pkgdir}" ninja -C build install
+}
+
+# vim: ts=2 sw=2 et:

Deleted: pcsx2-system-fmt.patch
===================================================================
--- pcsx2-system-fmt.patch	2020-11-09 07:47:37 UTC (rev 746758)
+++ pcsx2-system-fmt.patch	2020-11-09 07:47:44 UTC (rev 746759)
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1bc43a8e3..a8dd6e2ea 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -41,11 +41,6 @@ if(NOT NO_TRANSLATION)
-     endif()
- endif()
- 
--# 3rdpary Libraries
--if(EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/fmt/fmt")
--    add_subdirectory(3rdparty/fmt/fmt)
--endif()
--
- # make common
- if(common_libs)
-     add_subdirectory(common/src/Utilities)
-diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
-index 7a3871535..236682e6a 100644
---- a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -74,6 +74,11 @@ endif()
- find_package(wxWidgets COMPONENTS base core adv)
- find_package(ZLIB)
- 
-+find_package(fmt)
-+if(NOT fmt_FOUND)
-+    add_subdirectory(${CMAKE_SOURCE_DIR}/3rdparty/fmt/fmt)
-+endif()
-+
- ## Use pcsx2 package to find module
- include(FindLibc)
- 
-

Copied: pcsx2/repos/community-x86_64/pcsx2-system-fmt.patch (from rev 746758, pcsx2/trunk/pcsx2-system-fmt.patch)
===================================================================
--- pcsx2-system-fmt.patch	                        (rev 0)
+++ pcsx2-system-fmt.patch	2020-11-09 07:47:44 UTC (rev 746759)
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1bc43a8e3..a8dd6e2ea 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,11 +41,6 @@ if(NOT NO_TRANSLATION)
+     endif()
+ endif()
+ 
+-# 3rdpary Libraries
+-if(EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/fmt/fmt")
+-    add_subdirectory(3rdparty/fmt/fmt)
+-endif()
+-
+ # make common
+ if(common_libs)
+     add_subdirectory(common/src/Utilities)
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index 7a3871535..236682e6a 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -74,6 +74,11 @@ endif()
+ find_package(wxWidgets COMPONENTS base core adv)
+ find_package(ZLIB)
+ 
++find_package(fmt)
++if(NOT fmt_FOUND)
++    add_subdirectory(${CMAKE_SOURCE_DIR}/3rdparty/fmt/fmt)
++endif()
++
+ ## Use pcsx2 package to find module
+ include(FindLibc)
+ 
+


More information about the arch-commits mailing list