Date: Sunday, October 29, 2017 @ 20:17:43
Author: alucryd
Revision: 264697
archrelease: copy trunk to multilib-x86_64
Added:
pcsx2/repos/multilib-x86_64/PKGBUILD
(from rev 264696, pcsx2/trunk/PKGBUILD)
pcsx2/repos/multilib-x86_64/pcsx2-gcc6.patch
(from rev 264696, pcsx2/trunk/pcsx2-gcc6.patch)
Deleted:
pcsx2/repos/multilib-x86_64/PKGBUILD
pcsx2/repos/multilib-x86_64/pcsx2-gcc6.patch
------------------+
PKGBUILD | 164 ++++++++++++++++++++++++++---------------------------
pcsx2-gcc6.patch | 24 +++----
2 files changed, 94 insertions(+), 94 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-10-29 20:11:43 UTC (rev 264696)
+++ PKGBUILD 2017-10-29 20:17:43 UTC (rev 264697)
@@ -1,82 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <aluc...@archlinux.org>
-# Contributor: josephgbr <rafael.f...@gmail.com>
-# Contributor: vEX <v...@niechift.com>
-
-pkgname=pcsx2
-pkgver=1.4.0
-pkgrel=6
-pkgdesc='A Sony PlayStation 2 emulator'
-arch=('i686' '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')
-source=("pcsx2-${pkgver}.tar.gz::https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz";
- 'pcsx2-gcc6.patch')
-sha256sums=('2c8a986e2b6514d7018f6cfd39c4f2a72229b9b4ab06ca6b1d3466dfd9c33005'
- 'd78c63808a609a249ec7e8330eeabee306a55ee08d2c9ce9c383b46b334bf7d0')
-
-prepare() {
- cd pcsx2-${pkgver}
-
- patch -p1 -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
-
- make
-}
-
-package() {
- cd pcsx2-${pkgver}/build
-
- make DESTDIR="${pkgdir}" install
-}
-
-# vim: ts=2 sw=2 et:
Copied: pcsx2/repos/multilib-x86_64/PKGBUILD (from rev 264696,
pcsx2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-10-29 20:17:43 UTC (rev 264697)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Maxime Gauduin <aluc...@archlinux.org>
+# Contributor: josephgbr <rafael.f...@gmail.com>
+# Contributor: vEX <v...@niechift.com>
+
+pkgname=pcsx2
+pkgver=1.4.0
+pkgrel=7
+pkgdesc='A Sony PlayStation 2 emulator'
+arch=('i686' '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')
+source=("pcsx2-${pkgver}.tar.gz::https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz";
+ 'pcsx2-gcc6.patch')
+sha256sums=('2c8a986e2b6514d7018f6cfd39c4f2a72229b9b4ab06ca6b1d3466dfd9c33005'
+ 'd78c63808a609a249ec7e8330eeabee306a55ee08d2c9ce9c383b46b334bf7d0')
+
+prepare() {
+ cd pcsx2-${pkgver}
+
+ patch -p1 -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
+
+ make
+}
+
+package() {
+ cd pcsx2-${pkgver}/build
+
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: pcsx2-gcc6.patch
===================================================================
--- pcsx2-gcc6.patch 2017-10-29 20:11:43 UTC (rev 264696)
+++ pcsx2-gcc6.patch 2017-10-29 20:17:43 UTC (rev 264697)
@@ -1,12 +0,0 @@
-diff --git a/common/src/x86emitter/cpudetect.cpp
b/common/src/x86emitter/cpudetect.cpp
-index b318909..38f506d 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 "fxsrintrin.h"
-
- using namespace x86Emitter;
-
Copied: pcsx2/repos/multilib-x86_64/pcsx2-gcc6.patch (from rev 264696,
pcsx2/trunk/pcsx2-gcc6.patch)
===================================================================
--- pcsx2-gcc6.patch (rev 0)
+++ pcsx2-gcc6.patch 2017-10-29 20:17:43 UTC (rev 264697)
@@ -0,0 +1,12 @@
+diff --git a/common/src/x86emitter/cpudetect.cpp
b/common/src/x86emitter/cpudetect.cpp
+index b318909..38f506d 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 "fxsrintrin.h"
+
+ using namespace x86Emitter;
+
