Fix exit() being called without arguments, bug #32801.

5 files changed, 76 insertions, 5 deletions

diff --git a/media-video/mpeg-tools/ChangeLog b/media-video/mpeg-tools/ChangeLog
index d97baa967492..f983c6d14e01 100644
--- a/media-video/mpeg-tools/ChangeLog
+++ b/media-video/mpeg-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mpeg-tools
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.5 2003/06/12 00:03:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.6 2003/11/07 18:54:45 azarah Exp $
+
+*mpeg-tools-1.5b-r1 (07 Nov 2003)
+
+  07 Nov 2003; Martin Schlemmer <azarah@gentoo.org> mpeg-tools-1.5b-r1.ebuild,
+  files/1.5b/mpeg-tools-1.5b-fix-exit-call.patch:
+  Fix exit() being called without arguments, bug #32801.
 
   11 Jun 2003; <msterret@gentoo.org> mpeg-tools-1.5b.ebuild:
   Fix url (Bug#: 22544)
diff --git a/media-video/mpeg-tools/Manifest b/media-video/mpeg-tools/Manifest
index 2f0e00afd7e9..45cf93e3d2d6 100644
--- a/media-video/mpeg-tools/Manifest
+++ b/media-video/mpeg-tools/Manifest
@@ -1,10 +1,9 @@
-MD5 e99597d49b6604c129ef18b9528e6ac6 ChangeLog 802
+MD5 da62d77b7a45aa8a1c5da459947e44f6 ChangeLog 1022
 MD5 6d1443c5797003ac437cab0ed90af9b0 mpeg-tools-1.5b.ebuild 1112
-MD5 05c24a0a691e4abc54d959722b2f07f0 .mpeg-tools-1.5b-r1.ebuild.swp 12288
-MD5 957163ff71602a171f91914705fab9f9 mpeg-tools-1.5b-r1.ebuild 1165
+MD5 087c0930f8d77aa3ef3709f5dbea695b mpeg-tools-1.5b-r1.ebuild 1228
 MD5 bf748902484902bcc7eb4e616a8d04dd files/digest-mpeg-tools-1.5b-r1 73
-MD5 b45f0ebe9bad10888b67ac1d1475c0d4 files/mpeg-tools-1.5b-fix-exit-call.patch 464
 MD5 bf748902484902bcc7eb4e616a8d04dd files/digest-mpeg-tools-1.5b 73
 MD5 1f0b9c5d21516dc0b597bdd8563a7e39 files/1.5b/libpnmrw.h 6791
 MD5 ee6ac6a97ef340aecff643f24bc2f02c files/1.5b/mpeg-tools-1.5b-gentoo.patch 560
+MD5 b45f0ebe9bad10888b67ac1d1475c0d4 files/1.5b/mpeg-tools-1.5b-fix-exit-call.patch 464
 MD5 1c465916c02ad5e984eefda8b236fbc9 files/1.5b/libpnmrw.c 37348
diff --git a/media-video/mpeg-tools/files/1.5b/mpeg-tools-1.5b-fix-exit-call.patch b/media-video/mpeg-tools/files/1.5b/mpeg-tools-1.5b-fix-exit-call.patch
new file mode 100644
index 000000000000..4a2783345edd
--- /dev/null
+++ b/media-video/mpeg-tools/files/1.5b/mpeg-tools-1.5b-fix-exit-call.patch
@@ -0,0 +1,17 @@
+--- convert/jmovie2jpeg.c.az	2003-11-07 20:49:07.646262600 +0200
++++ convert/jmovie2jpeg.c	2003-11-07 20:49:21.707125024 +0200
+@@ -283,12 +283,12 @@
+     if (fread (&(image_offset),sizeof(int),1,inFile) != 1)
+     {
+ 	perror("Error in reading image offset");
+-	exit();
++	exit(1);
+     }
+     if (fread (&(audio_tracks),sizeof(int),1,inFile) != 1)
+     {
+ 	perror("Error in reading audio tracks");
+-	exit();
++	exit(1);
+     }
+     if (audio_tracks != 1) 
+       { 
diff --git a/media-video/mpeg-tools/files/digest-mpeg-tools-1.5b-r1 b/media-video/mpeg-tools/files/digest-mpeg-tools-1.5b-r1
new file mode 100644
index 000000000000..63605b69a15d
--- /dev/null
+++ b/media-video/mpeg-tools/files/digest-mpeg-tools-1.5b-r1
@@ -0,0 +1 @@
+MD5 ff125fb82118efc7c852f0d26d5552c6 mpeg_encode-1.5b-src.tar.gz 2028724
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r1.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r1.ebuild
new file mode 100644
index 000000000000..e4eef942a25d
--- /dev/null
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r1.ebuild,v 1.1 2003/11/07 18:54:45 azarah Exp $
+
+MY_PN=mpeg_encode
+S=${WORKDIR}/${MY_PN}
+DESCRIPTION="Tools for MPEG video"
+SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${MY_PN}-${PV}-src.tar.gz"
+HOMEPAGE="http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html"
+
+DEPEND="virtual/x11"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86"
+
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+	cp ${FILESDIR}/${PV}/libpnmrw.c .
+	cp ${FILESDIR}/${PV}/libpnmrw.h headers/
+	epatch ${FILESDIR}/${PV}/${P}-gentoo.patch
+	cd ${S}/../convert
+	# Fix exit() being called without arguments
+	epatch ${FILESDIR}/${PV}/${P}-fix-exit-call.patch
+}
+
+src_compile() {
+	cd ${S}
+	make || die
+	cd ../convert
+	make || die
+	cd mtv
+	make || die
+}
+
+src_install () {
+	cd ${S}
+	into /usr
+	dobin mpeg_encode
+	doman docs/*.1
+	dodoc BUGS CHANGES COPYRIGHT README TODO VERSION
+	dodoc docs/EXTENSIONS docs/INPUT.FORMAT docs/*.param docs/param-summary
+	docinto examples
+	dodoc examples/*
+	cd ../convert
+	dobin eyuvtojpeg eyuvtoppm jmovie2jpeg mpeg_demux ppmtoeyuv mtv/movieToVid
+}