[arch-commits] Commit in pcsx2/trunk (PKGBUILD)

[Maxime Gauduin]

    Date: Tuesday, September 1, 2020 @ 14:10:29
  Author: alucryd
Revision: 695517

upgpkg: pcsx2 1.7.0.r202.9c0865c0f-1

Modified:
  pcsx2/trunk/PKGBUILD

----------+
 PKGBUILD |   74 +++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 45 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-01 14:09:32 UTC (rev 695516)
+++ PKGBUILD	2020-09-01 14:10:29 UTC (rev 695517)
@@ -3,8 +3,8 @@
 # Contributor: vEX <vex at niechift.com>
 
 pkgname=pcsx2
-pkgver=1.6.0
-pkgrel=2
+pkgver=1.7.0.r202.9c0865c0f
+pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
 url=https://www.pcsx2.net
@@ -15,52 +15,68 @@
   LGPL3
 )
 depends=(
-  lib32-glew
-  lib32-libaio
-  lib32-libcanberra
-  lib32-libjpeg-turbo
-  lib32-libpcap
-  lib32-libpulse
-  lib32-libxml2
-  lib32-nvidia-cg-toolkit
-  lib32-ocl-icd
-  lib32-portaudio
-  lib32-sdl2
-  lib32-soundtouch
-  lib32-wxgtk3
+  gdk-pixbuf2
+  glibc
+  libaio
+  libasound.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
+  nvidia-cg-toolkit
+  sdl2
+  soundtouch
+  wxgtk3
+  wxgtk-common
+  xz
+  zlib
 )
 makedepends=(
+  clang
   cmake
   git
-  opencl-headers
+  ninja
   png++
 )
-_tag=aaaf29557fe63870ede815dd6d2e48a98279ca59
-source=(git+https://github.com/PCSX2/pcsx2.git#tag=${_tag})
+_commit=9c0865c0f486ee7dfb15669b3488248590d0b11a
+source=(git+https://github.com/PCSX2/pcsx2.git#commit=${_commit})
 sha256sums=(SKIP)
 
 pkgver() {
   cd pcsx2
 
-  git describe --tags | sed 's/^v//'
+  git describe --tags | sed 's/^v//; s/-dev//; s/-/.r/; s/-g/./'
 }
 
 build() {
-  cmake -S pcsx2 -B build \
+  export CC=clang
+  export CXX=clang++
+  export CFLAGS="$CFLAGS -Wno-argument-outside-range"
+  export CXXFLAGS="$CXXFLAGS -Wno-argument-outside-range"
+
+  cmake -S pcsx2 -B build -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_LIBRARY_PATH=/usr/lib32 \
+    -DDOC_DIR=/usr/share/doc/pcsx2 \
     -DGAMEINDEX_DIR=/usr/share/pcsx2 \
-    -DPLUGIN_DIR=/usr/lib32/pcsx2 \
+    -DPLUGIN_DIR=/usr/lib/pcsx2 \
     -DDISABLE_ADVANCE_SIMD=ON \
     -DDISABLE_BUILD_DATE=ON \
     -DDISABLE_PCSX2_WRAPPER=ON \
     -DEXTRA_PLUGINS=ON \
-    -DEGL_API=OFF \
-    -DGLSL_API=ON \
     -DGTK3_API=ON \
-    -DOPENCL_API=ON \
+    -DOPENCL_API=OFF \
     -DSDL2_API=ON \
     -DPACKAGE_MODE=ON \
     -DREBUILD_SHADER=ON \
@@ -67,13 +83,13 @@
     -DUSE_LTO=OFF \
     -DUSE_VTUNE=OFF \
     -DXDG_STD=ON \
-    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config32 \
+    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \
     -Wno-dev
-  make -C build
+  ninja -C build
 }
 
 package() {
-  make DESTDIR="${pkgdir}" -C build install
+  DESTDIR="${pkgdir}" ninja -C build install
 }
 
 # vim: ts=2 sw=2 et: