Backport libpng14 patch to stable 3.6.1 release.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 30 insertions, 170 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index ea8b955cd40a..d43a67dcc10e 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.99 2010/03/12 08:54:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.100 2010/05/15 16:22:12 ssuominen Exp $
+
+  15 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  povray-3.6.1-r4.ebuild, +files/povray-3.6.1-libpng14.patch:
+  Backport libpng14 patch to stable 3.6.1 release.
 
   12 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   povray-3.7.0_beta32.ebuild, +files/povray-3.7.0_beta32-libpng14.patch:
diff --git a/media-gfx/povray/files/povray-3.6.1-libpng14.patch b/media-gfx/povray/files/povray-3.6.1-libpng14.patch
new file mode 100644
index 000000000000..250927f183eb
--- /dev/null
+++ b/media-gfx/povray/files/povray-3.6.1-libpng14.patch
@@ -0,0 +1,20 @@
+--- source/png_pov.cpp
++++ source/png_pov.cpp
+@@ -1428,7 +1428,7 @@
+ 		if(r_info_ptr->valid & PNG_INFO_tRNS)
+ 		{
+ 			for (index = 0; index < r_info_ptr->num_trans; index++)
+-				cmap[index].Transmit = 255 - r_info_ptr->trans[index];
++				cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
+ 		}
+ 
+ 		Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
+@@ -1461,7 +1461,7 @@
+ 		if(r_info_ptr->valid & PNG_INFO_tRNS)
+ 		{
+ 			for (index = 0; index < r_info_ptr->num_trans; index++)
+-				cmap[index].Transmit = 255 - r_info_ptr->trans[index];
++				cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
+ 		}
+ 
+ 		Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
diff --git a/media-gfx/povray/files/povray-3.7.0_beta29-fix-expiration-bug.patch b/media-gfx/povray/files/povray-3.7.0_beta29-fix-expiration-bug.patch
deleted file mode 100644
index 2da0056750b5..000000000000
--- a/media-gfx/povray/files/povray-3.7.0_beta29-fix-expiration-bug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- vfe/vfe.cpp	2008-09-06 00:14:57.000000000 +0200
-+++ vfe/vfe.cpp	2009-01-16 12:48:13.646808534 +0100
-@@ -747,9 +747,9 @@
- 
-   // this code may not be removed or modified unless the compilation is for personal
-   // use and the binary is not distributed to anyone else.
--  xtime_get(&t, TIME_UTC);
--  if (t.sec > 1230760800)
--    throw POV_EXCEPTION(kCannotHandleRequestErr, "Please obtain an updated version of this application.");
-+  // xtime_get(&t, TIME_UTC);
-+  // if (t.sec > 1230760800)
-+  //   throw POV_EXCEPTION(kCannotHandleRequestErr, "Please obtain an updated version of this application.");
- 
-   state = kStarting;
- 
diff --git a/media-gfx/povray/files/povray-3.7.0_beta29-print-extend-expiration-info.patch b/media-gfx/povray/files/povray-3.7.0_beta29-print-extend-expiration-info.patch
deleted file mode 100644
index 80a382ad672c..000000000000
--- a/media-gfx/povray/files/povray-3.7.0_beta29-print-extend-expiration-info.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- vfe/unix/unixconsole.cpp~	2008-10-07 17:06:27.000000000 -0600
-+++ vfe/unix/unixconsole.cpp	2008-11-08 14:11:58.000000000 -0700
-@@ -281,10 +281,21 @@
- 
- 		if (user_code != current_code)
- 		{
--			fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix %s\n",
--				PACKAGE,
--				current_week < 52 ? "has expired" : "is over twelve months old and is no longer usable"
--			);
-+                        if (current_week < 52)
-+                        {
-+				fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix %s\n",
-+					PACKAGE,
-+					"has expired"
-+				);
-+                                fprintf(stderr, "\nTo extend the license period (a week at a time), you can do\nsomething like the following (adjust syntax for your shell):\n\n    export POVRAY_BETA=`povray --betacode 2>&1`\n\n");
-+                        }
-+                        else
-+                        {
-+				fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix %s\n",
-+					PACKAGE,
-+					"is over twelve months old and is no longer usable"
-+				);
-+                        }
- 			exit(RETURN_ERROR);
- 		}
- 		current_time = EXPIRE_AT + (current_week+1)*spw - current_time;
diff --git a/media-gfx/povray/povray-3.6.1-r4.ebuild b/media-gfx/povray/povray-3.6.1-r4.ebuild
index 82e212b8158f..d918cd0db499 100644
--- a/media-gfx/povray/povray-3.6.1-r4.ebuild
+++ b/media-gfx/povray/povray-3.6.1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.6.1-r4.ebuild,v 1.8 2008/11/15 19:05:53 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.6.1-r4.ebuild,v 1.9 2010/05/15 16:22:12 ssuominen Exp $
 
 inherit flag-o-matic eutils autotools
 
@@ -24,6 +24,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	has_version ">=media-libs/libpng-1.4" && epatch \
+		"${FILESDIR}"/${P}-libpng14.patch
+
 	epatch "${FILESDIR}"/${P}-configure.patch
 	epatch "${FILESDIR}"/${P}-find-egrep.patch
 
