Use media-gfx/optipng built with internal copy of libpng15 to correct IDAT lenght in multiple broken PNG files from the smplayer tarball wrt #466572 by Tobias Klausmann

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

3 files changed, 110 insertions, 17 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index 9c8b0caf9f46..356b750b84ed 100644
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/smplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.132 2013/03/24 09:25:57 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.133 2013/05/03 16:56:44 ssuominen Exp $
+
+*smplayer-0.8.4-r1 (03 May 2013)
+
+  03 May 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +smplayer-0.8.4-r1.ebuild:
+  Use media-gfx/optipng built with internal copy of libpng15 to correct IDAT
+  lenght in multiple broken PNG files in the smplayer tarball wrt #466572 by
+  Tobias Klausmann
 
 *smplayer-0.8.4 (24 Mar 2013)
 
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 3e44178ad92d..3821f8c144e8 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -4,26 +4,20 @@ Hash: SHA256
 AUX smplayer-0.8.0-quazip.patch 2915 SHA256 ac1e7f6301d14df624c13219397958d2f5ebee3c3f89f46cc9651e9413548bd2 SHA512 a642720f4db2a705ef6380212c6658a8ef34ec34319e575630750b614516f430ce91d40a47989980e695f9e0e6ada031da3ea8608e16c11112e94d5b8ccb6503 WHIRLPOOL b055fa4c97da7505a66e9b4061e0fce4609dc0f68691670cacdd9890cfa68098df11b1ae66ed153ba1c47e58f5786bee4ab4a4fdbf261eca17bcc43f9b722383
 DIST smplayer-0.8.3.tar.bz2 3201389 SHA256 835141111697c9e5b68b6dc5c96b4b38c1c0eed41f02d42ff1467e932a996435 SHA512 14d1830ce4ff3f4bf4b7f6cce1c74c84edf11dbe43fad540b9919a9b06aa148ad22c8a13498a2a61b576677c27b44482d52accf5f5c89294c4e0d7a3eba46252 WHIRLPOOL 7a1d52c0f3b5f6e7d47b1d9b8716ce9f561036697a2ed63b2d6440eeb7b010b68e0476fe8821b931e435644c73aa02428d2b84c59a8f1e7a257955a727407a6b
 DIST smplayer-0.8.4.tar.bz2 3333370 SHA256 97e2f2810a3718e5ae11d000e117c104a9b5ba7d92516f6be03c9afa5f07a2bf SHA512 d9b28154fbc6a47d5efa7313eed06ea8c683ab8a5c717a417d2dc9b0610f8da0aac56ed795296e006ef0756dd88aa5e91c14f09380e7ef2dd65d046c25803893 WHIRLPOOL 11bd9a8e36b30bde3e997c603e71cba3f20c97ae9056a677659b44d293c8ddb76e9eb50e2bccef6962e9fab37c793178d2d0198fc3b29c31a1961aef8c8b9ff8
+DIST smplayer-icons-0.8.4.tar.xz 505220 SHA256 bf394f6c049f5fdd678d817fc47f366745dd57d67b4efd2bfdc356923ec216d4 SHA512 81cca51e1ff20b309a8134e53183cf02fc90438d67847c36fce05984bb74045b86b84fad078dc09e10a61090ec27c661174dddd49d29c55f0546ed1e12ce4c97 WHIRLPOOL 1b502f39e488ebbe32dd79284730147be5a457e70e85d5a10d168c08d34abb5a046f75738899df402676942c4c6c41a4ea0c72a9fdf96f179baa9d99844ea81d
 EBUILD smplayer-0.8.3.ebuild 2213 SHA256 4e26578732de0c974854f4b50fcd9a622b56e998113d9636dc9af8cc22b32429 SHA512 1b0cb4fa5dd25760107b47465954c97b0a20717add98ff0429a52c05cf2115632101bc8f73d65d6f5672981b47b1b7adf60e3c3c2f0f291c581a186a4da06ae0 WHIRLPOOL 002018835bb4ef39c572007bd3b1888fde40057da6426ffe16c137803c66ccef4b83e65628e8b3a42e2ca27522d90cc792f94849d300aa237e4628d411cbc543
