The following commit has been merged in the master branch:
commit 4f7484b03d4ce0eb84271a1bf844035d0a572627
Merge: df74696a622418443b5c14c598e08dd0893de5be
b5877752a3d2e71f163fc11e6b9c538ce79e948e
deb9c78a9077e344961279ce80eb181071bd4e0e
0bc887e215a98a5e8e469a2020c44eb59d2343b7
Author: Mahyuddin Susanto <[email protected]>
Date: Wed Mar 28 11:22:09 2012 +0700
Merge remote-tracking branches 'remotes/tags/1.0.1.dsfg-3',
'remotes/tags/1.0.1.dsfg-2', 'remotes/tags/1.0.1.dsfg-1' and
'remotes/tags/1.0.1.dsfg-2@5894'
Conflicts:
Signed-off-by: Mahyuddin Susanto <[email protected]>
diff --combined debian/patches/01-fix_segfault_notebook.patch
index 0000000,0000000,0000000,0000000..1048295
new file mode 100644
--- /dev/null
+++ b/debian/patches/01-fix_segfault_notebook.patch
@@@@@ -1,0 -1,0 -1,0 -1,0 +1,33 @@@@@
++++Description: Add fix_segfault_notebook.diff to avoid a segfault if the
screen
++++ doesn't accept 1024x768 like most of the notebook computer
++++Author: Gonéri Le Bouder <[email protected]>
++++Bug-Debian: http://bugs.debian.org/523271
++++
++++Index: bloboats-1.0.2.dsfg/src/main.cpp
++++===================================================================
++++--- bloboats-1.0.2.dsfg.orig/src/main.cpp 2010-11-24 01:23:12.000000000
+0700
+++++++ bloboats-1.0.2.dsfg/src/main.cpp 2012-03-06 20:05:58.595691437
+0700
++++@@ -184,7 +184,7 @@
++++
++++ if (Config.fullscreen) flags |= SDL_FULLSCREEN;
++++
++++- SDL_Surface *s;
+++++ SDL_Surface *s = NULL;
++++
++++ if (!manualres) {
++++ s = Window.OpenWindow(Config.reswidth, Config.resheight, 32, flags);
++++Index: bloboats-1.0.2.dsfg/src/window.cpp
++++===================================================================
++++--- bloboats-1.0.2.dsfg.orig/src/window.cpp 2010-08-26 03:07:46.000000000
+0700
+++++++ bloboats-1.0.2.dsfg/src/window.cpp 2012-03-06 20:07:28.924139344
+0700
++++@@ -53,6 +53,10 @@
++++
++++
++++ screen = SDL_SetVideoMode(width, height, bpp, flags);
+++++
+++++ if (!screen)
+++++ return NULL;
+++++
++++ SDL_EventState(SDL_VIDEOEXPOSE, SDL_ENABLE);
++++
++++ // Set viewport
diff --combined debian/patches/02-fix-Makefile.patch
index 5ce7765,5ce7765,5ce7765,bd92c63..5410b4d
--- a/debian/patches/02-fix-Makefile.patch
+++ b/debian/patches/02-fix-Makefile.patch
@@@@@ -1,8 -1,8 -1,8 -1,8 +1,8 @@@@@
--- Index: bloboats-1.0.1.dsfg/Makefile
-Index: bloboats-1.0.1/Makefile
++++Index: bloboats-1.0.2.dsfg/Makefile
===================================================================
--- --- bloboats-1.0.1.dsfg.orig/Makefile 2008-02-21 17:22:58.000000000
+0100
--- +++ bloboats-1.0.1.dsfg/Makefile 2008-02-21 17:24:02.000000000 +0100
--- @@ -7,17 +7,19 @@
---- bloboats-1.0.1.orig/Makefile 2006-08-20 21:23:06.000000000 +0200
-+++ bloboats-1.0.1/Makefile 2006-08-20 21:43:35.000000000 +0200
-@@ -7,17 +7,19 @@
++++--- bloboats-1.0.2.dsfg.orig/Makefile 2010-11-24 02:27:16.000000000
+0700
+++++++ bloboats-1.0.2.dsfg/Makefile 2012-03-07 12:16:59.543928783 +0700
++++@@ -7,17 +7,21 @@
### Installation directory (Installation prefix)
# If you don't have root privileges, set this to
/home/tentacleman/bloboats/
# for example, otherwise /. Don't use ~ or other environment variables!
@@@@@ -15,28 -15,28 -15,28 -15,19 +15,32 @@@@@
### Or if you don't want to run make install at all, uncomments the next
line
# and comment the line below. Compile and run with './bin/bloboats'
#DATADIR = data
-----
++++
-DATADIR = $(PREFIX)/usr/games/bloboats/data
+DATADIR ?= $(PREFIX)/usr/games/bloboats/data
### If you do make install, you may perhaps want to set these
-BINARYDIR = $(PREFIX)/usr/bin
-CONFIGDIR = $(PREFIX)/etc
+++++
+BINARYDIR ?= $(PREFIX)/usr/bin
+CONFIGDIR ?= $(PREFIX)/etc
PRIVATEDIR = ~/.bloboats
--- @@ -27,6 +29,8 @@
--- # SDL, SDL_image, SDL_mixer and SDL_net to compile. Libvorbis for music
support.
-@@ -41,7 +43,7 @@
++++@@ -27,7 +31,10 @@
++++ # SDL, SDL_image, SDL_mixer to compile. Libvorbis for music support.
+ # OpenGL support.
+
++++-SOUND = 1
++# since the sound files were removed from the tarball (see:
README.Debian), we
++# turn off the sound support
--- SOUND = 0
--- NETWORK = 1
--- MUSIC = 0
--- @@ -41,7 +45,7 @@
+++++
+++++SOUND = 0
++++ MUSIC = 1
++++ DEBUG = 0
++++
++++@@ -40,7 +47,7 @@
#This should probably be DEFAULT
@@@@@ -45,18 -45,18 -45,18 -36,7 +49,17 @@@@@
### Only some random settings below
--- @@ -73,7 +77,9 @@
-@@ -133,17 +135,20 @@
++++@@ -72,7 +79,8 @@
+ SDLCONFIG = $(SDLCONFIG_$(TARGET))
+
+ ### Libs
--- -LIBS_DEFAULT = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net
-lGL -lGLU
--- +#LIBS_DEFAULT = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net
-lGL -lGLU
--- +# No sound enable => no SDL_mixer
--- +LIBS_DEFAULT = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_net -lGL -lGLU
--- LIBS_FREEBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net
-L/usr/X11R6/lib -lGL -lGLU
--- LIBS_NETBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -lGL
-lGLU -L/usr/pkg/lib
--- LIBS_MACOSX = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net
-framework OpenGL
--- @@ -133,17 +139,18 @@
++++-LIBS_DEFAULT = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lGL -lGLU
+++++# no sound enable => no SDL_Mixer
+++++LIBS_DEFAULT = `$(SDLCONFIG) --libs` -lSDL_image -lGL -lGLU
++++ LIBS_FREEBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer
-L/usr/X11R6/lib -lGL -lGLU
++++ LIBS_NETBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lGL -lGLU
-L/usr/pkg/lib
++++ LIBS_MACOSX = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -framework
OpenGL
++++@@ -132,18 +140,22 @@
CXXFLAGS_CROSS_ = -g `$(SDLCONFIG) --cflags` -o bin/$(BINARY_) -O2
CXXFLAGS_ = $(CXXFLAGS_$(TARGET)_)
@@@@@ -64,23 -64,23 -64,23 -44,23 +67,27 @@@@@
+all: config-stamp build-stamp
-main: $(OBJ)
+++++#main: $(OBJ)
+build-stamp: build
+build: config-stamp $(OBJ)
++++ mkdir -p bin
$(CXX) $(OBJ) $(LIBS) $(CXXFLAGS)
- $(STRIP) bin/$(BINARY)
+- $(STRIP) bin/$(BINARY)
+ touch build-stamp
+++++ #$(STRIP) bin/$(BINARY)
icon:
$(ICON_CMD)
$(CXX) -o bin/$(BINARY) $(OBJ) $(ICON) $(LIBS)
- $(STRIP) bin/$(BINARY)
+- $(STRIP) bin/$(BINARY)
+++++ #$(STRIP) bin/$(BINARY)
+config-stamp: config
config:
echo "datadir $(DATADIR)" >bloboats.dirs
echo "privatedir $(PRIVATEDIR)" >>bloboats.dirs
--- @@ -153,16 +160,16 @@
--- echo "#define NETWORK $(NETWORK)" >> src/compiling_settings.h
-@@ -153,16 +158,16 @@
- echo "#define NETWORK $(NETWORK)" >> src/compiling_settings.h
++++@@ -152,16 +164,16 @@
++++ echo "#define SOUND $(SOUND)" >> src/compiling_settings.h
echo "#define MUSIC $(MUSIC)" >> src/compiling_settings.h
echo "#define DEBUG $(DEBUG)" >> src/compiling_settings.h
+ touch config-stamp
@@@@@ -105,11 -105,11 -105,11 -85,8 +112,12 @@@@@
uninstall:
rm -f $(CONFIGDIR)/bloboats.dirs
--- @@ -174,10 +181,10 @@
-@@ -177,7 +182,8 @@
- $(STRIP) bin/$(BINARY_)
++++@@ -173,10 +185,11 @@
+
+ gho: src/viewport.o
+ $(CXX) src/viewport.o $(LIBS) $(CXXFLAGS_)
+- $(STRIP) bin/$(BINARY_)
+++++ #$(STRIP) bin/$(BINARY_)
clean:
- rm bloboats.dirs
diff --combined debian/patches/03-uint32.patch
index 733596d,733596d,0000000,0000000..6721849
mode 100644,100644,000000,000000..100644
--- a/debian/patches/03-uint32.patch
+++ b/debian/patches/03-uint32.patch
@@@@@ -1,39 -1,39 -1,0 -1,0 +1,39 @@@@@
-- Subject: Bug#523271: bloboats: segfault at start up
-- From: Raphael Geissert <[email protected]>
++++Description: Fix segfault at start up
++++Author: Raphael Geissert <[email protected]>
++++Bug-Debian: http://bugs.debian.org/523271
++
--
-- Index: bloboats-1.0.1.dsfg/src/window.cpp
++++Index: bloboats-1.0.2.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(){}
++++--- bloboats-1.0.2.dsfg.orig/src/window.cpp 2012-03-06 20:16:41.778880814
+0700
+++++++ bloboats-1.0.2.dsfg/src/window.cpp 2012-03-06 20:18:06.671301767
+0700
++++@@ -36,7 +36,7 @@
++
++
++
++-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
++++Index: bloboats-1.0.2.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
++++--- bloboats-1.0.2.dsfg.orig/src/window.h 2006-08-03 05:05:36.000000000
+0700
+++++++ bloboats-1.0.2.dsfg/src/window.h 2012-03-06 20:18:34.023437399
+0700
++++@@ -31,7 +31,7 @@
++ 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
++++@@ -52,7 +52,7 @@
++
++ int xlast, ylast;
++
++- int oldflags;
+++ Uint32 oldflags;
++
++ private:
++ SDL_Surface *screen;
diff --combined debian/patches/series
index 79ecb0a,79ecb0a,0000000,1d3db58..af5fc28
mode 100644,100644,000000,100644..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@@@ -1,3 -1,3 -1,0 -1,1 +1,3 @@@@@
-- fix_segfault_notebook.diff
-- -fix_makefile.patch
-- uint32.diff
++++01-fix_segfault_notebook.patch
++++02-fix-Makefile.patch
++++03-uint32.patch
--
bloboats repository
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
