updated ebuild

Package-Manager: portage-2.0.51.19

5 files changed, 140 insertions, 67 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index fdc97cfdbe13..827ac0dc71ac 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.83 2005/03/26 20:21:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.84 2005/03/27 20:08:31 lu_zero Exp $
+
+  27 Mar 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/mjpegtools-1.6.2-configure.patch, mjpegtools-1.6.2-r3.ebuild:
+  Updated ebuild, from Diego Pettenò <dgp85@users.sourceforge.net>
 
   26 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
   -files/1.6.0-r7-ppc.patch, -files/mjpegtools-1.6.0-gcc3.patch,
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 1023133bdb54..0c342331b981 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0146a06e44d4b855e471e43099f8a3d4 ChangeLog 15173
 MD5 fe49014257499366bdc6903a9aa33fe5 metadata.xml 311
-MD5 58375141c996e1699b3fcec061640f94 mjpegtools-1.6.2-r3.ebuild 3247
+MD5 42134764c3011ae6d48405decce4e775 ChangeLog 15359
+MD5 6521a6a5041277acdbbc634934ecf43a mjpegtools-1.6.2-r3.ebuild 3437
+MD5 1b2c526400f0a0f1e0c150c6ff42e8c6 files/mjpegtools-1.6.2-configure.patch 2592
+MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469
+MD5 abdfec9a9d07b842509b709ba17d69ab files/mjpegtools-1.6.2-nogtk.patch 556
 MD5 3150d43b1c44c02265b8481e271093c8 files/altivec-fix-1.6.2.patch 1011
-MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r3 69
 MD5 a4cae44ea5989aed95d7b8d84aaf0af4 files/mjpegtools-1.6.2-fPIC.patch 9945
+MD5 39b5dadaf6e522165490f099d98b954c files/mjpegtools-1.6.2-dv.patch 634
 MD5 f16b681aebfa408a1ff5b6030c50fad8 files/mjpegtools-1.6.2-gcc34-altivec.patch 3693
 MD5 d67f97f3bd586946968fca9b8d31be85 files/mjpegtools-1.6.2-gcc34.patch 1601
-MD5 abdfec9a9d07b842509b709ba17d69ab files/mjpegtools-1.6.2-nogtk.patch 556
-MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469
-MD5 39b5dadaf6e522165490f099d98b954c files/mjpegtools-1.6.2-dv.patch 634
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCRcRJArHZZzCEUG0RAt07AJ0Unl40STf75qhz03pkC/+C+J3fIgCdFlG3
-WDNilDKtHPS2IQk0/uvYGvI=
-=36b4
------END PGP SIGNATURE-----
+MD5 7c88ea787d22b8ec25b68478d037151e files/digest-mjpegtools-1.6.2-r3 135
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r3 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r3
index f61243bfc284..3bf5e8e399ca 100644
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r3
+++ b/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r3
@@ -1 +1,2 @@
 MD5 01c0120b0182de67f182ef99ad855daa mjpegtools-1.6.2.tar.gz 1256280
