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

2020-12-16 Thread Maxime Gauduin via arch-commits 
Date: Wednesday, December 16, 2020 @ 13:24:38
  Author: alucryd
Revision: 776686

upgpkg: pcsx2 1.7.0.r686.03445d0b5-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-16 13:24:22 UTC (rev 776685)
+++ PKGBUILD2020-12-16 13:24:38 UTC (rev 776686)
@@ -3,7 +3,7 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.7.0.r655.16d33f896
+pkgver=1.7.0.r686.03445d0b5
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
@@ -50,7 +50,7 @@
   ninja
   png++
 )
-_commit=16d33f896054333e00fbb3fd65b697f24c97b774
+_commit=03445d0b553fc5a8275e5df91fe004a5e10607a2
 source=(git+https://github.com/PCSX2/pcsx2.git#commit=${_commit})
 b2sums=(SKIP)
 
@@ -76,6 +76,7 @@
 -DPACKAGE_MODE=ON \
 -DREBUILD_SHADER=ON \
 -DUSE_LTO=OFF \
+-DUSE_SYSTEM_YAML=ON \
 -DUSE_VTUNE=OFF \
 -DXDG_STD=ON \
 -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \

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

2020-12-06 Thread Maxime Gauduin via arch-commits 
Date: Sunday, December 6, 2020 @ 16:25:49
  Author: alucryd
Revision: 771050

upgpkg: pcsx2 1.7.0.r655.16d33f896-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-06 16:01:48 UTC (rev 771049)
+++ PKGBUILD2020-12-06 16:25:49 UTC (rev 771050)
@@ -3,7 +3,7 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.7.0.r636.3b073343c
+pkgver=1.7.0.r655.16d33f896
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
@@ -36,6 +36,7 @@
   libx11
   libxcb
   libxml2
+  libyaml-cpp.so
   sdl2
   soundtouch
   wxgtk3
@@ -49,7 +50,7 @@
   ninja
   png++
 )
-_commit=3b073343cc00760cdeb8ae205637c6402ec40578
+_commit=16d33f896054333e00fbb3fd65b697f24c97b774
 source=(git+https://github.com/PCSX2/pcsx2.git#commit=${_commit})
 b2sums=(SKIP)

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

2020-11-30 Thread Maxime Gauduin via arch-commits 
Date: Tuesday, December 1, 2020 @ 07:32:08
  Author: alucryd
Revision: 766987

upgpkg: pcsx2 1.7.0.r636.3b073343c-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-01 07:30:40 UTC (rev 766986)
+++ PKGBUILD2020-12-01 07:32:08 UTC (rev 766987)
@@ -3,7 +3,7 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.7.0.r619.626bf2788
+pkgver=1.7.0.r636.3b073343c
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
@@ -49,7 +49,7 @@
   ninja
   png++
 )
-_commit=626bf278876cfb44c1e4d427804235a93b190332
+_commit=3b073343cc00760cdeb8ae205637c6402ec40578
 source=(git+https://github.com/PCSX2/pcsx2.git#commit=${_commit})
 b2sums=(SKIP)

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

2020-11-23 Thread Maxime Gauduin via arch-commits 
Date: Tuesday, November 24, 2020 @ 07:40:26
  Author: alucryd
Revision: 760887

upgpkg: pcsx2 1.7.0.r619.626bf2788-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-24 07:37:57 UTC (rev 760886)
+++ PKGBUILD2020-11-24 07:40:26 UTC (rev 760887)
@@ -3,7 +3,7 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.7.0.r592.60ef26ec5
+pkgver=1.7.0.r619.626bf2788
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
@@ -49,7 +49,7 @@
   ninja
   png++
 )
-_commit=60ef26ec518a78c4954bdee6ee1269d4aeb5614f
+_commit=626bf278876cfb44c1e4d427804235a93b190332
 source=(git+https://github.com/PCSX2/pcsx2.git#commit=${_commit})
 b2sums=(SKIP)

[arch-commits] Commit in pcsx2/trunk (PKGBUILD pcsx2-system-fmt.patch)

2020-11-12 Thread Maxime Gauduin via arch-commits 
Date: Thursday, November 12, 2020 @ 09:08:16
  Author: alucryd
Revision: 751335

upgpkg: pcsx2 1.7.0.r592.60ef26ec5-1

Modified:
  pcsx2/trunk/PKGBUILD
Deleted:
  pcsx2/trunk/pcsx2-system-fmt.patch

+
 PKGBUILD   |   20 +---
 pcsx2-system-fmt.patch |   33 -
 2 files changed, 5 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-12 08:36:46 UTC (rev 751334)
+++ PKGBUILD2020-11-12 09:08:16 UTC (rev 751335)
@@ -3,7 +3,7 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.7.0.r545.12c21de66
+pkgver=1.7.0.r592.60ef26ec5
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
@@ -31,6 +31,7 @@
   libpcap
   libpng
   libportaudio.so
+  libpulse.so
   libudev.so
   libx11
   libxcb
@@ -48,13 +49,9 @@
   ninja
   png++
 )
