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

(Portage version: 2.1.9.42/cvs/Linux i686)

4 files changed, 143 insertions, 1 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/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"
+}