Fixed linking with --as-needed, see bug #144656.

Package-Manager: portage-2.1.1_pre5-r3

4 files changed, 41 insertions, 13 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 6b28c476dcaa..6b228da73da7 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.116 2006/08/25 12:21:43 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.117 2006/08/25 13:45:53 zzam Exp $
+
+  25 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/mjpegtools-1.8.0-as-needed.patch, mjpegtools-1.8.0-r1.ebuild:
+  Fixed linking with --as-needed, see bug #144656.
 
   25 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
   +files/mjpegtools-1.8.0-pkg-config.patch, mjpegtools-1.8.0-r1.ebuild:
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 920b3e731757..75beebe24226 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX mjpegtools-1.8.0-as-needed.patch 900 RMD160 0066d2fd664a8e0b19d93e1f79dff3f81f424cf3 SHA1 bd2a9b24c5944a6fd1f8dbc5be9bdb966d79aa58 SHA256 00a3f3abc81e3e0b27d7bf4a5c89439bbe79e00edb6313c07659884a1ed23f92
+MD5 c50660d824d29e1b45321984e9397cb3 files/mjpegtools-1.8.0-as-needed.patch 900
+RMD160 0066d2fd664a8e0b19d93e1f79dff3f81f424cf3 files/mjpegtools-1.8.0-as-needed.patch 900
+SHA256 00a3f3abc81e3e0b27d7bf4a5c89439bbe79e00edb6313c07659884a1ed23f92 files/mjpegtools-1.8.0-as-needed.patch 900
 AUX mjpegtools-1.8.0-gcc41.patch 420 RMD160 e48e6d716f21e450cc26e7039c703005ed9a0bd9 SHA1 b1bd9604fa0eb6c8b54ee9d0836b0c61b233ffff SHA256 5e748deceb1af3179025ab42d274cc2941fe85bb0b7b512b49263a9ff6754446
 MD5 803eccd889c60a442ee23ba65951fadc files/mjpegtools-1.8.0-gcc41.patch 420
 RMD160 e48e6d716f21e450cc26e7039c703005ed9a0bd9 files/mjpegtools-1.8.0-gcc41.patch 420
@@ -18,14 +22,14 @@ MD5 d50c3cb88e659af5e2679530e645c0bf files/mjpegtools-1.8.0-pkg-config.patch 423
 RMD160 2d3d55fb7561a9c0ceeb7ce880953cb12662489c files/mjpegtools-1.8.0-pkg-config.patch 423
 SHA256 3b26122803c1ea805534308137323ee119fbc29777fa4a588ebe6dade0a8d490 files/mjpegtools-1.8.0-pkg-config.patch 423
 DIST mjpegtools-1.8.0.tar.gz 1475998 RMD160 4d97a6a721f29223975605e2a5e645b4d7d129b5 SHA1 e11d68298a64b52f98724dbf3fd14f168e140290 SHA256 d841575c72cd0e587c1bab703d0906e3d23bf428424000557739cf5d6097209a