-_commit=12c21de66c7ea2fa326f7217ee662f443dcbe7f3
-source=(
-  git+https://github.com/PCSX2/pcsx2.git#commit=${_commit}
-  pcsx2-system-fmt.patch
-)
-b2sums=('SKIP'
-
'af63faeb85d79a99d05605b937f7ac2fe83a2b3bcfebb0ca20d9ead014fd076bb744ae90e75dc2083ccf02657b56414142e796f005d68f89e067ba0270cd54cd')
+_commit=60ef26ec518a78c4954bdee6ee1269d4aeb5614f
+source=(git+https://github.com/PCSX2/pcsx2.git#commit=${_commit})
+b2sums=(SKIP)
 
 pkgver() {
   cd pcsx2
@@ -62,12 +59,6 @@
   git describe --tags | sed 's/^v//; s/-dev//; s/-/.r/; s/-g/./'
 }
 
-prepare() {
-  cd pcsx2
-
-  patch -Np1 -i ../pcsx2-system-fmt.patch
-}
-
 build() {
   cmake -S pcsx2 -B build -G Ninja \
 -DCMAKE_BUILD_TYPE=Release \
@@ -80,7 +71,6 @@
 -DDISABLE_PCSX2_WRAPPER=ON \
 -DENABLE_TESTS=OFF \
 -DEXTRA_PLUGINS=ON \
--DGTK3_API=ON \
 -DSDL2_API=ON \
 -DPACKAGE_MODE=ON \
 -DREBUILD_SHADER=ON \

Deleted: pcsx2-system-fmt.patch
===
--- pcsx2-system-fmt.patch  2020-11-12 08:36:46 UTC (rev 751334)
+++ pcsx2-system-fmt.patch  2020-11-12 09:08:16 UTC (rev 751335)
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1bc43a8e3..a8dd6e2ea 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -41,11 +41,6 @@ if(NOT NO_TRANSLATION)
- endif()
- endif()
- 
--# 3rdpary Libraries
--if(EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/fmt/fmt")
--add_subdirectory(3rdparty/fmt/fmt)
--endif()
--
- # make common
- if(common_libs)
- add_subdirectory(common/src/Utilities)
-diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
-index 7a3871535..236682e6a 100644
 a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -74,6 +74,11 @@ endif()
- find_package(wxWidgets COMPONENTS base core adv)
- find_package(ZLIB)
- 
-+find_package(fmt)
-+if(NOT fmt_FOUND)
-+add_subdirectory(${CMAKE_SOURCE_DIR}/3rdparty/fmt/fmt)
-+endif()
-+
- ## Use pcsx2 package to find module
- include(FindLibc)
- 
-

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

2020-11-08 Thread Maxime Gauduin via arch-commits 
Date: Monday, November 9, 2020 @ 07:47:37
  Author: alucryd
Revision: 746758

upgpkg: pcsx2 1.7.0.r545.12c21de66-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-09 07:36:44 UTC (rev 746757)
+++ PKGBUILD2020-11-09 07:47:37 UTC (rev 746758)
@@ -3,7 +3,7 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.7.0.r487.6ad8563c1
+pkgver=1.7.0.r545.12c21de66
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
@@ -48,7 +48,7 @@
   ninja
   png++
 )
-_commit=6ad8563c1672c1e73869a83b4d83108cba183572
+_commit=12c21de66c7ea2fa326f7217ee662f443dcbe7f3
 source=(
   git+https://github.com/PCSX2/pcsx2.git#commit=${_commit}
   pcsx2-system-fmt.patch

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

2020-10-28 Thread Maxime Gauduin via arch-commits 
Date: Wednesday, October 28, 2020 @ 07:55:05
  Author: alucryd
Revision: 735273

upgpkg: pcsx2 1.7.0.r487.6ad8563c1-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-28 07:53:56 UTC (rev 735272)
+++ PKGBUILD2020-10-28 07:55:05 UTC (rev 735273)
@@ -3,7 +3,7 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.7.0.r482.3dc44bafb
+pkgver=1.7.0.r487.6ad8563c1
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
@@ -48,7 +48,7 @@
   ninja
   png++
 )
-_commit=3dc44bafb33a7291491de5642c8043fa68b8d3fd
+_commit=6ad8563c1672c1e73869a83b4d83108cba183572
 source=(
   git+https://github.com/PCSX2/pcsx2.git#commit=${_commit}
   pcsx2-system-fmt.patch

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

2020-10-27 Thread Maxime Gauduin via arch-commits 
Date: Tuesday, October 27, 2020 @ 13:53:21
  Author: alucryd
Revision: 734414

upgpkg: pcsx2 1.7.0.r482.3dc44bafb-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-27 13:53:02 UTC (rev 734413)
+++ PKGBUILD2020-10-27 13:53:21 UTC (rev 734414)
@@ -3,7 +3,7 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.7.0.r475.418974a28
+pkgver=1.7.0.r482.3dc44bafb
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
@@ -48,7 +48,7 @@
   ninja
   png++
 )
-_commit=418974a28a75a2d3114b3de2b3d9faf42b65336d
+_commit=3dc44bafb33a7291491de5642c8043fa68b8d3fd
 source=(
   git+https://github.com/PCSX2/pcsx2.git#commit=${_commit}
   pcsx2-system-fmt.patch

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

2020-10-22 Thread Maxime Gauduin via arch-commits 
Date: Thursday, October 22, 2020 @ 06:29:26
  Author: alucryd
Revision: 728778

upgpkg: pcsx2 1.7.0.r475.418974a28-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-22 06:03:26 UTC (rev 728777)
+++ PKGBUILD2020-10-22 06:29:26 UTC (rev 728778)
@@ -3,7 +3,7 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.7.0.r469.51976aa06
+pkgver=1.7.0.r475.418974a28
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
@@ -48,7 +48,7 @@
   ninja
   png++
 )
-_commit=51976aa06b63174718383f2309d759a97edd79b3
+_commit=418974a28a75a2d3114b3de2b3d9faf42b65336d
 source=(
   git+https://github.com/PCSX2/pcsx2.git#commit=${_commit}
   pcsx2-system-fmt.patch

[arch-commits] Commit in pcsx2/trunk (PKGBUILD pcsx2-system-fmt.patch)

2020-10-19 Thread Maxime Gauduin via arch-commits 
Date: Monday, October 19, 2020 @ 14:13:14
  Author: alucryd
Revision: 727159

upgpkg: pcsx2 1.7.0.r469.51976aa06-1

Added:
  pcsx2/trunk/pcsx2-system-fmt.patch
Modified:
  pcsx2/trunk/PKGBUILD

+
 PKGBUILD   |   19 +++
 pcsx2-system-fmt.patch |   33 +
 2 files changed, 48 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-19 14:09:50 UTC (rev 727158)
+++ PKGBUILD2020-10-19 14:13:14 UTC (rev 727159)
@@ -3,7 +3,7 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.7.0.r441.92171ddba
+pkgver=1.7.0.r469.51976aa06
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
@@ -19,6 +19,7 @@
   glibc
   libaio
   libasound.so
+  libfmt.so
   libfreetype.so
   libgdk-3.so
   libgio-2.0.so
@@ -47,9 +48,13 @@
   ninja
   png++
 )
-_commit=92171ddbaa8a90bed7e0228337bd0dbecd0ed03e
-source=(git+https://github.com/PCSX2/pcsx2.git#commit=${_commit})
-sha256sums=(SKIP)
+_commit=51976aa06b63174718383f2309d759a97edd79b3
+source=(
+  git+https://github.com/PCSX2/pcsx2.git#commit=${_commit}
+  pcsx2-system-fmt.patch
+)
+b2sums=('SKIP'
+
'af63faeb85d79a99d05605b937f7ac2fe83a2b3bcfebb0ca20d9ead014fd076bb744ae90e75dc2083ccf02657b56414142e796f005d68f89e067ba0270cd54cd')
 
 pkgver() {
   cd pcsx2
@@ -57,6 +62,12 @@
   git describe --tags | sed 's/^v//; s/-dev//; s/-/.r/; s/-g/./'
 }
 
+prepare() {
+  cd pcsx2
+
+  patch -Np1 -i ../pcsx2-system-fmt.patch
+}
+
 build() {
   cmake -S pcsx2 -B build -G Ninja \
 -DCMAKE_BUILD_TYPE=Release \

Added: pcsx2-system-fmt.patch
===
--- pcsx2-system-fmt.patch  (rev 0)
+++ pcsx2-system-fmt.patch  2020-10-19 14:13:14 UTC (rev 727159)
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1bc43a8e3..a8dd6e2ea 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -41,11 +41,6 @@ if(NOT NO_TRANSLATION)
+ endif()
+ endif()
+ 
+-# 3rdpary Libraries
+-if(EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/fmt/fmt")
+-add_subdirectory(3rdparty/fmt/fmt)
+-endif()
+-
+ # make common
+ if(common_libs)
+ add_subdirectory(common/src/Utilities)
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index 7a3871535..236682e6a 100644
+--- a/cmake/SearchForStuff.cmake
 b/cmake/SearchForStuff.cmake
+@@ -74,6 +74,11 @@ endif()
+ find_package(wxWidgets COMPONENTS base core adv)
+ find_package(ZLIB)
+ 
++find_package(fmt)
++if(NOT fmt_FOUND)
++add_subdirectory(${CMAKE_SOURCE_DIR}/3rdparty/fmt/fmt)
++endif()
++
+ ## Use pcsx2 package to find module
+ include(FindLibc)
+ 
+


Property changes on: pcsx2/trunk/pcsx2-system-fmt.patch
___
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property

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

2020-10-16 Thread Maxime Gauduin via arch-commits 
Date: Friday, October 16, 2020 @ 07:27:43
  Author: alucryd
Revision: 724330

upgpkg: pcsx2 1.7.0.r441.92171ddba-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-16 07:26:25 UTC (rev 724329)
+++ PKGBUILD2020-10-16 07:27:43 UTC (rev 724330)
@@ -3,7 +3,7 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.7.0.r437.fb29353d5
+pkgver=1.7.0.r441.92171ddba
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
@@ -47,7 +47,7 @@
   ninja
   png++
 )
-_commit=fb29353d5d85d73f635029a02ec68422ab6c7312
+_commit=92171ddbaa8a90bed7e0228337bd0dbecd0ed03e
 source=(git+https://github.com/PCSX2/pcsx2.git#commit=${_commit})
 sha256sums=(SKIP)

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

2020-10-12 Thread Maxime Gauduin via arch-commits 
Date: Monday, October 12, 2020 @ 13:23:31
  Author: alucryd
Revision: 723656

upgpkg: pcsx2 1.7.0.r437.fb29353d5-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-12 13:20:10 UTC (rev 723655)
+++ PKGBUILD2020-10-12 13:23:31 UTC (rev 723656)
@@ -3,7 +3,7 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.7.0.r343.5858f7274
+pkgver=1.7.0.r437.fb29353d5
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
@@ -47,7 +47,7 @@
   ninja
   png++
 )
-_commit=5858f72748d0ec0810fc3c570c9e1803be54f76f
+_commit=fb29353d5d85d73f635029a02ec68422ab6c7312
 source=(git+https://github.com/PCSX2/pcsx2.git#commit=${_commit})
 sha256sums=(SKIP)

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

2020-09-30 Thread Maxime Gauduin via arch-commits 
Date: Wednesday, September 30, 2020 @ 06:36:55
  Author: alucryd
Revision: 714031

upgpkg: pcsx2 1.7.0.r343.5858f7274-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 3 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-09-30 06:23:30 UTC (rev 714030)
+++ PKGBUILD2020-09-30 06:36:55 UTC (rev 714031)
@@ -3,7 +3,7 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.7.0.r202.9c0865c0f
+pkgver=1.7.0.r343.5858f7274
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
@@ -34,7 +34,6 @@
   libx11
   libxcb
   libxml2
-  nvidia-cg-toolkit
   sdl2
   soundtouch
   wxgtk3
@@ -43,13 +42,12 @@
   zlib
 )
 makedepends=(
-  clang
   cmake
   git
   ninja
   png++
 )
-_commit=9c0865c0f486ee7dfb15669b3488248590d0b11a
+_commit=5858f72748d0ec0810fc3c570c9e1803be54f76f
 source=(git+https://github.com/PCSX2/pcsx2.git#commit=${_commit})
 sha256sums=(SKIP)
 
@@ -60,11 +58,6 @@
 }
 
 build() {
-  export CC=clang
-  export CXX=clang++
-  export CFLAGS="$CFLAGS -Wno-argument-outside-range"
-  export CXXFLAGS="$CXXFLAGS -Wno-argument-outside-range"
-
   cmake -S pcsx2 -B build -G Ninja \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
@@ -74,9 +67,9 @@
 -DDISABLE_ADVANCE_SIMD=ON \
 -DDISABLE_BUILD_DATE=ON \
 -DDISABLE_PCSX2_WRAPPER=ON \
+-DENABLE_TESTS=OFF \
 -DEXTRA_PLUGINS=ON \
 -DGTK3_API=ON \
--DOPENCL_API=OFF \
 -DSDL2_API=ON \
 -DPACKAGE_MODE=ON \
 -DREBUILD_SHADER=ON \

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

2020-09-01 Thread Maxime Gauduin via arch-commits 
Date: Tuesday, September 1, 2020 @ 14:10:29
  Author: alucryd
Revision: 695517

upgpkg: pcsx2 1.7.0.r202.9c0865c0f-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |   74 +
 1 file changed, 45 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-09-01 14:09:32 UTC (rev 695516)
+++ PKGBUILD2020-09-01 14:10:29 UTC (rev 695517)
@@ -3,8 +3,8 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.6.0
-pkgrel=2
+pkgver=1.7.0.r202.9c0865c0f
+pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
 url=https://www.pcsx2.net
@@ -15,52 +15,68 @@
   LGPL3
 )
 depends=(
-  lib32-glew
-  lib32-libaio
-  lib32-libcanberra
-  lib32-libjpeg-turbo
-  lib32-libpcap
-  lib32-libpulse
-  lib32-libxml2
-  lib32-nvidia-cg-toolkit
-  lib32-ocl-icd
-  lib32-portaudio
-  lib32-sdl2
-  lib32-soundtouch
-  lib32-wxgtk3
+  gdk-pixbuf2
+  glibc
+  libaio
+  libasound.so
+  libfreetype.so
+  libgdk-3.so
+  libgio-2.0.so
+  libgl
+  libGLEW.so
+  libglib-2.0.so
+  libgobject-2.0.so
+  libgtk-3.so
+  libpcap
+  libpng
+  libportaudio.so
+  libudev.so
+  libx11
+  libxcb
+  libxml2
+  nvidia-cg-toolkit
+  sdl2
+  soundtouch
+  wxgtk3
+  wxgtk-common
+  xz
+  zlib
 )
 makedepends=(
+  clang
   cmake
   git
-  opencl-headers
+  ninja
   png++
 )
-_tag=aaaf29557fe63870ede815dd6d2e48a98279ca59
-source=(git+https://github.com/PCSX2/pcsx2.git#tag=${_tag})
+_commit=9c0865c0f486ee7dfb15669b3488248590d0b11a
+source=(git+https://github.com/PCSX2/pcsx2.git#commit=${_commit})
 sha256sums=(SKIP)
 
 pkgver() {
   cd pcsx2
 
-  git describe --tags | sed 's/^v//'
+  git describe --tags | sed 's/^v//; s/-dev//; s/-/.r/; s/-g/./'
 }
 
 build() {
-  cmake -S pcsx2 -B build \
+  export CC=clang
+  export CXX=clang++
+  export CFLAGS="$CFLAGS -Wno-argument-outside-range"
+  export CXXFLAGS="$CXXFLAGS -Wno-argument-outside-range"
+
+  cmake -S pcsx2 -B build -G Ninja \
 -DCMAKE_BUILD_TYPE=Release \
--DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake \
 -DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_LIBRARY_PATH=/usr/lib32 \
+-DDOC_DIR=/usr/share/doc/pcsx2 \
 -DGAMEINDEX_DIR=/usr/share/pcsx2 \
--DPLUGIN_DIR=/usr/lib32/pcsx2 \
+-DPLUGIN_DIR=/usr/lib/pcsx2 \
 -DDISABLE_ADVANCE_SIMD=ON \
 -DDISABLE_BUILD_DATE=ON \
 -DDISABLE_PCSX2_WRAPPER=ON \
 -DEXTRA_PLUGINS=ON \
--DEGL_API=OFF \
--DGLSL_API=ON \
 -DGTK3_API=ON \
--DOPENCL_API=ON \
+-DOPENCL_API=OFF \
 -DSDL2_API=ON \
 -DPACKAGE_MODE=ON \
 -DREBUILD_SHADER=ON \
@@ -67,13 +83,13 @@
 -DUSE_LTO=OFF \
 -DUSE_VTUNE=OFF \
 -DXDG_STD=ON \
--DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config32 \
+-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \
 -Wno-dev
-  make -C build
+  ninja -C build
 }
 
 package() {
-  make DESTDIR="${pkgdir}" -C build install
+  DESTDIR="${pkgdir}" ninja -C build install
 }
 
 # vim: ts=2 sw=2 et:

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

2020-08-07 Thread Maxime Gauduin via arch-commits 
Date: Friday, August 7, 2020 @ 13:13:14
  Author: alucryd
Revision: 671526

upgpkg: pcsx2 1.6.0-2

Modified:
  pcsx2/trunk/PKGBUILD
Deleted:
  pcsx2/trunk/pcsx2-gcc6.patch

--+
 PKGBUILD |   22 +++---
 pcsx2-gcc6.patch |   81 -
 2 files changed, 17 insertions(+), 86 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-07 12:58:13 UTC (rev 671525)
+++ PKGBUILD2020-08-07 13:13:14 UTC (rev 671526)
@@ -4,7 +4,7 @@
 
 pkgname=pcsx2
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
 url=https://www.pcsx2.net
@@ -23,17 +23,20 @@
   lib32-libpulse
   lib32-libxml2
   lib32-nvidia-cg-toolkit
+  lib32-ocl-icd
   lib32-portaudio
   lib32-sdl2
   lib32-soundtouch
-  lib32-wxgtk2
+  lib32-wxgtk3
 )
 makedepends=(
   cmake
   git
+  opencl-headers
   png++
 )
-source=(git+https://github.com/PCSX2/pcsx2.git#tag=aaaf29557fe63870ede815dd6d2e48a98279ca59)
+_tag=aaaf29557fe63870ede815dd6d2e48a98279ca59
+source=(git+https://github.com/PCSX2/pcsx2.git#tag=${_tag})
 sha256sums=(SKIP)
 
 pkgver() {
@@ -44,7 +47,7 @@
 
 build() {
   cmake -S pcsx2 -B build \
--DCMAKE_BUILD_TYPE=None \
+-DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_LIBRARY_PATH=/usr/lib32 \
@@ -51,12 +54,21 @@
 -DGAMEINDEX_DIR=/usr/share/pcsx2 \
 -DPLUGIN_DIR=/usr/lib32/pcsx2 \
 -DDISABLE_ADVANCE_SIMD=ON \
+-DDISABLE_BUILD_DATE=ON \
+-DDISABLE_PCSX2_WRAPPER=ON \
 -DEXTRA_PLUGINS=ON \
+-DEGL_API=OFF \
 -DGLSL_API=ON \
+-DGTK3_API=ON \
+-DOPENCL_API=ON \
+-DSDL2_API=ON \
 -DPACKAGE_MODE=ON \
 -DREBUILD_SHADER=ON \
+-DUSE_LTO=OFF \
+-DUSE_VTUNE=OFF \
 -DXDG_STD=ON \
--DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config32
+-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config32 \
+-Wno-dev
   make -C build
 }
 

Deleted: pcsx2-gcc6.patch
===
--- pcsx2-gcc6.patch2020-08-07 12:58:13 UTC (rev 671525)
+++ pcsx2-gcc6.patch2020-08-07 13:13:14 UTC (rev 671526)
@@ -1,81 +0,0 @@
-diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake
-index 889c0ba..b96aeff 100644
 a/cmake/BuildParameters.cmake
-+++ b/cmake/BuildParameters.cmake
-@@ -126,7 +126,7 @@ if(${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386")
-
- if(NOT DEFINED ARCH_FLAG)
- if (DISABLE_ADVANCE_SIMD)
--set(ARCH_FLAG "-msse -msse2 -mfxsr -march=i686")
-+set(ARCH_FLAG "-msse -msse2 -mfxsr -march=i686 -mxsave")
- else()
- # AVX requires some fix of the ABI (mangling) (default 2)
- # Note: V6 requires GCC 4.7
-diff --git a/common/include/intrin_x86.h b/common/include/intrin_x86.h
-index 9665dd1..e35132e 100644
 a/common/include/intrin_x86.h
-+++ b/common/include/intrin_x86.h
-@@ -104,12 +104,8 @@ static __inline__ __attribute__((always_inline)) void 
__cpuidex(int CPUInfo[], c
-   __asm__ __volatile__("cpuid": "=a" (CPUInfo[0]), "=b" (CPUInfo[1]), 
"=c" (CPUInfo[2]), "=d" (CPUInfo[3]) : "a" (level), "c" (count));
- }
-
--static __inline__ __attribute__((always_inline)) unsigned long long 
_xgetbv(unsigned int index)
--{
--  unsigned int eax, edx;
--  __asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index));
--  return ((unsigned long long)edx << 32) | eax;
--}
-+#include 
-+#define xgetbv _xgetbv
-
- /*** Interrupts ***/
- #ifndef __linux__
-diff --git a/common/src/x86emitter/cpudetect.cpp 
b/common/src/x86emitter/cpudetect.cpp
-index 717ca89..d6fb581 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 "intrin_x86.h"
-
- using namespace x86Emitter;
-
-@@ -270,7 +271,7 @@ void x86capabilities::Identify()
-
-   if((Flags2 >> 27) & 1) // OSXSAVE
-   {
--  if((_xgetbv(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' 
(XMM state and YMM state are enabled by OS).
-+  if((xgetbv(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' 
(XMM state and YMM state are enabled by OS).
-   {
-   hasAVX  
= ( Flags2 >> 28 ) & 1; //avx
-   hasFMA  
= ( Flags2 >> 12 ) & 1; //fma
-diff --git a/plugins/zzogl-pg/opengl/Util.h b/plugins/zzogl-pg/opengl/Util.h
-index 27fb537..24fbe72 100644
 a/plugins/zzogl-pg/opengl/Util.h
-+++ b/plugins/zzogl-pg/opengl/Util.h
-@@ -41,8 +41,6 @@
- #include 
-
- #include 
--#include 
--#include 
- #include 
-
- #include 
-diff --git a/plugins/zzogl-pg/opengl/ZZGl.h b/plugins/zzogl-pg/opengl/ZZGl.h

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

2020-05-28 Thread Maxime Gauduin via arch-commits 
Date: Thursday, May 28, 2020 @ 11:43:41
  Author: alucryd
Revision: 636295

upgpkg: pcsx2 1.6.0-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |   22 ++
 1 file changed, 6 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-28 11:43:22 UTC (rev 636294)
+++ PKGBUILD2020-05-28 11:43:41 UTC (rev 636295)
@@ -3,8 +3,8 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.4.0
-pkgrel=10
+pkgver=1.6.0
+pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
 url=https://www.pcsx2.net
@@ -19,7 +19,9 @@
   lib32-libaio
   lib32-libcanberra
   lib32-libjpeg-turbo
+  lib32-libpcap
   lib32-libpulse
+  lib32-libxml2
   lib32-nvidia-cg-toolkit
   lib32-portaudio
   lib32-sdl2
@@ -31,14 +33,8 @@
   git
   png++
 )
-source=(
-  
git+https://github.com/PCSX2/pcsx2.git#tag=8f74b640f01d8d00030254b25742bdd002ea18c8
-  pcsx2-gcc6.patch
-)
-sha256sums=(
-  SKIP
-  68364f4e571836c96674061a989934d0f551f6a142e33816c791de980d140e00
-)
+source=(git+https://github.com/PCSX2/pcsx2.git#tag=aaaf29557fe63870ede815dd6d2e48a98279ca59)
+sha256sums=(SKIP)
 
 pkgver() {
   cd pcsx2
@@ -46,12 +42,6 @@
   git describe --tags | sed 's/^v//'
 }
 
-prepare() {
-  cd pcsx2
-
-  patch -Np1 -i ../pcsx2-gcc6.patch
-}
-
 build() {
   cmake -S pcsx2 -B build \
 -DCMAKE_BUILD_TYPE=None \

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

2020-04-25 Thread Evangelos Foutras via arch-commits 
Date: Saturday, April 25, 2020 @ 16:19:24
  Author: foutrelis
Revision: 620947

glew 2.2.0 rebuild

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-25 16:19:14 UTC (rev 620946)
+++ PKGBUILD2020-04-25 16:19:24 UTC (rev 620947)
@@ -4,7 +4,7 @@
 
 pkgname=pcsx2
 pkgver=1.4.0
-pkgrel=9
+pkgrel=10
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=(x86_64)
 url=https://www.pcsx2.net

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

2020-02-09 Thread Maxime Gauduin via arch-commits 
Date: Sunday, February 9, 2020 @ 15:49:03
  Author: alucryd
Revision: 565402

FS#65409: pcsx2 1.4.0-9

Modified:
  pcsx2/trunk/PKGBUILD
  pcsx2/trunk/pcsx2-gcc6.patch

--+
 PKGBUILD |   96 +++--
 pcsx2-gcc6.patch |   77 --
 2 files changed, 130 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-09 15:47:33 UTC (rev 565401)
+++ PKGBUILD2020-02-09 15:49:03 UTC (rev 565402)
@@ -4,56 +4,74 @@
 
 pkgname=pcsx2
 pkgver=1.4.0
-pkgrel=8
+pkgrel=9
 pkgdesc='A Sony PlayStation 2 emulator'
-arch=('x86_64')
-url='https://www.pcsx2.net'
-license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3')
-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' 'png++')
-source=("pcsx2-${pkgver}.tar.gz::https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz;
-'pcsx2-gcc6.patch')
-sha256sums=('2c8a986e2b6514d7018f6cfd39c4f2a72229b9b4ab06ca6b1d3466dfd9c33005'
-'d78c63808a609a249ec7e8330eeabee306a55ee08d2c9ce9c383b46b334bf7d0')
+arch=(x86_64)
+url=https://www.pcsx2.net
+license=(
+  GPL2
+  GPL3
+  LGPL2.1
+  LGPL3
+)
+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
+  git
+  png++
+)
+source=(
+  
git+https://github.com/PCSX2/pcsx2.git#tag=8f74b640f01d8d00030254b25742bdd002ea18c8
+  pcsx2-gcc6.patch
+)
+sha256sums=(
+  SKIP
+  68364f4e571836c96674061a989934d0f551f6a142e33816c791de980d140e00
+)
 
+pkgver() {
+  cd pcsx2
+
+  git describe --tags | sed 's/^v//'
+}
+
 prepare() {
-  cd pcsx2-${pkgver}
+  cd pcsx2
 
   patch -Np1 -i ../pcsx2-gcc6.patch
 }
 
 build() {
-  if [[ -d build ]]; then
-rm -rf build
-  fi
-  mkdir build && cd build
-
-  # 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
+  cmake -S pcsx2 -B build \
+-DCMAKE_BUILD_TYPE=None \
+-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_LIBRARY_PATH=/usr/lib32 \
+-DGAMEINDEX_DIR=/usr/share/pcsx2 \
+-DPLUGIN_DIR=/usr/lib32/pcsx2 \
+-DDISABLE_ADVANCE_SIMD=ON \
+-DEXTRA_PLUGINS=ON \
+-DGLSL_API=ON \
+-DPACKAGE_MODE=ON \
+-DREBUILD_SHADER=ON \
+-DXDG_STD=ON \
+-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config32
+  make -C build
 }
 
 package() {
-  cd build
-
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" -C build install
 }
 
 # vim: ts=2 sw=2 et:

Modified: pcsx2-gcc6.patch
===
--- pcsx2-gcc6.patch2020-02-09 15:47:33 UTC (rev 565401)
+++ pcsx2-gcc6.patch2020-02-09 15:49:03 UTC (rev 565402)
@@ -1,5 +1,37 @@
+diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake
+index 889c0ba..b96aeff 100644
+--- a/cmake/BuildParameters.cmake
 b/cmake/BuildParameters.cmake
+@@ -126,7 +126,7 @@ if(${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386")
+
+ if(NOT DEFINED ARCH_FLAG)
+ if (DISABLE_ADVANCE_SIMD)
+-set(ARCH_FLAG "-msse -msse2 -mfxsr -march=i686")
++set(ARCH_FLAG "-msse -msse2 -mfxsr -march=i686 -mxsave")
+ else()
+ # AVX requires some fix of the ABI (mangling) (default 2)
+ # Note: V6 requires GCC 4.7
+diff --git a/common/include/intrin_x86.h b/common/include/intrin_x86.h
+index 9665dd1..e35132e 100644
+--- a/common/include/intrin_x86.h
 b/common/include/intrin_x86.h
+@@ -104,12 +104,8 @@ static __inline__ __attribute__((always_inline)) void 
__cpuidex(int CPUInfo[], c
+   __asm__ __volatile__("cpuid": "=a" (CPUInfo[0]), "=b" (CPUInfo[1]), 
"=c" (CPUInfo[2]), "=d" (CPUInfo[3]) : "a" (level), "c" (count));
+ }
+
+-static __inline__ __attribute__((always_inline)) unsigned long long 
_xgetbv(unsigned int index)
+-{
+-  unsigned int eax, edx;
+-  __asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index));
+-  return ((unsigned long long)edx << 32) | eax;
+-}
++#include 
++#define xgetbv _xgetbv
+
+ /*** Interrupts ***/
+

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

2018-03-25 Thread Eli Schwartz via arch-commits 
Date: Sunday, March 25, 2018 @ 22:03:28
  Author: eschwartz
Revision: 312619

Update url to HTTPS

Drop obsolete makedepends on gcc-multilib

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-25 21:45:54 UTC (rev 312618)
+++ PKGBUILD2018-03-25 22:03:28 UTC (rev 312619)
@@ -8,12 +8,12 @@
 pkgrel=8
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('x86_64')
-url='http://www.pcsx2.net'
+url='https://www.pcsx2.net'
 license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3')
 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++')
+makedepends=('cmake' 'png++')
 
source=("pcsx2-${pkgver}.tar.gz::https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz;
 'pcsx2-gcc6.patch')
 sha256sums=('2c8a986e2b6514d7018f6cfd39c4f2a72229b9b4ab06ca6b1d3466dfd9c33005'

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

2017-12-31 Thread Maxime Gauduin via arch-commits 
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
===
--- PKGBUILD2017-12-31 13:45:44 UTC (rev 277582)
+++ PKGBUILD2017-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
 }

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

2017-10-29 Thread Maxime Gauduin 
Date: Sunday, October 29, 2017 @ 20:11:30
  Author: alucryd
Revision: 264695

upgpkg: pcsx2 1.4.0-7

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-29 19:59:36 UTC (rev 264694)
+++ PKGBUILD2017-10-29 20:11:30 UTC (rev 264695)
@@ -5,7 +5,7 @@
 
 pkgname=pcsx2
 pkgver=1.4.0
-pkgrel=6
+pkgrel=7
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'

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

2017-10-29 Thread Maxime Gauduin 
Date: Sunday, October 29, 2017 @ 19:57:36
  Author: alucryd
Revision: 264692

upgpkg: pcsx2 1.4.0-6

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-29 19:20:24 UTC (rev 264691)
+++ PKGBUILD2017-10-29 19:57:36 UTC (rev 264692)
@@ -5,13 +5,13 @@
 
 pkgname=pcsx2
 pkgver=1.4.0
-pkgrel=5
+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' 'wxgtk')
+  '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'

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

2017-10-29 Thread Maxime Gauduin 
Date: Sunday, October 29, 2017 @ 19:20:24
  Author: alucryd
Revision: 264691

Remove AUR otpdeps

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-29 19:18:01 UTC (rev 264690)
+++ PKGBUILD2017-10-29 19:20:24 UTC (rev 264691)
@@ -18,17 +18,15 @@
 'lib32-wxgtk')
 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')
 options=('!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz;
-pcsx2-gcc6.patch)
+source=("pcsx2-${pkgver}.tar.gz::https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz;
+'pcsx2-gcc6.patch')
 sha256sums=('2c8a986e2b6514d7018f6cfd39c4f2a72229b9b4ab06ca6b1d3466dfd9c33005'
 'd78c63808a609a249ec7e8330eeabee306a55ee08d2c9ce9c383b46b334bf7d0')
 
 prepare() {
-  cd $pkgname-$pkgver
-  # Fix build with GCC 6
+  cd pcsx2-${pkgver}
+
   patch -p1 -i ../pcsx2-gcc6.patch
 }

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

2017-08-03 Thread Felix Yan 
Date: Thursday, August 3, 2017 @ 21:27:40
  Author: felixonmars
Revision: 247973

GLEW 2.1.0 rebuild

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-03 21:22:53 UTC (rev 247972)
+++ PKGBUILD2017-08-03 21:27:40 UTC (rev 247973)
@@ -5,7 +5,7 @@
 
 pkgname=pcsx2
 pkgver=1.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'

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

2017-08-03 Thread Evangelos Foutras 
Date: Thursday, August 3, 2017 @ 20:53:54
  Author: foutrelis
Revision: 247952

Fix multilib build

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |3 +++
 1 file changed, 3 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-03 20:51:14 UTC (rev 247951)
+++ PKGBUILD2017-08-03 20:53:54 UTC (rev 247952)
@@ -54,8 +54,11 @@
   -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' \

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

2016-08-09 Thread Antonio Rojas 
Date: Tuesday, August 9, 2016 @ 14:33:03
  Author: arojas
Revision: 186214

Really rebuild against glew 2.0

Added:
  pcsx2/trunk/pcsx2-gcc6.patch
Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 pcsx2-gcc6.patch |   12 
 2 files changed, 13 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-09 14:19:15 UTC (rev 186213)
+++ PKGBUILD2016-08-09 14:33:03 UTC (rev 186214)
@@ -5,7 +5,7 @@
 
 pkgname=pcsx2
 pkgver=1.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'

Added: pcsx2-gcc6.patch
===
--- pcsx2-gcc6.patch(rev 0)
+++ pcsx2-gcc6.patch2016-08-09 14:33:03 UTC (rev 186214)
@@ -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;
+

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

2016-08-04 Thread Antonio Rojas 
Date: Thursday, August 4, 2016 @ 17:31:05
  Author: arojas
Revision: 185075

GLEW 2.0 rebuild

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-04 17:13:07 UTC (rev 185074)
+++ PKGBUILD2016-08-04 17:31:05 UTC (rev 185075)
@@ -5,7 +5,7 @@
 
 pkgname=pcsx2
 pkgver=1.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'
@@ -21,9 +21,17 @@
 optdepends_x86_64=('lib32-gtk-engines: GTK2 engines support'
'lib32-gtk-engine-unico: Unico GTK2 engine support')
 options=('!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz;)
-sha256sums=('2c8a986e2b6514d7018f6cfd39c4f2a72229b9b4ab06ca6b1d3466dfd9c33005')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/PCSX2/pcsx2/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
+}
+
 build() {
   cd pcsx2-${pkgver}

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

2016-04-16 Thread Maxime Gauduin 
Date: Saturday, April 16, 2016 @ 19:31:25
  Author: alucryd
Revision: 171198

soundtouch rebuild: pcsx2 1.4.0-2

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-16 17:25:01 UTC (rev 171197)
+++ PKGBUILD2016-04-16 17:31:25 UTC (rev 171198)
@@ -5,7 +5,7 @@
 
 pkgname=pcsx2
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'

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

2016-01-09 Thread Maxime Gauduin 
Date: Saturday, January 9, 2016 @ 10:38:19
  Author: alucryd
Revision: 155777

upgpkg: pcsx2 1.4.0-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |   26 --
 1 file changed, 8 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-09 09:24:57 UTC (rev 155776)
+++ PKGBUILD2016-01-09 09:38:19 UTC (rev 155777)
@@ -4,36 +4,26 @@
 # Contributor: vEX 
 
 pkgname=pcsx2
-pkgver=1.3.1
-pkgrel=6
+pkgver=1.4.0
+pkgrel=1
 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' 'sdl' 'soundtouch' 'wxgtk')
+  'portaudio' 'sdl2' 'soundtouch' 'wxgtk')
 depends_x86_64=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra'
 'lib32-libjpeg-turbo' 'lib32-nvidia-cg-toolkit'
-'lib32-portaudio' 'lib32-sdl' 'lib32-soundtouch' 'lib32-wxgtk')
-makedepends=('cmake')
+'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch'
+'lib32-wxgtk')
+makedepends=('cmake' 'png++')
 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')
 options=('!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz;
-'0001-common-fix-gcc-5.0-issue.patch')
-sha256sums=('60ba9f7f85bf4337ca6962f9b437d549f16fc04ea0b6b261d7521e0416c2b8c9'
-'dc3bdfaea2e024da1d16dd6142030b13b3e2a4540ba1685399e3109d026866c4')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz;)
+sha256sums=('2c8a986e2b6514d7018f6cfd39c4f2a72229b9b4ab06ca6b1d3466dfd9c33005')
 
-prepare() {
-  cd pcsx2-${pkgver}
-
-  # Fix startup crash with GCC 5.1
-  # https://github.com/PCSX2/pcsx2/issues/560
-  patch -Np1 -i ../0001-common-fix-gcc-5.0-issue.patch
-}
-
 build() {
   cd pcsx2-${pkgver}

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

2015-12-07 Thread Felix Yan 
Date: Monday, December 7, 2015 @ 21:42:05
  Author: fyan
Revision: 150115

C++11 ABI rebuild

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 20:36:54 UTC (rev 150114)
+++ PKGBUILD2015-12-07 20:42:05 UTC (rev 150115)
@@ -5,7 +5,7 @@
 
 pkgname=pcsx2
 pkgver=1.3.1
-pkgrel=5
+pkgrel=6
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'

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

2015-09-29 Thread Felix Yan 
Date: Tuesday, September 29, 2015 @ 09:58:48
  Author: fyan
Revision: 142216

poppler 0.36.0 / glew 1.13.0 rebuild

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-29 07:46:33 UTC (rev 142215)
+++ PKGBUILD2015-09-29 07:58:48 UTC (rev 142216)
@@ -5,7 +5,7 @@
 
 pkgname=pcsx2
 pkgver=1.3.1
-pkgrel=3
+pkgrel=4
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'

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

2015-09-28 Thread Felix Yan 
Date: Tuesday, September 29, 2015 @ 07:23:00
  Author: fyan
Revision: 142191

poppler 0.36.0 / glew 1.13.0 rebuild

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-29 05:21:18 UTC (rev 142190)
+++ PKGBUILD2015-09-29 05:23:00 UTC (rev 142191)
@@ -5,7 +5,7 @@
 
 pkgname=pcsx2
 pkgver=1.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'

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

2015-02-13 Thread Maxime Gauduin 
Date: Friday, February 13, 2015 @ 11:03:46
  Author: alucryd
Revision: 127649

FS#43796: pcsx2 1.3.1-2

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-13 09:11:47 UTC (rev 127648)
+++ PKGBUILD2015-02-13 10:03:46 UTC (rev 127649)
@@ -5,7 +5,7 @@
 
 pkgname=pcsx2
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'
@@ -39,6 +39,7 @@
   -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' \
@@ -52,6 +53,7 @@
   -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' \

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

2014-08-18 Thread Maxime Gauduin 
Date: Monday, August 18, 2014 @ 23:27:02
  Author: alucryd
Revision: 117536

glew rebuild: pcsx2 1.2.2-3

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-18 21:22:26 UTC (rev 117535)
+++ PKGBUILD2014-08-18 21:27:02 UTC (rev 117536)
@@ -5,7 +5,7 @@
 
 pkgname=pcsx2
 pkgver=1.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'

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

2014-02-19 Thread Maxime Gauduin 
Date: Wednesday, February 19, 2014 @ 18:17:38
  Author: alucryd
Revision: 105941

FS#38960: pcsx2 1.2.2-2

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-19 16:43:36 UTC (rev 105940)
+++ PKGBUILD2014-02-19 17:17:38 UTC (rev 105941)
@@ -5,7 +5,7 @@
 
 pkgname=pcsx2
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'
@@ -12,9 +12,9 @@
 license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3')
 makedepends=('cmake' 'sparsehash')
 if [[ $CARCH == i686 ]]; then
-  depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'nvidia-cg-toolkit' 
'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.8')
+  depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'nvidia-cg-toolkit' 
'portaudio' 'soundtouch' 'wxgtk2.8')
 elif [[ $CARCH == x86_64 ]]; then
-  makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 
'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-nvidia-cg-toolkit' 
'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8')
+  makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 
'lib32-libjpeg-turbo' 'lib32-libgl' 'lib32-nvidia-cg-toolkit' 'lib32-portaudio' 
'lib32-soundtouch' 'lib32-wxgtk2.8')
 fi
 options=('!emptydirs')
 source=(https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz;)
@@ -29,12 +29,12 @@
   mkdir build  cd build
 
   if [[ $CARCH == i686 ]]; then
-cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' 
-D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,SDL2_API,XDG_STD}=TRUE 
-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'
+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,SDL2_API,XDG_STD}=TRUE 
-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'
+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'
   fi
 
   make
@@ -44,7 +44,7 @@
   cd ${pkgname}-${pkgver}/build
 
   if [[ $CARCH == x86_64 ]]; then
-depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 
'lib32-libjpeg-turbo' 'lib32-nvidia-cg-toolkit' 'lib32-portaudio' 'lib32-sdl2' 
'lib32-soundtouch' 'lib32-wxgtk2.8')
+depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 
'lib32-libjpeg-turbo' 'lib32-nvidia-cg-toolkit' 'lib32-portaudio' 
'lib32-soundtouch' 'lib32-wxgtk2.8')
   fi
 
   make DESTDIR=${pkgdir} install

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

2014-02-16 Thread Maxime Gauduin 
Date: Sunday, February 16, 2014 @ 11:30:11
  Author: alucryd
Revision: 105845

upgpkg: pcsx2 1.2.2-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-16 09:52:22 UTC (rev 105844)
+++ PKGBUILD2014-02-16 10:30:11 UTC (rev 105845)
@@ -4,7 +4,7 @@
 # Contributor: vEX v...@niechift.com
 
 pkgname=pcsx2
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
 fi
 options=('!emptydirs')
 source=(https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz;)
-sha256sums=('965d0fc589dfc63934adc7214b069746b994cdcfd65ab3bb708c4ac6307b1162')
+sha256sums=('4fccef58098d099ffe955fadd5ceee78ed063ab585b8772f4242fd6dc5fd2d23')
 
 build() {
   cd ${pkgname}-${pkgver}

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

2014-02-05 Thread Maxime Gauduin 
Date: Wednesday, February 5, 2014 @ 14:51:22
  Author: alucryd
Revision: 105336

upgpkg: pcsx2 1.2.1-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-05 13:36:53 UTC (rev 105335)
+++ PKGBUILD2014-02-05 13:51:22 UTC (rev 105336)
@@ -4,13 +4,13 @@
 # Contributor: vEX v...@niechift.com
 
 pkgname=pcsx2
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'
 license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3')
-makedepends=('cmake' 'sparsehash' 'svn')
+makedepends=('cmake' 'sparsehash')
 if [[ $CARCH == i686 ]]; then
   depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'nvidia-cg-toolkit' 
'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.8')
 elif [[ $CARCH == x86_64 ]]; then
@@ -17,8 +17,8 @@
   makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 
'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-nvidia-cg-toolkit' 
'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8')
 fi
 options=('!emptydirs')
-source=(${pkgname}-${pkgver}::svn+http://pcsx2.googlecode.com/svn/tags/v${pkgver%.?};)
-sha256sums=('SKIP')
+source=(https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz;)
+sha256sums=('965d0fc589dfc63934adc7214b069746b994cdcfd65ab3bb708c4ac6307b1162')
 
 build() {
   cd ${pkgname}-${pkgver}

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

2014-02-03 Thread Maxime Gauduin 
Date: Monday, February 3, 2014 @ 12:40:28
  Author: alucryd
Revision: 105250

upgpkg: pcsx2 1.2.0-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-03 11:29:24 UTC (rev 105249)
+++ PKGBUILD2014-02-03 11:40:28 UTC (rev 105250)
@@ -4,12 +4,12 @@
 # Contributor: vEX v...@niechift.com
 
 pkgname=pcsx2
-pkgver=1.1.0.r5797
+pkgver=1.2.0
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'
-license=('GPL')
+license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3')
 makedepends=('cmake' 'sparsehash' 'svn')
 if [[ $CARCH == i686 ]]; then
   depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'nvidia-cg-toolkit' 
'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.8')
@@ -17,11 +17,11 @@
   makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 
'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-nvidia-cg-toolkit' 
'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8')
 fi
 options=('!emptydirs')
-source=(${pkgname}::svn+http://pcsx2.googlecode.com/svn/trunk/#revision=${pkgver#*r};)
+source=(${pkgname}-${pkgver}::svn+http://pcsx2.googlecode.com/svn/tags/v${pkgver%.?};)
 sha256sums=('SKIP')
 
 build() {
-  cd ${pkgname}
+  cd ${pkgname}-${pkgver}
 
   if [[ -d build ]]; then
 rm -rf build
@@ -41,7 +41,7 @@
 }
 
 package() {
-  cd ${pkgname}/build
+  cd ${pkgname}-${pkgver}/build
 
   if [[ $CARCH == x86_64 ]]; then
 depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 
'lib32-libjpeg-turbo' 'lib32-nvidia-cg-toolkit' 'lib32-portaudio' 'lib32-sdl2' 
'lib32-soundtouch' 'lib32-wxgtk2.8')

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

2014-01-06 Thread Maxime Gauduin 
Date: Monday, January 6, 2014 @ 15:09:29
  Author: alucryd
Revision: 103474

wxgtk rebuild: pcsx2 1.1.0.r5797-1

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |   27 +--
 1 file changed, 9 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-06 13:45:29 UTC (rev 103473)
+++ PKGBUILD2014-01-06 14:09:29 UTC (rev 103474)
@@ -4,33 +4,24 @@
 # Contributor: vEX v...@niechift.com
 
 pkgname=pcsx2
-pkgver=1.1.0
-_rev=5674
+pkgver=1.1.0.r5797
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'
 license=('GPL')
-makedepends=('cmake' 'sparsehash')
+makedepends=('cmake' 'sparsehash' 'svn')
 if [[ $CARCH == i686 ]]; then
-  depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'sdl2' 
'soundtouch' 'wxgtk2.8')
+  depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'nvidia-cg-toolkit' 
'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.8')
 elif [[ $CARCH == x86_64 ]]; then
-  makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 
'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-sdl2' 
'lib32-soundtouch' 'lib32-wxgtk2.8')
+  makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 
'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-nvidia-cg-toolkit' 
'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8')
 fi
 options=('!emptydirs')
-source=(http://pcsx2.googlecode.com/files/${pkgname}-${pkgver}-r${_rev}-lnx-sources.tar.bz2;
-'zzogl-mesa10.patch')
-sha256sums=('1353db351784dca47244c4b184e14c279218fb6933fba53b9d6a6a81182c2663'
-'e9b3a70ada333c78d94733a1b71f3a1f005a8dabb480c3fbfaf1f91f44f4c5fe')
+source=(${pkgname}::svn+http://pcsx2.googlecode.com/svn/trunk/#revision=${pkgver#*r};)
+sha256sums=('SKIP')
 
-prepare() {
-  cd ${pkgname}.snapshot-${_rev}
-
-  patch -Np1 -i ../zzogl-mesa10.patch
-}
-
 build() {
-  cd ${pkgname}.snapshot-${_rev}
+  cd ${pkgname}
 
   if [[ -d build ]]; then
 rm -rf build
@@ -50,10 +41,10 @@
 }
 
 package() {
-  cd ${pkgname}.snapshot-${_rev}/build
+  cd ${pkgname}/build
 
   if [[ $CARCH == x86_64 ]]; then
-depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 
'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 
'lib32-wxgtk2.8')
+depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 
'lib32-libjpeg-turbo' 'lib32-nvidia-cg-toolkit' 'lib32-portaudio' 'lib32-sdl2' 
'lib32-soundtouch' 'lib32-wxgtk2.8')
   fi
 
   make DESTDIR=${pkgdir} install

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

2013-07-26 Thread Maxime Gauduin 
Date: Friday, July 26, 2013 @ 10:34:28
  Author: alucryd
Revision: 94517

glew 1.10.0 todo list: pcsx2 1.0.0-6

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |   17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-26 04:00:35 UTC (rev 94516)
+++ PKGBUILD2013-07-26 08:34:28 UTC (rev 94517)
@@ -5,7 +5,7 @@
 
 pkgname=pcsx2
 pkgver=1.0.0
-pkgrel=5
+pkgrel=6
 pkgdesc=A Sony PlayStation 2 emulator
 arch=('i686' 'x86_64')
 url=http://www.pcsx2.net;
@@ -23,22 +23,20 @@
 '57204299c89d98f900af2e6c98fd3af0460d9095d1046f4d67772b9b75dc894b')
 
 prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}-r5350-sources
