rpms/desmume/devel desmume-0.9.2-64bit.patch, NONE, 1.1 desmume-0.9.2-nobuggytoolsmenu.patch, NONE, 1.1 desmume.spec, 1.6, 1.7 desmume-0.9.1-gcc44.patch, 1.1, NONE desmume-0.9.1-nobuggytoolsmenu.patch, 1.1, NONE

Andrea Musuruane musuruan at rpmfusion.org
Sat Apr 25 11:19:28 CEST 2009 

Author: musuruan

Update of /cvs/free/rpms/desmume/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15509

Modified Files:
	desmume.spec 
Added Files:
	desmume-0.9.2-64bit.patch desmume-0.9.2-nobuggytoolsmenu.patch 
Removed Files:
	desmume-0.9.1-gcc44.patch desmume-0.9.1-nobuggytoolsmenu.patch 
Log Message:
* Sun Apr 19 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.2-1
- Updated to upstream version 0.9.2
- Removed no longer needed patch to compile with gcc 4.4
- Added a patch from upstream to compile on 64 bit systems (SF #2755952)


desmume-0.9.2-64bit.patch:

--- NEW FILE desmume-0.9.2-64bit.patch ---
Index: src/gfx3d.h
===================================================================
--- src/gfx3d.h	(revisione 1893)
+++ src/gfx3d.h	(revisione 1894)
@@ -187,17 +187,17 @@
 extern CACHE_ALIGN const u8 alpha_5bit_to_4bit[32];
 
 //GE commands:
-void gfx3d_glViewPort(unsigned long v);
-void gfx3d_glClearColor(unsigned long v);
-void gfx3d_glFogColor(unsigned long v);
-void gfx3d_glFogOffset (unsigned long v);
-void gfx3d_glClearDepth(unsigned long v);
-void gfx3d_glMatrixMode(unsigned long v);
+void gfx3d_glViewPort(u32 v);
+void gfx3d_glClearColor(u32 v);
+void gfx3d_glFogColor(u32 v);
+void gfx3d_glFogOffset (u32 v);
+void gfx3d_glClearDepth(u32 v);
+void gfx3d_glMatrixMode(u32 v);
 void gfx3d_glLoadIdentity();
 BOOL gfx3d_glLoadMatrix4x4(signed long v);
 BOOL gfx3d_glLoadMatrix4x3(signed long v);
-void gfx3d_glStoreMatrix(unsigned long v);
-void gfx3d_glRestoreMatrix(unsigned long v);
+void gfx3d_glStoreMatrix(u32 v);
+void gfx3d_glRestoreMatrix(u32 v);
 void gfx3d_glPushMatrix(void);
 void gfx3d_glPopMatrix(signed long i);
 BOOL gfx3d_glTranslate(signed long v);
@@ -205,40 +205,40 @@
 BOOL gfx3d_glMultMatrix3x3(signed long v);
 BOOL gfx3d_glMultMatrix4x3(signed long v);
 BOOL gfx3d_glMultMatrix4x4(signed long v);
-void gfx3d_glBegin(unsigned long v);
+void gfx3d_glBegin(u32 v);
 void gfx3d_glEnd(void);
-void gfx3d_glColor3b(unsigned long v);
+void gfx3d_glColor3b(u32 v);
 BOOL gfx3d_glVertex16b(unsigned int v);
-void gfx3d_glVertex10b(unsigned long v);
+void gfx3d_glVertex10b(u32 v);
 void gfx3d_glVertex3_cord(unsigned int one, unsigned int two, unsigned int v);
-void gfx3d_glVertex_rel(unsigned long v);
+void gfx3d_glVertex_rel(u32 v);
 void gfx3d_glSwapScreen(unsigned int screen);
 int gfx3d_GetNumPolys();
 int gfx3d_GetNumVertex();
-void gfx3d_glPolygonAttrib (unsigned long val);
-void gfx3d_glMaterial0(unsigned long val);
-void gfx3d_glMaterial1(unsigned long val);
-BOOL gfx3d_glShininess (unsigned long val);
+void gfx3d_glPolygonAttrib (u32 val);
+void gfx3d_glMaterial0(u32 val);
+void gfx3d_glMaterial1(u32 val);
+BOOL gfx3d_glShininess (u32 val);
 void gfx3d_UpdateToonTable(u8 offset, u16 val);
 void gfx3d_UpdateToonTable(u8 offset, u32 val);
-void gfx3d_glTexImage(unsigned long val);
-void gfx3d_glTexPalette(unsigned long val);
-void gfx3d_glTexCoord(unsigned long val);
-void gfx3d_glNormal(unsigned long v);
+void gfx3d_glTexImage(u32 val);
+void gfx3d_glTexPalette(u32 val);
+void gfx3d_glTexCoord(u32 val);
+void gfx3d_glNormal(u32 v);
 signed long gfx3d_GetClipMatrix (unsigned int index);
 signed long gfx3d_GetDirectionalMatrix (unsigned int index);
-void gfx3d_glLightDirection (unsigned long v);
-void gfx3d_glLightColor (unsigned long v);
-void gfx3d_glAlphaFunc(unsigned long v);
-BOOL gfx3d_glBoxTest(unsigned long v);
-BOOL gfx3d_glPosTest(unsigned long v);
-void gfx3d_glVecTest(unsigned long v);
+void gfx3d_glLightDirection (u32 v);
+void gfx3d_glLightColor (u32 v);
+void gfx3d_glAlphaFunc(u32 v);
+BOOL gfx3d_glBoxTest(u32 v);
+BOOL gfx3d_glPosTest(u32 v);
+void gfx3d_glVecTest(u32 v);
 unsigned int gfx3d_glGetPosRes(unsigned int index);
 unsigned short gfx3d_glGetVecRes(unsigned int index);
-void gfx3d_glFlush(unsigned long v);
+void gfx3d_glFlush(u32 v);
 void gfx3d_VBlankSignal();
 void gfx3d_VBlankEndSignal(bool skipFrame);
-void gfx3d_Control(unsigned long v);
+void gfx3d_Control(u32 v);
 u32 gfx3d_GetGXstatus();
 void gfx3d_sendCommandToFIFO(u32 val);
 void gfx3d_sendCommand(u32 cmd, u32 param);

 	  	 

desmume-0.9.2-nobuggytoolsmenu.patch:

--- NEW FILE desmume-0.9.2-nobuggytoolsmenu.patch ---
diff -durN desmume-0.9.2.orig/src/gtk/main.cpp desmume-0.9.2/src/gtk/main.cpp
--- desmume-0.9.2.orig/src/gtk/main.cpp	2009-04-12 00:25:33.000000000 +0200
+++ desmume-0.9.2/src/gtk/main.cpp	2009-04-19 10:38:40.000000000 +0200
@@ -1966,7 +1966,6 @@
     desmume_gtk_menu_file(pMenuBar);
     desmume_gtk_menu_emulation(pMenuBar, my_config->opengl_2d);
     desmume_gtk_menu_config(pMenuBar, my_config->savetype);
-    desmume_gtk_menu_tools(pMenuBar);
     desmume_gtk_menu_help(pMenuBar);
 
     gtk_box_pack_start(GTK_BOX(pVBox), pMenuBar, FALSE, FALSE, 0);


Index: desmume.spec
===================================================================
RCS file: /cvs/free/rpms/desmume/devel/desmume.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- desmume.spec	29 Mar 2009 12:58:30 -0000	1.6
+++ desmume.spec	25 Apr 2009 09:19:28 -0000	1.7
@@ -1,6 +1,6 @@
 Name: desmume
-Version: 0.9.1
-Release: 3%{?dist}
+Version: 0.9.2
+Release: 1%{?dist}
 Summary: A Nintendo DS emulator
 
 Group: Applications/Emulators
@@ -9,10 +9,10 @@
 Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Source1: desmume-man-pages-0.7.3.tar.gz
 Patch0: %{name}-0.9-dontlookinbuilddir.patch
-Patch1: %{name}-0.9.1-nobuggytoolsmenu.patch
-# Compile with gcc 4.4
-# http://sourceforge.net/tracker/index.php?func=detail&aid=2599049&group_id=164579&atid=832291 
-Patch2: %{name}-0.9.1-gcc44.patch
+Patch1: %{name}-0.9.2-nobuggytoolsmenu.patch
+# Compile on 64 bit systems
+# http://sourceforge.net/tracker/?func=detail&aid=2755952&group_id=164579&atid=832291
+Patch2: %{name}-0.9.2-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtkglext-devel
@@ -55,7 +55,7 @@
 %ifarch x86_64
 %patch1 -p1
 %endif
-%patch2 -p1
+%patch2 -p0
 
 # Fix end-of-line encoding
 sed -i 's/\r//' ChangeLog AUTHORS
@@ -189,6 +189,11 @@
 
 
 %changelog
+* Sun Apr 19 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.2-1
+- Updated to upstream version 0.9.2
+- Removed no longer needed patch to compile with gcc 4.4
+- Added a patch from upstream to compile on 64 bit systems (SF #2755952)
+
 * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.9.1-3
 - rebuild for new F11 features
 


--- desmume-0.9.1-gcc44.patch DELETED ---


--- desmume-0.9.1-nobuggytoolsmenu.patch DELETED ---

More information about the rpmfusion-commits mailing list