summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-24 19:27:38 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-24 19:27:38 +0000
commit0a11b897548225b9b556da59b0e5a7ddcead8717 (patch)
tree1b8e3fba53ea8c4958dd23d34287e50a6f3a3188 /media-video
parentRemove old version. (diff)
downloadhistorical-0a11b897548225b9b556da59b0e5a7ddcead8717.tar.gz
historical-0a11b897548225b9b556da59b0e5a7ddcead8717.tar.bz2
historical-0a11b897548225b9b556da59b0e5a7ddcead8717.zip
Fix building with >=media-libs/jpeg-7 wrt #282588, thanks to Christian Becke for reporting.
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mpeg-tools/ChangeLog11
-rw-r--r--media-video/mpeg-tools/Manifest4
-rw-r--r--media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch26
-rw-r--r--media-video/mpeg-tools/mpeg-tools-1.5b-r3.ebuild62
4 files changed, 100 insertions, 3 deletions
diff --git a/media-video/mpeg-tools/ChangeLog b/media-video/mpeg-tools/ChangeLog
index ee5c1154b9b9..01a792214efe 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.19 2007/07/22 08:46:49 dberkholz Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.20 2009/08/24 19:27:30 ssuominen Exp $
+
+*mpeg-tools-1.5b-r3 (24 Aug 2009)
+
+ 24 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+ +mpeg-tools-1.5b-r3.ebuild, +files/mpeg-tools-1.5b-system-jpeg-7.patch:
+ Fix building with >=media-libs/jpeg-7 wrt #282588, thanks to Christian
+ Becke for reporting.
22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
mpeg-tools-1.5b-r2.ebuild:
diff --git a/media-video/mpeg-tools/Manifest b/media-video/mpeg-tools/Manifest
index 72dbe2eae3f3..d42d7f8a5dd3 100644
--- a/media-video/mpeg-tools/Manifest
+++ b/media-video/mpeg-tools/Manifest
@@ -1,10 +1,12 @@
AUX mpeg-tools-1.5b-64bit_fixes.patch 6986 RMD160 7bfb2fdaf89846043d95074a5226c77f0f9ef98b SHA1 18bb11dac577a0a8cb4352ea12a0f2571de37065 SHA256 76e8add6d8241898abf20c27ff93655df05ee90866632a0eb852ff6665078d4e
AUX mpeg-tools-1.5b-build.patch 1414 RMD160 987151e4c0c30097c7bc993552dd7459686fba5b SHA1 e5eff3be21eca4da940a5d964e1704b0948fbea9 SHA256 0cbcc0e0de74f02b069059588334ba0766bf74769fdd63d37c1702d2e47eb1e5
+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-r2.ebuild 1649 RMD160 c6ddf070421b853a23b2dd199bf30d1db3b24d58 SHA1 e8a8f6c3d1f6b11f39dd08fbd3d87f56b177d5c1 SHA256 b92a9a354da018b039348e22a98df266a09194fa773d5301dff7335d07c35e26
-MISC ChangeLog 3054 RMD160 4d7ceea133026ab98e33b42e4ea8eb36890a2677 SHA1 6ac95788b15936c60177b30377181c384bb3c9a4 SHA256 6fd380ea23a0250de4c6775994dce13e21d8333b997a043567fcfb5a69495fc8
+EBUILD mpeg-tools-1.5b-r3.ebuild 1788 RMD160 7a56c0db6f8b962401783447e36b88941c97d851 SHA1 56cd09e4f7cb1afd7d6f0b336e416bf18f52038f SHA256 d1cf6ece9b381a53430e338b3936ea47201657e4a9b7de86fffeeec46e63f0fa
+MISC ChangeLog 3314 RMD160 61c80575493b7edd415456f1e6b03202f452d608 SHA1 07b2ff80e7dbaa2db8299422b82623de85745d50 SHA256 ee639a3f99a4ad4d6dfa07531df0c1b5e7abfa564ac89f5ddec53d56a837e5a8
MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch
new file mode 100644
index 000000000000..3b0ad4792a54
--- /dev/null
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch
@@ -0,0 +1,26 @@
+diff -ur mpeg_encode.orig/jpeg.c mpeg_encode/jpeg.c
+--- mpeg_encode.orig/jpeg.c 2009-08-24 21:33:18.000000000 +0300
++++ mpeg_encode/jpeg.c 2009-08-24 22:23:08.000000000 +0300
+@@ -80,13 +80,9 @@
+ /* make it happier.... */
+ #undef DCTSIZE2
+ #include "jpeglib.h"
+-#include "jpegint.h"
+-
+
+ #define HEADER_SIZE 607 /*JFIF header size used on output images*/
+
+-
+-
+ /*=======================================================================*
+ * *
+ * JMovie2JPEG *
+@@ -517,7 +513,7 @@
+ #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;
++ buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size;
+ #endif
+
+ for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r3.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r3.ebuild
new file mode 100644
index 000000000000..57cc5153c5b6
--- /dev/null
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2009 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-r3.ebuild,v 1.1 2009/08/24 19:27:30 ssuominen Exp $
+
+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 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ >=media-libs/jpeg-7"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_PN}
+
+src_unpack () {
+ unpack ${A}
+ cd "${WORKDIR}"
+ epatch "${FILESDIR}"/${P}-build.patch
+ epatch "${FILESDIR}"/${P}-64bit_fixes.patch
+ epatch "${FILESDIR}"/${P}-tempfile-convert.patch
+ cd "${S}"
+ rm -r jpeg
+ epatch "${FILESDIR}"/${P}-system-jpeg.patch
+ epatch "${FILESDIR}"/${P}-system-jpeg-7.patch
+ epatch "${FILESDIR}"/${P}-tempfile-mpeg-encode.patch
+ epatch "${FILESDIR}"/${P}-tempfile-tests.patch
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" || die "emake failed"
+ emake -C convert || die "emake convert failed"
+ emake -C convert/mtv || die "emake convert/mtv failed"
+}
+
+src_install () {
+ dobin mpeg_encode || die "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 || die "dobin convert utils"
+ 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
+}