+EBUILD smplayer-0.8.4-r1.ebuild 2467 SHA256 59f287287c512b493456fa8e26c7559c6a00a613c5a43369f9847c055e86e1b2 SHA512 cb67ec098cbd6fdab060283950651facaabf4833f0c6bf2fb4a7b7b73c70c8c6d79b207a241b6522771e673c778f23b672eba01845d92a076a3ab60a4946326b WHIRLPOOL 0b4abe5beb744cb291e1072e45551c79a5c0de71146667c662f56eb7f4166cb739520b798d59942c8de46f28079c1b908464ed05cbedb87d6492027d0b64f7ee
 EBUILD smplayer-0.8.4.ebuild 2223 SHA256 13fca063adf83dfadf3059c8a09479485cbedaee39e09227d6563a4cc5506d45 SHA512 dad936b8504a353b1934faf84ed39d8e76397ef49e377da4ee6e2632354d408915d0567e44924df687faeb7c74808f7b5900fd5a0066d0b137c99ad92b5c29cc WHIRLPOOL a03426710a68133cf7736c37e22433e17191190eb4e963397b1ce5ebd7c66817bab3316b21fb53fa9a97f404cef6ebbff4e610fe208de9b7795be18f03efe8d7
-MISC ChangeLog 17953 SHA256 8dae9abdf25a7f2c20ddd396f09c6b93e26ef34b57e0d49f0298b5780c1093fa SHA512 4c0f62039f316e3981396f874ed32c459087a6ce8efc9cfc62e3839e1fe67098a525aa9f48c4f2339d29d1935dd58e38f8bb2a4a506d4dbba1363f964a0b5d71 WHIRLPOOL 5b81ac1b7a520726af8ca15d3f92917babe46de9a56f1c3db94805699c73a153958185e667424d047aed1344eb079834343b320e60a105b26fe01fcc0d266129
+MISC ChangeLog 18247 SHA256 0ae153054c6f7a623d0d3ba48b1b9192a6f0c8b5e4bf6ae827fc979df118c43d SHA512 024ce2c9a9a9021f75b134a485324b03f2b36829b462fc69ac4db9eca1a329911ca08e5870c5a7969b84725993494e9200ac8684945d1a60be169d73f924ca11 WHIRLPOOL 928587a1a78b4ec8e7564a1a45b44b51bd41e6c0a300c15210d285a764ce15907d0e26d8e39597b80d4da8af42bd07736f42b6275f549376287704394ada6bff
 MISC metadata.xml 174 SHA256 89d4f3510de4db0434e0b3794ed9bef3e603217ca0cb195d3e817c208239f6fa SHA512 bc396506ea847d6a36e400a86b8a575a46d075da58b57a4b085e12ac242e210a7a55c4e8b3da567b97c0e5a8bfc682bb5546b3b657c2f92f6fa00da674bb7062 WHIRLPOOL 0e82e9ab352222683df9da1682d9cc03d2123786218c74f31ac487417100408cd5737aac3355e96f68388ddba76b3a1ea2f4bcf50fd4ec55c87fb6bfd20a5fee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRTsarXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1DzilurFQQAJVH8lKJC/+S93sv2CNrns7l
-xn/2afCfz/i64fWQEK36CUcMkzn7xLwKZMB/wZoX74dkDQLBE7y+sOT7eaPwbnQK
-z+vLVpZikTeVxvTPanGgyC9ydnKZKAb6YlH8qcL9b0njdeCN5WbMYR1AiLwnYGQd
-RiCVkfye6PHO6xgfEwP/mY68SdEdY3M+EQlpdXIZWSBR4tSAvE62kh4WafidWLYf
-M1szXKd0khJ0vkmBklt+3jlX9oRO5zt3SwIbo4GnRWJPJ7EE1IBOBK+E2VKKlsfE
-NXUsvEKWteoL/ND+QZXxTC18Skkv7B/cVRGUn17/bmpdqz2wITm0F9rsYUe6c89m
-Uu8XNQVAIqVxq2weHd43UzZJKdSNoilXX5hV363SA8IYSzspFHKDHlJguNzG7Vlf
-kZc4DIyblk82NKN6vHGg1yrV1Rmi/WxLkwqX/8k+8I55/Cfqx9nws5RyBQQsC6bZ
-7Pr0Ca3x37DVN0vjZyeU0tNeFHr1YNcnMqW8PlVJoUOg4oiiQiS9V2coNcoUa9XE
-CamycaSDkMy8X1SqV14UKZOns4ki8D2gxUYZY2sVC8u5cga2jBh0WISRS4RLUtCu
-h+x1cWq7A+d756louuh+2hsZHcXn/sM7nxUIrvBzLv8ujwz4PHKRh3Tayf2z2y5A
-8i/eYSFk9rGLBku5h710
-=0RCN
+iQEcBAEBCAAGBQJRg+xGAAoJEEdUh39IaPFN4/UIAIbYBwtiyqVZ+q03NCE2YqoT
+/Eb1ZD/Gp34vCGOgvAj9y7yr402KLp4tZ1eyN20CaR26juGCQR+Xc+6l5K5uFTpG
+awR8KPHHWQaeGfjm2HE56ftmhmBndP7WhMLIh0y0XvpH7dOFxNjjGu0ZYrn8u7FN
++hHn+rqa5UW6t+fTnNILbJ26EPS9sPHS9U+i9piiftKyGkpVNY/aQ1lK9y8Und5p
+CTV11dt5NHpmiorbKLO/AzbKUHO0Sq8uTWBCmPvOiYWtaH5nrn73snQITjP4bafE
+Xmbo8iGzb3RGX7qZCV1kp0pAxAAwa2IIA+1s2tIwBI8+POrW3r9n0//YBoreAxE=
+=pUon
 -----END PGP SIGNATURE-----
