rpms/pcsxr/F-17 pcsxr-remove-assertion-64bit.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 pcsxr.spec, 1.3, 1.4 sources, 1.4, 1.5

[Jeremy Newton]

Author: jem256

Update of /cvs/free/rpms/pcsxr/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27261/F-17

Modified Files:
	.cvsignore pcsxr.spec sources 
Added Files:
	pcsxr-remove-assertion-64bit.patch 
Log Message:
Update to new Upstream, fix a minor issue with 64bit


pcsxr-remove-assertion-64bit.patch:
 ix86-64.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE pcsxr-remove-assertion-64bit.patch ---
diff -rupN pcsxr-old/libpcsxcore/ix86_64/ix86-64.c pcsxr/libpcsxcore/ix86_64/ix86-64.c
--- pcsxr-old/libpcsxcore/ix86_64/ix86-64.c	2012-07-23 16:57:47.000000000 -0400
+++ pcsxr/libpcsxcore/ix86_64/ix86-64.c	2012-07-23 17:15:41.620584335 -0400
@@ -230,7 +230,6 @@ void x86SetJ8( u8* j8 )
 	u32 jump = ( x86Ptr - (s8*)j8 ) - 1;
 
 	if ( jump > 0x7f ) {
-		assert(0);
 		SysPrintf( "j8 greater than 0x7f!!\n" );
 	}
 	*j8 = (u8)jump;


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/pcsxr/F-17/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Jul 2012 16:26:24 -0000	1.4
+++ .cvsignore	23 Jul 2012 22:35:08 -0000	1.5
@@ -1 +1 @@
-pcsxr-78288.zip
+pcsxr-78971.zip


Index: pcsxr.spec
===================================================================
RCS file: /cvs/free/rpms/pcsxr/F-17/pcsxr.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pcsxr.spec	5 Jul 2012 16:26:24 -0000	1.3
+++ pcsxr.spec	23 Jul 2012 22:35:08 -0000	1.4
@@ -1,7 +1,7 @@
-%global svnversion 78288
+%global svnversion 78971
 Name:           pcsxr
 Version:        1.9.92
-Release:        1.20120705svn%{svnversion}%{?dist}
+Release:        1.20120723svn%{svnversion}%{?dist}
 Summary:        A plugin based PlayStation (PSX) emulator with high compatibility
 
 #All is GPLv2+ except:
@@ -11,8 +11,10 @@
 License:        GPLv2+ and BSD and Public Domain
 Url:            http://pcsxr.codeplex.com/
 #The source can be downloaded here:
-#http://pcsxr.codeplex.com/SourceControl/changeset/changes/78288
+#http://pcsxr.codeplex.com/SourceControl/changeset/changes/78971
 Source:         %{name}-%{svnversion}.zip
+#http://pcsxr.codeplex.com/workitem/8567
+Patch0:         %{name}-remove-assertion-64bit.patch
 
 BuildRequires:  SDL-devel
 BuildRequires:  gtk2-devel
@@ -40,6 +42,7 @@
 %setup -q -n %{name}
 #remove any unnecessary files:
 rm -f -r win32 macosx debian-upstream
+%patch0 -p1
 
 %build
 sh autogen.sh
@@ -64,48 +67,43 @@
 %{_libdir}/games/psemu
 %{_datadir}/applications/%{name}.desktop
 
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
+%changelog
+* Mon Jul 23 2012 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120723svn78971
+- Added a patch to temporarily fix a 64bit-only problem
 
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+* Thu Jul 19 2012 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120719svn78971
+- Updated to new SVN checkout version
+- Removed unnessary hicolor icon updating
 
-%changelog
-* Fri Mar 9 2011 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120705svn78288
+* Thu Jul 5 2012 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120705svn78288
 - Updated to new SVN checkout version
 
-* Fri Mar 9 2011 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120421svn77577
+* Fri Mar 9 2012 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120421svn77577
 - Updated to new SVN checkout version
 
-* Fri Mar 9 2011 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120309svn75683
+* Fri Mar 9 2012 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120309svn75683
 - Updated to new SVN checkout version
 - Changed define to global
 
-* Sun Feb 19 2011 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120219svn75200
+* Sun Feb 19 2012 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120219svn75200
 - Updated to new SVN checkout version
 
-* Sun Feb 19 2011 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120219svn75156
+* Sun Feb 19 2012 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120219svn75156
 - Updated to new SVN checkout version
 - Added svn macro
 - Removed incorrect disabling of opengl for 64bit
 
-* Wed Feb 8 2011 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-3.20120128svn73976
+* Wed Feb 8 2012 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-3.20120128svn73976
 - Minor source change for convenience.
 
-* Wed Feb 8 2011 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-2.20120128svn73976
+* Wed Feb 8 2012 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-2.20120128svn73976
 - Fixed and optimized source files for size and convenience.
 - Added missing file in license breakdown
 
-* Sat Jan 28 2011 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120128svn73976
+* Sat Jan 28 2012 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120128svn73976
 - Fixed version number to be more specific
 - Fixed inproper license
 - Trimmed down the source, removed non-linux code
 
-* Sat Jan 28 2011 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120128svn
+* Sat Jan 28 2012 Jeremy Newton <alexjnewt at hotmail.com> - 1.9.92-1.20120128svn
 - Initial package SPEC created


Index: sources
===================================================================
RCS file: /cvs/free/rpms/pcsxr/F-17/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Jul 2012 16:26:24 -0000	1.4
+++ sources	23 Jul 2012 22:35:08 -0000	1.5
@@ -1 +1 @@
-937732d2f1bdc659b3b5134994648599  pcsxr-78288.zip
+9cc4f23312823f176947df0bfa6e9b84  pcsxr-78971.zip