Fix building of png2theora with libpng16 wrt #465450 by Billy DeVincentis

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 56 insertions, 29 deletions

diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog
index 7c18ae88b90b..518127e5e796 100644
--- a/media-libs/libtheora/ChangeLog
+++ b/media-libs/libtheora/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libtheora
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.108 2013/02/22 15:51:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.109 2013/04/11 03:02:28 ssuominen Exp $
+
+  11 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> libtheora-1.1.1.ebuild,
+  +files/libtheora-1.1.1-libpng16.patch:
+  Fix building of png2theora with libpng16 wrt #465450 by Billy DeVincentis
 
   22 Feb 2013; Zac Medico <zmedico@gentoo.org> libtheora-1.1.1.ebuild:
   Fix for prefix, add ~arm-linux keyword, and merge KEYWORDS from the
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 21d3c8769477..832fd096c526 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -2,14 +2,19 @@
 Hash: SHA256
 
 AUX libtheora-1.0_beta2-flags.patch 763 SHA256 7efb7aec3e472914ffc0facbdc9769e088e5d69e285254d19f353555ca90c7d6 SHA512 72916c4ed0f9609b84af7c72b35b558ecfb2ed7533739e170ed088e06d0e82a585dcc1185f3c5a5d0644d30901459813b635df2ba951e2290bcd4303cfebc20b WHIRLPOOL 6545f1566ae050c109b786dc7d1a5ee42b4d093fcd4d418ac4e86a51f0ac753f6c9ca2837a43db2dd60623a0c9b1650d0243dcf06bcf7a0eab455856eb08f2ab
+AUX libtheora-1.1.1-libpng16.patch 479 SHA256 788dc4d06bc1a80f3f146b7710251d3f24c3f2e957cae8611e83baec4f827adb SHA512 ea4e7ac416ea341f3231644d0009e2c9619990bbd3e64d0700d749801d8c2a54aac6266e7bd642f785247e01ee2cb85be3d88954f0b7aa0f1c8e99c5234d7250 WHIRLPOOL 5bcc6c9d74232f86ea5ca4f22550054128863e090cce84371562e990b9e35961064ae22dca90f641ed977d0ae5b7e194517e6fff63a0799e1bcc05f22790c71e
 DIST libtheora-1.1.1.tar.bz2 1903175 SHA256 b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd WHIRLPOOL deeb71454da7b32e3561ef31925e685170123bb18b0b4963db18cad8c422ede3a8e0a29662dbd45edce51ceca12c7ad5d2fe70f33db0c3a9b1cabe84fb37376b
-EBUILD libtheora-1.1.1.ebuild 1980 SHA256 2f5b3ac39240b4a874231937b4efdb776dee2d0982a73edb6a063c30c5de07ef SHA512 8705df867c77a886353f4d9b4dfd1b10fdf7f0acb6b2cd471150c77de6344dea8e84d960d3e209c92c04a32dec10017a5496dfb2d0c51f1603c07eff9e47101e WHIRLPOOL c12a08cc28d717f01140705fd828c4e8b24e7dba7002a4673f5ba442c307e2c49963f2c496c2a931b39bc0a8e38baaa481abe7a3bfa85e9a343250946c7c6e87
-MISC ChangeLog 15227 SHA256 b41f9dd5eb3a1125906856ff520728607a29e2364902c64250dd03d84fd594d7 SHA512 75bc9486b82a76262532f4370727cae563ed41508d263b9c4d5fee9e0aa7459b5b6aef90afb630d3a17004032f5df401fb18551173c3838fbf7e2b7a78abaea6 WHIRLPOOL 3c67012813a9b3dfc6f3ac770f00b97674e9c2eb3cd333d7b57a1ae10548a3c9c08177490e42b79299999f67dcb84731065d2bb70b181f89d16ffec1fc9d6dae
+EBUILD libtheora-1.1.1.ebuild 1876 SHA256 9ae9c61e280d4726b594c2c7a7ae1b4dccc03465237d20e66f1e21245b20e38d SHA512 e4ab73731e558159c9a929c2295b6d92b219cb64c033ea855d58c612f098b6d571108c1d4153682182dbe060c40f0c886fc177052e1855140158ecdeeae94671 WHIRLPOOL ec0039a8f20e6768a54235d648da1178087ecc85e6a2725c20ea8ac5d681992f3c9a37785376e4a102fd5f21675150cc112bf496939cbefde9d990e3cc6d9605
+MISC ChangeLog 15425 SHA256 75edf0f54dcf41cc235420fefc755a88aaf935d8f7e6d230da12bacc9e93611e SHA512 d39ffaca83ca484de2845123d9c369545f0a7645d49699bf02aff2f10cf91cae6f881c6c2bb6eb8a13bcde558548a8c75fb187a91f18e148a383b3b9737dfc88 WHIRLPOOL 4986c4cb2adc522a0a51876c13ae5bceae3ab64f749c134b47379db3aae381660fbacd63061e2ae9076c50f590d71f4bce20bcb275b6a76ec8f379d1427c8b10
 MISC metadata.xml 225 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 SHA512 79bf53ca11044e2cbddf8ba8c661abd2a6f7602748ef4dc1d1a3447d4f0e5a15a4d69f6e1f60e0f854465097019607a6fe7157906bc41ddfe41fb747de3ca7d6 WHIRLPOOL d257430e16390fc27365e2f58796f0f0b7c2c818f1bae76bb2a13b7971e5d33baa9d8aa33a12605653d05e0c7bd52b020aa96b737c56ac1038c32897c481a12c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEnk/EACgkQ/ejvha5XGaMNogCg2Ok69T60k3/7Mg2d3HmyDVQW