+  cd ${pkgname}-${pkgver}-r5350-sources
 
   patch -Np1 -i ../gcc48.patch
+  sed 's/0.9.8/1.0.0/' -i CMakeLists.txt
 }
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}-r5350-sources
+  cd ${pkgname}-${pkgver}-r5350-sources
 
-# Patch
-  sed 's|0.9.8|1.0.0|' -i CMakeLists.txt
-
-# Build
   if [[ -d build ]]; then
 rm -rf build
   fi
   mkdir build  cd build
+
   if [[ $CARCH == i686 ]]; then
 cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release 
-DPACKAGE_MODE=TRUE -DXDG_STD=TRUE -DGLSL_API=TRUE -DREBUILD_SHADER=TRUE 
-DPLUGIN_DIR=/usr/lib/pcsx2 -DGAMEINDEX_DIR=/usr/share/pcsx2 
-DGLSL_SHADER_DIR=/usr/share/pcsx2
   elif [[ $CARCH == x86_64 ]]; then
@@ -47,18 +45,17 @@
 export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
 cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release 
-DPACKAGE_MODE=TRUE -DXDG_STD=TRUE -DGLSL_API=TRUE -DREBUILD_SHADER=TRUE 
-DPLUGIN_DIR=/usr/lib32/pcsx2 -DGAMEINDEX_DIR=/usr/share/pcsx2 
-DGLSL_SHADER_DIR=/usr/share/pcsx2 
-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config32 
-DwxWidgets_wxrc_EXECUTABLE=/usr/bin/wxrc32 -DCMAKE_LIBRARY_PATH=/usr/lib32
   fi
