Add patch to fix building with gcc-4.7. Thanks to Branko BAdrljica in bug #409197.

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

4 files changed, 109 insertions, 6 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index e148f760362e..9dab14b80372 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.168 2011/10/23 18:02:04 billie Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.169 2012/04/08 11:33:36 billie Exp $
+
+*mjpegtools-2.0.0-r2 (08 Apr 2012)
+
+  08 Apr 2012; Daniel Pielmeier <billie@gentoo.org>
+  +mjpegtools-2.0.0-r2.ebuild, +files/mjpegtools-2.0.0-gcc470.patch:
+  Add patch to fix building with gcc-4.7. Thanks to Branko BAdrljica in bug
+  #409197.
 
   23 Oct 2011; Daniel Pielmeier <billie@gentoo.org> mjpegtools-2.0.0-r1.ebuild:
   Remove USE="X" as per bug 387537. Thanks to Ulrich Müller for the report.
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 14149e9301d4..fb648c88b8f8 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX mjpegtools-2.0.0-gcc470.patch 253 RMD160 ca37964113acbee089beee2565b32c2bb1c83839 SHA1 6b1326fb54e566b1bcd6fde5f34ef68bf748ae40 SHA256 5852687afff431b26fc1832fb32098ad7900fce52accc5c46d90bc19e98a8e85
 AUX mjpegtools-2.0.0-sdlgfx-automagic.patch 1620 RMD160 1eb27563b08e2f6f2e3fc014865119914a419bb2 SHA1 12043ae95416c173ee413fa774c0c6a3c69ee9ff SHA256 11f914d0f17700b8e02a4bca447fc44c7b8b73e1bef7358057ff25a0155afbd6
 DIST mjpegtools-2.0.0.tar.gz 1749671 RMD160 454e23bedb2bd592912a546d0621b5c3662c3bb2 SHA1 f411e8573d446711dbe8455a6ae9257e1afe1e70 SHA256 bf3541593e71602f7b440c2e7d81b433f53d0511e74642f35bea9b3feded7a97
 EBUILD mjpegtools-2.0.0-r1.ebuild 2046 RMD160 80011ef33e31e4f015d53945183f26d519af51e6 SHA1 0e496a5b736357c0eebee33039ece1cca3ac0cba SHA256 5bd04e641c06b5e2c99b89a1b4c90bff37373b28c125bb23539c1cf1616b676c
-MISC ChangeLog 29729 RMD160 e1c935822c3e6cb7270baef7b10e133ed04b3630 SHA1 b3b049e69dc07a03620d089a520acdee74af4515 SHA256 fa69e398ccf806ba21d46f316ce939bc61ad25c16d728e597323f807badb6ecb
+EBUILD mjpegtools-2.0.0-r2.ebuild 2093 RMD160 fa989df037ac508c47825803d65f0f8266509ed2 SHA1 fdcf9f0e9e1428395bedc4091c57b1d138750717 SHA256 185cb09bf2bfaee3291670d71301ebb0251051b8c21be4287353c6c570fba285
+MISC ChangeLog 29974 RMD160 64ee5278758796e4a4609d6e6b4b5ac4ab712a55 SHA1 3ef9390276e5f3f54583f9bd911ca90c3c6f652c SHA256 69bcaa797faf932db46b74212a7de1bebe937a5fff2f1365b5a00d9eaa691930
 MISC metadata.xml 372 RMD160 2fbc8c72d04adbfabfa9c6d2f63f9861c9b07ed2 SHA1 343eb2adf749af0ea042f9d6f005155998034b19 SHA256 1a22854e4e0449f6e855f21962f4af646a81eeb7cfa0de905c87ffb52a7081b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk6kVq4ACgkQlcuUeyFa0U1nwgCeJMU5pkiNmUwpMqXCnWd76C14
-9aYAn1QuheeFAuohJsmex+0CsotsPSDf
-=V3eH
+iEYEAREIAAYFAk+Bd5sACgkQlcuUeyFa0U2ZnwCeIzQBNsmLc1vZgNzvYWPmaJbT
+kRAAnRdFtHmDbTyAYDuhrA0EW7TDEGaO
+=xj/R
 -----END PGP SIGNATURE-----
diff --git a/media-video/mjpegtools/files/mjpegtools-2.0.0-gcc470.patch b/media-video/mjpegtools/files/mjpegtools-2.0.0-gcc470.patch
new file mode 100644
index 000000000000..050b33febb68
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-2.0.0-gcc470.patch
@@ -0,0 +1,11 @@
+--- a/y4mdenoise/MotionSearcher.hh
++++ b/y4mdenoise/MotionSearcher.hh
+@@ -2196,7 +2196,7 @@
+ 	{
+ 		// This region is too small to be bothered with.
+ 		// Just get rid of it.
+-		DeleteRegion (a_pRegion);
++		this->DeleteRegion (a_pRegion);
+ 	}
+ 	else
+ 	{
diff --git a/media-video/mjpegtools/mjpegtools-2.0.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..d3e17a8cf38b
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.0.0-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/04/08 11:33:36 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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dga dv gtk mmx png quicktime sdl sdlgfx static-libs v4l"
+REQUIRED_USE="sdlgfx? ( sdl )"
+
+RDEPEND="virtual/jpeg
+	quicktime? ( media-libs/libquicktime )
+	dv? ( >=media-libs/libdv-0.99 )
+	png? ( media-libs/libpng )
+	dga? ( x11-libs/libXxf86dga )
+	gtk? ( x11-libs/gtk+:2 )
+	sdl? ( >=media-libs/libsdl-1.2.7-r3
+		x11-libs/libX11
+		x11-libs/libXt
+		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
+	epatch "${FILESDIR}"/${P}-gcc470.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 sdl x)
+}
+
+src_install() {
+	default
+
+	dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
+
+	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}