diff options
| author | Omar Vega Ramos <ovruni@gnu.org.pe> | 2018-01-15 19:52:05 -0500 |
|---|---|---|
| committer | Omar Vega Ramos <ovruni@gnu.org.pe> | 2018-01-15 19:52:05 -0500 |
| commit | 895ebb8b919e5983d9100b2356cd40d013e98e20 (patch) | |
| tree | 62e866b2fce8a2703a21c061b5a8409bd746cffa | |
| parent | b3136371f58751478301b7b46527dceb8bb13e9f (diff) | |
| download | abslibre-895ebb8b919e5983d9100b2356cd40d013e98e20.tar.gz abslibre-895ebb8b919e5983d9100b2356cd40d013e98e20.tar.bz2 abslibre-895ebb8b919e5983d9100b2356cd40d013e98e20.zip | |
pcsx2-1.4.0-8.parabola1: rebuild
| -rw-r--r-- | libre-multilib/pcsx2/PKGBUILD | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/libre-multilib/pcsx2/PKGBUILD b/libre-multilib/pcsx2/PKGBUILD index 682e44bb0..07c42b7de 100644 --- a/libre-multilib/pcsx2/PKGBUILD +++ b/libre-multilib/pcsx2/PKGBUILD @@ -2,37 +2,36 @@ # Maintainer (Arch): Maxime Gauduin <alucryd@archlinux.org> # Contributor (Arch): josephgbr <rafael.f.f1@gmail.com> # Contributor (Arch): vEX <vex@niechift.com> -# Maintainer: Márcio Silva <coadde@hyperbola.info> +# Maintainer (Hyperbola): Márcio Silva <coadde@hyperbola.info> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=pcsx2 pkgver=1.4.0 -pkgrel=4.parabola1 +pkgrel=8.parabola1 pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support' arch=('i686' 'x86_64') url='http://www.pcsx2.net' license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3') -depends_i686=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' - 'portaudio' 'sdl2' 'soundtouch' 'wxgtk') +depends_i686=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'libpulse' + 'portaudio' 'sdl2' 'soundtouch' 'wxgtk2') depends_x86_64=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' - 'lib32-libjpeg-turbo' + 'lib32-libjpeg-turbo' 'lib32-libpulse' 'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' - 'lib32-wxgtk') + 'lib32-wxgtk2') makedepends=('cmake' 'png++') makedepends_x86_64=('gcc-multilib') -optdepends_x86_64=('lib32-gtk-engines: GTK2 engines support' - 'lib32-gtk-engine-unico: Unico GTK2 engine support') conflicts=("${pkgname}-libre") replaces=("${pkgname}-libre") options=('!emptydirs') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/PCSX2/${pkgname}/archive/v${pkgver}.tar.gz" +source=("pcsx2-${pkgver}.tar.gz::https://github.com/PCSX2/${pkgname}/archive/v${pkgver}.tar.gz" pcsx2-gcc6.patch) sha256sums=('2c8a986e2b6514d7018f6cfd39c4f2a72229b9b4ab06ca6b1d3466dfd9c33005' 'd78c63808a609a249ec7e8330eeabee306a55ee08d2c9ce9c383b46b334bf7d0') prepare() { cd ${pkgname}-${pkgver} - # Fix build with GCC 6 - patch -p1 -i ../pcsx2-gcc6.patch + + patch -Np1 -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 @@ -60,8 +59,11 @@ build() { -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' \ |