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

[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
===================================================================
--- PKGBUILD	2013-06-02 15:55:52 UTC (rev 92192)
+++ PKGBUILD	2013-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.h	2013-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.h	2013-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.h	2013-06-02 18:32:05.092233800 +0200
+@@ -430,7 +430,11 @@ struct aligned_free_second {template<cla
+ 
+ 	#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 __rdtsc _lnx_rdtsc
++	//__forceinline unsigned long long __rdtsc()
++	__forceinline unsigned long long _lnx_rdtsc()
+ 	{
+ 		#if defined(__amd64__) || defined(__x86_64__)
+ 		unsigned long long low, high;


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