Author: sargentd-guest Date: 2009-02-12 02:08:01 +0000 (Thu, 12 Feb 2009) New Revision: 8769
Removed: packages/trunk/desmume/debian/patches/01-dont_crash_on_bad_3d.patch packages/trunk/desmume/debian/patches/02-fix_3d_emulation_setup.patch Modified: packages/trunk/desmume/debian/ packages/trunk/desmume/debian/changelog packages/trunk/desmume/debian/patches/series packages/trunk/desmume/debian/rules Log: update to 0.9.1 - Link with --as-needed to strip direct dependencies. - Kill old patches Property changes on: packages/trunk/desmume/debian ___________________________________________________________________ Name: svn-bp:origUrl - http://pkg-games.alioth.debian.org/tarballs/desmume_0.9.orig.tar.gz + http://pkg-games.alioth.debian.org/tarballs/desmume_0.9.1.orig.tar.gz Modified: packages/trunk/desmume/debian/changelog =================================================================== --- packages/trunk/desmume/debian/changelog 2009-02-12 01:36:28 UTC (rev 8768) +++ packages/trunk/desmume/debian/changelog 2009-02-12 02:08:01 UTC (rev 8769) @@ -1,21 +1,21 @@ -desmume (0.9-1) unstable; urgency=low +desmume (0.9.1-1) unstable; urgency=low * New upstream release. + + Doesn't try to setup a 24bit drawing area but reuse the current one. + Closes: #455749 * debian/rules: + Configure with --enable-gdb-stub. (Closes: #484683) + Don't set CFLAGS, let dpkg handle them. + Make the build-system more cross-build friendly. + Use dh_clean instead of rm -f in the clean target. + Don't install manpages, upstream does that now. + + Link with --as-needed to strip direct dependencies. * debian/control: + Add ${misc:Depends} to Depends of desmume. + Bump Standards-Version to 3.8.0. * 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. * debian/watch: @@ -24,7 +24,7 @@ + Update to machine readable format. + Check copyright more carefully. - -- Evgeni Golov <[email protected]> Sun, 25 Jan 2009 10:20:19 +0100 + -- Evgeni Golov <[email protected]> Thu, 12 Feb 2009 02:55:17 +0100 desmume (0.8-2) unstable; urgency=low Deleted: packages/trunk/desmume/debian/patches/01-dont_crash_on_bad_3d.patch =================================================================== --- packages/trunk/desmume/debian/patches/01-dont_crash_on_bad_3d.patch 2009-02-12 01:36:28 UTC (rev 8768) +++ packages/trunk/desmume/debian/patches/01-dont_crash_on_bad_3d.patch 2009-02-12 02:08:01 UTC (rev 8769) @@ -1,40 +0,0 @@ ---- desmume-0.8/src/gtk/gdk_3Demu.c 2007-06-27 16:44:40.000000000 +0200 -+++ desmume-0.8-fixed/src/gtk/gdk_3Demu.c 2008-12-23 22:31:55.000000000 +0100 -@@ -124,10 +124,14 @@ - - static int - begin_opengl_region_gdk_3d( void) { -+ int failed = 0; - -- if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext)) { -- return 0; -- } -+ gdk_error_trap_push(); -+ failed = !gdk_gl_drawable_gl_begin(gldrawable, glcontext); -+ gdk_flush(); -+ failed = failed | gdk_error_trap_pop(); -+ -+ if (failed) return 0; - - return 1; - } ---- desmume-0.8/src/gtk-glade/gdk_3Demu.c 2007-07-15 23:50:30.000000000 +0200 -+++ desmume-0.8-fixed/src/gtk-glade/gdk_3Demu.c 2008-12-23 22:33:05.000000000 +0100 -@@ -128,10 +128,14 @@ - - static int - begin_opengl_region_gdk_3d( void) { -+ int failed = 0; - -- if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext)) { -- return 0; -- } -+ gdk_error_trap_push(); -+ failed = !gdk_gl_drawable_gl_begin(gldrawable, glcontext); -+ gdk_flush(); -+ failed = failed | gdk_error_trap_pop(); -+ -+ if (failed) return 0; - - return 1; - } Deleted: packages/trunk/desmume/debian/patches/02-fix_3d_emulation_setup.patch =================================================================== --- packages/trunk/desmume/debian/patches/02-fix_3d_emulation_setup.patch 2009-02-12 01:36:28 UTC (rev 8768) +++ packages/trunk/desmume/debian/patches/02-fix_3d_emulation_setup.patch 2009-02-12 02:08:01 UTC (rev 8769) @@ -1,91 +0,0 @@ -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-02-12 01:36:28 UTC (rev 8768) +++ packages/trunk/desmume/debian/patches/series 2009-02-12 02:08:01 UTC (rev 8769) @@ -1,2 +1 @@ -#01-dont_crash_on_bad_3d.patch -02-fix_3d_emulation_setup.patch +# Modified: packages/trunk/desmume/debian/rules =================================================================== --- packages/trunk/desmume/debian/rules 2009-02-12 01:36:28 UTC (rev 8768) +++ packages/trunk/desmume/debian/rules 2009-02-12 02:08:01 UTC (rev 8769) @@ -32,7 +32,7 @@ cp -f /usr/share/misc/config.guess config.guess endif ./configure $(configure_flags) \ - CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" build: $(QUILT_STAMPFN) build-stamp _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
