This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus.
commit 104e2f6d31ebc3f8a3d9d758ed08aff7c810b01f Author: Sven Eckelmann <[email protected]> Date: Tue Jun 2 22:23:19 2009 +0200 Add 107-system-libbz2.patch, use libbz2 from debian instead of buildin --- debian/changelog | 1 + debian/control | 2 +- debian/patches/107-system-libbz2.patch | 64 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 67 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fbeba55..9d1a536 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,7 @@ mupen64plus (1.5-3) UNRELEASED; urgency=low libraries - Add 105-system-libpng.patch, use libpng from debian instead of buildin - Add 106-system-zlib.patch, use zlib from debian instead of buildin + - Add 107-system-libbz2.patch, use libbz2 from debian instead of buildin * Convert debian/copyright to new dep5 version -- Félix Arreola Rodríguez <[email protected]> Mon, 01 Jun 2009 14:42:41 +0200 diff --git a/debian/control b/debian/control index eae012c..c7b0861 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Homepage: http://code.google.com/p/mupen64plus/ Vcs-Browser: http://git.debian.org/?p=collab-maint/mupen64plus.git Vcs-Git: git://git.debian.org/git/collab-maint/mupen64plus.git Build-Depends: debhelper (>= 7), quilt, libsdl1.2-dev, libsdl-ttf2.0-dev, - libgtk2.0-dev, libsamplerate0-dev, libpng12-dev | libpng-dev, + libgtk2.0-dev, libsamplerate0-dev, libpng12-dev | libpng-dev, libbz2-dev, zlib1g-dev | libz-dev XS-Autobuild: true diff --git a/debian/patches/107-system-libbz2.patch b/debian/patches/107-system-libbz2.patch new file mode 100644 index 0000000..e20361c --- /dev/null +++ b/debian/patches/107-system-libbz2.patch @@ -0,0 +1,64 @@ +From 5dfc86e38d28c5b2058830617c6c9cede38581fc Mon Sep 17 00:00:00 2001 +From: Sven Eckelmann <[email protected]> +Date: Tue, 2 Jun 2009 22:02:13 +0200 +Subject: [PATCH] Use libbz2 from system instead of buildin one + + +Signed-off-by: Sven Eckelmann <[email protected]> +--- + Makefile | 11 ++--------- + main/rom.c | 2 +- + 2 files changed, 3 insertions(+), 10 deletions(-) + +diff --git a/Makefile b/Makefile +index 3e46873..5f7abac 100644 +--- a/Makefile ++++ b/Makefile +@@ -110,13 +110,6 @@ OBJ_CORE = \ + main/savestates.o \ + main/zip/ioapi.o \ + main/zip/unzip.o \ +- main/bzip2/bzlib.o \ +- main/bzip2/crctable.o \ +- main/bzip2/decompress.o \ +- main/bzip2/compress.o \ +- main/bzip2/randtable.o \ +- main/bzip2/huffman.o \ +- main/bzip2/blocksort.o \ + main/lzma/buffer.o \ + main/lzma/io.o \ + main/lzma/main.o \ +@@ -245,7 +238,7 @@ SHARE = $(shell grep CONFIG_PATH config.h | cut -d '"' -f 2) + # set primary objects and libraries for all outputs + ALL = mupen64plus $(PLUGINS) + OBJECTS = $(OBJ_CORE) $(OBJ_DYNAREC) $(OBJ_OPENGL) +-LIBS = $(SDL_LIBS) $(LIBGL_LIBS) ++LIBS = $(SDL_LIBS) $(LIBGL_LIBS) -lbz2 + + # add extra objects and libraries for selected options + ifeq ($(DBG), 1) +@@ -342,7 +335,7 @@ endif + clean-core: + ifneq ($(OS), WINDOWS) + $(RM_F) ./r4300/*.o ./r4300/x86/*.o ./r4300/x86_64/*.o ./memory/*.o ./debugger/*.o ./opengl/*.o +- $(RM_F) ./main/*.o ./main/version.h ./main/zip/*.o ./main/bzip2/*.o ./main/lzma/*.o ./main/7zip/*.o ./main/gui_gtk/*.o ./main/gui_gtk/debugger/*.o ++ $(RM_F) ./main/*.o ./main/version.h ./main/zip/*.o ./main/lzma/*.o ./main/7zip/*.o ./main/gui_gtk/*.o ./main/gui_gtk/debugger/*.o + $(RM_F) mupen64plus mupen64plus.desktop + $(RM_F) main/gui_qt4/moc_* main/gui_qt4/ui_*.h main/gui_qt4/*.o main/gui_qt4/*.a main/gui_qt4/Makefile + $(RM_F) translations/*.qm +diff --git a/main/rom.c b/main/rom.c +index 8654517..74c9643 100644 +--- a/main/rom.c ++++ b/main/rom.c +@@ -28,7 +28,7 @@ + #include <zlib.h> + + #include "zip/unzip.h" +-#include "bzip2/bzlib.h" ++#include <bzlib.h> + #include "lzma/lzmadec.h" + #include "7zip/7zExtract.h" + #include "7zip/7zCrc.h" +-- +1.6.3.1 + diff --git a/debian/patches/series b/debian/patches/series index b08a33a..3cf0640 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 104-as-needed.patch 105-system-libpng.patch 106-system-zlib.patch +107-system-libbz2.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
