Add patch from bug #128619 when using libquicktime 0.9.9, thanks to Mario Fetka; also fix quicktime useflag, thanks to Eldad Zack (eldad), both in bug #128619.

Package-Manager: portage-2.1.1_pre4

4 files changed, 63 insertions, 22 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index d89a805421e7..f3c3d81f9427 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.114 2006/04/27 23:42:08 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.115 2006/07/30 11:42:48 flameeyes Exp $
+
+  30 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mjpegtools-1.8.0-libquicktime.patch, mjpegtools-1.8.0-r1.ebuild:
+  Add patch from bug #128619 when using libquicktime 0.9.9, thanks to Mario
+  Fetka; also fix quicktime useflag, thanks to Eldad Zack (eldad), both in bug
+  #128619.
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org> Manifest:
   Fixing SHA256 digest, pass four
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 8564db530494..f4aa36f2cbd5 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,24 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX mjpegtools-1.8.0-gcc41.patch 420 RMD160 e48e6d716f21e450cc26e7039c703005ed9a0bd9 SHA1 b1bd9604fa0eb6c8b54ee9d0836b0c61b233ffff SHA256 5e748deceb1af3179025ab42d274cc2941fe85bb0b7b512b49263a9ff6754446 size 420
+AUX mjpegtools-1.8.0-gcc41.patch 420 RMD160 e48e6d716f21e450cc26e7039c703005ed9a0bd9 SHA1 b1bd9604fa0eb6c8b54ee9d0836b0c61b233ffff SHA256 5e748deceb1af3179025ab42d274cc2941fe85bb0b7b512b49263a9ff6754446
 MD5 803eccd889c60a442ee23ba65951fadc files/mjpegtools-1.8.0-gcc41.patch 420
 RMD160 e48e6d716f21e450cc26e7039c703005ed9a0bd9 files/mjpegtools-1.8.0-gcc41.patch 420
 SHA256 5e748deceb1af3179025ab42d274cc2941fe85bb0b7b512b49263a9ff6754446 files/mjpegtools-1.8.0-gcc41.patch 420
-AUX mjpegtools-1.8.0-parallelmake.patch 2163 RMD160 1bf0d3c30601b2b6d421c8dad3167a42304cce39 SHA1 72c4caeb7d18f9bb82176bad8e10347da6ea3f1e SHA256 d2456d4a75c7c2b205fc9c71431aaae427dd5667c71dd3bee2fa4869cb438b03 size 2163
+AUX mjpegtools-1.8.0-libquicktime.patch 1186 RMD160 125fe4cfdecb5b98480d45670e3cb6d84f894c4f SHA1 205138f34d665174cb8f323669b8aa0ee4eb7785 SHA256 abf3043efbcdb29af2ee1b2a2e0b92b948a740d377d8e534635eb8599e6fb386
+MD5 f24ed418a30be9f6a3c581312ff2137f files/mjpegtools-1.8.0-libquicktime.patch 1186
+RMD160 125fe4cfdecb5b98480d45670e3cb6d84f894c4f files/mjpegtools-1.8.0-libquicktime.patch 1186
+SHA256 abf3043efbcdb29af2ee1b2a2e0b92b948a740d377d8e534635eb8599e6fb386 files/mjpegtools-1.8.0-libquicktime.patch 1186
+AUX mjpegtools-1.8.0-parallelmake.patch 2163 RMD160 1bf0d3c30601b2b6d421c8dad3167a42304cce39 SHA1 72c4caeb7d18f9bb82176bad8e10347da6ea3f1e SHA256 d2456d4a75c7c2b205fc9c71431aaae427dd5667c71dd3bee2fa4869cb438b03
 MD5 78e3f74445e8ab3c4e3f171cfb21a17f files/mjpegtools-1.8.0-parallelmake.patch 2163
 RMD160 1bf0d3c30601b2b6d421c8dad3167a42304cce39 files/mjpegtools-1.8.0-parallelmake.patch 2163
 SHA256 d2456d4a75c7c2b205fc9c71431aaae427dd5667c71dd3bee2fa4869cb438b03 files/mjpegtools-1.8.0-parallelmake.patch 2163