+
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}-r5350-sources/build
+  cd ${pkgname}-${pkgver}-r5350-sources/build
 
-# Multilib
   if [[ $CARCH == x86_64 ]]; then
 depends=('lib32-wxgtk' 'lib32-libgl' 'lib32-glew' 'lib32-libjpeg-turbo' 
'lib32-portaudio' 'lib32-soundtouch')
   fi
 
-# Install
   make DESTDIR=${pkgdir} install
 }

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

2013-06-02 Thread Maxime Gauduin 
Date: Sunday, June 2, 2013 @ 18:39:23
  Author: alucryd
Revision: 92193

Remove virtual deps: pcsx2 1.0.0-5

Added:
  pcsx2/trunk/gcc48.patch
Modified:
  pcsx2/trunk/PKGBUILD

-+
 PKGBUILD|   18 +---
 gcc48.patch |   65 ++
 2 files changed, 76 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-02 15:55:52 UTC (rev 92192)
+++ PKGBUILD2013-06-02 16:39:23 UTC (rev 92193)
@@ -5,7 +5,7 @@
 
 pkgname=pcsx2
 pkgver=1.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc=A Sony PlayStation 2 emulator
 arch=('i686' 'x86_64')
 url=http://www.pcsx2.net;
@@ -15,15 +15,19 @@
   depends=('glew' 'libjpeg-turbo' 'portaudio' 'soundtouch' 'wxgtk')
 elif [[ $CARCH == x86_64 ]]; then
   makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libjpeg-turbo' 
