Fix segmentation fault with jpeg >= 7 wrt #288158 by Salah Coronya.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 188 insertions, 3 deletions

diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index 4fa78b6cad60..cd950722bfc5 100644
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/xawtv
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.59 2009/01/10 13:13:56 beandog Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.60 2010/03/02 16:55:31 ssuominen Exp $
+
+*xawtv-3.95-r2 (02 Mar 2010)
+
+  02 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> +xawtv-3.95-r2.ebuild,
+  +files/xawtv-3.95-jpeg-7.patch:
+  Fix segmentation fault with jpeg >= 7 wrt #288158 by Salah Coronya.
 
   10 Jan 2009; Steve Dibb <beandog@gentoo.org> xawtv-3.95-r1.ebuild:
   Drop deprecated bindnow flags, bug 226979
diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
index b8b6cf5d2fa9..3d033d9b7fb7 100644
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -1,9 +1,11 @@
 AUX webcamrc 597 RMD160 54897fefd31711f402da3e39cb97d4ef63bb200b SHA1 0a9d7d1fe4e455c9bee387fdc6334df73f33b233 SHA256 9cf61695be6b8005c663a6c73f90bd4b048f9e16f95ba659b6bc1087bc6e248e
+AUX xawtv-3.95-jpeg-7.patch 666 RMD160 2c1a5aa70cd06528831fa9bc2dec7faafab56714 SHA1 b132d16e10f5a39185f65baf45417866c8e14d26 SHA256 65e015afbaebaf2f3a832ab4b6a19aeebe93e7cba2aaeee9f127a0d6d39a952e
 AUX xawtv-3.95-libquicktime-compat.patch 1040 RMD160 07a6a212136dd6b1108a1fc1605506e9f94a8ceb SHA1 91d3c1824d7810389f56c89e33e2bc4340d52faf SHA256 e7c49e00e845d237478ba13b7afdfa4f8e59d49749a1f953464ae848b90454b3
 AUX xawtv-3.95-pagemask-fix.patch 1466 RMD160 4407a85bf518bf7d02bec44d7f436b085c1a69d5 SHA1 7983bc9977a1b3cdb7a6b68f390175ef82d26c00 SHA256 9e47b5e49fd64bd5cf67452d5c010434bf43d4006b1ff946f9f198913e75eee5
 DIST tv-fonts-1.1.tar.bz2 80177 RMD160 0bf4aa9ebc8b08edfc3b6c306e0d9efad3656652 SHA1 e35d1ddf5cc0b68a5935e5cabd2fbb1c39c6f760 SHA256 0194dd03ac9b384951e7f5ed7d08c6fc5f6d94efcd08516732720a1a4704d9f6
 DIST xawtv-3.95.tar.gz 555731 RMD160 1dc7b564bec0515cc409c723904ec9c6f8dae998 SHA1 0b0743fc06aae4f1a03c8572bcf2baa9b869ff52 SHA256 1204212c59d10df4e29a9a0ddce96cab78342859ec44bf6fd1c5f260b5c7216f
 DIST xawtv-patches-4.tar.bz2 3258 RMD160 83199822cca5c06fb155b0764fccf77a61c8040e SHA1 18e2feb33fccb231261438125ac6aad26b029bc9 SHA256 0d1a6c386c9e3ea58e92ab26268f620a3e36d888dd8cbaa46441e38215a69e9e
 EBUILD xawtv-3.95-r1.ebuild 3667 RMD160 2ecf381b02b6c18157740b0b584fbbb36f2b7c4b SHA1 1285fc6074bdea2337d1698a55e087cf219eb355 SHA256 7e1651b0c2ebb91f6d2cac69feabb1898ee0f396c7ae2ef64e98900ef67968b0
