Author: sargentd-guest
Date: 2008-12-24 00:08:45 +0000 (Wed, 24 Dec 2008)
New Revision: 8555
Added:
packages/trunk/desmume/debian/patches/
packages/trunk/desmume/debian/patches/01-dont_crash_on_bad_3d.patch
packages/trunk/desmume/debian/patches/series
Modified:
packages/trunk/desmume/debian/changelog
packages/trunk/desmume/debian/control
packages/trunk/desmume/debian/rules
Log:
* Add debian/patches/01-dont_crash_on_bad_3d.patch, so we don't crash
when 3D can't be enabled correctly. (Closes: #509365)
* Use $(QUILT_STAMPFN) instead of patch.
* Add myself to uploaders.
Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog 2008-12-24 00:02:06 UTC (rev
8554)
+++ packages/trunk/desmume/debian/changelog 2008-12-24 00:08:45 UTC (rev
8555)
@@ -1,4 +1,4 @@
-desmume (0.8-2) UNRELEASED; urgency=low
+desmume (0.8-2) unstable; urgency=low
[ Ansgar Burchardt ]
* debian/control: Remove Homepage semi-field from description
@@ -8,15 +8,19 @@
the clean target, instead of updating them in the clean target, so as
to keep the Debian diff clean, and also prevent an FTBFS with the new
“3.0 (quilt)” source package format.
- * Drop the only patch (along with the series file), since it's already
+ * Drop debian/patches/fix-64bit-segfault.diff, since it's already
applied upstream, and would cause an FTBFS under the same conditions
as above, thanks to Raphaël Hertzog for the notice (Closes: #485033).
- * Also drop patch-related target dependencies, and quilt build-dependency
- accordingly.
* Update my mail address.
- -- Reinhard Tartler <[email protected]> Sat, 10 May 2008 23:18:38 +0200
+ [ Evgeni Golov ]
+ * Add debian/patches/01-dont_crash_on_bad_3d.patch, so we don't crash
+ when 3D can't be enabled correctly. (Closes: #509365)
+ * Use $(QUILT_STAMPFN) instead of patch.
+ * Add myself to uploaders.
+ -- Evgeni Golov <[email protected]> Tue, 23 Dec 2008 22:56:36 +0100
+
desmume (0.8-1) unstable; urgency=low
[ Eddy Petrișor ]
Modified: packages/trunk/desmume/debian/control
===================================================================
--- packages/trunk/desmume/debian/control 2008-12-24 00:02:06 UTC (rev
8554)
+++ packages/trunk/desmume/debian/control 2008-12-24 00:08:45 UTC (rev
8555)
@@ -2,8 +2,8 @@
Section: games
Priority: extra
Maintainer: Debian Games Team <[email protected]>
-Uploaders: Reinhard Tartler <[email protected]>, Pascal Giard
<[email protected]>, Cyril Brulebois <[email protected]>
-Build-Depends: debhelper (>= 5), libglade2-dev, libgtk2.0-dev, libsdl1.2-dev,
libgtkglext1-dev, intltool
+Uploaders: Reinhard Tartler <[email protected]>, Pascal Giard
<[email protected]>, Cyril Brulebois <[email protected]>, Evgeni Golov
<[email protected]>
+Build-Depends: debhelper (>= 5), libglade2-dev, libgtk2.0-dev, libsdl1.2-dev,
libgtkglext1-dev, intltool, quilt
Standards-Version: 3.7.2
Homepage: http://desmume.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/desmume/
Added: packages/trunk/desmume/debian/patches/01-dont_crash_on_bad_3d.patch
===================================================================
--- packages/trunk/desmume/debian/patches/01-dont_crash_on_bad_3d.patch
(rev 0)
+++ packages/trunk/desmume/debian/patches/01-dont_crash_on_bad_3d.patch
2008-12-24 00:08:45 UTC (rev 8555)
@@ -0,0 +1,40 @@
+--- 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;
+ }
Added: packages/trunk/desmume/debian/patches/series
===================================================================
--- packages/trunk/desmume/debian/patches/series
(rev 0)
+++ packages/trunk/desmume/debian/patches/series 2008-12-24 00:08:45 UTC
(rev 8555)
@@ -0,0 +1 @@
+01-dont_crash_on_bad_3d.patch
Modified: packages/trunk/desmume/debian/rules
===================================================================
--- packages/trunk/desmume/debian/rules 2008-12-24 00:02:06 UTC (rev 8554)
+++ packages/trunk/desmume/debian/rules 2008-12-24 00:08:45 UTC (rev 8555)
@@ -1,6 +1,8 @@
#!/usr/bin/make -f
# -*- makefile -*-
+include /usr/share/quilt/quilt.make
+
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -33,14 +35,14 @@
--localedir=/usr/share/locale \
CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-build: build-stamp
+build: $(QUILT_STAMPFN) build-stamp
build-stamp: config.status
dh_testdir
$(MAKE)
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
