Use if and else to support both libjpeg.so.62 and libjpeg.so.8 and libjpeg.so.9 wrt #479462 by Juergen Rose

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

4 files changed, 155 insertions, 20 deletions

diff --git a/media-video/mpeg-tools/ChangeLog b/media-video/mpeg-tools/ChangeLog
index a982e63b0c72..756e9e0211f5 100644
--- a/media-video/mpeg-tools/ChangeLog
+++ b/media-video/mpeg-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mpeg-tools
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.29 2012/06/04 01:29:35 xmw Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.30 2013/08/02 06:14:18 ssuominen Exp $
+
+*mpeg-tools-1.5b-r5 (02 Aug 2013)
+
+  02 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +mpeg-tools-1.5b-r5.ebuild, +files/mpeg-tools-1.5b-jpeg.patch:
+  Use if and else to support both libjpeg.so.62, libjpeg.so.8 and
+  libjpeg.so.9 wrt #479462 by Juergen Rose
 
   04 Jun 2012; Michael Weber <xmw@gentoo.org> mpeg-tools-1.5b-r4.ebuild:
   ppc stable (bug 366229)
diff --git a/media-video/mpeg-tools/Manifest b/media-video/mpeg-tools/Manifest
index 68a6d3c30334..d47033e5c339 100644
--- a/media-video/mpeg-tools/Manifest
+++ b/media-video/mpeg-tools/Manifest
@@ -1,24 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX mpeg-tools-1.5b-64bit_fixes.patch 6986 RMD160 7bfb2fdaf89846043d95074a5226c77f0f9ef98b SHA1 18bb11dac577a0a8cb4352ea12a0f2571de37065 SHA256 76e8add6d8241898abf20c27ff93655df05ee90866632a0eb852ff6665078d4e
-AUX mpeg-tools-1.5b-as-needed.patch 1526 RMD160 1f0e0de79dde5c44d555d083fe7dd4104fc640a0 SHA1 fcf635e9c3a47ca14767d0fd7bcdda778d53940b SHA256 204f1ca6fc2d30c1bd4c7ed69d2d0fc3792e819bcc31837c945ade680b333961
-AUX mpeg-tools-1.5b-build.patch 1414 RMD160 987151e4c0c30097c7bc993552dd7459686fba5b SHA1 e5eff3be21eca4da940a5d964e1704b0948fbea9 SHA256 0cbcc0e0de74f02b069059588334ba0766bf74769fdd63d37c1702d2e47eb1e5
-AUX mpeg-tools-1.5b-powerpc.patch 1041 RMD160 6a32012c7fbefd7747e45fb7e9ec761247a6cbb4 SHA1 06cc88f31cf4a65a51b75f93343e583150aa63db SHA256 93c04d75cd216d2d24500db785f8c91821c46f579f8771f24c1ea9babbe5b0a1
-AUX mpeg-tools-1.5b-system-jpeg-7.patch 907 RMD160 5f4bee5cb8a663579d29a1ad944a2fabf7f91579 SHA1 06395853b6130d7e27e74224790428ae1f22a682 SHA256 de0815e2f9be14761b25cef0a6602d79eaed47411ce1148c4e64826c3cfd46dc
-AUX mpeg-tools-1.5b-system-jpeg.patch 893 RMD160 e32d6e6f0d355085f1781eef5b0569940fbd274e SHA1 25067d834bdc72e4709d9b01bb93ad2a88f48e2d SHA256 f0e9f99bf42c12b91cebb0e17c1a8567629d522b269e11c2adc6fffaed43afa8
-AUX mpeg-tools-1.5b-tempfile-convert.patch 4097 RMD160 3e37f83093c2d09051b4fc131cc0b8b91e7351cf SHA1 efd786d90f3faf655f127b10540a2ad702e5991b SHA256 a8f67272493e7bd6536e020b75bcf2174a7ae1f453dc0bd3b09f134ed3f1a649
-AUX mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2538 RMD160 3bc3e29da8cdd4d05de50cf073c6b6ea0e7417c6 SHA1 5ac9374572f8ad1405148357c7444404ab80c86d SHA256 2325ccdc43bce07d38522250c488f21db8010c7e5f27b244b107d05882e4a17b
-AUX mpeg-tools-1.5b-tempfile-tests.patch 5256 RMD160 e292bfec28bb13bf35ec40e4f86702ff086dbc72 SHA1 dc3c2458a077bac43bd6fc6cf7d1d07f3c892163 SHA256 ba156158d92dc6f3803b40ad3b0e8e248b0e74c5b59415a91f55c1e775a6e5a4
-DIST mpeg_encode-1.5b-src.tar.gz 2028724 RMD160 24c0a1090076630c292936639c5fb275778f6470 SHA1 853cd175f73b8064ce28deb256e4b81159a684ed SHA256 dd8db42f88393bb0ff0d738defa271729a8aa9b8de24ed13bc6bd27014f2daf5
-EBUILD mpeg-tools-1.5b-r3.ebuild 1804 RMD160 64b7cb96be1d59701264431869bb98e3bf72f9f1 SHA1 5f5af332aa81d9f71baabd475a2031ba312f3224 SHA256 3b5ff71ca90dc1c57fa103b701296977ca4f5949619181ab75a81a219abac1fc
-EBUILD mpeg-tools-1.5b-r4.ebuild 2113 RMD160 028aefedf88f9aa74e27f9f600fd30619f46997c SHA1 faf42b9bb5b9071d9b1d0557c31f55cb5d24f79a SHA256 1059bf37a421786bbed78b3d66b17073d1b20935d87a46fc69c21f1c112a36c5
-MISC ChangeLog 4575 RMD160 68e7ef23d84701e336467f6b3307759e3963a142 SHA1 80eb063ca7ba6a96811989b4717bea8a4e77df60 SHA256 2bb5a2c1077685dd97d7e85be03f8f413a9db704da8f886d0d2094b59f9a0957
-MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
+AUX mpeg-tools-1.5b-64bit_fixes.patch 6986 SHA256 76e8add6d8241898abf20c27ff93655df05ee90866632a0eb852ff6665078d4e SHA512 8d8f596cf39c1e9535ae21f8399136189e0775cbe69146208654bf394b8524932a4961e99061c76ba195c20909ab6dc2f420a12b72862ebbc6c81d7e7c7c6cc6 WHIRLPOOL 45348e3d70ee0f624ce8a16de52ec74164b728a56dad7695066dbae6314e37a4860cf2aca68e2674ec391c219470e53db3b621a4815d4c23a55f0d42e376f432
+AUX mpeg-tools-1.5b-as-needed.patch 1526 SHA256 204f1ca6fc2d30c1bd4c7ed69d2d0fc3792e819bcc31837c945ade680b333961 SHA512 5874d5241ffb9ed6d6bc35774f6e643c141c8ec63811d8f761700acef816911220df20a943c739f4df4ce95783502f8963235ae4ecc0b66bd116a6daaa2aa5d1 WHIRLPOOL 3a0e2fa95b222712c8fee82cdd8d07dc89118db6922d65602308ab8dcfde5ddb3c0513e805930060523e5f0b47d5720b6461e45ca49c6eb809e75f368a836d79
+AUX mpeg-tools-1.5b-build.patch 1414 SHA256 0cbcc0e0de74f02b069059588334ba0766bf74769fdd63d37c1702d2e47eb1e5 SHA512 f2bfe1126926c6473a149ea120898eb252c681808cd2745bed5428164ebeabfb33218cb7f98b4a9930af9d88055ca067129f1a4ffede824d5d6179762f27a4d7 WHIRLPOOL 7360fac65ff398cd0a2ff703c6f81d67b24487ce46e90a06594c888996f5f45d11758acf55a6165851f3ad101c31b09d95c42703c544aa5a788436ac42c16c9e
+AUX mpeg-tools-1.5b-jpeg.patch 1498 SHA256 de0fb57de46db6ee33d901782ffad666b70bfaa39b84277595837726d9486d6e SHA512 9bc509c603e825d94372f866fced352149d5d003c2ee247eb356db22f80bbf6cfbfcaaf03fb7a104ff84548e52f0f3034619e15598d0ae04df36d4b4332ea18b WHIRLPOOL 30fc5fc35fefd40baaa029073a73edbbfd8d50f23ffd989e81726109cde05e1abeeeafd599e0562f149e10a332077e9a0097cb00dd92e7025539d3d154b79617
+AUX mpeg-tools-1.5b-powerpc.patch 1041 SHA256 93c04d75cd216d2d24500db785f8c91821c46f579f8771f24c1ea9babbe5b0a1 SHA512 f0ee310dce12d9137186b7d99aa88282cb65838855820ad3642bf090194be07d5f6cfef509561d1e097a938e68a6c2f8c61536a1921d08df458c66b83c6eaeca WHIRLPOOL 373b714f251bd9538898b74bf701e1913729b6120b3260fcdc649093566813f6f86499d6b2484b36537c25e493102af3534bd82a18e877209f6bf3105b5eb845
+AUX mpeg-tools-1.5b-system-jpeg-7.patch 907 SHA256 de0815e2f9be14761b25cef0a6602d79eaed47411ce1148c4e64826c3cfd46dc SHA512 010460117a835092a42ab0a7b7f7d04dabe3ff691452541db204d34f1459e72060045af10dee4cb1c953235eb6ab2184fbe7aa032e8672454fc96c5f1d1ecde9 WHIRLPOOL 6977a36e027872bc662013fa30ef635b63c7458a6d57fd0c4d65ab7f8a7cc1306ef975716a045f7c15b31be33ed87ab5a998f140a88f9ab9527db8d161202bb9
+AUX mpeg-tools-1.5b-system-jpeg.patch 893 SHA256 f0e9f99bf42c12b91cebb0e17c1a8567629d522b269e11c2adc6fffaed43afa8 SHA512 243bc75aabcdcdd1024ad33edde6dbb48e3e4ded355b54f09244792d4d854a736b69d858da5b496c059cd5e28c7ac4a2e764129a0812025ab59caf59082de787 WHIRLPOOL b5d2498b6fbf8a050459ae7ee3012b441b46175a8349fd412590319f9e84ff586c1ba62c23951e5d7c068ec8a05083e464d4e1dbe9a3b229a19d32eff1a0601c
+AUX mpeg-tools-1.5b-tempfile-convert.patch 4097 SHA256 a8f67272493e7bd6536e020b75bcf2174a7ae1f453dc0bd3b09f134ed3f1a649 SHA512 b90879e884e9f5a5bd61149adda293c149e533b8fdb969b6e6d579917b2abed0fb848629f1567782d80c97dcf40eaf3c005731d216c02d1e97d54543c74e6e2d WHIRLPOOL cf010516b523c4031279da17282289bd16050218f48ea0450e607715f94ca9eee383ef09ebfe658243cb52834af9be6ba9868198f6134063d2def54845e61997
+AUX mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2538 SHA256 2325ccdc43bce07d38522250c488f21db8010c7e5f27b244b107d05882e4a17b SHA512 229fcd4e28628fa8d45a20766e6b46bcf2e3a6ea9e69b2e8764b180b2766d539a701c64a7969a4020805a06188825c5fa5a5e1146052ee6a52edbb7d3d572f1e WHIRLPOOL 97beca3d5196cf84c41f0251953e2b067cf13b9e0369938afa5d995821c48c38e6c21612e81cc5b6cfa1e33e0fb26af4caa79bfac148eeb4f83b544b6c3eb626
+AUX mpeg-tools-1.5b-tempfile-tests.patch 5256 SHA256 ba156158d92dc6f3803b40ad3b0e8e248b0e74c5b59415a91f55c1e775a6e5a4 SHA512 ee616fc5b4b4bf15e547d737a00a4349fff98127c5ec836e63ae5b6b3e365c50b6cba1c535fd27de2ce6ee28ef5bd3872f5d3b7880f39fe23c7e8ebdc24508e8 WHIRLPOOL d7b13a803824991a76eec1f9acac1d67611366f344bc63dd71d0b789d95d5a2271d819432126f2448954950a6af2012c47b60d9fb22b43227f68320659acea17
+DIST mpeg_encode-1.5b-src.tar.gz 2028724 SHA256 dd8db42f88393bb0ff0d738defa271729a8aa9b8de24ed13bc6bd27014f2daf5 SHA512 df6f9def3ba05c752ebdc5311c512688d6fae380480009dad55b4183a378685eca79943c075166b21ed3bfd0cce7697761abc6ec795f57c0ed1c60c2a5cba469 WHIRLPOOL 9e1f06ffa4518903280bc1693fa6c8ae0b71ebcf4936889ed3e74ee6144d22a6de8e347797f61001b037d5148abf5a35edfd11968f12e565f06c8a0fdfb0d2b4
+EBUILD mpeg-tools-1.5b-r3.ebuild 1804 SHA256 3b5ff71ca90dc1c57fa103b701296977ca4f5949619181ab75a81a219abac1fc SHA512 39727996244d37ac733eb28ac59d2911a0f2d5c1bbe924582c594ff3bbe2c2f03ec0f9051f79e35c5273cce457c266b1c24fb3bbf7eff3d72e246f1aaa1803a9 WHIRLPOOL 4d6e1159d9cced6491f5517d9093f768ed80d08f8f9b6a468f7f6d24e5d2d2f2ee43ff1d28237e57cfee2423ca5b8fd8e5b5501a63b2b6e2ee68a731adab2477
+EBUILD mpeg-tools-1.5b-r4.ebuild 2113 SHA256 1059bf37a421786bbed78b3d66b17073d1b20935d87a46fc69c21f1c112a36c5 SHA512 656ee7ca74d0061a3abf0bbc8d99285fba7fdd5ddbb4e441f2c665663e8efe8187fa339085237989a9644eb55e31f8c6c76af13bb0f3932ee9b5e579c9972780 WHIRLPOOL a68c920e9801c79f98b1119f79c89b5fa105ff594c2d5f886caa2f26944b6925a15a8e17002dc3101d6229230b79fda2815378a8a81174fa60ed30e523980978
+EBUILD mpeg-tools-1.5b-r5.ebuild 1918 SHA256 515a5bd4fcecf6dacf2f6866ad597a7d6ec1895adf9a16e30c96276e753f4f48 SHA512 7709811647f724381642ae3532ace56e61b3d86963901915201b3ae79bfe968f26c8fd1e7f84f704d0ff76f4970cfb8a6f08c468d25bc75c84d517864273a210 WHIRLPOOL 150c4459040f7cbbd3e96492ac961fe3190816b39211b3a8b86e58f8a338d25d6e6d4617838da448fe4d0ab40cfc66b8de0094018e67b500435218d8a4c4bbd5
+MISC ChangeLog 4845 SHA256 56207d344ce0a34b786dee5b41cc3f7225ae13848519a1032f6440c872df68c4 SHA512 cb0620243475a0befcd198ffd8103b43565124bf7603cdf0c013677a16aeb5ce8cd15a4378949d4a5f6177e4cca44b0cab72b7ec199f2f7f1c24858130cfa476 WHIRLPOOL 3d257f1dbca54b8c3b90fe6700f821a5e903f1fcd93fe9056935057faab35e9b4f0ed6eb864a10d4d7f3949dd71003ecff8e2059f0043b6591384cb299141924
+MISC metadata.xml 225 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 SHA512 79bf53ca11044e2cbddf8ba8c661abd2a6f7602748ef4dc1d1a3447d4f0e5a15a4d69f6e1f60e0f854465097019607a6fe7157906bc41ddfe41fb747de3ca7d6 WHIRLPOOL d257430e16390fc27365e2f58796f0f0b7c2c818f1bae76bb2a13b7971e5d33baa9d8aa33a12605653d05e0c7bd52b020aa96b737c56ac1038c32897c481a12c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAk/MD2cACgkQknrdDGLu8JAzHAEAhCL0E/d5BamayMNcUuORZXLN
-F+YENw/SqeWoQeYD2YMA+wcwMOJlnSwgsGW6eIeF4mxucc+uAkmohtQL+bRUzBoD
-=pYdk
+iQEcBAEBCAAGBQJR+03hAAoJEEdUh39IaPFNZkAH/1uz5p42aprlvvRHkWfz8RFs
+gkNT6WHMZdOgFvz5jl7k/Esn1f2G+byDsFlVJn/BiBtzXLj+y1V/OSVbrKEvV2o3
+h4GNtPf5/Nmr159tfqXKn934knOaNOvyYAwm1OpPvemKqjNbNuJ46S2Qf/uBhSJE
+5K8oNl7vfLBmuIGixB3X3FH4PmmDKZ7K0ZwRBN24xOcvOCRc9D8eKBBjXXhgP6x+
++bhLIFe82nRWHHfSv0ylEkXt2xJD8cSGo1Ximvh3fkqL1xTBbyCsRQQd8GwSNYxO
+qI+24D9fXpsM2T+IGW9xpzsQsSJmDq/ewCBrf91OxCAepb1caRFjH8qOUUPkX5I=
+=kQjr
 -----END PGP SIGNATURE-----
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch
new file mode 100644
index 000000000000..633321879e8d
--- /dev/null
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch
@@ -0,0 +1,56 @@
+--- jpeg.c
++++ jpeg.c
+@@ -77,13 +77,10 @@
+ 
+ /* make it happier.... */
+ #undef DCTSIZE2
+-#include "jpeg/jpeglib.h"
+-
++#include "jpeglib.h"
+ 
+ #define HEADER_SIZE 607   /*JFIF header size used on output images*/
+ 
+-
+-
+ /*=======================================================================*
+  *                                                                       *
+  * JMovie2JPEG                                                           *
+@@ -514,8 +511,12 @@
+ #ifdef JPEG4
+   buffer_height = 8;  /* could be 2, 4,8 rows high */
+ #else
+-  buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
+-#endif
++  #if JPEG_LIB_VERSION >= 80
++    buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size;
++  #else
++    buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
++  #endif
++#endif /* JPEG4 */
+   
+   for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
+       cp++,compptr++) {
+--- Makefile
++++ Makefile
+@@ -36,9 +36,9 @@
+ ##############
+ # JPEG STUFF #
+ ##############
+-JPEG_LIB = jpeg/libjpeg.a
+-JPEG_DIR = -Ijpeg
+-JPEG_LIB_DIR = -Ljpeg
++JPEG_LIB = -ljpeg
++JPEG_DIR = 
++JPEG_LIB_DIR = 
+ MP_JPEG_OBJS = jpeg.o
+ MP_JPEG_SRCS = jpeg.c
+ 
+@@ -57,7 +57,7 @@
+ #################
+ # INCLUDE FILES # 
+ #################
+-INCLUDEDIR = -Iheaders -I/usr/include $(JPEG_DIR)
++INCLUDEDIR = -Iheaders
+ 
+ ############################################################################
+ # LIBRARIES # specify library directories; need jpg lib and maybe pbm	   #
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
new file mode 100644
index 000000000000..9417909d3fa0
--- /dev/null
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild,v 1.1 2013/08/02 06:14:18 ssuominen Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+MY_PN=mpeg_encode
+DESCRIPTION="Tools for MPEG video"
+HOMEPAGE="http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html"
+SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${MY_PN}-${PV}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	virtual/jpeg:0"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_PN}
+
+src_prepare() {
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-64bit_fixes.patch
+	epatch "${FILESDIR}"/${P}-tempfile-convert.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-powerpc.patch
+	cd "${S}"
+	rm -r jpeg
+	epatch "${FILESDIR}"/${P}-jpeg.patch
+	epatch "${FILESDIR}"/${P}-tempfile-mpeg-encode.patch
+	epatch "${FILESDIR}"/${P}-tempfile-tests.patch
+	# don't include malloc.h, but use stdlib.h instead
+	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:' \
+		convert/*.c convert/mtv/*.c *.c headers/*.h || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+	emake -C convert CC="$(tc-getCC)"
+	emake -C convert/mtv CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin mpeg_encode
+	doman docs/*.1
+	dodoc BUGS CHANGES README TODO VERSION
+	dodoc docs/EXTENSIONS docs/INPUT.FORMAT docs/*.param docs/param-summary
+	docinto examples
+	dodoc examples/*
+
+	cd ../convert
+	dobin eyuvtojpeg jmovie2jpeg mpeg_demux mtv/movieToVid
+	newdoc README README.convert
+	newdoc mtv/README README.mtv
+}
+
+pkg_postinst() {
+	if [[ -z $(best_version media-libs/netpbm) ]]; then
+		elog "If you are looking for eyuvtoppm or ppmtoeyuv, please"
+		elog "emerge the netpbm package.  It has updated versions."
+	fi
+}