Fix bug #436208. Thanks to Rafał Mużyło for the report.

(Portage version: 2.1.11.9/cvs/Linux i686)

3 files changed, 107 insertions, 1 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index f6cf74869fbc..609447619ce4 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.179 2012/09/13 18:46:41 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.180 2012/09/28 17:24:38 billie Exp $
+
+*mjpegtools-2.0.0-r3 (28 Sep 2012)
+
+  28 Sep 2012; Daniel Pielmeier <billie@gentoo.org>
+  +mjpegtools-2.0.0-r3.ebuild,
+  +files/mjpegtools-2.0.0-stream-params-include.patch:
+  Fix bug #436208. Thanks to Rafał Mużyło for the report.
 
   13 Sep 2012; Daniel Pielmeier <billie@gentoo.org>
   -mjpegtools-2.0.0-r1.ebuild:
diff --git a/media-video/mjpegtools/files/mjpegtools-2.0.0-stream-params-include.patch b/media-video/mjpegtools/files/mjpegtools-2.0.0-stream-params-include.patch
new file mode 100644
index 000000000000..0e83633ce926
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-2.0.0-stream-params-include.patch
@@ -0,0 +1,15 @@
+--- mplex/stream_params.hpp	2010/03/13 13:05:07	1.6
++++ mplex/stream_params.hpp	2011/06/11 14:28:39	1.7
+@@ -19,11 +19,10 @@
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  */
+-
++
+ #ifndef __STREAM_PARAMS_HH__
+ #define __STREAM_PARAMS_HH__
+ 
+-#include <config.h>
+ #include <mjpeg_types.h>
+ class LpcmParams
+ {
diff --git a/media-video/mjpegtools/mjpegtools-2.0.0-r3.ebuild b/media-video/mjpegtools/mjpegtools-2.0.0-r3.ebuild
new file mode 100644
index 000000000000..a3538e94fa55
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.0.0-r3.ebuild
@@ -0,0 +1,84 @@
+# 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-r3.ebuild,v 1.1 2012/09/28 17:24:38 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 ~amd64-fbsd"
+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
+	virtual/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 kernel 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
+	epatch "${FILESDIR}"/${P}-stream-params-include.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"
+}