-MISC ChangeLog 14490 RMD160 3f9eb88062a983d6015016e8468013d68c1f0340 SHA1 be5c3b4112f26084247da5f42a2cb8c024580848 SHA256 68b76cf8671340542843d3a72b8a9b084e315d2d67606c81a81f418f33ff3d1c
+EBUILD xawtv-3.95-r2.ebuild 3709 RMD160 afbd652060c09e3613ff8ae68a318a0d323d60d2 SHA1 1bbd02057716ab6f4bf9f6d0bef8f2e0af8ce063 SHA256 200826f63423ec615e76eef9985a897d082d7f90a1c6a37ef5175bcc5ef51083
+MISC ChangeLog 14704 RMD160 27844745b3cca7ff303c150ff4eb9394499be5bb SHA1 e5a35fd3e943a6747b1761ccc60da41746dc866d SHA256 1cafd264446d19aaef93fe8cd73c262d03df413c561ec498d662cdbacd95b1f8
 MISC metadata.xml 328 RMD160 60ca05706e9e8bd6a6cc99170fe60fa7ee52f431 SHA1 0f5d785d773557b246a60ed7d242feb19115a6c4 SHA256 96f627b19b6b8c71bf35895cbd63e4e355caa23579e5879ecaeace8c37f1a7c5