diff --git a/media-video/smplayer/smplayer-0.8.4-r1.ebuild b/media-video/smplayer/smplayer-0.8.4-r1.ebuild
new file mode 100644
index 000000000000..2c56425e121e
--- /dev/null
+++ b/media-video/smplayer/smplayer-0.8.4-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.8.4-r1.ebuild,v 1.1 2013/05/03 16:56:44 ssuominen Exp $
+
+EAPI=4
+PLOCALES="ar_SY bg ca cs da de el_GR en_US es et eu fi fr gl he_IL hr hu it ja
+ka ko ku lt mk nl pl pt pt_BR ro_RO ru_RU sk sl_SI sr sv th tr uk_UA vi_VN
+zh_CN zh_TW"
+PLOCALE_BACKUP="en_US"
+
+inherit eutils l10n qt4-r2
+
+MY_PV=${PV##*_p}
+if [[ "${MY_PV}" != "${PV}" ]]; then
+	# svn snapshot
+	MY_PV=r${MY_PV}
+	MY_P=${PN}-${MY_PV}
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+else
+	# regular upstream release
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+fi
+
+DESCRIPTION="Great Qt4 GUI front-end for mplayer"
+HOMEPAGE="http://smplayer.sourceforge.net/"
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~ssuominen/${PN}-icons-${PV}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="debug"
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-libs/quazip"
+MPLAYER_USE="[libass,png,X]"
+RDEPEND="${DEPEND}
+	|| ( media-video/mplayer2${MPLAYER_USE} media-video/mplayer${MPLAYER_USE} )"
+
+src_prepare() {
+	# http://bugs.gentoo.org/466572
+	mv "${WORKDIR}"/${PN}-icons-${PV}/icons/*.png icons/
+	mv "${WORKDIR}"/${PN}-icons-${PV}/src/icons-png/*.png src/icons-png/
+
+	# Unbundle dev-libs/quazip
+	rm -R src/findsubtitles/quazip/ || die
+	epatch "${FILESDIR}"/${PN}-0.8.0-quazip.patch
+
+	# Upstream Makefile sucks
+	sed -i -e "/^PREFIX=/s:/usr/local:/usr:" \
+		-e "/^DOC_PATH=/s:packages/smplayer:${PF}:" \
+		-e '/\.\/get_svn_revision\.sh/,+2c\
+	cd src && $(DEFS) $(MAKE)' \
+		"${S}"/Makefile || die "sed failed"
+
+	# Turn debug message flooding off
+	if ! use debug ; then
+		sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+			"${S}"/src/smplayer.pro || die "sed failed"
+	fi
+
+	# l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
+}
+
+src_configure() {
+	cd "${S}"/src
+	echo "#define SVN_REVISION \"SVN-${MY_PV} (Gentoo)\"" > svn_revision.h
+	eqmake4
+}
+
+gen_translation() {
+	ebegin "Generating $1 translation"
+	lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	emake
+
+	cd "${S}"/src/translations
+	l10n_for_each_locale_do gen_translation
+}
+
+src_install() {
+	# remove unneeded copies of GPL
+	rm -f Copying.txt docs/{cs,en,hu,it,ja,pt,ru,zh_CN}/gpl.html || die
+	rm -rf docs/{de,es,nl,ro} || die
+
+	emake DESTDIR="${D}" install
+}