-EBUILD mjpegtools-1.8.0-r1.ebuild 3067 RMD160 089d8f55f06bc8d5a192c172cd13dd9a17e101d5 SHA1 fac03979bac247f8080b4e569e439f11a81eebbf SHA256 45edf2af82300f5d859bb39344580c8c0bf989ece85e8a8689a3189caa045787
-MD5 f37d95e3fddc041f1eafe8cde158afca mjpegtools-1.8.0-r1.ebuild 3067
-RMD160 089d8f55f06bc8d5a192c172cd13dd9a17e101d5 mjpegtools-1.8.0-r1.ebuild 3067
-SHA256 45edf2af82300f5d859bb39344580c8c0bf989ece85e8a8689a3189caa045787 mjpegtools-1.8.0-r1.ebuild 3067
-MISC ChangeLog 20721 RMD160 2bd6ee13a89182e5dafca8fa65eb22685a82fc48 SHA1 8fb239876c911663d8bf28cada313eb733d47f8b SHA256 b2117dc38d77243fe8a1c2c53de86dd3ea8acc379ae3d71764ee2ccee9a1c798
-MD5 33264d3450a8cb3592ff7339be2f2605 ChangeLog 20721
-RMD160 2bd6ee13a89182e5dafca8fa65eb22685a82fc48 ChangeLog 20721
-SHA256 b2117dc38d77243fe8a1c2c53de86dd3ea8acc379ae3d71764ee2ccee9a1c798 ChangeLog 20721
+EBUILD mjpegtools-1.8.0-r1.ebuild 3110 RMD160 817d2b9bcc62f77a391005c8a111d6eaaa88bd0c SHA1 880348121ddb13dbaa054d30ebec7811d0a1f6ec SHA256 f6029351e669c28e85e32c66a86da97f7e4f025b06be5b254ad1366b868d8379
+MD5 155467ad63209e30d463e4e28ea15553 mjpegtools-1.8.0-r1.ebuild 3110
+RMD160 817d2b9bcc62f77a391005c8a111d6eaaa88bd0c mjpegtools-1.8.0-r1.ebuild 3110
+SHA256 f6029351e669c28e85e32c66a86da97f7e4f025b06be5b254ad1366b868d8379 mjpegtools-1.8.0-r1.ebuild 3110
+MISC ChangeLog 20897 RMD160 ac7680224473d254669f54a677ec15fe1e798516 SHA1 f04601590f75669c5307c13e3f5f2473a12b8075 SHA256 4f2ddfc0392b231c6fdd8ac524ee133c94e9c011ddf1022e1272597efaa959da
+MD5 44b17b0ecd4c5783d34eca4bc416cb28 ChangeLog 20897
+RMD160 ac7680224473d254669f54a677ec15fe1e798516 ChangeLog 20897
+SHA256 4f2ddfc0392b231c6fdd8ac524ee133c94e9c011ddf1022e1272597efaa959da ChangeLog 20897
 MISC metadata.xml 311 RMD160 5d2d2fac1a97018f75e5ff1e8e7c90fb02511cb9 SHA1 228093feb5989936d0480ac2bc543df959b06dfa SHA256 74869f2267904c0a7409e16cc0d2e54f41b186683c4f5bb6e0127b275e66b4b0
 MD5 fe49014257499366bdc6903a9aa33fe5 metadata.xml 311
 RMD160 5d2d2fac1a97018f75e5ff1e8e7c90fb02511cb9 metadata.xml 311
@@ -36,7 +40,7 @@ SHA256 21770c4dd885e9231db381f9693c0650f32cd48f0a5c4438e62338c3b75d3c97 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE7utpt2vP6XvVdOcRAm/GAKDWcOP1VYhgMtYKsH2YBMrNlj3SpgCeP8oG
-a7pHccBgCHhK+4zdstCZ370=
-=tYLq
+iD8DBQFE7v8ht2vP6XvVdOcRAouRAKC8AQ6RWxGGk0pL+vlndNvbcYTr/ACaA1uE
+2HFwVp1dRfvVEqOsf83Gm4I=
+=k7SB
 -----END PGP SIGNATURE-----
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-as-needed.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-as-needed.patch
new file mode 100644
index 000000000000..c639b3012546
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-as-needed.patch
@@ -0,0 +1,19 @@
+diff -ru mjpegtools-1.8.0-orig/lavtools/Makefile.am mjpegtools-1.8.0/lavtools/Makefile.am
+--- mjpegtools-1.8.0-orig/lavtools/Makefile.am	2006-08-25 15:09:51.542109878 +0200
++++ mjpegtools-1.8.0/lavtools/Makefile.am	2006-08-25 15:11:37.920337695 +0200
+@@ -51,10 +51,15 @@
+ liblavrec_la_SOURCES = liblavrec.c audiolib.c frequencies.c
+ liblavrec_la_CPPFLAGS = $(AM_CPPFLAGS) # so automake doesn't complain about audiolib & frequencies
+ liblavrec_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
++liblavrec_la_LIBADD = -llavfile -llavjpeg
+ 
+ liblavplay_la_SOURCES = liblavplay.c audiolib.c
+ liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS)
+ liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
++liblavplay_la_LIBADD = -llavfile $(SDL_LIBS) -llavjpeg
++if HAVE_X
++  liblavplay_la_LIBADD += $(X_LIBS) -lX11
++endif
+ 
+ # *********************************************************************
+ # The tools themselves
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
index ed0604f0da99..fdf1209c94ba 100644
--- a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.17 2006/08/25 12:21:43 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.18 2006/08/25 13:45:53 zzam Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool autotools
 
@@ -45,6 +45,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-gcc41.patch"
 	epatch "${FILESDIR}/${P}-parallelmake.patch"
 	epatch "${FILESDIR}/${P}-pkg-config.patch"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
 	has_version ">=media-libs/libquicktime-0.9.9" && epatch "${FILESDIR}/${P}-libquicktime.patch"
 
 	# eautoreconf instead of elibtoolize