This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus.
commit 21cdb04f1a69594b79580f6a23590dcca3ed632e Author: Sven Eckelmann <[email protected]> Date: Tue Jun 2 22:18:28 2009 +0200 Add 105-system-libpng.patch, use libpng from debian instead of buildin --- debian/changelog | 1 + debian/control | 2 +- debian/patches/105-system-libpng.patch | 74 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 77 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8f37270..92312f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,7 @@ mupen64plus (1.5-3) UNRELEASED; urgency=low - Add 103-dejavu-font.patch, use font from ttf-dejavu-core package - 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 * 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 30f1a61..fbd154d 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 + libgtk2.0-dev, libsamplerate0-dev, libpng12-dev | libpng-dev XS-Autobuild: true Package: mupen64plus diff --git a/debian/patches/105-system-libpng.patch b/debian/patches/105-system-libpng.patch new file mode 100644 index 0000000..9157202 --- /dev/null +++ b/debian/patches/105-system-libpng.patch @@ -0,0 +1,74 @@ +From 71c93737566b9124e484f00a180179b2ea49b63e Mon Sep 17 00:00:00 2001 +From: Sven Eckelmann <[email protected]> +Date: Tue, 2 Jun 2009 21:40:28 +0200 +Subject: [PATCH] Use libpng from system instead of buildin one + + +Signed-off-by: Sven Eckelmann <[email protected]> +--- + rice_video/Makefile | 16 +--------------- + rice_video/liblinux/pngrw.c | 3 +-- + 2 files changed, 2 insertions(+), 17 deletions(-) + +diff --git a/rice_video/Makefile b/rice_video/Makefile +index 3de7316..02c9ad4 100644 +--- a/rice_video/Makefile ++++ b/rice_video/Makefile +@@ -76,26 +76,12 @@ OBJECTS = OGLGraphicsContext.o \ + DecodedMux.o \ + RenderTexture.o \ + liblinux/BMGUtils.o \ +- liblinux/pngread.o \ +- liblinux/png.o \ +- liblinux/pngget.o \ +- liblinux/pngrtran.o \ +- liblinux/pngtrans.o \ +- liblinux/pngwrite.o \ +- liblinux/pngset.o \ +- liblinux/pngmem.o \ + OGLDecodedMux.o \ + CNvTNTCombiner.o \ + GeneralCombiner.o \ + DirectXDecodedMux.o \ +- liblinux/pngerror.o \ + liblinux/inflate.o \ +- liblinux/pngrio.o \ +- liblinux/pngrutil.o \ + liblinux/crc32.o \ +- liblinux/pngwutil.o \ +- liblinux/pngwio.o \ +- liblinux/pngwtran.o \ + liblinux/deflate.o \ + CombinerTable.o \ + liblinux/infblock.o \ +@@ -131,7 +117,7 @@ targets: + all: version.h ricevideo.so + + ricevideo.so: $(OBJECTS) +- $(LD) $(OBJECTS) $(LDFLAGS) $(GTK_LIBS) -o $@ ++ $(LD) $(OBJECTS) $(LDFLAGS) $(CORE_LDFLAGS) $(GTK_LIBS) -o $@ + $(STRIP) $@ + + clean: +diff --git a/rice_video/liblinux/pngrw.c b/rice_video/liblinux/pngrw.c +index 039cb98..673741a 100644 +--- a/rice_video/liblinux/pngrw.c ++++ b/rice_video/liblinux/pngrw.c +@@ -29,13 +29,12 @@ + #include <ctype.h> + #include <stdio.h> + #include <stdlib.h> +-#include <setjmp.h> + #ifdef _BMG_LIBPNG_STANDALONE + #include "BMGLibPNG.h" + #else + #include "pngrw.h" + #endif +-#include "png.h" ++#include <png.h> + + #ifndef png_jmpbuf + # define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf) +-- +1.6.3.1 + diff --git a/debian/patches/series b/debian/patches/series index 58684cc..71e02e7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 102-plugin-searchpath.patch 103-dejavu-font.patch 104-as-needed.patch +105-system-libpng.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
