Enable multilib support. Fix build with multilib SDL.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 160 insertions, 6 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/Manifest b/media-video/mjpegtools/Manifest
index 30ef70d94b39..da7441d1130f 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -2,14 +2,28 @@
 Hash: SHA256
 
 AUX mjpegtools-2.1.0-pic.patch 2282 SHA256 1b8c08c993d01838b6fe04094c00fd07220ae543c8f115c79ffaae32edc8c5c2 SHA512 3ad9d0b488a4fcc29fab8c0cc8322d99e63c755234c02a7fe7ad7efa974f67871460f43db05ca8097c358fdf7aafcc852967959a2abc83460c258aa38a448e28 WHIRLPOOL 6986af27769fa540706e7dd575b6d42f9a5c5e817929db2c08de2842d32c9cb361f97ecadc0b00bb37563a0be12727e4e4c6719b2dacfe3a684949589314c05a
+AUX mjpegtools-2.1.0-sdl-cflags.patch 387 SHA256 fcba002f1f12f1fd864179f2c9971acab1bf298d9a719f74ceacc231e7232a99 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602 WHIRLPOOL 1eb9815a12d425acc8345a825258f7e71c2e362e79cf064484edc4dfdd67164f4935c1b9de44f8460e791340e315fd9a40127d1899a45a81b74c6a7a880e24c8
 DIST mjpegtools-2.1.0.tar.gz 1844336 SHA256 864f143d7686377f8ab94d91283c696ebd906bf256b2eacc7e9fb4dddcedc407 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5 WHIRLPOOL e2e869a328e95dab22331ea1f03a669553ee01682a8e76d27d33da8b1cda46e042d252ff2b1974d08b2109ab1a664f4d5247ee92d7846876d496c7e63b472af9
 EBUILD mjpegtools-2.1.0-r1.ebuild 2357 SHA256 53fc448275f7de12f4dfaa8f860415e57e5b6b0797d50f372617903ccfffb99b SHA512 78271b3f8123823c69a85405416462d64471ab1b5f8e3af95e63a619fceab89d999fea1382e7dc351fd6cdb25b7c62d9ec296d47ec1f8794634bd3e6591179fb WHIRLPOOL faebb8796997f688b3d8c8db861affccd8ce6d3d2338c661add63bc3eb93d750b64508f03f9653bfff0b9142b6618315c2f551110b228c54e55dac951704edea
-MISC ChangeLog 36048 SHA256 95be6c101ff4a2067871832131aa934d7350e6a04f7f1abcdd7a58a88bf50cd3 SHA512 113d5d9edb0654ea64bc249770baee6635532b2a29cc2c4ae5b30f2a6e3c3aa2470ea06493c7bad390486b45d4daf7069390619d416ca31a0001b9debebc3035 WHIRLPOOL dea37519c7c65ebe33d3bc62aac4764790a9c0ddf7257536f88821915708961c4d3cf887fdf9c28131fb5fba3248b0f51fc3482c662307e5ef98456da5a12ce7
+EBUILD mjpegtools-2.1.0-r2.ebuild 3255 SHA256 ba2f4ab2afb4203c225ed6cbbe4c56d37401ba341fc8fae53b638801c673ea5e SHA512 cde6c81580e5bf989cac445413e557f41e4cdb6d70ec7a8e0d2fe21584620473c972f71646375bd58bbc01646d9cf3f3f0107642401b5fd81e0a0e34028d96e8 WHIRLPOOL c2c8ad8ae5c621b0c29f4c024184978605885552e8e4e1db64a3484217d74f99ccc6bd4d754ae022abcdf527263f8fa9385ced8d09fb203f557abc7d4a6f3263
+MISC ChangeLog 36264 SHA256 96846c539a21653284679bd87d8799420d6a87ad329e1738632b27c591a49e22 SHA512 1d0f2187e5eff4aa2119b322fefbe5f149d7740539f18288ff62441c3f38c2e676beef20a62b6a938fec18564ce9591a5707e0b18f6dbdce669780c5d5d09466 WHIRLPOOL a6d0e5942a4133dd694bf45191065ae0da6fb73c81856da695b9f9990b9a4330f343440b6ec4b6c887861c1d0ee64e4821a2f8b4d0dafb9ed9ecd833144b7a1a
 MISC metadata.xml 372 SHA256 1a22854e4e0449f6e855f21962f4af646a81eeb7cfa0de905c87ffb52a7081b7 SHA512 a1b0beff78a45667fb4095c203c59c0a63f262ac486b98858f7432fe1f4295f51e9c59c056149c1408e413c5e975abb41b971d1036179ecdea48772a04a5b222 WHIRLPOOL 90544f87533aaf15dba62efcea8ebf4039f29e6e3fef86a5a6907e2245c1f443132f967d65a6651393ad3e64ecedc1b0b73365662d2e770cb74f3abe1fa09b7f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlMwaEwACgkQlcuUeyFa0U1wjQCg0yOV9OqMJ+7BYGA8rZci8e9c
-mpsAoMdCKeAOxx5OUAY5XwlOT9/XxanE
-=3tzB
+iQJ7BAEBCABmBQJTl0maXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOcCcP9ibtQnsihBTmbN9L8hNk2+n0
+XD1/OeHqjpQG7Hjw2yRqY4hei6zxU7XwC2P3zztaZXS4pzK19nOP8w0PMcm7fyiv
+0A3E48A9/LI39oGwY8WZccCDXgxbml3CXfoZV4XG0F06ZvdlqWqWS3YCZ+Edosza
+KdgwMjNE47eQwkqEW1oA1syIfppy0e1ZIgl4QICmCCHO6kwQBDcNpsC35AuG7pou
+T91KkU0tyWsLN8uBThtUWV1pxcohVxCb1u2oxGf6f1nZiSIqzDHxFSnikPtpsxXw
+23qgVBRRiSRw9IcyLxWtp1MOAHeHyg7Xgvv6+CB2t6JgNhpFiU6ogOoA1AISPoBi
+rTYXlEN/yF3wsQuNc9+nGdYbCusOQXS+IYRbhe9+KKnjpCiJnev3XbFOBhbBTrE1
+wF5blax50z4txFLKBl9qX+oUQFN4zhGX5GfE6+VMFre7YY0CpzWllSiXr5S7DxhP
+RuHDS07OuATAW6Y3gRsw45h1IZTLf0z72N7/qRcDNhTsL7gBacmM7m2Mk1UiOLKJ
+URLkAxIffhAO+qEzWRq40uKOTqKA5Th5HROFTYt85zxbnmq53ReZ+2IHoTBkb3mp
+htSU5msfoMvrFUmmQYHIToiPbzFhLJHmLJZyZVj3uX7fY9+xWyeA7p8boBxSGzYL
+J+FfAu6wUEBYBsVzXEs=
+=oW5E
 -----END PGP SIGNATURE-----
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
+}