Fixing bug 38459

6 files changed, 197 insertions, 15 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 4bc29ee9929c..0544352ca57b 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.48 2004/02/24 19:40:09 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.49 2004/03/15 12:18:47 phosphan Exp $
+
+*mjpegtools-1.6.2-r1 (15 Mar 2004)
+
+  15 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>
+  mjpegtools-1.6.2-r1.ebuild, mjpegtools-1.6.1.90-r2.ebuild:
+  Adding missing info directory entries (bug #38459).
 
   24 Feb 2004; Martin Holzer <mholzer@gentoo.org>
   files/mjpegtools-1.6.1.92-fPIC.patch, files/mjpegtools-1.6.1.93-fPIC.patch:
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 2d3ac820e5e6..85b67bd995c7 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,23 +1,27 @@
-MD5 ef6a086f4c821a50ee89414a48c1bf1c ChangeLog 8785
-MD5 c9bb82e3c4de92ad8ed6ce7470250e6b metadata.xml 180
-MD5 1342615ce9c1eb99bc5fa4915c3950ec mjpegtools-1.6.0-r7.ebuild 2871
-MD5 3631956b92e796f9218423f19bc98af3 mjpegtools-1.6.1.90-r1.ebuild 1881
-MD5 fdbbda76e189c38a565baf19345e0516 mjpegtools-1.6.1.ebuild 2419
 MD5 33a0236a9659a513f648305e17ae0a57 mjpegtools-1.6.1.91.ebuild 1934
-MD5 afafa62bb1c8e3b6f5a9875256068110 mjpegtools-1.6.1.92.ebuild 2124
+MD5 3631956b92e796f9218423f19bc98af3 mjpegtools-1.6.1.90-r1.ebuild 1881
 MD5 ae66d0153f3aee8d39b16468d552dc56 mjpegtools-1.6.1.93.ebuild 2122
+MD5 04ba24837c1e0ace93f58c66fa308283 mjpegtools-1.6.2-r1.ebuild 2455
 MD5 f95c2b5b9c6e541bacb0868e8d945de7 mjpegtools-1.6.2.ebuild 2153
-MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
-MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r7 147
-MD5 4a594198579130cfe453fffb532b2aef files/digest-mjpegtools-1.6.1 147
+MD5 1342615ce9c1eb99bc5fa4915c3950ec mjpegtools-1.6.0-r7.ebuild 2871
+MD5 afafa62bb1c8e3b6f5a9875256068110 mjpegtools-1.6.1.92.ebuild 2124
+MD5 f487a201813914f1e9fcc57b376cd7fe ChangeLog 8984
+MD5 c9bb82e3c4de92ad8ed6ce7470250e6b metadata.xml 180
+MD5 e969126dc1aa5369aeb8966cef346076 mjpegtools-1.6.1.90-r2.ebuild 2186
+MD5 fdbbda76e189c38a565baf19345e0516 mjpegtools-1.6.1.ebuild 2419
+MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.2-fPIC.patch 555
 MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r1 72
-MD5 81c49bb48a8d8e3ea4eb360811c01f67 files/no-x11-lib.patch 497
+MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r2 72
 MD5 0d5f90e8ac4023e403bf79d2e14314cb files/mjpegtools-1.6.0-gcc3.patch 5086
-MD5 acf58bbe360d5fdd1242419be02ef981 files/digest-mjpegtools-1.6.1.91 72
 MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.91-fPIC.patch 555
+MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.92-fPIC.patch 555
+MD5 4a594198579130cfe453fffb532b2aef files/digest-mjpegtools-1.6.1 147
+MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2 69
+MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r7 147
+MD5 acf58bbe360d5fdd1242419be02ef981 files/digest-mjpegtools-1.6.1.91 72
 MD5 787b556d11610020108eae81c18d66a9 files/digest-mjpegtools-1.6.1.92 72
 MD5 f27165f55fa5a3a8f582b362a1331074 files/digest-mjpegtools-1.6.1.93 72
-MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2 69
-MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.2-fPIC.patch 555
-MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.92-fPIC.patch 555
+MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r1 69
 MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.93-fPIC.patch 555
+MD5 81c49bb48a8d8e3ea4eb360811c01f67 files/no-x11-lib.patch 497
+MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r2 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r2
new file mode 100644
index 000000000000..5f401da864e9
--- /dev/null
+++ b/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r2
@@ -0,0 +1 @@
+MD5 a903c49ee5902710b8e44bd6c0f4b38e mjpegtools-1.6.1.90.tar.gz 1168921
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r1 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r1
new file mode 100644
index 000000000000..f61243bfc284
--- /dev/null
+++ b/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r1
@@ -0,0 +1 @@
+MD5 01c0120b0182de67f182ef99ad855daa mjpegtools-1.6.2.tar.gz 1256280
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild
new file mode 100644
index 000000000000..fa19f4545831
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.90-r2.ebuild,v 1.1 2004/03/15 12:18:47 phosphan Exp $
+
+inherit flag-o-matic gcc
+
+DESCRIPTION="Tools for MJPEG video."
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="1"
+KEYWORDS="x86 -ppc ~sparc"
+IUSE="gtk avi dv quicktime sdl X 3dnow mmx sse"
+
+DEPEND="media-libs/jpeg
+	>=sys-apps/sed-4
+	=dev-libs/glib-1.2*
+	x86? ( media-libs/libmovtar
+	       sse? ( dev-lang/nasm )
+	       mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 dev-lang/nasm )
+	       3dnow? ( dev-lang/nasm ) )
+	gtk? ( =x11-libs/gtk+-1.2* )
+	avi? ( >=media-video/avifile-0.7.38 )
+	dv? ( >=media-libs/libdv-0.99 )
+	quicktime? ( virtual/quicktime )
+	sdl? ( media-libs/libsdl )
+	X? ( x11-base/xfree )"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+	epatch "${FILESDIR}/no-x11-lib.patch"
+}
+
+src_compile() {
+	local myconf
+
+	[ `use x86` ] && [ `gcc-major-version` -eq 3 ] && append-flags -mno-sse2
+
+	myconf="${myconf} `use_with X x`"
+	myconf="${myconf} `use_with quicktime`"
+	myconf="${myconf} `use_enable x86 cmov-extensions`"
+
+	if [ "`use dv`" ] ; then
+		myconf="${myconf} --with-dv=/usr"
+	fi
+	if [ "`use mmx`" -o "`use 3dnow`" -o "`use sse`" ] ; then
+		myconf="${myconf} --enable-simd-accel"
+	fi
+	if [ "`use mmx`" ] ; then
+		myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
+	fi
+
+	econf ${myconf}
+
+	if has_version 'sys-devel/hardened-gcc' ; then
+		for i in `find "${S}" -name "Makefile"` ; do
+			sed -e "s:CC = gcc:CC = gcc -yet_exec:g" \
+				-e "s:CXX = gcc:CXX = g++ -yet_exec:g" \
+				-e "s:CXXCPP = gcc -E:CXX = g++ -E -yet_exec:g" \
+				-i "${i}" || die "sed failed"
+		done
+	fi
+
+	emake || die "compile problem"
+	cd docs
+	local infofile
+	for infofile in mjpeg*info*; do
+		echo "INFO-DIR-SECTION Miscellaneous" >> ${infofile}
+		echo "START-INFO-DIR-ENTRY" >> ${infofile}
+		echo "* mjpeg-howto: (mjpeg-howto).                  How to use the mjpeg-tools" >> ${infofile}
+		echo "END-INFO-DIR-ENTRY" >> ${infofile}
+	done
+}
+
+src_install() {
+	einstall
+	dodoc mjpeg_howto.txt
+}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..afbcbe553c6e
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r1.ebuild,v 1.1 2004/03/15 12:18:47 phosphan Exp $
+
+inherit flag-o-matic gcc eutils
+
+DESCRIPTION="Tools for MJPEG video"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="1"
+KEYWORDS="~x86 ~ppc amd64"
+IUSE="gtk avi dv quicktime sdl X 3dnow mmx sse"
+
+DEPEND="media-libs/jpeg
+	>=sys-apps/sed-4
+	=dev-libs/glib-1.2*
+	x86? ( media-libs/libmovtar
+		mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 dev-lang/nasm )
+		3dnow? ( dev-lang/nasm )
+		sse? ( dev-lang/nasm )
+	)
+	gtk? ( =x11-libs/gtk+-1.2* )
+	avi? ( >=media-video/avifile-0.7.38 )
+	dv? ( >=media-libs/libdv-0.99 )
+	quicktime? ( virtual/quicktime )
+	sdl? ( media-libs/libsdl )
+	X? ( x11-base/xfree )"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	# This breaks compilation on x86 architecture
+	# See bug #36502, comment 8
+	[ "$ARCH" != x86 ] && epatch ${FILESDIR}/${P}-fPIC.patch
+
+#	epatch "${FILESDIR}/no-x11-lib.patch"
+}
+
+src_compile() {
+	local myconf
+
+	[ `gcc-major-version` -eq 3 ] && [ "${ARCH}" == "x86" ] && append-flags -mno-sse2
+
+	myconf="${myconf} `use_with X x`"
+	myconf="${myconf} `use_with quicktime`"
+	myconf="${myconf} `use_enable x86 cmov-extensions`"
+
+	# Fix for Via C3-1, see #30345
+	grep -q cmov /proc/cpuinfo || myconf="${myconf} --disable-cmov"
+
+	if [ "`use dv`" ] ; then
+		myconf="${myconf} --with-dv=/usr"
+	fi
+
+	if [ "`use x86`" ]; then
+		if [ "`use mmx`" -o "`use 3dnow`" -o "`use sse`" ] ; then
+			myconf="${myconf} --enable-simd-accel"
+		fi
+		if [ "`use mmx`" ] ; then
+			myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
+		fi
+	fi
+
+	econf ${myconf} || die
+
+	if has_version 'sys-devel/hardened-gcc' ; then
+		for i in `find "${S}" -name "Makefile"` ; do
+			sed -e "s:CC = gcc:CC = gcc -yet_exec:g" \
+				-e "s:CXX = gcc:CXX = g++ -yet_exec:g" \
+				-e "s:CXXCPP = gcc -E:CXX = g++ -E -yet_exec:g" \
+				-i "${i}" || die "sed failed"
+		done
+	fi
+
+	emake -j1 || die "compile problem"
+	cd docs
+	local infofile
+	for infofile in mjpeg*info*; do
+		echo "INFO-DIR-SECTION Miscellaneous" >> ${infofile}
+		echo "START-INFO-DIR-ENTRY" >> ${infofile}
+		echo "* mjpeg-howto: (mjpeg-howto).                  How to use the mjpeg-tools" >> ${infofile}
+		echo "END-INFO-DIR-ENTRY" >> ${infofile}
+	done
+}
+
+src_install() {
+	einstall
+	dodoc mjpeg_howto.txt
+}