-DIST mjpegtools-1.8.0.tar.gz 1475998 RMD160 4d97a6a721f29223975605e2a5e645b4d7d129b5 SHA256 d841575c72cd0e587c1bab703d0906e3d23bf428424000557739cf5d6097209a size 1475998
-EBUILD mjpegtools-1.8.0-r1.ebuild 2776 RMD160 146b0d23814292fce996ef7f1c154f9fe19a7e1a SHA1 01aa09f6ca4f86d3ade54db31b0a3817cffa7749 SHA256 0561d936dbe8522ecbae61908d39e55d873ff6abc125b75cbd4baf7e58f999fc size 2776
-MD5 854c6bd6919cb717efd807adb00abf9c mjpegtools-1.8.0-r1.ebuild 2776
-RMD160 146b0d23814292fce996ef7f1c154f9fe19a7e1a mjpegtools-1.8.0-r1.ebuild 2776
-SHA256 0561d936dbe8522ecbae61908d39e55d873ff6abc125b75cbd4baf7e58f999fc mjpegtools-1.8.0-r1.ebuild 2776
-MISC ChangeLog 19864 RMD160 7c7971987ee128ec0b46d0b839ff61b4ac5185da SHA1 06ccca85dc2b679f88d30a2b7fb11f8f2784d64d SHA256 3c89a7e537da5315402f2fc17d140dae1c20dc74726089bdd2893ba9a725bdae size 19864
-MD5 94cca3fda7723e1961692df677257fbe ChangeLog 19864
-RMD160 7c7971987ee128ec0b46d0b839ff61b4ac5185da ChangeLog 19864
-SHA256 3c89a7e537da5315402f2fc17d140dae1c20dc74726089bdd2893ba9a725bdae ChangeLog 19864
-MISC metadata.xml 311 RMD160 5d2d2fac1a97018f75e5ff1e8e7c90fb02511cb9 SHA1 228093feb5989936d0480ac2bc543df959b06dfa SHA256 74869f2267904c0a7409e16cc0d2e54f41b186683c4f5bb6e0127b275e66b4b0 size 311
+DIST mjpegtools-1.8.0.tar.gz 1475998 RMD160 4d97a6a721f29223975605e2a5e645b4d7d129b5 SHA1 e11d68298a64b52f98724dbf3fd14f168e140290 SHA256 d841575c72cd0e587c1bab703d0906e3d23bf428424000557739cf5d6097209a
+EBUILD mjpegtools-1.8.0-r1.ebuild 2877 RMD160 0090f5817a5e46c87768ef8600385f5f76f9b5e4 SHA1 4b64996d059bf75ab1cc4fcb58dd2021943441ee SHA256 8182111e0f66cca971e1eb2000d500e1daf161356744802790c18c2047c961a8
+MD5 6cdb307f221b4b083fc18f244d9b559a mjpegtools-1.8.0-r1.ebuild 2877
+RMD160 0090f5817a5e46c87768ef8600385f5f76f9b5e4 mjpegtools-1.8.0-r1.ebuild 2877
+SHA256 8182111e0f66cca971e1eb2000d500e1daf161356744802790c18c2047c961a8 mjpegtools-1.8.0-r1.ebuild 2877
+MISC ChangeLog 20160 RMD160 ef95af19810c954966324682f9f324dc134ec34b SHA1 0eff0632a5a42a032c92c221baed9a6be02817e7 SHA256 79b7dd8dd36c3481a6aaa2a9a3578e308deb46680bdaf278a1db1be258aa9cd9
+MD5 7cd3958ca7d5cdee99fb937a07523a85 ChangeLog 20160
+RMD160 ef95af19810c954966324682f9f324dc134ec34b ChangeLog 20160
+SHA256 79b7dd8dd36c3481a6aaa2a9a3578e308deb46680bdaf278a1db1be258aa9cd9 ChangeLog 20160
+MISC metadata.xml 311 RMD160 5d2d2fac1a97018f75e5ff1e8e7c90fb02511cb9 SHA1 228093feb5989936d0480ac2bc543df959b06dfa SHA256 74869f2267904c0a7409e16cc0d2e54f41b186683c4f5bb6e0127b275e66b4b0
 MD5 fe49014257499366bdc6903a9aa33fe5 metadata.xml 311
 RMD160 5d2d2fac1a97018f75e5ff1e8e7c90fb02511cb9 metadata.xml 311
 SHA256 74869f2267904c0a7409e16cc0d2e54f41b186683c4f5bb6e0127b275e66b4b0 metadata.xml 311
