Disable -fno_PIC. This fixes bug #267829. Thanks to a_tevelev for the report.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D

4 files changed, 167 insertions, 5 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 3d83506479b0..c8a6531d422d 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.199 2013/11/18 10:57:03 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.200 2013/11/30 14:47:02 billie Exp $
+
+*mjpegtools-2.1.0-r1 (30 Nov 2013)
+
+  30 Nov 2013; Daniel Pielmeier <billie@gentoo.org>
+  +mjpegtools-2.1.0-r1.ebuild, +files/mjpegtools-2.1.0-pic.patch:
+  Disable -fno_PIC. This fixes bug #267829. Thanks to a_tevelev for the report.
 
   18 Nov 2013; Tony Vroon <chainsaw@gentoo.org> mjpegtools-2.1.0.ebuild:
   Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 24ca5e6184f9..6afdeec8e2a8 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -4,16 +4,18 @@ Hash: SHA256
 AUX mjpegtools-2.0.0-gcc470.patch 253 SHA256 5852687afff431b26fc1832fb32098ad7900fce52accc5c46d90bc19e98a8e85 SHA512 ac66736dc7cf3bf585770d2b7d725a134ccaf1212e14194a0038c3b68986d8af1d7001333bd730f709dc59a0e8b41ffe00386bead580d39eb1b6fba12c301294 WHIRLPOOL 5f4fe9b0baf431fa97a33aed806e74903e91d60e270af8eef7d3ceb8182de6647efd6396d92fde3dac1a623b7247ea763af5f22066e32b2bfd67bbba283ffeab
 AUX mjpegtools-2.0.0-sdlgfx-automagic.patch 1620 SHA256 11f914d0f17700b8e02a4bca447fc44c7b8b73e1bef7358057ff25a0155afbd6 SHA512 e20e478c0c1e058369f1a4b19a62e16586f67a0ffb69c8c3d42a23c66469e169697a9d7e5147c191e3532c1f61cc54b8b282682e7da5ab444636b7a39b524d7a WHIRLPOOL d5c8d754017e1798dd4a55855388b0cb0724b3f9ad53c6a969bcbfa49eb941ebb4b273f16ea0a97323a2625454cf282b9b5bec8899cd2e3d3830fd6ad5efc6d2
 AUX mjpegtools-2.0.0-stream-params-include.patch 410 SHA256 ad4e939f0b43568c4a4507e57ded540da3656683db9d58227df09d2d8c39de58 SHA512 4de9fec8e7339f7b1c3a3de3ada976540a03fa2d82cba019fd5df7206a2f939465b683a292ca40b7abe44ee29a02a8be619cff6a640e11becda12dc1ad43e599 WHIRLPOOL 0bc1f8178b72900976dad74360169496ec3cdbc369d3745086ca2df3b2b3341f9f13e419dfd217b905778668d30492fd609c4d0404ba856735b3ec8efa2d8a4a
