diff options
| -rw-r--r-- | media-gfx/povray/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/povray/files/povray-3.7.0_beta35-configure-allow-libpng14.patch | 14 | ||||
| -rw-r--r-- | media-gfx/povray/povray-3.7.0_beta35.ebuild | 6 |
3 files changed, 24 insertions, 2 deletions
diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog index 187fd96c7180..e72544813aac 100644 --- a/media-gfx/povray/ChangeLog +++ b/media-gfx/povray/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/povray # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.101 2010/05/24 14:29:56 lavajoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.102 2010/05/24 21:37:39 lavajoe Exp $ + + 24 May 2010; Joe Peterson <lavajoe@gentoo.org> povray-3.7.0_beta35.ebuild, + +files/povray-3.7.0_beta35-configure-allow-libpng14.patch: + Fix bug #321361 *povray-3.7.0_beta35 (24 May 2010) diff --git a/media-gfx/povray/files/povray-3.7.0_beta35-configure-allow-libpng14.patch b/media-gfx/povray/files/povray-3.7.0_beta35-configure-allow-libpng14.patch new file mode 100644 index 000000000000..363ff8d50d57 --- /dev/null +++ b/media-gfx/povray/files/povray-3.7.0_beta35-configure-allow-libpng14.patch @@ -0,0 +1,14 @@ +--- povray-3.7.0.beta.35a/configure.ac.old 2010-05-24 14:57:58.000000000 -0600 ++++ povray-3.7.0.beta.35a/configure.ac 2010-05-24 15:12:20.000000000 -0600 +@@ -361,11 +361,6 @@ else + fi + AC_MSG_RESULT([yes]) + AX_CHECK_LIB([png], [$required_libpng_version], [png12 png], [png_get_libpng_ver], [png.h], [png_get_libpng_ver(NULL)], [$with_libpng]) +- ### FIXME: do not allow for 1.4.x +- AC_MSG_CHECKING([for libpng version < 1.4 (not supported at the moment!)]) +- AX_COMPARE_VERSION([$ax_check_lib_version], [ge], [1.4], [ax_check_lib="bad"], [ax_check_lib="ok"]) +- AC_MSG_RESULT([$ax_check_lib]) +- ### + if test x"$ax_check_lib" != x"ok"; then + AC_MSG_ERROR([cannot find a suitable PNG library]) + else diff --git a/media-gfx/povray/povray-3.7.0_beta35.ebuild b/media-gfx/povray/povray-3.7.0_beta35.ebuild index 1841e0c5cb91..cbeac763e298 100644 --- a/media-gfx/povray/povray-3.7.0_beta35.ebuild +++ b/media-gfx/povray/povray-3.7.0_beta35.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_beta35.ebuild,v 1.1 2010/05/24 14:29:56 lavajoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_beta35.ebuild,v 1.2 2010/05/24 21:37:39 lavajoe Exp $ inherit eutils autotools flag-o-matic versionator @@ -35,6 +35,10 @@ S="${WORKDIR}/${PN}-${MY_PV}" src_unpack() { unpack ${A} cd "${S}" + + # Remove logic disallowing libpng 1.4 + epatch "${FILESDIR}"/${P}-configure-allow-libpng14.patch + # r_info_ptr->trans_alpha might be no-go with libpn12 has_version ">=media-libs/libpng-1.4" && epatch "${FILESDIR}"/${P}-libpng14.patch |