'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk')
-  optdepends=('lib32-gtk-engines: gtk2 engines support'
-  'lib32-gtk-aurora-engine: aurora gtk2 engine support'
-  'lib32-gtk-murrine: murrine gtk3 engine support'
-  'lib32-gtk-unico: unico gtk2 engine support')
 fi
 options=('!emptydirs')
-source=(${pkgname}-${pkgver}-r5350-sources.7z::http://pcsx2.net/download/releases/source-code/finish/7-source/93-pcsx2-v1-0-0-source-code/0.html;)
-sha256sums=('3f6067c3ea23b2afa4d4c411f3121d86612c310b1c7a44413577cf5727e498bc')
+source=(${pkgname}-${pkgver}-r5350-sources.7z::http://pcsx2.net/download/releases/source-code/finish/7-source/93-pcsx2-v1-0-0-source-code/0.html;
+'gcc48.patch')
+sha256sums=('3f6067c3ea23b2afa4d4c411f3121d86612c310b1c7a44413577cf5727e498bc'
+'57204299c89d98f900af2e6c98fd3af0460d9095d1046f4d67772b9b75dc894b')
 
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}-r5350-sources
+
+  patch -Np1 -i ../gcc48.patch
+}
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}-r5350-sources
 

Added: gcc48.patch
===
--- gcc48.patch (rev 0)
+++ gcc48.patch 2013-06-02 16:39:23 UTC (rev 92193)
@@ -0,0 +1,65 @@
+diff -rupN pcsx2-1.0.0-r5350-sources.orig/common/include/PS2Eext.h 
pcsx2-1.0.0-r5350-sources/common/include/PS2Eext.h
+--- pcsx2-1.0.0-r5350-sources.orig/common/include/PS2Eext.h2013-06-02 
18:24:59.369581900 +0200
 pcsx2-1.0.0-r5350-sources/common/include/PS2Eext.h 2013-06-02 
