Author: sargentd-guest
Date: 2009-01-05 22:59:22 +0000 (Mon, 05 Jan 2009)
New Revision: 8614
Added:
packages/trunk/desmume/debian/patches/02-fix_3d_emulation_setup.patch
Modified:
packages/trunk/desmume/debian/changelog
packages/trunk/desmume/debian/patches/series
Log:
Add 02-fix_3d_emulation_setup.patch, pulled from upstream.
Don't try to setup a 24bit drawing area but reuse the current one.
Closes: #455749
Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog 2009-01-05 20:56:18 UTC (rev
8613)
+++ packages/trunk/desmume/debian/changelog 2009-01-05 22:59:22 UTC (rev
8614)
@@ -13,10 +13,13 @@
* debian/patches:
+ Disable 01-dont_crash_on_bad_3d.patch, it was pulled from upstream
and is present in the current version.
+ + Add 02-fix_3d_emulation_setup.patch, pulled from upstream.
+ Don't try to setup a 24bit drawing area but reuse the current one.
+ Closes: #455749
* debian/README.source:
+ Add information on quilt usage as suggested by policy.
- -- Evgeni Golov <[email protected]> Fri, 02 Jan 2009 10:03:21 +0100
+ -- Evgeni Golov <[email protected]> Mon, 05 Jan 2009 23:53:49 +0100
desmume (0.8-2) unstable; urgency=low
Added: packages/trunk/desmume/debian/patches/02-fix_3d_emulation_setup.patch
===================================================================
--- packages/trunk/desmume/debian/patches/02-fix_3d_emulation_setup.patch
(rev 0)
+++ packages/trunk/desmume/debian/patches/02-fix_3d_emulation_setup.patch
2009-01-05 22:59:22 UTC (rev 8614)
@@ -0,0 +1,91 @@
+From: Guillaume Duhamel <[email protected]>
+Date: 05.01.2009 23:50 +0100
+Subject: Reuse the current drawing are, instead of creating a new one.
+License: GPL-2+
+
+Index: desmume/src/gtk/gdk_3Demu.cpp
+===================================================================
+--- desmume/src/gtk/gdk_3Demu.cpp (revision 1378)
++++ desmume/src/gtk/gdk_3Demu.cpp (revision 1399)
+@@ -151,11 +151,11 @@
+ }
+
+ int
+-init_opengl_gdk_3Demu( void) {
++init_opengl_gdk_3Demu( GdkDrawable * drawable) {
+ GdkGLConfig *glconfig;
+
+ /* create the off screen pixmap */
+- target_pixmap = gdk_pixmap_new ( NULL, 256, 192, 24);
++ target_pixmap = gdk_pixmap_new ( drawable, 256, 192, -1);
+
+ if ( target_pixmap == NULL) {
+ g_print ("*** Failed to create pixmap.\n");
+Index: desmume/src/gtk/main.cpp
+===================================================================
+--- desmume/src/gtk/main.cpp (revision 1378)
++++ desmume/src/gtk/main.cpp (revision 1399)
+@@ -1878,7 +1878,7 @@
+ #ifdef GTKGLEXT_AVAILABLE
+ if ( !use_null_3d) {
+ /* setup the gdk 3D emulation */
+- if ( init_opengl_gdk_3Demu()) {
++ if ( init_opengl_gdk_3Demu(GDK_DRAWABLE(pWindow->window))) {
+ NDS_3D_SetDriver ( 1);
+
+ if (!gpu3D->NDS_3D_Init ()) {
+Index: desmume/src/gtk/gdk_3Demu.h
+===================================================================
+--- desmume/src/gtk/gdk_3Demu.h (revision 1378)
++++ desmume/src/gtk/gdk_3Demu.h (revision 1399)
+@@ -27,6 +27,6 @@
+ */
+
+ int
+-init_opengl_gdk_3Demu( void);
++init_opengl_gdk_3Demu( GdkDrawable * drawable);
+
+ #endif
+Index: desmume/src/gtk-glade/gdk_3Demu.cpp
+===================================================================
+--- desmume/src/gtk-glade/gdk_3Demu.cpp (revision 1378)
++++ desmume/src/gtk-glade/gdk_3Demu.cpp (revision 1399)
+@@ -154,11 +154,11 @@
+ }
+
+ int
+-init_opengl_gdk_3Demu( void) {
++init_opengl_gdk_3Demu( GdkDrawable * drawable) {
+ GdkGLConfig *glconfig;
+
+ /* create the off screen pixmap */
+- target_pixmap = gdk_pixmap_new ( NULL, 256, 192, 24);
++ target_pixmap = gdk_pixmap_new ( drawable, 256, 192, -1);
+
+ if ( target_pixmap == NULL) {
+ g_print (_("*** Failed to create pixmap.\n"));
+Index: desmume/src/gtk-glade/gdk_3Demu.h
+===================================================================
+--- desmume/src/gtk-glade/gdk_3Demu.h (revision 1378)
++++ desmume/src/gtk-glade/gdk_3Demu.h (revision 1399)
+@@ -27,6 +27,6 @@
+ */
+
+ int
+-init_opengl_gdk_3Demu( void);
++init_opengl_gdk_3Demu( GdkDrawable * drawable);
+
+ #endif
+Index: desmume/src/gtk-glade/main.cpp
+===================================================================
+--- desmume/src/gtk-glade/main.cpp (revision 1378)
++++ desmume/src/gtk-glade/main.cpp (revision 1399)
+@@ -497,7 +497,7 @@
+ #ifdef GTKGLEXT_AVAILABLE
+ if ( !use_null_3d) {
+ /* setup the gdk 3D emulation */
+- if ( init_opengl_gdk_3Demu()) {
++ if ( init_opengl_gdk_3Demu(GDK_DRAWABLE(pWindow->window))) {
+ NDS_3D_SetDriver(1);
+
+ if (!gpu3D->NDS_3D_Init()) {
Modified: packages/trunk/desmume/debian/patches/series
===================================================================
--- packages/trunk/desmume/debian/patches/series 2009-01-05 20:56:18 UTC
(rev 8613)
+++ packages/trunk/desmume/debian/patches/series 2009-01-05 22:59:22 UTC
(rev 8614)
@@ -1 +1,2 @@
#01-dont_crash_on_bad_3d.patch
+02-fix_3d_emulation_setup.patch
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