+MD5 cd55f55ddd646eb79d4e4df99d4c777f mjpegtools-m4-1.tar.bz2 4547
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.2-configure.patch b/media-video/mjpegtools/files/mjpegtools-1.6.2-configure.patch
new file mode 100644
index 000000000000..e7e1f57afe6a
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.6.2-configure.patch
@@ -0,0 +1,71 @@
+--- configure.in.orig	2004-02-03 23:57:29.000000000 +0100
++++ configure.in	2004-12-02 03:27:39.649492528 +0100
+@@ -44,6 +44,10 @@
+   [  --with-dv-yv12,                   libDV PAL YV12 read-support])
+ AC_ARG_ENABLE(zalpha,
+   [  --enable-zalpha,                  include MPEG Z/Alpha support in mplex (www.geofront.se/products_software_mza.php)])
++AC_ARG_WITH(v4l,
++  [ --without-v4l		       disable video4linux support])
++AC_ARG_WITH(gtk,
++  [--without-gtk		       disable gtk+ support])
+ 
+ AC_GNU_SOURCE
+ 
+@@ -155,12 +159,16 @@
+ os_type=`uname`
+ have_video4linux=false
+ if test x$os_type = x"Linux"; then
+-  AC_CHECK_HEADER(linux/videodev.h,
+-    have_video4linux=true
+-    AC_DEFINE(HAVE_V4L,1,
+-		      [Building for Linux - using the video4linux API]),
+-    AC_MSG_ERROR([videodev.h not found - please install the linux kernel headers])
+-    )
++  if test x$with_v4l != xno; then
++    AC_CHECK_HEADER(linux/videodev.h,
++      have_video4linux=true
++      AC_DEFINE(HAVE_V4L,1,
++  		      [Building for Linux - using the video4linux API]),
++      AC_MSG_ERROR([videodev.h not found - please install the linux kernel headers])
++      )
++  else
++    AC_MSG_WARN([video4linux support disapled])
++  fi
+ else
+   AC_MSG_WARN([Did not find linux platform - video4linux functionality will be disabled])
+   AC_MSG_WARN([If you are on MacOS X, please note that only the classic libjpeg works !])
+@@ -294,6 +302,7 @@
+ fi
+ 
+ have_dv=false
++if test x$with_dv != xno ; then
+ EXTRA_LIBS=" $LIBM_LIBS $GLIB_LIBS  $PTHREAD_LIBS"
+ AC_CHECK_LIB(dv, dv_decoder_free,
+   [ DV_LIBS="-L${with_dv}/lib -ldv ${EXTRA_LIBS}"
+@@ -302,6 +311,7 @@
+ 			  [libdv is present])
+     have_dv=true],, 
+     -L${with_dv}/lib -ldv ${EXTRA_LIBS})
++fi
+ 
+ dnl *********************************************************************
+ dnl Check for libDV YV12 read-support
+@@ -364,11 +374,13 @@
+ dnl Check for Gtk+/glib (for glav)
+ dnl ********************************************************************
+ have_gtk=false
+-ifdef([AM_PATH_GTK],
+-      [ AM_PATH_GTK(1.2.0, [ have_gtk=true
+-                           AC_DEFINE(HAVE_GTK,1,
+-									 [Gtk library present]
+-							)],,) ])
++if test x$with_gtk != xno; then
++ ifdef([AM_PATH_GTK],
++       [ AM_PATH_GTK(1.2.0, [ have_gtk=true
++                            AC_DEFINE(HAVE_GTK,1,
++                                                                        [Gtk library present]
++                                                       )],,) ])
++fi
+ 
+ dnl ********************************************************************
+ dnl Check for the SDL library (for software playback)
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild
index 97ab3489c260..e8ec4db8e86b 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild
@@ -1,59 +1,61 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild,v 1.19 2005/03/26 20:21:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild,v 1.20 2005/03/27 20:08:31 lu_zero Exp $
 
 inherit flag-o-matic gcc eutils
 
+M4V="1"
+
 DESCRIPTION="Tools for MJPEG video"
 HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz
+	mirror://gentoo/${PN}-m4-${M4V}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="1"
 KEYWORDS="x86 ppc amd64 ~sparc ppc64"
-IUSE="gtk avi dv quicktime sdl X yv12 3dnow mmx sse"
+IUSE="gtk avi dv quicktime sdl X yv12 3dnow mmx sse v4l dga"
 
-DEPEND="media-libs/jpeg
-	>=sys-apps/sed-4
+RDEPEND="media-libs/jpeg
 	x86? ( media-libs/libmovtar
-		mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1
-				dev-lang/nasm )
-		3dnow? ( dev-lang/nasm )
-		sse? ( dev-lang/nasm )
+		mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 )
 	)
 	gtk? ( =x11-libs/gtk+-1.2*
-			=dev-libs/glib-1.2* )
+		=dev-libs/glib-1.2* )
 	avi? ( media-video/avifile )
 	dv? ( >=media-libs/libdv-0.99 )
 	quicktime? ( virtual/quicktime )
 	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
 	X? ( virtual/x11 )"
 
