Author: goneri Date: 2009-04-18 22:40:52 +0000 (Sat, 18 Apr 2009) New Revision: 9619
Added: packages/trunk/bloboats/debian/patches/uint32.diff Modified: packages/trunk/bloboats/debian/changelog packages/trunk/bloboats/debian/patches/series packages/trunk/bloboats/debian/rules Log: * deals correctly with noopt and debug, thanks Raphael Geisser * Apply Raphael Geisser patch to pass correct parameter to SDL_SetVideoMode Modified: packages/trunk/bloboats/debian/changelog =================================================================== --- packages/trunk/bloboats/debian/changelog 2009-04-18 22:06:51 UTC (rev 9618) +++ packages/trunk/bloboats/debian/changelog 2009-04-18 22:40:52 UTC (rev 9619) @@ -8,7 +8,9 @@ * Use /usr/share/quilt/quilt.make to call quilt * Unapply the patches during the clean, thanks Raphael Geisser * Standard version 3.8.1 - - do not ignore 'make clean' return + - do not ignore 'make clean' return + * deals correctly with noopt and debug, thanks Raphael Geisser + * Apply Raphael Geisser patch to pass correct parameter to SDL_SetVideoMode -- Gonéri Le Bouder <[email protected]> Sun, 19 Apr 2009 00:00:15 +0200 Modified: packages/trunk/bloboats/debian/patches/series =================================================================== --- packages/trunk/bloboats/debian/patches/series 2009-04-18 22:06:51 UTC (rev 9618) +++ packages/trunk/bloboats/debian/patches/series 2009-04-18 22:40:52 UTC (rev 9619) @@ -1 +1,2 @@ fix_makefile.patch +uint32.diff Added: packages/trunk/bloboats/debian/patches/uint32.diff =================================================================== --- packages/trunk/bloboats/debian/patches/uint32.diff (rev 0) +++ packages/trunk/bloboats/debian/patches/uint32.diff 2009-04-18 22:40:52 UTC (rev 9619) @@ -0,0 +1,39 @@ +Subject: Bug#523271: bloboats: segfault at start up +From: Raphael Geissert <[email protected]> + + +Index: bloboats-1.0.1.dsfg/src/window.cpp +=================================================================== +--- bloboats-1.0.1.dsfg.orig/src/window.cpp ++++ bloboats-1.0.1.dsfg/src/window.cpp +@@ -36,7 +36,7 @@ window::~window(){} + + + +-SDL_Surface * window::OpenWindow(int w, int h, int b, int flags) { ++SDL_Surface * window::OpenWindow(int w, int h, int b, Uint32 flags) { + if (!flags) { + flags = oldflags^SDL_FULLSCREEN; + } +Index: bloboats-1.0.1.dsfg/src/window.h +=================================================================== +--- bloboats-1.0.1.dsfg.orig/src/window.h ++++ bloboats-1.0.1.dsfg/src/window.h +@@ -31,7 +31,7 @@ class window + window(); + ~window(); + +- SDL_Surface * OpenWindow(int width, int height, int bpp, int flags); ++ SDL_Surface * OpenWindow(int width, int height, int bpp, Uint32 flags); + void SetTitle(char *text, char *icon); + bool Iconify(); + +@@ -52,7 +52,7 @@ class window + + int xlast, ylast; + +- int oldflags; ++ Uint32 oldflags; + + private: + SDL_Surface *screen; Modified: packages/trunk/bloboats/debian/rules =================================================================== --- packages/trunk/bloboats/debian/rules 2009-04-18 22:06:51 UTC (rev 9618) +++ packages/trunk/bloboats/debian/rules 2009-04-18 22:40:52 UTC (rev 9619) @@ -3,6 +3,19 @@ #export DH_VERBOSE=1 include /usr/share/quilt/quilt.make +CFLAGS = -Wall -g + +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif + + build: build-stamp build-stamp: $(QUILT_STAMPFN) dh_testdir @@ -12,8 +25,7 @@ clean: unpatch dh_testdir - # first make clean failes - make clean + [ ! -f bloboats.dirs ] || make clean rm -f debian/bloboats.6 dh_clean _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
