Fix building with >=media-libs/jpeg-7 wrt #282588, thanks to Christian Becke for reporting.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 97 insertions, 2 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/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
+}