18:27:39.091107300 +0200
+@@ -144,10 +144,9 @@ struct PluginConf
+ int ReadInt(const std::string item, int defval)
+ {
+ int value = defval;
+-  int err = 0;
+ std::string buf = item +  = %d\n;
+ 
+-if (ConfFile) err=fscanf(ConfFile, buf.c_str(), value);
++if (ConfFile) fscanf(ConfFile, buf.c_str(), value);
+ 
+ return value;
+ }
+@@ -157,7 +156,7 @@ struct PluginConf
+   int err = 0;
+ std::string buf = item +  = %d\n;
+ 
+-if (ConfFile) err=fprintf(ConfFile, buf.c_str(), value);
++if (ConfFile) fprintf(ConfFile, buf.c_str(), value);
+ }
+ };
+ 
+diff -rupN pcsx2-1.0.0-r5350-sources.orig/plugins/GSdx/GSDeviceSW.cpp 
pcsx2-1.0.0-r5350-sources/plugins/GSdx/GSDeviceSW.cpp
+--- pcsx2-1.0.0-r5350-sources.orig/plugins/GSdx/GSDeviceSW.cpp 2013-06-02 
18:24:59.922788200 +0200
 pcsx2-1.0.0-r5350-sources/plugins/GSdx/GSDeviceSW.cpp  2013-06-02 
