version bump + compile fixes

4 files changed, 98 insertions, 5 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index d5969b6f7657..800e1d7dbb6e 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,10 +1,18 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.43 2004/01/02 20:55:43 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.44 2004/01/16 17:18:59 wmertens Exp $
 
+*mjpegtools-1.6.1.92 (16 Jan 2004)
+
+  16 Jan 2004; Wout Mertens <wmertens@gentoo.org> mjpegtools-1.6.1.92.ebuild:
+  Version bump and disabling -fPIC on x86 where it fails. Also first go at
+  making it work for Via C3-I chips (That don't have the cmov instruction)
+  Closing #37133, #36502 and #30345
+  
   02 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> mjpegtools-1.6.1.91.ebuild:
-  Added fPIC patch to make it compile on amd64. Also updated dependencies so that
-  mmx, 3dnow and sse dependencies only gets pulled in for x86. Closing #36843.
+  Added fPIC patch to make it compile on amd64. Also updated dependencies so
+  that mmx, 3dnow and sse dependencies only gets pulled in for x86. Closing
+  #36843.
 
   28 Dec 2003; Jason Wever <weeve@gentoo.org> mjpegtools-1.6.1.90-r1.ebuild:
   Fixed ebuild so it works better with non-x86 arches. Adding ~sparc keyword as
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index f5a15314cb87..9a130cdd7018 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,10 +1,10 @@
-MD5 8ea37ae9ba8271d81ff710a8d24bf26b ChangeLog 8249
+MD5 633529c3524f1e5922d12e16ad6b342f ChangeLog 8253
 MD5 c9bb82e3c4de92ad8ed6ce7470250e6b metadata.xml 180
 MD5 cbefd08320e8e23114fd67346d853b1d mjpegtools-1.6.0-r7.ebuild 2870
 MD5 9fa67243454e797c061ddd4facf262cc mjpegtools-1.6.1.ebuild 2413
 MD5 5eff49bdfc7995d6d4437a926d474566 mjpegtools-1.6.1.90-r1.ebuild 1878
 MD5 34c007b6296bdeed780119edd0f43f3a mjpegtools-1.6.1.91.ebuild 1931
-MD5 d02d2b07b980da3b99fa5496436c04df mjpegtools-1.6.1.92.ebuild 2121
+MD5 b7c475da06a80755703e4a05cf585d1c mjpegtools-1.6.1.92.ebuild 2123
 MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
 MD5 0d5f90e8ac4023e403bf79d2e14314cb files/mjpegtools-1.6.0-gcc3.patch 5086
 MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r7 147
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.92 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.92
new file mode 100644
index 000000000000..7fb7eafd766a
--- /dev/null
+++ b/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.92
@@ -0,0 +1 @@
+MD5 254aaadf56b0a6ee428bd937024801a2 mjpegtools-1.6.1.92.tar.gz 1227370
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.92.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.92.ebuild
new file mode 100644
index 000000000000..9f58b2e23226
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-1.6.1.92.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2003 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.92.ebuild,v 1.1 2004/01/16 17:18:59 wmertens Exp $
+
+inherit flag-o-matic gcc
+
+DESCRIPTION="Tools for MJPEG video."
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
+RESTRICT="nomirror"
+
+LICENSE="as-is"
+SLOT="1"
+KEYWORDS="~x86 -ppc"
+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 ] && 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} --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}
+
+	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"
+}
+
+src_install() {
+	einstall
+	dodoc mjpeg_howto.txt
+}