-BmYAn07wKA0+pmGaqoJFwI07EHV+sK2U
-=rRuX
+iQEcBAEBCAAGBQJRZie8AAoJEEdUh39IaPFNiz8H/i/jyBsuDBlK1UyNm3YPX0zD
+Hc8yanIzqx4oNJyfGh9WPRqE/h+zQTZZBp4tKWSJOHNCqf8/n7YXMpDL26rOCfWS
+Tdj4IeN/EPCDpaNlB4ye0aQAxKgXPur8Icj15IIVxWccuHC/er9SOcd3oHaR/rvy
+6CaVyk/eypShZguZ7Sgt7Wye5ya3K9nYbiHTtVfCiOwZxalk9OyiWJVyFOkdg/qh
+x4XNj7B6/fs1Qr6ju9gYYB87yUxK3Dbaw+fWtYFB1dBj+jydpiGPcZ4hTdH7+rOJ
++woZsLBZ4XocUEM4yv0/8x+QhUgSuPSPGBgH3YA+hC0REannytGpBQ8zUnW2DMA=
+=rTWE
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libtheora/files/libtheora-1.1.1-libpng16.patch b/media-libs/libtheora/files/libtheora-1.1.1-libpng16.patch
new file mode 100644
index 000000000000..883cb91465c0
--- /dev/null
+++ b/media-libs/libtheora/files/libtheora-1.1.1-libpng16.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/465450
+
+--- examples/png2theora.c
++++ examples/png2theora.c
+@@ -462,9 +462,9 @@
+   png_set_strip_alpha(png_ptr);
+ 
+   row_data = (png_bytep)png_malloc(png_ptr,
+-    3*height*width*png_sizeof(*row_data));
++    3*height*width*sizeof(*row_data));
+   row_pointers = (png_bytep *)png_malloc(png_ptr,
+-    height*png_sizeof(*row_pointers));
++    height*sizeof(*row_pointers));
+   for(y = 0; y < height; y++) {
+     row_pointers[y] = row_data + y*(3*width);
+   }
diff --git a/media-libs/libtheora/libtheora-1.1.1.ebuild b/media-libs/libtheora/libtheora-1.1.1.ebuild
index 4e675f19d9be..a0baee0d4a9c 100644
--- a/media-libs/libtheora/libtheora-1.1.1.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.1.1.ebuild,v 1.11 2013/02/22 15:51:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.1.1.ebuild,v 1.12 2013/04/11 03:02:28 ssuominen Exp $
 
-EAPI=3
+EAPI=5
 inherit autotools eutils flag-o-matic
 
 DESCRIPTION="The Theora Video Compression Codec"
@@ -14,46 +14,48 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +encode examples static-libs"
 
-RDEPEND="media-libs/libogg
-	encode? ( media-libs/libvorbis )
-	examples? ( media-libs/libpng
-		media-libs/libvorbis
-		>=media-libs/libsdl-0.11.0 )"
+RDEPEND="media-libs/libogg:=
+	encode? ( media-libs/libvorbis:= )
+	examples? (
+		media-libs/libpng:0=
+		>=media-libs/libsdl-0.11.0
+		media-libs/libvorbis:=
+		)"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	virtual/pkgconfig"
+REQUIRED_USE="examples? ( encode )" #285895
 
-VARTEXFONTS=${T}/fonts
 S=${WORKDIR}/${P/_}
 
+VARTEXFONTS=${T}/fonts
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0_beta2-flags.patch
-	AT_M4DIR="m4" eautoreconf
+	epatch \
+		"${FILESDIR}"/${PN}-1.0_beta2-flags.patch \
+		"${FILESDIR}"/${P}-libpng16.patch #465450
+	AT_M4DIR=m4 eautoreconf
 }
 
 src_configure() {
 	use x86 && filter-flags -fforce-addr -frename-registers #200549
-	use doc || export ac_cv_prog_HAVE_DOXYGEN="false"
-
-	local myconf
-	use examples && myconf="--enable-encode"
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
 
 	# --disable-spec because LaTeX documentation has been prebuilt
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable static-libs static) \
 		--disable-spec \
 		$(use_enable encode) \
-		$(use_enable examples) \
-		${myconf}
+		$(use_enable examples)
 }
 
 src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		install || die "emake install failed"
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
 
 	dodoc AUTHORS CHANGES README
-	prepalldocs
 
 	if use examples; then
 		if use doc; then
@@ -61,11 +63,11 @@ src_install() {
 			doins examples/*.[ch]
 		fi
 
-		dobin examples/.libs/png2theora || die "dobin failed"
+		dobin examples/.libs/png2theora
 		for bin in dump_{psnr,video} {encoder,player}_example; do
-			newbin examples/.libs/${bin} theora_${bin} || die "newbin failed"
+			newbin examples/.libs/${bin} theora_${bin}
 		done
 	fi
 
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
+	prune_libtool_files
 }