+AUX mjpegtools-2.1.0-pic.patch 2282 SHA256 1b8c08c993d01838b6fe04094c00fd07220ae543c8f115c79ffaae32edc8c5c2 SHA512 3ad9d0b488a4fcc29fab8c0cc8322d99e63c755234c02a7fe7ad7efa974f67871460f43db05ca8097c358fdf7aafcc852967959a2abc83460c258aa38a448e28 WHIRLPOOL 6986af27769fa540706e7dd575b6d42f9a5c5e817929db2c08de2842d32c9cb361f97ecadc0b00bb37563a0be12727e4e4c6719b2dacfe3a684949589314c05a
 DIST mjpegtools-2.0.0.tar.gz 1749671 SHA256 bf3541593e71602f7b440c2e7d81b433f53d0511e74642f35bea9b3feded7a97 SHA512 1b666293f55b10869e959305d9b3b2ab0388292498f49ba791439ae167f1d8c8921457e0e5312b74d53f61a68fc13da0222f1f83aced5fe5b04768be0cce07ad WHIRLPOOL df385ee5df0275a82b3fc9662d60d5bf10216b5cafe2d433902884476df2edaf46ec59d8129228e03d45cb74b3bd579002068af1ce243e4a14892dd7a51a9757
 DIST mjpegtools-2.1.0.tar.gz 1844336 SHA256 864f143d7686377f8ab94d91283c696ebd906bf256b2eacc7e9fb4dddcedc407 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5 WHIRLPOOL e2e869a328e95dab22331ea1f03a669553ee01682a8e76d27d33da8b1cda46e042d252ff2b1974d08b2109ab1a664f4d5247ee92d7846876d496c7e63b472af9
 EBUILD mjpegtools-2.0.0-r3.ebuild 2605 SHA256 4288f3afb6a0d6122d53a0e7336f871341cd1597ac9e38cd11f8aa483ad3b603 SHA512 46fb79f0a1e52b000978e05834db7496f22bfdff794cfe084767519676a651e98c200d3885d23aebde89800d4dff6308e5bba018738c2fef3cb1912fcae5eea9 WHIRLPOOL 84e91546cca61c6239066a90d9037edf0c6e084a8636509ad1a7736c26feff805210641a8b363aa2eb3c2376b6457e0421e68031e8870c5217b6e0de77c4d3a9
+EBUILD mjpegtools-2.1.0-r1.ebuild 2368 SHA256 4405e5040bdd19b3f3c4982aaf8a08c6272c0d68a0ab49837e76156d4c9d1892 SHA512 79ea6e221953653f9e6d501699fe99a70ffc08fafb583a2d55cdae3f29fbe10c4e22c259282cf725ad57f2100038711a13bdeb0566d67335ae007901e6d2fcc3 WHIRLPOOL 0ac64fd6afa1ac9348ac0e4edf7be80a211b894d1f1333ab711a52e3cdf04e0014edcbbf092263fd7dee56c16d7dd3340c780032ea65a8c37505f0e56cdf1c2e
 EBUILD mjpegtools-2.1.0.ebuild 2298 SHA256 d2a00a19025f350d0bf3153223d0607e152a0a60976515a013200bd09e31c250 SHA512 2978b38a7f620018b5e0100f17a0a488d22f99534990477ba249f4fd4f90405222c8af72597ce4cc1c25787909c3bf9cbf7eb407cdc20b8a6db099eef0ddfc7e WHIRLPOOL 4ec3752daff35e4263640113be9b8fb99d82a4f41573b07f3897658d07bb16703fadbdf027226bd99dc40d83bb25976fc0b18529a13da588b7281bf11f2b2ce4
-MISC ChangeLog 33924 SHA256 728c0158695d88df9f25c07d53f85abe42eaf6a0db010973835db9ab35bae338 SHA512 8c3bc97aa9a177a836639ddffde095d1bfc999c9d81f1857162898892ac7633d927ed4c977f0c896b6d33295b8b8d893ee5c23cdc427520e249cadceda8b62dc WHIRLPOOL 645ee02a536ce0a91c36d08fe7b0e6cec139f336c5fdb1405fd4f20fe722a294bf675afb886c07172adfb66e0c67b943ca7203dcb26eee69e3df50489789f69e
+MISC ChangeLog 34157 SHA256 3f7185ea9d235a13487c5effc502006815fed6d249bccb1ebb82e0a12ac8eaaf SHA512 6f53b251c38ab119f0d35a89ca298fba516935e7f371eae847c9aa60028eecdd94a5aea7e53a198c270e5e63a99b333daf75c61095c3ec4277aaffd8b7b8aa39 WHIRLPOOL 0f5a6835c63f2e7d7be89ef118658d8b38fdb611552722919a3bfde291df8263fa886f2e51af14f211179dfbeafff4c159f127b3dbb3b1e46ea8bc995addf6f0
 MISC metadata.xml 372 SHA256 1a22854e4e0449f6e855f21962f4af646a81eeb7cfa0de905c87ffb52a7081b7 SHA512 a1b0beff78a45667fb4095c203c59c0a63f262ac486b98858f7432fe1f4295f51e9c59c056149c1408e413c5e975abb41b971d1036179ecdea48772a04a5b222 WHIRLPOOL 90544f87533aaf15dba62efcea8ebf4039f29e6e3fef86a5a6907e2245c1f443132f967d65a6651393ad3e64ecedc1b0b73365662d2e770cb74f3abe1fa09b7f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKJ8noACgkQp5vW4rUFj5o82QCcDCdw0Vt9gZCrLKx0qvFboyV8
