diff options
| -rw-r--r-- | libre-multilib/pcsx2/PKGBUILD | 12 | ||||
| -rw-r--r-- | libre-multilib/pcsx2/pcsx2-gcc6.patch | 12 |
2 files changed, 20 insertions, 4 deletions
diff --git a/libre-multilib/pcsx2/PKGBUILD b/libre-multilib/pcsx2/PKGBUILD index 302898ac4..43f706753 100644 --- a/libre-multilib/pcsx2/PKGBUILD +++ b/libre-multilib/pcsx2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171198 2016-04-16 17:31:25Z alucryd $ +# $Id: PKGBUILD 185075 2016-08-04 17:31:05Z arojas $ # Maintainer (Arch): Maxime Gauduin <alucryd@archlinux.org> # Contributor (Arch): josephgbr <rafael.f.f1@gmail.com> # Contributor (Arch): vEX <vex@niechift.com> @@ -6,7 +6,7 @@ pkgname=pcsx2 pkgver=1.4.0 -pkgrel=2.parabola1 +pkgrel=3.parabola1 pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support' arch=('i686' 'x86_64') url='http://www.pcsx2.net' @@ -24,11 +24,15 @@ optdepends_x86_64=('lib32-gtk-engines: GTK2 engines support' conflicts=("${pkgname}-libre") replaces=("${pkgname}-libre") options=('!emptydirs') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/PCSX2/${pkgname}/archive/v${pkgver}.tar.gz") -sha256sums=('2c8a986e2b6514d7018f6cfd39c4f2a72229b9b4ab06ca6b1d3466dfd9c33005') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/PCSX2/${pkgname}/archive/v${pkgver}.tar.gz" + pcsx2-gcc6.patch) +sha256sums=('2c8a986e2b6514d7018f6cfd39c4f2a72229b9b4ab06ca6b1d3466dfd9c33005' + '70f3c865c2dd5590ff5ec0ea83e0561a75d7ae6af78085e5eb64b1463921802f') prepare() { cd ${pkgname}-${pkgver} + # Fix build with GCC 6 + patch -p1 -i ../pcsx2-gcc6.patch # Remove zzogl and zerogs plugins (depends nonfree nvidia-cg-toolkit) rm -vr plugins/{zerogs,zzogl-pg} sed -i '\|zz_res =|,+4 d' linux_various/glsl2h.pl diff --git a/libre-multilib/pcsx2/pcsx2-gcc6.patch b/libre-multilib/pcsx2/pcsx2-gcc6.patch new file mode 100644 index 000000000..ee58441f5 --- /dev/null +++ b/libre-multilib/pcsx2/pcsx2-gcc6.patch @@ -0,0 +1,12 @@ +diff --git a/common/src/x86emitter/cpudetect.cpp b/common/src/x86emitter/cpudetect.cpp +index 717ca89..fcf0c90 100644 +--- a/common/src/x86emitter/cpudetect.cpp ++++ b/common/src/x86emitter/cpudetect.cpp +@@ -16,6 +16,7 @@ + #include "PrecompiledHeader.h" + #include "cpudetect_internal.h" + #include "internal.h" ++#include <x86intrin.h> + + using namespace x86Emitter; + |