Author: goneri-guest Date: 2008-02-21 16:34:06 +0000 (Thu, 21 Feb 2008) New Revision: 5887
Modified: packages/trunk/bloboats/debian/changelog packages/trunk/bloboats/debian/control packages/trunk/bloboats/debian/patches/fix_makefile.patch Log: -remove libsdl-mixer1.2-dev since it's not needed for the moment -do not link with sdl-mixer too (fix_makefile.patch updated) Modified: packages/trunk/bloboats/debian/changelog =================================================================== --- packages/trunk/bloboats/debian/changelog 2008-02-21 09:36:08 UTC (rev 5886) +++ packages/trunk/bloboats/debian/changelog 2008-02-21 16:34:06 UTC (rev 5887) @@ -18,7 +18,8 @@ * Add Icon to .desktop file [ Gonéri Le Bouder ] - * update fix_makefile.patch to turn on the sound effects + * remove libsdl-mixer1.2-dev since it's not needed for the moment + * do not link with sdl-mixer too (fix_makefile.patch updated) -- Gonéri Le Bouder <[EMAIL PROTECTED]> Wed, 20 Feb 2008 16:38:06 +0000 Modified: packages/trunk/bloboats/debian/control =================================================================== --- packages/trunk/bloboats/debian/control 2008-02-21 09:36:08 UTC (rev 5886) +++ packages/trunk/bloboats/debian/control 2008-02-21 16:34:06 UTC (rev 5887) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Games Team <[EMAIL PROTECTED]> Uploaders: Gonéri Le Bouder <[EMAIL PROTECTED]>, Barry deFreese <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.0), libglib2.0-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, quilt, docbook-to-man +Build-Depends: debhelper (>= 5.0.0), libglib2.0-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, quilt, docbook-to-man Standards-Version: 3.7.3 Homepage: http://bloboats.dy.fi/about.php Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/bloboats/ Modified: packages/trunk/bloboats/debian/patches/fix_makefile.patch =================================================================== --- packages/trunk/bloboats/debian/patches/fix_makefile.patch 2008-02-21 09:36:08 UTC (rev 5886) +++ packages/trunk/bloboats/debian/patches/fix_makefile.patch 2008-02-21 16:34:06 UTC (rev 5887) @@ -1,7 +1,7 @@ Index: bloboats-1.0.1.dsfg/Makefile =================================================================== ---- bloboats-1.0.1.dsfg.orig/Makefile 2006-09-22 12:27:17.000000000 +0000 -+++ bloboats-1.0.1.dsfg/Makefile 2008-02-20 16:37:07.000000000 +0000 +--- 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 @@ ### Installation directory (Installation prefix) # If you don't have root privileges, set this to /home/tentacleman/bloboats/ @@ -27,28 +27,36 @@ PRIVATEDIR = ~/.bloboats -@@ -27,9 +29,9 @@ +@@ -27,6 +29,8 @@ # SDL, SDL_image, SDL_mixer and SDL_net to compile. Libvorbis for music support. # OpenGL support. --SOUND = 0 -+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 -+MUSIC = 1 - DEBUG = 0 + MUSIC = 0 +@@ -41,7 +45,7 @@ - # Select target system -@@ -41,7 +43,7 @@ - #This should probably be DEFAULT -TARGET = DEFAULT +TARGET ?= DEFAULT ### Only some random settings below -@@ -133,17 +135,18 @@ +@@ -73,7 +77,9 @@ + 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 @@ CXXFLAGS_CROSS_ = -g `$(SDLCONFIG) --cflags` -o bin/$(BINARY_) -O2 CXXFLAGS_ = $(CXXFLAGS_$(TARGET)_) @@ -71,7 +79,7 @@ config: echo "datadir $(DATADIR)" >bloboats.dirs echo "privatedir $(PRIVATEDIR)" >>bloboats.dirs -@@ -153,16 +156,16 @@ +@@ -153,16 +160,16 @@ echo "#define NETWORK $(NETWORK)" >> src/compiling_settings.h echo "#define MUSIC $(MUSIC)" >> src/compiling_settings.h echo "#define DEBUG $(DEBUG)" >> src/compiling_settings.h @@ -97,7 +105,7 @@ uninstall: rm -f $(CONFIGDIR)/bloboats.dirs -@@ -174,10 +177,10 @@ +@@ -174,10 +181,10 @@ gho: src/viewport.o $(CXX) src/viewport.o $(LIBS) $(CXXFLAGS_) _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
