[svn] r5709 - trunk/rpms/snes9x

[packagers at lists.rpmforge.net]

Author: thias
Date: 2007-08-11 15:50:09 +0200 (Sat, 11 Aug 2007)
New Revision: 5709

Removed:
   trunk/rpms/snes9x/snes9x-1.5-src-externc.patch
Modified:
   trunk/rpms/snes9x/snes9x.spec
Log:
Update snes9x to 1.51.


Deleted: trunk/rpms/snes9x/snes9x-1.5-src-externc.patch
===================================================================
--- trunk/rpms/snes9x/snes9x-1.5-src-externc.patch	2007-08-10 20:45:31 UTC (rev 5708)
+++ trunk/rpms/snes9x/snes9x-1.5-src-externc.patch	2007-08-11 13:50:09 UTC (rev 5709)
@@ -1,39 +0,0 @@
-diff -Naupr snes9x-1.5-src.orig/bsx.h snes9x-1.5-src/bsx.h
---- snes9x-1.5-src.orig/bsx.h	2006-06-30 15:40:56.000000000 +0200
-+++ snes9x-1.5-src/bsx.h	2006-10-17 17:38:47.000000000 +0200
-@@ -164,7 +164,7 @@ struct SBSX
- 	uint8	test2192[32];
- };
- 
--extern struct SBSX	BSX;
-+extern "C" struct SBSX	BSX;
- 
- uint8 S9xGetBSX(uint32);
- void S9xSetBSX(uint8, uint32);
-diff -Naupr snes9x-1.5-src.orig/dsp1.h snes9x-1.5-src/dsp1.h
---- snes9x-1.5-src.orig/dsp1.h	2006-06-30 15:40:56.000000000 +0200
-+++ snes9x-1.5-src/dsp1.h	2006-10-17 17:38:31.000000000 +0200
-@@ -180,6 +180,6 @@ uint8 S9xGetDSP (uint16 Address);
- void S9xSetDSP (uint8 Byte, uint16 Address);
- END_EXTERN_C
- 
--extern struct SDSP1 DSP1;
-+extern "C" struct SDSP1 DSP1;
- 
- #endif
-diff -Naupr snes9x-1.5-src.orig/ppu.h snes9x-1.5-src/ppu.h
---- snes9x-1.5-src.orig/ppu.h	2006-06-30 15:40:56.000000000 +0200
-+++ snes9x-1.5-src/ppu.h	2006-10-17 17:39:13.000000000 +0200
-@@ -409,9 +409,9 @@ typedef struct{
- 	uint8 _5A22;
- } SnesModel;
- 
--extern SnesModel* Model;
--extern SnesModel M1SNES;
--extern SnesModel M2SNES;
-+extern "C" SnesModel* Model;
-+extern "C" SnesModel M1SNES;
-+extern "C" SnesModel M2SNES;
- 
- #define MAX_5C77_VERSION 0x01
- #define MAX_5C78_VERSION 0x03

Modified: trunk/rpms/snes9x/snes9x.spec
===================================================================
--- trunk/rpms/snes9x/snes9x.spec	2007-08-10 20:45:31 UTC (rev 5708)
+++ trunk/rpms/snes9x/snes9x.spec	2007-08-11 13:50:09 UTC (rev 5709)
@@ -11,21 +11,20 @@
 %{?fc5:  %define _with_modxorg 1}
 
 #define prever -WIP1
-%define real_version 1.5
+%define real_version 1.51
 
 Summary: Portable, freeware Super Nintendo Entertainment System (TM) emulator
 Name: snes9x
-Version: 1.50
+Version: 1.51
 Release: 1
 License: Other
 Group: Applications/Emulators
 URL: http://www.snes9x.com/
 Source: http://files.ipherswipsite.com/snes9x/snes9x-%{real_version}%{?prever}-src.tar.bz2
-Patch0: snes9x-1.5-src-externc.patch
-Patch1: snes9x-1.43-wmclass.patch
+Patch0: snes9x-1.43-wmclass.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gcc-c++, zlib-devel, libpng-devel
-%{?_with_opengl:BuildRequires: libGL-devel}
+BuildRequires: libGL-devel, libGLU-devel
 %{?_with_modxorg:BuildRequires: libXt-devel, libXext-devel, libXxf86dga-devel, libXxf86vm-devel}
 %{!?_with_modxorg:BuildRequires: XFree86-devel}
 BuildRequires: nasm
@@ -38,19 +37,28 @@
 
 %prep
 %setup -n %{name}-%{real_version}%{?prever:-dev}-src
-%patch0 -p1 -b .externc
-%patch1 -p2 -b .wmclass
+%patch0 -p2 -b .wmclass
 
 
 %build
-%configure %{?_with_opengl}
+# First, build the OpenGL version
+%configure --with-netplay --with-opengl
 # Replace OPTIMISE here, it's the best I've found...
 %{__perl} -pi.orig -e 's|^OPTIMISE.*|OPTIMISE = %{optflags}|g' Makefile
 %{__make} %{?_smp_mflags}
 
+%{__make} clean
 
+# Second, build the normal X11 version
+%configure --with-netplay
+# Replace OPTIMISE here, it's the best I've found...
+%{__perl} -pi.orig -e 's|^OPTIMISE.*|OPTIMISE = %{optflags}|g' Makefile
+%{__make} %{?_smp_mflags}
+
+
 %install
 %{__rm} -rf %{buildroot}
+%{__install} -D -m 0755 osnes9x %{buildroot}%{_bindir}/osnes9x
 %{__install} -D -m 0755 snes9x %{buildroot}%{_bindir}/snes9x
 
 
@@ -59,12 +67,19 @@
 
 
 %files
-%defattr(-, root, root, 0755)
-%doc doc/*
+%defattr(-,root,root,-)
+%doc doc/* unix/docs/readme_unix.txt
+%{_bindir}/osnes9x
 %{_bindir}/snes9x
 
 
 %changelog
+* Sat Aug 11 2007 Matthias Saou <http://freshrpms.net/> 1.51-1
+- Update to 1.51.
+- Bundle a second binary, osnes9x, the OpenGL version.
+- Include useful readme_unix.txt.
+- Remove no longer needed externc patch.
+
 * Tue Oct 17 2006 Matthias Saou <http://freshrpms.net/> 1.50-1
 - Update to 1.5... well, luckily it's also called 1.50 in some places, ugh.
 - Update source URL.