+DEPEND="${RDEPEND}
+	x86? ( mmx? ( dev-lang/nasm )
+		3dnow? ( dev-lang/nasm )
+		sse? ( dev-lang/nasm )
+		)
+	>=sys-apps/sed-4
+	sys-devel/autoconf
+	=sys-devel/automake-1.5*"
+
 src_unpack() {
 	unpack ${A} ; cd ${S}
-	cp -rf ${S}{,.orig}
 
+	epatch ${FILESDIR}/${P}-configure.patch
 	epatch ${FILESDIR}/${P}-fPIC.patch
 	epatch ${FILESDIR}/${P}-gcc34.patch
-	epatch ${FILESDIR}/${P}-dv.patch
-
-	# remove checks for gtk in configure in
-	use gtk || epatch ${FILESDIR}/${P}-nogtk.patch
 
 	if use ppc; then
 		# Fix an error in the detection of the altivec-support
 		# in the compiler
 		epatch "${FILESDIR}/altivec-fix-${PV}.patch"
-		sed -i 's:-O3::' configure.in
+		sed -i -e 's:-O3::' configure.in
 		#Worst workaround ever...
-		sed -i \
-		-e "s/const vector signed short /vector signed short /g" \
-		${S}/utils/altivec/fdct_idct.c
+		sed -i -e "s/const vector signed short/vector signed short/g" \
+			${S}/utils/altivec/fdct_idct.c
 	fi
 
-	aclocal
 	libtoolize --copy --force
-	autoreconf || die
+	ACLOCAL="aclocal -I ${WORKDIR}/m4" autoreconf || die
 
 	use X || epatch "${FILESDIR}/no-x11-lib-2.patch"
 }
@@ -61,25 +63,13 @@ src_unpack() {
 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} --enable-cmov-extension=no"
-
-	if use dv; then
-		myconf="${myconf} --with-dv=/usr"
-		myconf="${myconf} $(use_with yv12 dv-yv12)"
-	else
-		myconf="${myconf} --without-dv --without-dv-yv12"
-		if use yv12; then
-			ewarn "yv12 support is only possible when \"dv\" is in your USE flags."
-		fi
+	if use yv12 && use dv; then
+		myconf="${myconf} --with-dv-yv12"
+	elif use yv12; then
+		ewarn "yv12 support is possible when 'dv' is in your USE flags."
 	fi
 
+	# This could be changed to allow building on g/fbsd in the future.
 	if use x86; then
 		if use mmx || use 3dnow || use sse; then
 			myconf="${myconf} --enable-simd-accel"
@@ -88,21 +78,35 @@ src_compile() {
 		if use mmx; then
 			myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
 		fi
+		
+		if [[ ${CHOST/i686/} != ${CHOST} ]] || [[ ${CHOST/x86_64/} != ${CHOST} ]]; then
+			myconf="${myconf} --enable-cmov-extension"
+		fi
+		
+		[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
 	fi
 
-	econf ${myconf} || die
-
-	if has_pie ; then
-		pie_magic="`test_flag -fno-pic` `test_flag -nopie`"
-		for i in `find "${S}" -name "Makefile"` ; do
-			sed -e "s:CC = gcc:CC = gcc ${pie_magic}:g" \
-				-e "s:CXX = gcc:CXX = g++ ${pie_magic}:g" \
-				-e "s:CXXCPP = gcc -E:CXX = g++ -E ${pie_magic}:g" \
-				-i "${i}" || die "sed failed"
-		done
+	econf \
+		$(use_with X x) \
+		$(use_enable dga xfree-ext) \
+		$(use_with quicktime) \
+		$(use_with v4l) \
+		$(use_with gtk) \
+		$(use_with sdl) \
+		$(use_with dv dv /usr) \
+		${myconf} || die
+
+	if has_pie; then
+		pie_magic="$(test_flag -fno-pic) $(test_flag -nopie)"
+		
+		find "${S}" -name Makefile | xargs sed -i \
+			-e "s:CC = gcc:CC = gcc ${pie_magic}:g" \
+			-e "s:CXX = gcc:CXX = g++ ${pie_magic}:g" \
+			-e "s:CXXCPP = gcc -E:CXX = g++ -E ${pie_magic}:g" \
+			|| die "sed failed"
 	fi
 
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -j1 || die "compile problem"
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -j1 || die "emake failed"
 	cd docs
 	local infofile
 	for infofile in mjpeg*info*; do
@@ -115,5 +119,7 @@ src_compile() {
 
 src_install() {
 	einstall || die "install failed"
-	dodoc mjpeg_howto.txt
+	dodoc mjpeg_howto.txt README PLANS NEWS README.AltiVec README.avilib \
+		README.DV README.glav README.lavpipe README.transist TODO \
+		HINTS BUGS ChangeLog AUTHORS CHANGES
 }