Fix -ljpeg linking (#515014 by Patrick Lauer and Toralf Förster), drop old

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 58 insertions, 112 deletions

diff --git a/media-plugins/gst-plugins-gl/ChangeLog b/media-plugins/gst-plugins-gl/ChangeLog
index 7fb07d5ab53c..0f31cc849904 100644
--- a/media-plugins/gst-plugins-gl/ChangeLog
+++ b/media-plugins/gst-plugins-gl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/gst-plugins-gl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gl/ChangeLog,v 1.13 2014/07/23 15:21:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gl/ChangeLog,v 1.14 2014/12/19 09:21:42 pacho Exp $
+
+  19 Dec 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/gst-plugins-gl-0.10.3-jpeg-check.patch, -gst-plugins-gl-0.10.2.ebuild,
+  -gst-plugins-gl-0.10.3.ebuild, gst-plugins-gl-0.10.3-r1.ebuild:
+  Fix -ljpeg linking (#515014 by Patrick Lauer and Toralf Förster), drop old
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org>
   gst-plugins-gl-0.10.3-r1.ebuild:
diff --git a/media-plugins/gst-plugins-gl/Manifest b/media-plugins/gst-plugins-gl/Manifest
index 9cff67ce05e1..b351bb67b0c6 100644
--- a/media-plugins/gst-plugins-gl/Manifest
+++ b/media-plugins/gst-plugins-gl/Manifest
@@ -1,27 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gst-plugins-gl-0.10.2.tar.bz2 700006 SHA256 d6913c3d3ee51d685ead94a069c6b370a0f8229bf6642c10a2980545adc2c364 SHA512 3b06663214cfd802242f63054da3ad621f57c41eaa1b89c7ddde2633650b4eed806cf2470f5d5e8d5b7d5fbacec1044ab71d4618831d51899b7dd746d148ccfc WHIRLPOOL 87e67ad6e3cf9faae2fdd67d8aacfaef446986436efd84c0b88354207119267087cbb47a4efb7dad8b725dd94c66b830237262f4059c43d05fb8d16e52b77fb9
+AUX gst-plugins-gl-0.10.3-jpeg-check.patch 1116 SHA256 bc2604b7e9873a85554ec8dfa73bedce7b61c09cc1030fbaeeceb00db6ef66f8 SHA512 a55bc8bee308aff0b4c823dd551733aa511fc678b6911dc498720ff58562495b0af5027ea5f54e0587fd6a08d49dfad99821486aa70570dd89348848d16eb8bd WHIRLPOOL 0d4e7ff1ed44374b5a34aa856964314333000d836e5c7227b34bd3de339307ab024ee92605268403323fca3a28bd8d53dec62d8a45c64450fd52825711c231ac
 DIST gst-plugins-gl-0.10.3.tar.gz 1005557 SHA256 689be7a6ddbe2db4648ad7a7aaa8fa667ff98c66710a806e6a80fa98a69b1ce9 SHA512 d42bc537ee94aab2c794a1886c17cc7eb41b89995a086da9a1f53f909f2bb93e95e940d397627589c2e2edd8d4b074736fab70fafda6e26105bb078a3ed7725a WHIRLPOOL 7a62c642cb4b8e14e02f9361a5dea7f842f0eb573c4e6e29cecd7bf96931d12df95a4de2aa90985f975f73ee12feef886ce946ad044b5190fe947b523a4a8f88
-EBUILD gst-plugins-gl-0.10.2.ebuild 1148 SHA256 35299d5b8f75d05e2c50a35b538dce8d4ee6376832fe97a0f73c0d28d2c18ffa SHA512 543c596b72a535fa3c60874417fa5051be4b360a1562a538b7f192d6c01c7aec35799bd15414a4fd404c87bdc25e641c671af2a8262801688d0a9dd419ba9702 WHIRLPOOL 0bed73bc7c227542601593d877741730b05dbd14925436f274c2388212278e243136a07923bdd5b19000dce3a24b484fd4e0c2f902d4835f2b8dbceb102d3621
-EBUILD gst-plugins-gl-0.10.3-r1.ebuild 1394 SHA256 eab7d30272ec0c5d64eca2f1f8eb9f2855a7660526e66895de424d4360d271db SHA512 d35659d6c743b9fc2d879b46a76e230513acf4cbef3648aa275a5165f0f11563a958c7b14f793df1308b33f76707e8384edf0323cbb0773a6fc38e0c4e19b49b WHIRLPOOL 15073f3a1327d3c7957191646edf2ed97bee1ff8ee02184d3b54024b53b613748e438b7612721d3b951e128df2e3d071e13154ba3871d3b2b980feb016a73472
-EBUILD gst-plugins-gl-0.10.3.ebuild 991 SHA256 ee4dc0f274186c350b15678cb8afe45d4765ac2b0b4b740c1f7944924777279a SHA512 fb3be432a11abc327498fd5bd4726ad30a6145a5d54448f76ebc8ef21d490aba2beb00625fb84304f1d200d4d351a9ffc796ade4d57c842aba0f91f69a654166 WHIRLPOOL c8608f41350376a30acf6259cf131a72f52498b1930651aae111734281799ab5d9b481d58aa8879d747fa72d75899646fcd27d606630cfc59baa713c67ce7263
-MISC ChangeLog 2138 SHA256 99f853c82c0eed0b8fed4c95daedbe91772199fc8e2ddf8d51bfaa00e7a57a1a SHA512 9d2f131615df1e6c055006a414e66643416b555ff3bc042ac2e9b06d03b3c211832a4751102f8f84ee88fb0ba62bee04f7960cc1fd367297aafb7d958d4adb3d WHIRLPOOL 24dd651dd7e6ece2e36e2737354181a04e7b50ba0f25c313c120ef82cc406c110fb3c7ae502838ebcc814fe02448b2c64f1057c998459c6af37f369232c49178
+EBUILD gst-plugins-gl-0.10.3-r1.ebuild 1576 SHA256 082367c444d08919c80a918dd324f660d8e10445316bfd31886e562da36fbeb3 SHA512 e0a654bb7cc59fea66009de18d4961f81b81ab32cf280d685a502921ba54a3495800c155f3db8fdfbb825daa759b4791ac8eb9028eed160337d0aa4638da9856 WHIRLPOOL 34072f7800c39b36bd0a17dd7d245057a84f1c868fbf1dfaaebb60c1929104bcd949dbf590a5e7cf0fd841f060e621c08694e35feeaf9bd246bedc5d111c2b51
+MISC ChangeLog 2411 SHA256 e63520b6eb4c963ec47d4fb9d22e9a11ffb02f989d4f9623f4b34625d03bd535 SHA512 fca03fef9acf13ed2170250ccb54e4597c3fe1141efa49bdfd2cf7d523c9a158bd542e6abd4d9acc4ad2c6d643b520f4069d82e4f81b68273f3fcbb311764a4a WHIRLPOOL b740d7ce42005e727775e2e7e12c98b70cb72c78196866b14a864ca3b3f9713ea8650fd7c0a72e3908baeef3903847a9b82ac347d33ddcc1e68cfec188ddb5a7
 MISC metadata.xml 278 SHA256 2cf406831db5f5b87bcfb43ab8d7726a63bca7975d99c6e01daa520aeaad7c92 SHA512 6ce1aba219a3705edf09d951f90578792848368841225450945f1998e826d4aabbaa9dc5c69b83d8b6ed16704eaa841e8857e7caf29f98d8a378d01b4e587fab WHIRLPOOL 3d47ce07a18bf7f4c183ce464f01880c32caed52be7b62cdf2dfaebf3f9bb4a59e742d170021884af77cdecac252a5a7ef613b01915d8395d5db63fb4f47ae7d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9LmAAoJELp701BxlEWfCU4P/1Sj30wTHgxzRezLcf8QyjZh
-/EHYnkQQALiQMzkyT4Yg/XLkwaEtrrDUMJR8AQPy23Qibl+tePs0By2zAr9NwnF4
-GfvQbD337EMHRkziBdPcVYmXKOAl0n+JzSl6UC0ffudxsX6Ys0dTMRXkngviP0Uh
-E/+q6kkO8vPuh5LST5vQgB1IvU33A4wAvWnkswz3qrbna2+nxMPFj5+bDk3v1Nlu
-XHZk7UTqSJVntsZsCRApbOyyWCIZw0WfKhA/DEXHoy/0Mj0mHpYd/McUtQVW8lAv
-oi3LSIhEE4qeBx5j8v6aL1DcGF55AQYHJoLaVlxrbbiZvcLjc7SZePwYbZFUWLbU
-sFazFcA1mkePBhdfazFOKDDGUe/il7SiFBpUle0TaTwmtTox5Be+xpRvjqrxMQHb
-xYYEse9UxNTWdxqD3AH6XegCqaIj7qzfxpdy7cWomTU0HAuY20+1/VnRI3ca6iW6
-p/YunjbcBMVCd7TqNBUIC/sk2iBPjs2am4g4NE2CFhwPA2g3Jgnc23R1wvtEwRxi
-4IED49dzCRO+8+WTztRC9Kazepk4KMg15CrabbLJOh6/M6IXtIco/18ZAWV6pja9
-9aXF1V7Xc81zDh39OXCCr4vZnkBTGqm2zCAUT/L8UJmGZ5+wo0j5oI9V2hX612dL
-Q5kqq64O0HkhmvfilPjv
-=M3MB
+iEYEAREIAAYFAlST7icACgkQCaWpQKGI+9TwPACcCYfeai+MPTt/UOfrKXAVnCgP
+OCsAnigFjD5GVSk5yMIFiUlPhYnAkuwi
+=gExP
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-gl/files/gst-plugins-gl-0.10.3-jpeg-check.patch b/media-plugins/gst-plugins-gl/files/gst-plugins-gl-0.10.3-jpeg-check.patch
new file mode 100644
index 000000000000..6092d3a1e980
--- /dev/null
+++ b/media-plugins/gst-plugins-gl/files/gst-plugins-gl-0.10.3-jpeg-check.patch
@@ -0,0 +1,37 @@
+From d970fc512ecef1b78418156dba34cf6e77e41f94 Mon Sep 17 00:00:00 2001
+From: Alessandro Decina <alessandro.d@gmail.com>
+Date: Sat, 28 Dec 2013 15:10:09 +0100
+Subject: configure: fix libjpeg check
+
+We were setting HAVE_JPEG=no JPEG_LIBS=-ljpeg if libjpeg wasn't found. Unset
+JPEG_LIBS too so that linking doesn't fail.
+
+diff --git a/configure.ac b/configure.ac
+index 6ccb1aa..c4e8e9d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -862,12 +862,18 @@ AC_CHECK_LIB(jpeg-mmx, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
+ JPEG_LIBS="$LIBS -ljpeg-mmx"
+ LIBS="$OLD_LIBS"
+ if test x$HAVE_JPEG != xyes; then
+-  AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
+   JPEG_LIBS="-ljpeg"
+-  AC_DEFINE(HAVE_JPEG, [1] , [Use libjpeg])
++  AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
++fi
++
++if test x$HAVE_JPEG = xyes; then
++  AC_DEFINE(HAVE_JPEG, [1], [Use libjpeg])
++else
++  AC_DEFINE(HAVE_JPEG, [0], [Use libjpeg])
++  JPEG_LIBS=
+ fi
+-AC_SUBST(HAVE_JPEG)
+ AC_SUBST(JPEG_LIBS)
++AC_SUBST(HAVE_JPEG)
+ AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes")
+ 
+ 
+-- 
+cgit v0.10.2
+
diff --git a/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.2.ebuild b/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.2.ebuild
deleted file mode 100644
index 4e232b8898e4..000000000000
--- a/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.2.ebuild,v 1.4 2013/09/01 17:20:36 eva Exp $
-
-EAPI=2
-
-DESCRIPTION="GStreamer OpenGL plugins"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=media-libs/glew-1.5
-	>=media-libs/libpng-1.4
-	>=media-libs/gstreamer-0.10.28:0.10
-	>=media-libs/gst-plugins-base-0.10.28:0.10
-	virtual/glu
-	virtual/opengl
-	x11-libs/libSM
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--disable-examples \
-		--disable-valgrind \
-		--with-package-origin="http://packages.gentoo.org/package/media-plugins/gst-plugins-gl" \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README RELEASE TODO
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.3-r1.ebuild b/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.3-r1.ebuild
index 1278867a7936..cf6bad3be37d 100644
--- a/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.3-r1.ebuild
+++ b/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.3-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.3-r1.ebuild,v 1.4 2014/07/23 15:21:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.3-r1.ebuild,v 1.5 2014/12/19 09:21:42 pacho Exp $
 
 EAPI="5"
 GST_TARBALL_SUFFIX="gz"
 
-inherit gstreamer
+inherit autotools eutils gstreamer
 
 DESCRIPTION="GStreamer OpenGL plugins"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
@@ -21,6 +21,7 @@ RDEPEND="
 	>=media-libs/gstreamer-0.10.36-r2:0.10[${MULTILIB_USEDEP}]
 	>=media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
 	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	virtual/jpeg:0[${MULTILIB_USEDEP}]
 	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 	>=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
 	libvisual? ( >=media-libs/libvisual-0.4.0-r3[${MULTILIB_USEDEP}] )
@@ -32,6 +33,12 @@ DEPEND="${RDEPEND}
 # FIXME: some deal with gst-plugin-scanner
 RESTRICT=test
 
+src_prepare() {
+	# Fix linking, bug 515014 (from 'master')
+	epatch "${FILESDIR}/${PN}-0.10.3-jpeg-check.patch"
+	eautoreconf
+}
+
 # FIXME: add support for libvisual
 multilib_src_configure() {
 	gstreamer_multilib_src_configure \
diff --git a/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.3.ebuild b/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.3.ebuild
deleted file mode 100644
index 6a004bac31d9..000000000000
--- a/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.3.ebuild,v 1.5 2013/10/11 05:18:31 ago Exp $
-
-EAPI="5"
-GST_TARBALL_SUFFIX="gz"
-
-inherit gst-plugins10
-
-DESCRIPTION="GStreamer OpenGL plugins"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libvisual"
-
-RDEPEND="
-	>=media-libs/glew-1.5
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/gstreamer-0.10.35:0.10
-	>=media-libs/gst-plugins-base-0.10.35:0.10
-	virtual/glu
-	virtual/opengl
-	x11-libs/libSM
-	libvisual? ( >=media-libs/libvisual-0.4 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.3
-"
-
-# FIXME: add support for libvisual
-src_configure() {
-	gst-plugins10_src_configure \
-		--disable-examples \
-		--disable-static \
-		--disable-valgrind \
-		$(use_enable libvisual)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}