@@ -26,9 +30,9 @@ MD5 2188754e2cd2108901028f4e9c83d696 files/digest-mjpegtools-1.8.0-r1 253
 RMD160 5743c9441f2552b35045c0b5d3b9797079f8d30d files/digest-mjpegtools-1.8.0-r1 253
 SHA256 21770c4dd885e9231db381f9693c0650f32cd48f0a5c4438e62338c3b75d3c97 files/digest-mjpegtools-1.8.0-r1 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEUVbXW78445TWHXcRAs2+AJ0YbDmagvjiNaLllnv64RLRn+G+hgCfQvjV
-Z2outYCWumk4iGpLsV0r2Ac=
-=2+1p
+iD8DBQFEzJs+AiZjviIA2XgRAk1hAKCwcctg4PS/l7lhOidyV21n+g1zRQCgr4F0
+svvLbVv5hM5upkXErkxH3NA=
+=o1Y5
 -----END PGP SIGNATURE-----
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-libquicktime.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-libquicktime.patch
new file mode 100644
index 000000000000..3a44db477572
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-libquicktime.patch
@@ -0,0 +1,28 @@
+# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# T2 SDE: package/.../mjpegtools/hotfix_libquicktime.patch
+# Copyright (C) 2006 The T2 SDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- T2-COPYRIGHT-NOTE-END ---
+
+diff -Nur mjpegtools-1.8.0-orig/lavtools/lav_io.c mjpegtools-1.8.0/lavtools/lav_io.c
+--- mjpegtools-1.8.0-orig/lavtools/lav_io.c	2005-08-27 11:47:20.000000000 +0000
++++ mjpegtools-1.8.0/lavtools/lav_io.c	2006-01-28 11:03:16.152857000 +0000
+@@ -1367,7 +1367,7 @@
+          break;
+ #ifdef HAVE_LIBQUICKTIME
+       case 'q':
+-         res = fileno(((quicktime_t *)lav_file->qt_fd)->stream);
++         res = lqt_fileno((quicktime_t *)lav_file->qt_fd);
+          break;
+ #endif
+       default:
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
index 823dc04feb07..60605f4ed352 100644
--- a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.15 2006/02/12 17:50:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.16 2006/07/30 11:42:48 flameeyes Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool
 
@@ -40,8 +40,11 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-	epatch "${FILESDIR}"/${P}-gcc41.patch
-	epatch "${FILESDIR}"/${P}-parallelmake.patch
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch "${FILESDIR}/${P}-parallelmake.patch"
+	has_version ">=media-libs/libquicktime-0.9.9" && epatch "${FILESDIR}/${P}-libquicktime.patch"
+
 	elibtoolize
 }
 
@@ -80,7 +83,7 @@ src_compile() {
 	econf \
 		$(use_with X x) \
 		$(use_enable dga xfree-ext) \
-		$(use_with quicktime) \
+		$(use_with quicktime libquicktime) \
 		$(use_with v4l) \
 		$(use_with gtk) \
 		$(use_with sdl) \
@@ -95,7 +98,7 @@ src_compile() {
 	for infofile in mjpeg*info*; do
 		echo "INFO-DIR-SECTION Miscellaneous" >> ${infofile}
 		echo "START-INFO-DIR-ENTRY" >> ${infofile}
-		echo "* mjpeg-howto: (mjpeg-howto).                  How to use the mjpeg-tools" >> ${infofile}
+		echo "* mjpeg-howto: (mjpeg-howto).					 How to use the mjpeg-tools" >> ${infofile}
 		echo "END-INFO-DIR-ENTRY" >> ${infofile}
 	done
 }