-lhcAn02+/NO6Y2Dfx+Eqd+kCad9CAeiu
-=+H3B
+iEYEAREIAAYFAlKZ+mwACgkQlcuUeyFa0U0rwQCgkJqTanluhwKzDCfHJnTf5pcT
+QH4AoLMiE/lZ2euJwrFQOr7Zf0QOL0cl
+=lPNj
 -----END PGP SIGNATURE-----
diff --git a/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch b/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch
new file mode 100644
index 000000000000..7d0d1b60c017
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch
@@ -0,0 +1,69 @@
+Index: y4mdenoise/Makefile.am
+===================================================================
+RCS file: /cvsroot/mjpeg/mjpeg_play/y4mdenoise/Makefile.am,v
+retrieving revision 1.12
+retrieving revision 1.13
+diff -u -r1.12 -r1.13
+--- y4mdenoise/Makefile.am	1 Apr 2012 08:44:49 -0000	1.12
++++ y4mdenoise/Makefile.am	28 Nov 2013 22:39:41 -0000	1.13
+@@ -4,8 +4,8 @@
+ 
+ EXTRA_DIST = implementation.html
+ 
+-AM_CFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
+-AM_CXXFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
++AM_CFLAGS = -DNDEBUG -finline-functions
++AM_CXXFLAGS = -DNDEBUG -finline-functions
+ 
+ INCLUDES =  -I$(top_srcdir) -I$(top_srcdir)/utils
+ 
+Index: y4munsharp/Makefile.am
+===================================================================
+RCS file: /cvsroot/mjpeg/mjpeg_play/y4munsharp/Makefile.am,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- y4munsharp/Makefile.am	16 Jun 2005 17:09:38 -0000	1.2
++++ y4munsharp/Makefile.am	28 Nov 2013 22:39:41 -0000	1.3
+@@ -4,7 +4,7 @@
+ 
+ INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir)
+ 
+-y4munharp_CFLAGS=@PROGRAM_NOPIC@
++y4munharp_CFLAGS=
+ 
+ bin_PROGRAMS = y4munsharp
+ 
+Index: y4mutils/Makefile.am
+===================================================================
+RCS file: /cvsroot/mjpeg/mjpeg_play/y4mutils/Makefile.am,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -r1.7 -r1.8
+--- y4mutils/Makefile.am	1 Apr 2012 08:44:49 -0000	1.7
++++ y4mutils/Makefile.am	28 Nov 2013 22:39:41 -0000	1.8
+@@ -2,7 +2,7 @@
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+ 
+-AM_CFLAGS   = @PROGRAM_NOPIC@
++AM_CFLAGS   =
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils
+ 
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+Index: yuvscaler/Makefile.am
+===================================================================
+RCS file: /cvsroot/mjpeg/mjpeg_play/yuvscaler/Makefile.am,v
+retrieving revision 1.5
+retrieving revision 1.6
+diff -u -r1.5 -r1.6
+--- yuvscaler/Makefile.am	1 Apr 2012 08:44:49 -0000	1.5
++++ yuvscaler/Makefile.am	28 Nov 2013 22:39:41 -0000	1.6
+@@ -18,6 +18,6 @@
+ 
+ EXTRA_DIST = yuvscaler_implementation.txt
+ 
+-yuvscaler_CFLAGS=@PROGRAM_NOPIC@
++yuvscaler_CFLAGS=
+ yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c
+ yuvscaler_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..2c2fd3b0f5dd
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/11/30 14:47:03 billie Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic 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="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:0= )
+	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
+	virtual/awk
+	virtual/pkgconfig"
+
+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
+	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"
+}
+
+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
+}