Revision bump to fix bug #259207, thanks to Victor Yu. Kowalsky for the report.

Package-Manager: portage-2.1.9.42/cvs/Linux i686

5 files changed, 150 insertions, 6 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index fb73c016e200..6ab034b1cd36 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.155 2011/05/30 17:09:21 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.156 2011/06/07 17:58:56 billie Exp $
+
+*mjpegtools-2.0.0-r1 (07 Jun 2011)
+
+  07 Jun 2011; Daniel Pielmeier <billie@gentoo.org>
+  +mjpegtools-2.0.0-r1.ebuild, +files/mjpegtools-2.0.0-sdlgfx-automagic.patch,
+  metadata.xml:
+  Revision bump to fix bug #259207, thanks to Victor Yu. Kowalsky for the
+  report.
 
   30 May 2011; Daniel Pielmeier <billie@gentoo.org>
   -mjpegtools-2.0.0_rc1.ebuild, mjpegtools-2.0.0.ebuild,
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 18ed56ff897e..c63b1732c38f 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -3,16 +3,18 @@ Hash: SHA1
 
 AUX mjpegtools-1.9.0-glibc-2.10.patch 429 RMD160 ef7f706aeda7ebfa04dbd43b70a5e3e6faf24610 SHA1 3029f0e835e693b144298ed9f8143c9566be26f3 SHA256 0a76b418df4daa1603c827001ede6a1b3da4457b5d3aefeda0a656cd88ad446b
 AUX mjpegtools-1.9.0-jpeg-7.patch 774 RMD160 22c50dd28617159eaa89aefb4647e21d4d9972e7 SHA1 2bdb1b3b8591cede11d4a133a758e8ead35db4dd SHA256 2c9b90a283e8e6d95bd9573cd16310107c654d0d701a7dff7e47ee1a773da7cf
+AUX mjpegtools-2.0.0-sdlgfx-automagic.patch 1620 RMD160 1eb27563b08e2f6f2e3fc014865119914a419bb2 SHA1 12043ae95416c173ee413fa774c0c6a3c69ee9ff SHA256 11f914d0f17700b8e02a4bca447fc44c7b8b73e1bef7358057ff25a0155afbd6
 DIST mjpegtools-1.9.0.tar.gz 1718063 RMD160 79e0eb4bce468bb8f12da336e29abe8fab390a5f SHA1 1701233354c7ea86b5b7808c4dd5d03a71118e48 SHA256 a9322aaab1e0835fbaa00fc10e58e885833454fa0ad6f57c60c89a78f7ed1711
 DIST mjpegtools-2.0.0.tar.gz 1749671 RMD160 454e23bedb2bd592912a546d0621b5c3662c3bb2 SHA1 f411e8573d446711dbe8455a6ae9257e1afe1e70 SHA256 bf3541593e71602f7b440c2e7d81b433f53d0511e74642f35bea9b3feded7a97
 EBUILD mjpegtools-1.9.0-r1.ebuild 2078 RMD160 d288a60f43f79ea5298fd860bd4e0e988c48478f SHA1 07fbcca44b05d371e7619f40b59a2ea8705e31f6 SHA256 7d303fea4b4eb8c278e07c0e1662dd9860e4b9ef5836322d5bc8d76112b947f7
+EBUILD mjpegtools-2.0.0-r1.ebuild 2082 RMD160 584cadce64d4f5c7b280dc76ded8d4267268a287 SHA1 b1aab5b34ddccf2ec185d2098a6e6bd5635e738f SHA256 c48104f80c00e80f39ed3b0e0b60a9ba8b732b06e057ad348a98721f012c06cb
 EBUILD mjpegtools-2.0.0.ebuild 1923 RMD160 584095be8a0e4ccde0127f914f6ce80b6fbc8230 SHA1 a4abeee72b0099e28fd2f51264db248ea816bd5a SHA256 f757c0820fcd8235dc69ff06537bc89bb7aa97bb023534066c00968dea1caeba
-MISC ChangeLog 28153 RMD160 d8c7e467d73882871828a4938f6de0a383c22e8f SHA1 a29236a62b1c192c9a5eb840211d6b51e9aa28d7 SHA256 294a7f8e41c47ccaade98e3cd8fd7a832531e841e17aebdb5a3dd31bb84cdb84
-MISC metadata.xml 363 RMD160 10615c49fe0655333db0f939b2e38c6efd1f887d SHA1 496986a1272e3b16da7360f18327621bd2e532d5 SHA256 51be248768e67ad5fe862f97bfa1b3010ceb85d8ddc08c434ebacc21ee4156a0
+MISC ChangeLog 28421 RMD160 8d8bc3ce6e4efa4a83324b6e459b0e20e78f7160 SHA1 67415fd40b323b2c22ca515b25aed27944969636 SHA256 ee59cd286ccd8b0c3dc1356f868bb3813de43074462435fd611b28a83b2a1d0d
+MISC metadata.xml 441 RMD160 882586a1e1317f483541d38d3ea933250a154f38 SHA1 09ce5febb5925409e9779c91fd9b780b75a1ae51 SHA256 3657ffbe76610b6de6e72fc1ff1ce479a7200e17cf4734548cd4a62d2b6884f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3jz2cACgkQlcuUeyFa0U0bMgCfR1yUWJpCigkDxiaBomYZPnM3
-wOMAoL3JQD6hGiPRgXlFYK9jFs7h/CL+
-=WL6L
+iEYEARECAAYFAk3uZwoACgkQlcuUeyFa0U3RSACeJtXe4giMDl+p/jPYjL7+fg2e
+HYYAoLf//iyznAZjBbmn9rvWsd++k2JA
+=9Tvm
 -----END PGP SIGNATURE-----
