From: Timothy Redaelli Date: Fri, 2 Mar 2007 11:45:52 +0000 (+0000) Subject: Add a patch to make it compile without libpng installed. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c27904a6c981be9ec1f09e3efd2edb2be1816c92;p=gentoo.git Add a patch to make it compile without libpng installed. Package-Manager: portage-2.1.2-r11 --- 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 + +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 zsnes-1.51.ebuild: stable x86; bug 168804 diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest index 8a0f7cac71b1..b926b8cfceed 100644 --- a/games-emulation/zsnes/Manifest +++ b/games-emulation/zsnes/Manifest @@ -17,20 +17,24 @@ AUX zsnes-1.51-gzdirect.patch 2125 RMD160 34d20566d0239cc755e5d83213e069f7cddb59 MD5 b67ada558af9164141ae505adcbf84d3 files/zsnes-1.51-gzdirect.patch 2125 RMD160 34d20566d0239cc755e5d83213e069f7cddb5947 files/zsnes-1.51-gzdirect.patch 2125 SHA256 752d52a2fc019c329d76e4f8fd6c0a3002ab75f82781ebec400f9b7d45fb87fa files/zsnes-1.51-gzdirect.patch 2125 +AUX zsnes-1.51-libpng.patch 974 RMD160 36bdb059c6641376bee6ea5040a7045420c02870 SHA1 a4f7960de8eece5ac1c51cc8b58f6fb8964bca40 SHA256 9e5ba014ba847f7e10075dfd51b0ca42b86aa2dcc47952d569c304f3e8e15470 +MD5 303258dd01c610595dbbd4a9beb49ee7 files/zsnes-1.51-libpng.patch 974 +RMD160 36bdb059c6641376bee6ea5040a7045420c02870 files/zsnes-1.51-libpng.patch 974 +SHA256 9e5ba014ba847f7e10075dfd51b0ca42b86aa2dcc47952d569c304f3e8e15470 files/zsnes-1.51-libpng.patch 974 DIST zsnes142src.tar.gz 1102840 RMD160 d794c69e876265715e141c26ecb6ed1802ffc27d SHA1 d38ca8c1b4168edc5bb5815f504b52654100bc4b SHA256 f06ef14db8d3fdae9d7c12442a52e535a5feee1cb18c78b51a74ed282ed874be DIST zsnes151src.tar.bz2 1071712 RMD160 337407bf7e5516bcd7bf310c7b17d6d12a948750 SHA1 03df35490870c9950d7010747d0546c8525c0362 SHA256 eb013f824f5a9814a714cf0daaea3ea68a1c74fd741e5b0979fcb7964236a866 EBUILD zsnes-1.42.ebuild 1506 RMD160 acfb4288a677b5bb41ad8392695b96506866e32a SHA1 c838f6277c5404aa267ce25ad498d7d965ac76ae SHA256 76ea0337597ce7b0cd921b24e626db5aa5938b632fabc1b0c52d03f1efe92fa2 MD5 d2185588da42a9edd0f6ce9288ce33b6 zsnes-1.42.ebuild 1506 RMD160 acfb4288a677b5bb41ad8392695b96506866e32a zsnes-1.42.ebuild 1506 SHA256 76ea0337597ce7b0cd921b24e626db5aa5938b632fabc1b0c52d03f1efe92fa2 zsnes-1.42.ebuild 1506 -EBUILD zsnes-1.51.ebuild 2092 RMD160 4fd6d9df4d8266e74cbecf9099a12290674a36f6 SHA1 27a7dc1f4e176ffd6214b89bd1e8aaa703419db1 SHA256 33b2915093b25efb8285643b768214c23911400917c7f1bed81eb8d050b26355 -MD5 136021b96a653d7418336d2717383677 zsnes-1.51.ebuild 2092 -RMD160 4fd6d9df4d8266e74cbecf9099a12290674a36f6 zsnes-1.51.ebuild 2092 -SHA256 33b2915093b25efb8285643b768214c23911400917c7f1bed81eb8d050b26355 zsnes-1.51.ebuild 2092 -MISC ChangeLog 6732 RMD160 b0b0608c8d8177831ad5d7ef5f63081c12f23f19 SHA1 c62163ff31480074d1f0c0e8d085fca056969630 SHA256 bed893a636290545c73981f8a2b65f7bcbe39bd0e3d6dbba19da2e82150d4a91 -MD5 62f0cce23e612c53a8ed13a4439501aa ChangeLog 6732 -RMD160 b0b0608c8d8177831ad5d7ef5f63081c12f23f19 ChangeLog 6732 -SHA256 bed893a636290545c73981f8a2b65f7bcbe39bd0e3d6dbba19da2e82150d4a91 ChangeLog 6732 +EBUILD zsnes-1.51.ebuild 2181 RMD160 120e817e39e2bc35507d4963cc8e57a07ef3b4e3 SHA1 e3d21756ae52f725cb293b51eb27df0b96d096d6 SHA256 6ccd84946305036012830704eab4a920541516eebb5f95854f1bd5c3633d5b31 +MD5 683c236941861e03aecc2efd54c032e0 zsnes-1.51.ebuild 2181 +RMD160 120e817e39e2bc35507d4963cc8e57a07ef3b4e3 zsnes-1.51.ebuild 2181 +SHA256 6ccd84946305036012830704eab4a920541516eebb5f95854f1bd5c3633d5b31 zsnes-1.51.ebuild 2181 +MISC ChangeLog 6898 RMD160 62a24b95783b3a5b14818ef120f29372cc47fa45 SHA1 09a49c80bb7d87a401c733acf0b96040caa25e8b SHA256 b4bca59ad3e3f203ed7cf6134ea2caf6621a1778f1ad716ddb764e3c6f3e400f +MD5 785aa3381eeeab96fa0374103692a32d ChangeLog 6898 +RMD160 62a24b95783b3a5b14818ef120f29372cc47fa45 ChangeLog 6898 +SHA256 b4bca59ad3e3f203ed7cf6134ea2caf6621a1778f1ad716ddb764e3c6f3e400f ChangeLog 6898 MISC metadata.xml 372 RMD160 0d0b2eeec56fca840beec662062dfa3961537649 SHA1 41d62af5e7cd389224135e8385b22355f2c7f2ac SHA256 043dd4fd85df344c5a335c1f3bc1a0f9ce9b169337060367f767b3e4be217bdb MD5 67c743475aa0bdcc349144352575421c metadata.xml 372 RMD160 0d0b2eeec56fca840beec662062dfa3961537649 metadata.xml 372 @@ -42,9 +46,9 @@ MD5 98d517360d380f58da5b1ed8cc6d3dfd files/digest-zsnes-1.51 241 RMD160 fc4e7b29b0fd5e0fadab0336a35126baeea23a6a files/digest-zsnes-1.51 241 SHA256 f9ba651da95dcbc8a7c53b572bc4ecd38f552891b26c351b8ab719177399e6c1 files/digest-zsnes-1.51 241 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF5oysNQqtfCuFneMRAvB5AJ4s1kK9YhaKfyrMUXGmnLe8gkhTCQCeIefT -2942MqqZabSn1UH2vHDYwoY= -=6Cxi +iD8DBQFF6A53GDyatLGpTbYRAoLZAJoDb1SuT/rr5LC5+AUwoKdun4LkSwCdFfmV +wiC+doFtIdL9Y/iwUvVmQGg= +=b9kV -----END PGP SIGNATURE----- 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 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