Fix segmentation fault with jpeg-7 and above wrt #294488 by Salah Coronya.

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

3 files changed, 162 insertions, 1 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index de3aba09aa0c..d93df287ed22 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/transcode
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.269 2010/01/22 17:09:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.270 2010/01/23 11:53:57 ssuominen Exp $
+
+*transcode-1.1.5-r1 (23 Jan 2010)
+
+  23 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +transcode-1.1.5-r1.ebuild, +files/transcode-1.1.5-jpeg-7.patch:
+  Fix segmentation fault with jpeg-7 and above wrt #294488 by Salah Coronya.
 
   22 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
   transcode-1.1.5.ebuild:
diff --git a/media-video/transcode/files/transcode-1.1.5-jpeg-7.patch b/media-video/transcode/files/transcode-1.1.5-jpeg-7.patch
new file mode 100644
index 000000000000..288932a6159c
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.5-jpeg-7.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/show_bug.cgi?id=294488
+
+Patch by: Salah Coronya
+
+Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore.
+
+--- export/export_jpg.c
++++ export/export_jpg.c
+@@ -91,6 +91,7 @@
+ 
+   jpeg_set_quality(&encinfo, quality, TRUE);
+   encinfo.raw_data_in = TRUE;
++  encinfo.do_fancy_downsampling = FALSE;
+   encinfo.in_color_space = JCS_YCbCr;
+ 
+   encinfo.comp_info[0].h_samp_factor = 2;
diff --git a/media-video/transcode/transcode-1.1.5-r1.ebuild b/media-video/transcode/transcode-1.1.5-r1.ebuild
new file mode 100644
index 000000000000..d4bbf78a5574
--- /dev/null
+++ b/media-video/transcode/transcode-1.1.5-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.5-r1.ebuild,v 1.1 2010/01/23 11:53:57 ssuominen Exp $
+
+EAPI="2"
+
+WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="1.10"
+
+inherit libtool flag-o-matic eutils multilib autotools
+
+MY_P=${P/_}
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="video stream processing tool"
+HOMEPAGE="http://tcforge.berlios.de/"
+SRC_URI="mirror://berlios/tcforge/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X 3dnow a52 aac alsa altivec dv dvd iconv imagemagick jpeg lzo mjpeg mp3 mpeg mmx nuv ogg oss postproc quicktime sdl sse sse2 theora truetype v4l2 vorbis x264 xml xvid"
+
+RDEPEND="aac? ( media-libs/faac )
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
+	dv? ( media-libs/libdv )
+	dvd? ( media-libs/libdvdread )
+	mjpeg? ( media-video/mjpegtools )
+	lzo? ( >=dev-libs/lzo-2 )
+	imagemagick? ( media-gfx/imagemagick )
+	mp3? ( media-sound/lame )
+	sdl? ( >=media-libs/libsdl-1.2.5[X] )
+	quicktime? ( >=media-libs/libquicktime-1.0.0 )
+	vorbis? ( media-libs/libvorbis )
+	ogg? ( media-libs/libogg )
+	theora? ( media-libs/libtheora )
+	jpeg? ( media-libs/jpeg:0 )
+	truetype? ( >=media-libs/freetype-2 )
+	>=media-video/ffmpeg-0.4.9_p20081014
+	|| ( sys-libs/glibc dev-libs/libiconv )
+	mpeg? ( media-libs/libmpeg2 )
+	x264? ( media-libs/x264 )
+	xml? ( dev-libs/libxml2 )
+	xvid? ( media-libs/xvid )
+	X? ( x11-libs/libXpm
+		x11-libs/libXaw
+		x11-libs/libXv )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	v4l2? ( >=sys-kernel/linux-headers-2.6.11 )"
+
+# Notify the user that some useflag have been forced on
+tc_use_force() {
+	use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
+}
+
+# Use when $2 depends strictly on $3
+# if use $1 then enable $2 and $3, otherwise disable $2
+tc_use_enable_force() {
+	if use $1 ; then
+		echo "--enable-$2 --enable-$3"
+	else
+		echo "--disable-$2"
+	fi
+}
+
+pkg_setup() {
+	tc_use_force sse mmx
+	tc_use_force 3dnow mmx
+	tc_use_force sse2 mmx
+	tc_use_force sse2 sse
+}
+
+src_prepare() {
+	sed -i -e "s:\$(datadir)/doc/transcode:\$(datadir)/doc/${PF}:" \
+		"${S}"/Makefile.am "${S}"/docs/Makefile.am "${S}"/docs/html/Makefile.am \
+		"${S}"/docs/pvm3/Makefile.am "${S}"/docs/tech/html/Makefile.am \
+		"${S}"/docs/tech/Makefile.am
+
+	eautoreconf
+}
+
+src_configure() {
+	# NuppelVideo is supported only on x86 platform yet
+	# TODO: mask nuv useflag for all other arches
+	# TODO: watch tcrequant for change. It's currently enabled with --enable-deprecated.
+	use x86 && myconf="${myconf} $(use_enable nuv)"
+	myconf="${myconf} \
+		$(use_enable mmx) \
+		$(use_enable 3dnow) \
+		$(use_enable sse) \
+		$(use_enable sse2) \
+		$(use_enable altivec) \
+		$(use_enable v4l2 v4l) \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable truetype freetype2) \
+		$(use_enable mp3 lame) \
+		$(use_enable x264) \
+		$(use_enable xvid) \
+		$(use_enable ogg) \
+		$(use_enable vorbis) \
+		$(use_enable theora) \
+		$(use_enable dvd libdvdread) \
+		$(use_enable dv libdv) \
+		$(use_enable quicktime libquicktime) \
+		$(use_enable imagemagick) \
+		$(use_enable postproc libpostproc) \
+		$(use_enable lzo) \
+		$(use_enable a52) \
+		$(use_enable aac faac) \
+		$(use_enable xml libxml2) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable mpeg libmpeg2convert) \
+		$(use_enable mjpeg mjpegtools) \
+		$(use_enable sdl) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable iconv) \
+		$(use_with X x) \
+		--enable-deprecated \
+		--enable-experimental \
+		--with-mod-path=/usr/$(get_libdir)/transcode \
+		$(tc_use_enable_force sse sse mmx) \
+		$(tc_use_enable_force 3dnow 3dnow mmx) \
+		$(tc_use_enable_force sse2 sse2 mmx) \
+		$(tc_use_enable_force sse2 sse2 sse) \
+		"
+
+	econf ${myconf} || die "econf failed"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	rm -fr "${D}/usr/share/doc/transcode"
+
+	dodoc AUTHORS ChangeLog README TODO STYLE
+	dodoc docs/*
+	dohtml docs/html/*
+}