[mupen64plus] 47/262: Add 106-system-zlib.patch, use zlib from debian instead of buildin

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit 430a73380be97fa782348c22e9a5047ad68b5d8d
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Tue Jun 2 22:20:03 2009 +0200

    Add 106-system-zlib.patch, use zlib from debian instead of buildin
---
 debian/changelog                     |  1 +
 debian/control                       |  3 +-
 debian/patches/106-system-zlib.patch | 92 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 4 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 92312f7..fbeba55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ mupen64plus (1.5-3) UNRELEASED; urgency=low
     - Add 104-as-needed.patch, allow --as-needed to reduce number of linked
       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
   * Convert debian/copyright to new dep5 version
 
  -- Félix Arreola Rodríguez <fgatuno.123 at gmail.com>  Mon, 01 Jun 2009 14:42:41 +0200
diff --git a/debian/control b/debian/control
index fbd154d..eae012c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ 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,
+ zlib1g-dev | libz-dev
 XS-Autobuild: true
 
 Package: mupen64plus
diff --git a/debian/patches/106-system-zlib.patch b/debian/patches/106-system-zlib.patch
new file mode 100644
index 0000000..5df3226
--- /dev/null
+++ b/debian/patches/106-system-zlib.patch
@@ -0,0 +1,92 @@
+From d549715de09a055384229c7de3950a6928399be6 Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven.eckelmann at gmx.de>
+Date: Tue, 2 Jun 2009 21:12:27 +0200
+Subject: [PATCH] Use zlib from system instead of buildin one
+
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
+---
+ Makefile            |    1 -
+ main/zip/ioapi.c    |    2 +-
+ main/zip/unzip.c    |    2 +-
+ main/zip/unzip.h    |    2 +-
+ rice_video/Makefile |   11 -----------
+ 5 files changed, 3 insertions(+), 15 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index aa95eb5..3e46873 100644
+--- a/Makefile
++++ b/Makefile
+@@ -104,7 +104,6 @@ OBJ_CORE = \
+ 	main/util.o \
+ 	main/cheat.o \
+ 	main/config.o \
+-	main/adler32.o \
+ 	main/md5.o \
+ 	main/plugin.o \
+ 	main/rom.o \
+diff --git a/main/zip/ioapi.c b/main/zip/ioapi.c
+index 0df3ab1..7e55286 100644
+--- a/main/zip/ioapi.c
++++ b/main/zip/ioapi.c
+@@ -22,7 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include "zlib.h"
++#include <zlib.h>
+ #include "ioapi.h"
+ 
+ 
+diff --git a/main/zip/unzip.c b/main/zip/unzip.c
+index 7644ac6..0d9234d 100644
+--- a/main/zip/unzip.c
++++ b/main/zip/unzip.c
+@@ -48,7 +48,7 @@ woven in by Terry Thorsen 1/2003.
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include "zlib.h"
++#include <zlib.h>
+ #include "unzip.h"
+ 
+ #ifdef STDC
+diff --git a/main/zip/unzip.h b/main/zip/unzip.h
+index ec7c1ee..faa23af 100644
+--- a/main/zip/unzip.h
++++ b/main/zip/unzip.h
+@@ -50,7 +50,7 @@ extern "C" {
+ #endif
+ 
+ #ifndef _ZLIB_H
+-#include "zlib.h"
++#include <zlib.h>
+ #endif
+ 
+ #ifndef _ZLIBIOAPI_H
+diff --git a/rice_video/Makefile b/rice_video/Makefile
+index 02c9ad4..2784bcd 100644
+--- a/rice_video/Makefile
++++ b/rice_video/Makefile
+@@ -80,18 +80,7 @@ OBJECTS = OGLGraphicsContext.o \
+ 	CNvTNTCombiner.o \
+ 	GeneralCombiner.o \
+ 	DirectXDecodedMux.o \
+-	liblinux/inflate.o \
+-	liblinux/crc32.o \
+-	liblinux/deflate.o \
+ 	CombinerTable.o \
+-	liblinux/infblock.o \
+-	liblinux/zutil.o \
+-	liblinux/adler32.o \
+-	liblinux/trees.o \
+-	liblinux/infcodes.o \
+-	liblinux/infutil.o \
+-	liblinux/inftrees.o \
+-	liblinux/inffast.o \
+ 	OGLRenderExt.o
+ 
+ GTKOBJECTS = \
+-- 
+1.6.3.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 71e02e7..b08a33a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 103-dejavu-font.patch
 104-as-needed.patch
 105-system-libpng.patch
+106-system-zlib.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git