Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

1 files changed, 39 insertions, 21 deletions

diff --git a/libre-multilib/pcsx2/PKGBUILD b/libre-multilib/pcsx2/PKGBUILD
index 462310975..3c661d70f 100644
--- a/libre-multilib/pcsx2/PKGBUILD
+++ b/libre-multilib/pcsx2/PKGBUILD
@@ -4,23 +4,27 @@
 # Contributor (Arch): vEX <vex@niechift.com>
 
 pkgname=pcsx2
-pkgver=1.2.2
-pkgrel=3.parabola1
+pkgver=1.3.1
+pkgrel=1.parabola1
 pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support'
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'
 license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3')
-makedepends=('cmake' 'sparsehash')
-if [[ $CARCH == "i686" ]]; then
-  depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'soundtouch' 'wxgtk2.8')
-elif [[ $CARCH == "x86_64" ]]; then
-  makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-libgl' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8')
-fi
+depends_i686=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo'
+              'portaudio' 'sdl' 'soundtouch' 'wxgtk')
+depends_x86_64=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra'
+                'lib32-libjpeg-turbo'
+                'lib32-portaudio' 'lib32-sdl' 'lib32-soundtouch' 'lib32-wxgtk')
+makedepends=('cmake')
+makedepends_x86_64=('gcc-multilib')
+optdepends_x86_64=('lib32-gtk-engines: GTK2 engines support'
+                   'lib32-gtk-engine-murrine: Murrine GTK3 engine support'
+                   'lib32-gtk-engine-unico: Unico GTK2 engine support')
 conflicts=("${pkgname}-libre")
 replaces=("${pkgname}-libre")
 options=('!emptydirs')
 source=("https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz")
-sha256sums=('4fccef58098d099ffe955fadd5ceee78ed063ab585b8772f4242fd6dc5fd2d23')
+sha256sums=('60ba9f7f85bf4337ca6962f9b437d549f16fc04ea0b6b261d7521e0416c2b8c9')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -36,13 +40,31 @@ build() {
   fi
   mkdir build && cd build
 
-  if [[ $CARCH == "i686" ]]; then
-    cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,XDG_STD}='ON' -DPLUGIN_DIR='/usr/lib/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8'
-  elif [[ $CARCH == "x86_64" ]]; then
-    export CC='gcc -m32'
-    export CXX='g++ -m32'
-    export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-    cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,XDG_STD}='ON' -DPLUGIN_DIR='/usr/lib32/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8' -DCMAKE_LIBRARY_PATH='/usr/lib32'
+  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' \
+      -DEXTRA_PLUGINS='TRUE' \
+      -DREBUILD_SHADER='TRUE' \
+      -DGLSL_API='TRUE' \
+      -DPACKAGE_MODE='TRUE' \
+      -DXDG_STD='TRUE'
+  elif [[ $CARCH == x86_64 ]]; then
+    cmake .. \
+      -DCMAKE_BUILD_TYPE='Release' \
+      -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' \
+      -DEXTRA_PLUGINS='TRUE' \
+      -DREBUILD_SHADER='TRUE' \
+      -DGLSL_API='TRUE' \
+      -DPACKAGE_MODE='TRUE' \
+      -DXDG_STD='TRUE'
   fi
 
   make
@@ -51,10 +73,6 @@ build() {
 package() {
   cd ${pkgname}-${pkgver}/build
 
-  if [[ $CARCH == "x86_64" ]]; then
-    depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8')
-  fi
-
   make DESTDIR="${pkgdir}" install
 }