diff --git a/media-video/mjpegtools/files/mjpegtools-2.0.0-sdlgfx-automagic.patch b/media-video/mjpegtools/files/mjpegtools-2.0.0-sdlgfx-automagic.patch
new file mode 100644
index 000000000000..9ca007194766
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-2.0.0-sdlgfx-automagic.patch
@@ -0,0 +1,48 @@
+--- configure.ac.old	2011-05-21 14:30:09.000000000 +0200
++++ configure.ac	2011-05-29 15:36:54.488792001 +0200
+@@ -64,6 +64,9 @@
+ AC_ARG_WITH(libsdl,
+ 	    AC_HELP_STRING([--without-libsdl], [Do not use libsdl.]),
+ 	    [], [with_libsdl=yes])
++AC_ARG_WITH(sdlgfx,
++        AC_HELP_STRING([--without-sdlgfx], [Do not use sdlgfx.]),
++        [], [with_sdlgfx=yes])
+ AC_GNU_SOURCE
+ 
+ dnl Initialize libtool
+@@ -306,20 +309,24 @@
+ fi
+ AM_CONDITIONAL(HAVE_SDL, test x$have_sdl = xtrue)			  
+ 
+-dnl ***
++dnl ********************************************************************
+ dnl Check for SDL_gfx which is used by y4mhist to display a graphical 
+ dnl histogram.
+-dnl ***
+-AC_SUBST(SDLgfx_LIBS)
+-if test x$have_sdl = xtrue; then
+-   OLD_LIBS="$LIBS"
+-   LIBS="$LIBS -lSDL -lSDL_gfx"
+-   AC_CHECK_LIB(SDL_gfx, vlineColor,
+-		[SDLgfx_LIBS="-lSDL_gfx"
+-		 AC_DEFINE(HAVE_SDLgfx, 1, [SDL_gfx library present])
+-		 have_sdlgfx=true ],[have_sdlgfx=false])
+-   LIBS="$OLD_LIBS"
++dnl ********************************************************************
++have_sdlgfx=false
++if test x$with_sdlgfx != xno ; then
++	AC_SUBST(SDLgfx_LIBS)
++	if test x$have_sdl = xtrue; then
++	   OLD_LIBS="$LIBS"
++	   LIBS="$LIBS -lSDL -lSDL_gfx"
++	   AC_CHECK_LIB(SDL_gfx, vlineColor,
++			[SDLgfx_LIBS="-lSDL_gfx"
++			 AC_DEFINE(HAVE_SDLgfx, 1, [SDL_gfx library present])
++			 have_sdlgfx=true ],[have_sdlgfx=false])
++	   LIBS="$OLD_LIBS"
++	fi
+ fi
++AM_CONDITIONAL(HAVE_SDLgfx, test x$have_sdlgfx = xtrue)
+ 
+ dnl ********************************************************************
+ dnl Test for MMX support if an IA32 platform.  If on a PPC then look for
diff --git a/media-video/mjpegtools/metadata.xml b/media-video/mjpegtools/metadata.xml
index 507c26e304a9..551b3b9fef58 100644
--- a/media-video/mjpegtools/metadata.xml
+++ b/media-video/mjpegtools/metadata.xml
@@ -9,5 +9,6 @@
 	</maintainer>
 	<use>
 		<flag name="yv12">Enables support for the YV12 pixel format</flag>
+		<flag name="sdlgfx">Enables y4mhist to display a graphical histogram</flag>
 	</use> 
 </pkgmetadata>
diff --git a/media-video/mjpegtools/mjpegtools-2.0.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..c09e5ada8ecf
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.0.0-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.0.0-r1.ebuild,v 1.1 2011/06/07 17:58:57 billie Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic toolchain-funcs
+
+MY_P=${P/_/}
+
+DESCRIPTION="Tools for MJPEG video"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="dga dv gtk mmx png quicktime sdl sdlgfx static-libs v4l X"
+REQUIRED_USE="!X? ( !gtk !sdl )
+	X? ( sdl )
+	sdlgfx? ( sdl )"
+
+RDEPEND="virtual/jpeg
+	quicktime? ( media-libs/libquicktime )
+	dv? ( >=media-libs/libdv-0.99 )
+	png? ( media-libs/libpng )
+	dga? ( x11-libs/libXxf86dga )
+	X? ( x11-libs/libX11
+		x11-libs/libXt
+		gtk? ( x11-libs/gtk+:2 )
+		sdl? ( >=media-libs/libsdl-1.2.7-r3
+			sdlgfx? ( media-libs/sdl-gfx )
+		)
+	 )"
+
+DEPEND="${RDEPEND}
+	mmx? ( dev-lang/nasm )
+	>=sys-apps/sed-4
+	sys-apps/gawk
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${P/_rc*}"
+
+pkg_pretend() {
+	if has_version ">=sys-kernel/linux-headers-2.6.38" && use v4l; then
+		ewarn "Current versions of mjpegtools only support V4L1 which is not available"
+		ewarn "for kernels versions 2.6.38 and above. V4L1 will be disabled."
+	fi
+}
+
+# Avoid execution of linux-info_pkg_setup()
+pkg_setup() { : ; }
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sdlgfx-automagic.patch
+	eautoreconf
+	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+src_configure() {
+	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
+
+	econf \
+		--enable-compile-warnings \
+		$(use_enable mmx simd-accel) \
+		$(use_enable static-libs static) \
+		--enable-largefile \
+		$(use_with quicktime libquicktime) \
+		$(use_with dv libdv) \
+		$(use_with png libpng) \
+		$(use_with dga) \
+		$(use_with gtk) \
+		$(use_with sdl libsdl) \
+		$(use_with sdlgfx) \
+		$(use_with v4l) \
+		$(use_with X x)
+}
+
+src_install() {
+	default
+
+	dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
+
+	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}