diff options
| author |   Timothy Redaelli <drizzt@gentoo.org> | 2007-03-02 11:45:52 +0000 |
|---|---|---|
| committer | Timothy Redaelli <drizzt@gentoo.org> | 2007-03-02 11:45:52 +0000 |
| commit | b76d26ab95cc92685961b64f404364cd750a5c24 (patch) | |
| tree | f25b4facdfa3ea19b0e3de258213ed6801e687b1 | |
| parent | Version bump (diff) | |
| download | gentoo-2-b76d26ab95cc92685961b64f404364cd750a5c24.tar.gz gentoo-2-b76d26ab95cc92685961b64f404364cd750a5c24.tar.bz2 gentoo-2-b76d26ab95cc92685961b64f404364cd750a5c24.zip | |
Add a patch to make it compile without libpng installed.
(Portage version: 2.1.2-r11)
| -rw-r--r-- | games-emulation/zsnes/ChangeLog | 6 | ||||
| -rw-r--r-- | games-emulation/zsnes/files/zsnes-1.51-libpng.patch | 35 | ||||
| -rw-r--r-- | games-emulation/zsnes/zsnes-1.51.ebuild | 5 |
3 files changed, 44 insertions, 2 deletions
diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog index 55a09cfd023e..a4b51fc51305 100644 --- a/games-emulation/zsnes/ChangeLog +++ b/games-emulation/zsnes/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-emulation/zsnes # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.29 2007/03/01 08:20:46 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.30 2007/03/02 11:45:52 drizzt Exp $ + + 02 Mar 2007; Timothy Redaelli <drizzt@gentoo.org> + +files/zsnes-1.51-libpng.patch, zsnes-1.51.ebuild: + Add a patch to make it compile without libpng installed. 01 Mar 2007; Christian Faulhammer <opfer@gentoo.org> zsnes-1.51.ebuild: stable x86; bug 168804 diff --git a/games-emulation/zsnes/files/zsnes-1.51-libpng.patch b/games-emulation/zsnes/files/zsnes-1.51-libpng.patch new file mode 100644 index 000000000000..0611697c868f --- /dev/null +++ b/games-emulation/zsnes/files/zsnes-1.51-libpng.patch @@ -0,0 +1,35 @@ +Index: acinclude.m4 +=================================================================== +--- acinclude.m4 (revisione 4838) ++++ acinclude.m4 (copia locale) +@@ -163,21 +163,21 @@ + libpng_prefix="") + + min_libpng_version=ifelse([$1], ,1.2.0,$1) +-tempLIBS="$LIBS" +-tempCFLAGS="$CFLAGS" +-if test x$libpng_prefix != x ; then +- LIBPNG_LIBS="-L$libpng_prefix" +- LIBPNG_CFLAGS="-I$libpng_prefix" +-fi +-LIBPNG_LIBS="$LIBPNG_LIBS -lpng -lm" +-LIBS="$LIBS $LIBPNG_LIBS" +-CFLAGS="$CFLAGS $LIBPNG_CFLAGS" + + AC_MSG_CHECKING(for libpng - version >= $min_libpng_version) + + dnl <--- disable for no user choice part #2 + if test x$enable_libpng != xno; then + dnl ---> ++ tempLIBS="$LIBS" ++ tempCFLAGS="$CFLAGS" ++ if test x$libpng_prefix != x ; then ++ LIBPNG_LIBS="-L$libpng_prefix" ++ LIBPNG_CFLAGS="-I$libpng_prefix" ++ fi ++ LIBPNG_LIBS="$LIBPNG_LIBS -lpng -lm" ++ LIBS="$LIBS $LIBPNG_LIBS" ++ CFLAGS="$CFLAGS $LIBPNG_CFLAGS" + + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <png.h> diff --git a/games-emulation/zsnes/zsnes-1.51.ebuild b/games-emulation/zsnes/zsnes-1.51.ebuild index 19a11fafc2a6..339bfbe5cc81 100644 --- a/games-emulation/zsnes/zsnes-1.51.ebuild +++ b/games-emulation/zsnes/zsnes-1.51.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51.ebuild,v 1.8 2007/03/01 08:20:46 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51.ebuild,v 1.9 2007/03/02 11:45:52 drizzt Exp $ inherit eutils autotools flag-o-matic toolchain-funcs games @@ -29,6 +29,9 @@ src_unpack() { unpack ${A} cd "${S}" + # Fixing compilation without libpng installed + epatch "${FILESDIR}"/${P}-libpng.patch + # Workaround for old libz [[ "${ARCH}" = amd64 ]] && epatch "${FILESDIR}"/${P}-gzdirect.patch |