diff --git a/media-gfx/povray/povray-3.7.0_beta29-r2.ebuild b/media-gfx/povray/povray-3.7.0_beta29-r2.ebuild
deleted file mode 100644
index cfe5f1162917..000000000000
--- a/media-gfx/povray/povray-3.7.0_beta29-r2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2009 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_beta29-r2.ebuild,v 1.1 2009/01/16 21:09:50 lavajoe Exp $
-
-inherit eutils autotools flag-o-matic versionator
-
-POVRAY_MAJOR_VER=$(get_version_component_range 1-3)
-POVRAY_MINOR_VER=$(get_version_component_range 4)
-if [ -n "$POVRAY_MINOR_VER" ]; then
-	POVRAY_MINOR_VER=${POVRAY_MINOR_VER/beta/beta.}
-	MY_PV="${POVRAY_MAJOR_VER}.${POVRAY_MINOR_VER}"
-else
-	MY_PV=${POVRAY_MAJOR_VER}
-fi
-
-DESCRIPTION="The Persistence of Vision Raytracer"
-HOMEPAGE="http://www.povray.org/"
-SRC_URI="http://www.povray.org/beta/source/${PN}-src-${MY_PV}.tar.bz2"
-
-LICENSE="povlegal-3.6"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="svga tiff X"
-
-DEPEND="media-libs/libpng
-	tiff? ( >=media-libs/tiff-3.6.1 )
-	media-libs/jpeg
-	sys-libs/zlib
-	X? ( x11-libs/libXaw )
-	svga? ( media-libs/svgalib )
-	>=dev-libs/boost-1.33"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Print info on how to extend the expiration date of the beta
-	# if it has expired.
-	epatch "${FILESDIR}"/${P}-print-extend-expiration-info.patch
-	epatch "${FILESDIR}"/${P}-fix-expiration-bug.patch
-
-	# Change some destination directories that cannot be adjusted via configure
-	cp configure.ac configure.ac.orig
-	sed -i -e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' configure.ac
-	sed -i -e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' configure.ac
-	sed -i -e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' configure.ac
-
-	cp Makefile.am Makefile.am.orig
-	sed -i -e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" Makefile.am
-	sed -i -e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" Makefile.am
-	sed -i -e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" Makefile.am
-
-	# The "+p" option on the test command line causes a pause and
-	# prompts the user to interact, so remove it.
-	sed -i -e"s:biscuit.pov -f +d +p:biscuit.pov -f +d:" Makefile.am
-
-	eautoreconf
-}
-
-src_compile() {
-	# Fixes bug 71255
-	if [[ $(get-flag march) == k6-2 ]]; then
-		filter-flags -fomit-frame-pointer
-	fi
-
-	# The config files are installed correctly (e.g. povray.conf),
-	# but the code compiles using incorrect [default] paths
-	# (based on /usr/local...), so povray will not find the system
-	# config files without the following fix:
-	append-flags -DPOVLIBDIR=\\\"${ROOT}usr/share/${PN}\\\"
-	append-flags -DPOVCONFDIR=\\\"${ROOT}etc/${PN}\\\"
-
-	econf \
-		COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" \
-		$(use_with svga) \
-		$(use_with tiff) \
-		$(use_with X) \
-		--disable-strip \
-		|| die
-
-	emake || die
-}
-
-src_test() {
-	# For the beta releases, we generate a license extension in case needed
-	POVRAY_BETA=`./unix/povray --betacode 2>&1` emake check || die "Test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-pkg_preinst() {
-	# Copy the old config files if they are in the old location
-	# but do not yet exist in the new location.
-	# This way, they can be treated by CONFIG_PROTECT as normal.
-	for conf_file in $(ls "${D}/etc/${PN}"); do
-		if [ ! -e "${ROOT}etc/${PN}/${conf_file}" ]; then
-			for version_dir in $(ls "${ROOT}etc/${PN}" | grep "^[0-9]" | sort -rn); do
-				if [ -e "${ROOT}etc/${PN}/${version_dir}/${conf_file}" ]; then
-					mv "${ROOT}etc/${PN}/${version_dir}/${conf_file}" "${ROOT}etc/${PN}"
-					elog "Note: ${conf_file} moved from ${ROOT}etc/povray/${version_dir}/ to ${ROOT}etc/povray/"
-					break
-				fi
-			done
-		fi
-	done
-}
-
-pkg_postinst() {
-	ewarn "POV-Ray betas have expiration dates, but these can be extended for up to"
-	ewarn "a year.  If expired, you will get the following error when running povray:"
-	ewarn
-	ewarn "    povray: this pre-release version of POV-Ray for Unix has expired"
-	ewarn
-	ewarn "To extend the license period (a week at a time), you can do"
-	ewarn "something like the following (adjust syntax for your shell):"
-	ewarn
-	ewarn "    export POVRAY_BETA=\`povray --betacode 2>&1\`"
-	ewarn
-	ewarn "You will need to repeat this each time it expires."
-}