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

[Maxime Gauduin]

    Date: Sunday, December 31, 2017 @ 14:02:16
  Author: alucryd
Revision: 277583

FS#53163: pcsx2 1.4.0-8

Modified:
  pcsx2/trunk/PKGBUILD

----------+
 PKGBUILD |   68 ++++++++++++++++++++-----------------------------------------
 1 file changed, 23 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-31 13:45:44 UTC (rev 277582)
+++ PKGBUILD	2017-12-31 14:02:16 UTC (rev 277583)
@@ -5,20 +5,15 @@
 
 pkgname=pcsx2
 pkgver=1.4.0
-pkgrel=7
+pkgrel=8
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('x86_64')
 url='http://www.pcsx2.net'
 license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3')
-depends_i686=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'nvidia-cg-toolkit'
-              'portaudio' 'sdl2' 'soundtouch' 'wxgtk2')
-depends_x86_64=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra'
-                'lib32-libjpeg-turbo' 'lib32-nvidia-cg-toolkit'
-                'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch'
-                'lib32-wxgtk')
-makedepends=('cmake' 'png++')
-makedepends_x86_64=('gcc-multilib')
-options=('!emptydirs')
+depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo'
+         'lib32-libpulse' 'lib32-nvidia-cg-toolkit' 'lib32-portaudio'
+         'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2')
+makedepends=('cmake' 'gcc-multilib' 'png++')
 source=("pcsx2-${pkgver}.tar.gz::https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz"
         'pcsx2-gcc6.patch')
 sha256sums=('2c8a986e2b6514d7018f6cfd39c4f2a72229b9b4ab06ca6b1d3466dfd9c33005'
@@ -27,54 +22,37 @@
 prepare() {
   cd pcsx2-${pkgver}
 
-  patch -p1 -i ../pcsx2-gcc6.patch
+  patch -Np1 -i ../pcsx2-gcc6.patch
 }
 
 build() {
-  cd pcsx2-${pkgver}
-
   if [[ -d build ]]; then
     rm -rf build
   fi
   mkdir build && cd build
 
-  if [[ $CARCH == i686 ]]; then
-    cmake .. \
-      -DCMAKE_BUILD_TYPE='Release' \
-      -DCMAKE_INSTALL_PREFIX='/usr' \
-      -DCMAKE_LIBRARY_PATH='/usr/lib' \
-      -DPLUGIN_DIR='/usr/lib/pcsx2' \
-      -DGAMEINDEX_DIR='/usr/share/pcsx2' \
-      -DDISABLE_ADVANCE_SIMD='TRUE' \
-      -DEXTRA_PLUGINS='TRUE' \
-      -DREBUILD_SHADER='TRUE' \
-      -DGLSL_API='TRUE' \
-      -DPACKAGE_MODE='TRUE' \
-      -DXDG_STD='TRUE'
-  elif [[ $CARCH == x86_64 ]]; then
-    # TODO: Drop wxWidgets_CONFIG_EXECUTABLE once the upstream fix is released
-    # https://github.com/PCSX2/pcsx2/issues/1933
-    cmake .. \
-      -DCMAKE_BUILD_TYPE='Release' \
-      -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32' \
-      -DCMAKE_TOOLCHAIN_FILE='cmake/linux-compiler-i386-multilib.cmake' \
-      -DCMAKE_INSTALL_PREFIX='/usr' \
-      -DCMAKE_LIBRARY_PATH='/usr/lib32' \
-      -DPLUGIN_DIR='/usr/lib32/pcsx2' \
-      -DGAMEINDEX_DIR='/usr/share/pcsx2' \
-      -DDISABLE_ADVANCE_SIMD='TRUE' \
-      -DEXTRA_PLUGINS='TRUE' \
-      -DREBUILD_SHADER='TRUE' \
-      -DGLSL_API='TRUE' \
-      -DPACKAGE_MODE='TRUE' \
-      -DXDG_STD='TRUE'
-  fi
+  # TODO: Drop wxWidgets_CONFIG_EXECUTABLE once the upstream fix is released
+  # https://github.com/PCSX2/pcsx2/issues/1933
+  cmake ../pcsx2-${pkgver} \
+    -DCMAKE_BUILD_TYPE='Release' \
+    -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32' \
+    -DCMAKE_TOOLCHAIN_FILE='cmake/linux-compiler-i386-multilib.cmake' \
+    -DCMAKE_INSTALL_PREFIX='/usr' \
+    -DCMAKE_LIBRARY_PATH='/usr/lib32' \
+    -DPLUGIN_DIR='/usr/lib32/pcsx2' \
+    -DGAMEINDEX_DIR='/usr/share/pcsx2' \
+    -DDISABLE_ADVANCE_SIMD='TRUE' \
+    -DEXTRA_PLUGINS='TRUE' \
+    -DREBUILD_SHADER='TRUE' \
+    -DGLSL_API='TRUE' \
+    -DPACKAGE_MODE='TRUE' \
+    -DXDG_STD='TRUE'
 
   make
 }
 
 package() {
-  cd pcsx2-${pkgver}/build
+  cd build
 
   make DESTDIR="${pkgdir}" install
 }