18:29:56.088850400 +0200
+@@ -50,7 +50,7 @@ bool GSDeviceSW::Reset(int w, int h)
+ 
+ GSTexture* GSDeviceSW::CreateSurface(int type, int w, int h, bool msaa, int 
format)
+ {
+-  if(format != 0) return false; // there is only one format
++  if(format != 0) return NULL; // there is only one format
+ 
+   return new GSTextureSW(type, w, h);
+ }
+diff -rupN pcsx2-1.0.0-r5350-sources.orig/plugins/GSdx/GS.h 
pcsx2-1.0.0-r5350-sources/plugins/GSdx/GS.h
+--- pcsx2-1.0.0-r5350-sources.orig/plugins/GSdx/GS.h   2013-06-02 
18:24:59.916311000 +0200
 pcsx2-1.0.0-r5350-sources/plugins/GSdx/GS.h2013-06-02 
18:29:28.940530500 +0200
+@@ -807,7 +807,8 @@ REG_END2
+   if(PSM == PSM_PSMT4) return TW  7 || TH  7;
+   }
+ 
+-  return (TBW  6)  (1u  TW);
++// The recast of TBW seems useless but it avoid tons of warning from 
GCC...
++return ((uint32)TBW  6u)  (1u  TW);
+   }
+ REG_END2
+ 
+diff -rupN pcsx2-1.0.0-r5350-sources.orig/plugins/GSdx/stdafx.h 
pcsx2-1.0.0-r5350-sources/plugins/GSdx/stdafx.h
+--- pcsx2-1.0.0-r5350-sources.orig/plugins/GSdx/stdafx.h   2013-06-02 
18:24:59.951638400 +0200
 pcsx2-1.0.0-r5350-sources/plugins/GSdx/stdafx.h2013-06-02 
