Enable multilib support. Fix build with multilib SDL.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

3 files changed, 141 insertions, 1 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index d3360b9fa7f1..2408175f2c67 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.216 2014/03/24 17:15:55 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.217 2014/06/10 18:08:25 mgorny Exp $
+
+*mjpegtools-2.1.0-r2 (10 Jun 2014)
+
+  10 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  +files/mjpegtools-2.1.0-sdl-cflags.patch, +mjpegtools-2.1.0-r2.ebuild:
+  Enable multilib support. Fix build with multilib SDL.
 
   24 Mar 2014; Daniel Pielmeier <billie@gentoo.org> -mjpegtools-2.1.0.ebuild,
   -files/mjpegtools-2.0.0-gcc470.patch,
diff --git a/media-video/mjpegtools/files/mjpegtools-2.1.0-sdl-cflags.patch b/media-video/mjpegtools/files/mjpegtools-2.1.0-sdl-cflags.patch
new file mode 100644
index 000000000000..3bb7563caaa3
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-2.1.0-sdl-cflags.patch
@@ -0,0 +1,11 @@
+diff a/y4mutils/Makefile.am b/y4mutils/Makefile.am
+--- a/y4mutils/Makefile.am
++++ b/y4mutils/Makefile.am
+@@ -44,6 +44,7 @@ y4mspatialfilter_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
+ 
+ y4mhist_SOURCES = y4mhist.c
+ y4mhist_LDADD = $(SDL_LIBS) $(SDLgfx_LIBS) $(LIBMJPEGUTILS)
++y4mhist_CPPFLAGS = $(AM_CPPFLAGS) $(SDL_CFLAGS)
+ 
+ y4mblack_SOURCES = y4mblack.c
+ y4mblack_LDADD = $(LIBMJPEGUTILS)
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..cf90acf38de3
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild,v 1.1 2014/06/10 18:08:24 mgorny Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Tools for MJPEG video"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="dv gtk mmx png quicktime sdl sdlgfx static-libs v4l"
+REQUIRED_USE="sdlgfx? ( sdl )"
+
+RDEPEND="virtual/jpeg[${MULTILIB_USEDEP}]
+	quicktime? ( media-libs/libquicktime[${MULTILIB_USEDEP}] )
+	dv? ( >=media-libs/libdv-0.99[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0= )
+	gtk? ( x11-libs/gtk+:2 )
+	sdl? ( >=media-libs/libsdl-1.2.7-r3[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		sdlgfx? ( media-libs/sdl-gfx )
+	 )"
+
+DEPEND="${RDEPEND}
+	mmx? ( dev-lang/nasm )
+	>=sys-apps/sed-4
+	virtual/awk
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-medialibs-20140508-r4
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+	)"
+
+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
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pic.patch
+	# https://sourceforge.net/p/mjpeg/bugs/139/
+	epatch "${FILESDIR}"/${P}-sdl-cflags.patch
+	eautoreconf
+	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+multilib_src_configure() {
+	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
+
+	local myconf=(
+		--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 sdl libsdl)
+		$(use_with v4l)
+		$(use_with sdl x)
+
+		# used by tools only
+		$(multilib_native_use_with gtk)
+		$(multilib_native_use_with png libpng)
+		$(multilib_native_use_with sdlgfx)
+
+		# used only in V4LCONF_LIBS that is not used anywhere...
+		--without-dga
+	)
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		# avoid building programs
+		emake bin_PROGRAMS=
+	fi
+}
+
+multilib_src_test() {
+	# there are no tests at the moment, so it would just build
+	# all programs in non-native ABIs...
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake DESTDIR="${D}" install \
+			bin_PROGRAMS=
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "mjpegtools installs user contributed scripts which require additional"
+		elog "dependencies not pulled in by the installation."
+		elog "These have to be installed manually."
+		elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer,"
+		elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python."
+	fi
+}