diff --git a/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch b/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch
new file mode 100644
index 000000000000..69f2d9836d55
--- /dev/null
+++ b/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch
@@ -0,0 +1,20 @@
+http://bugs.gentoo.org/show_bug.cgi?id=288158
+
+--- xawtv-3.95/libng/plugins/conv-mjpeg.c
++++ xawtv-3.95/libng/plugins/conv-mjpeg.c
+@@ -229,6 +229,7 @@
+     jpeg_set_quality(&h->mjpg_cinfo, ng_jpeg_quality, TRUE);
+ 
+     h->mjpg_cinfo.raw_data_in = TRUE;
++    h->mjpg_cinfo.do_fancy_downsampling = FALSE;
+     jpeg_set_colorspace(&h->mjpg_cinfo,JCS_YCbCr);
+ 
+     h->mjpg_ptrs[0] = malloc(h->fmt.height*sizeof(char*));
+@@ -453,6 +454,7 @@
+     h->buf = in;
+     jpeg_read_header(&h->mjpg_cinfo,1);
+     h->mjpg_cinfo.raw_data_out = 1;
++    h->mjpg_cinfo.do_fancy_upsampling = FALSE;
+ 
+     if (ng_debug > 1)
+ 	fprintf(stderr,"yuv: %dx%d  -  %d %d / %d %d / %d %d\n",
diff --git a/media-tv/xawtv/xawtv-3.95-r2.ebuild b/media-tv/xawtv/xawtv-3.95-r2.ebuild
new file mode 100644
index 000000000000..4e9e96ce80b9
--- /dev/null
+++ b/media-tv/xawtv/xawtv-3.95-r2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.95-r2.ebuild,v 1.1 2010/03/02 16:55:31 ssuominen Exp $
+
+inherit eutils font autotools flag-o-matic
+
+PATCHLEVEL="4"
+
+IUSE="aalib alsa dv lirc mmx motif nls opengl quicktime X xv zvbi xext"
+
+MY_FONT=tv-fonts-1.1
+DESCRIPTION="Small suite of video4linux related software"
+HOMEPAGE="http://bytesex.org/xawtv/"
+SRC_URI="http://dl.bytesex.org/releases/xawtv/${P}.tar.gz
+	X? ( http://dl.bytesex.org/releases/tv-fonts/${MY_FONT}.tar.bz2 )
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=sys-libs/ncurses-5.1
+	>=media-libs/jpeg-7
+	X? (
+		x11-libs/libFS
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXrender
+		xext? (
+			x11-libs/libXinerama
+			x11-libs/libXxf86dga
+			x11-libs/libXrandr
+			x11-libs/libXxf86vm
+		)
+		x11-apps/xset
+		xv? ( x11-libs/libXv )
+	)
+	motif? ( x11-libs/openmotif
+		app-text/recode )
+	alsa? ( media-libs/alsa-lib )
+	aalib? ( media-libs/aalib )
+	dv? ( media-libs/libdv )
+	lirc? ( app-misc/lirc )
+	opengl? ( virtual/opengl )
+	quicktime? ( virtual/quicktime )
+	zvbi? ( media-libs/zvbi
+		media-libs/libpng )"
+
+DEPEND="${RDEPEND}
+	X? (
+		x11-apps/xset
+		x11-apps/bdftopcf
+		x11-proto/videoproto
+		xext? ( x11-proto/xineramaproto )
+	)"
+
+pkg_setup() {
+	if use X; then
+		font_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	if use X; then
+		cd "${WORKDIR}/${MY_FONT}"
+		epatch "${WORKDIR}/patches/extra/${MY_FONT}-nox.patch"
+	fi
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	epatch "${FILESDIR}/${P}-libquicktime-compat.patch"
+	epatch "${FILESDIR}/${P}-pagemask-fix.patch"
+	epatch "${FILESDIR}/${P}-jpeg-7.patch"
+	eautoreconf
+}
+
+src_compile() {
+	# It tries to include FSlib.h directly, but this seems to have moved.
+	use X && has_version x11-libs/libFS && append-flags -I/usr/include/X11/fonts
+
+	econf \
+		$(use_with X x) \
+		$(use_enable xext xfree-ext) \
+		$(use_enable xv xvideo) \
+		$(use_enable dv)  \
+		$(use_enable mmx) \
+		$(use_enable motif) \
+		$(use_enable quicktime) \
+		$(use_enable alsa) \
+		$(use_enable lirc) \
+		$(use_enable opengl gl) \
+		$(use_enable zvbi) \
+		$(use_enable aalib aa) \
+		|| die " xawtv configure failed"
+
+	emake verbose=yes || die "Make failed"
+
+	if use X; then
+		cd "${WORKDIR}/${MY_FONT}"
+		emake -j1 DISPLAY= || die "tvfonts failed"
+	fi
+}
+
+src_install() {
+	make install DESTDIR="${D}" resdir="${D}"/etc/X11 || die "make install failed"
+
+	# v4lctl is only installed automatically if the X USE flag is enabled
+	use X || \
+		dobin x11/v4lctl
+
+	dodoc Changes README* TODO "${FILESDIR}"/webcamrc
+	docinto cgi-bin
+	dodoc scripts/webcam.cgi
+
+	use X || \
+		rm -f "${D}"/usr/share/man/man1/{pia,propwatch}.1 \
+			"${D}"/usr/share/{man,man/fr,man/es}/man1/xawtv.1 \
+			"${D}"/usr/share/{man,man/es}/man1/rootv.1
+
+	use motif || \
+		rm -f "${D}"/usr/share/man/man1/{motv,mtt}.1
+
+	use zvbi || \
+		rm -f "${D}"/usr/share/man/man1/{alevtd,mtt}.1 \
+			"${D}"/usr/share/{man,man/es}/man1/scantv.1
+
+	use nls || \
+		rm -f "${D}"/usr/share/man/fr \
+			"${D}"/usr/share/man/es
+
+	# The makefile seems to be fubar'd for some data
+	dodir /usr/share/${PN}
+	mv "${D}"/usr/share/*.list "${D}"/usr/share/${PN}
+	mv "${D}"/usr/share/Index* "${D}"/usr/share/${PN}
+
+	if use X; then
+		cd "${WORKDIR}/${MY_FONT}"
+		insinto /usr/share/fonts/xawtv
+		doins *.gz fonts.alias
+
+		font_xfont_config
+		font_xft_config
+	fi
+}
+
+pkg_postinst() {
+	if use X; then
+		ebegin "installing teletype fonts into /usr/share/fonts/xawtv"
+		cd /usr/share/fonts/xawtv
+		mkfontdir
+		eend
+	fi
+}