18:32:05.092233800 +0200
+@@ -430,7 +430,11 @@ struct aligned_free_second {templatecla
+ 
+   #ifdef __GNUC__
+ 
+-  __forceinline unsigned long long __rdtsc()
++  // gcc 4.8 define __rdtsc but unfortunately the compiler crash...
++  // The redefine allow to skip the gcc __rdtsc version -- Gregory
++  #define

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

2013-03-26 Thread Maxime Gauduin 
Date: Tuesday, March 26, 2013 @ 19:13:47
  Author: alucryd
Revision: 87080

upgpkg: pcsx2 1.0.0-4

Modified:
  pcsx2/trunk/PKGBUILD

--+
 PKGBUILD |4 
 1 file changed, 4 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-26 18:05:21 UTC (rev 87079)
+++ PKGBUILD2013-03-26 18:13:47 UTC (rev 87080)
@@ -15,6 +15,10 @@
   depends=('glew' 'libjpeg-turbo' 'portaudio' 'soundtouch' 'wxgtk')
 elif [[ $CARCH == x86_64 ]]; then
   makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libjpeg-turbo' 
'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk')
+  optdepends=('lib32-gtk-engines: gtk2 engines support'
+  'lib32-gtk-aurora-engine: aurora gtk2 engine support'
+  'lib32-gtk-murrine: murrine gtk3 engine support'
+  'lib32-gtk-unico: unico gtk2 engine support')
 fi
 options=('!emptydirs')
 
source=(${pkgname}-${pkgver}-r5350-sources.7z::http://pcsx2.net/download/releases/source-code/finish/7-source/93-pcsx2-v1-0-0-source-code/0.html;)