Fix building with --as-needed and swscaler enabled ffmpeg-20070616-r1 for bug 183714.

Package-Manager: portage-2.1.3_rc9

4 files changed, 132 insertions, 18 deletions

diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog
index 058fc5f57ea5..98737419dded 100644
--- a/net-www/gnash/ChangeLog
+++ b/net-www/gnash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/gnash
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.48 2007/07/22 07:44:54 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.49 2007/07/23 14:36:24 drac Exp $
+
+  23 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +files/gnash-0.8.0-ffmpeg.patch, gnash-0.8.0.ebuild:
+  Fix building with --as-needed and swscaler enabled ffmpeg-20070616-r1 for
+  bug 183714.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; gnash-0.8.0.ebuild,
   gnash-9999.ebuild:
diff --git a/net-www/gnash/Manifest b/net-www/gnash/Manifest
index 1df91757d179..6dbc406b5e65 100644
--- a/net-www/gnash/Manifest
+++ b/net-www/gnash/Manifest
@@ -1,16 +1,20 @@
+AUX gnash-0.8.0-ffmpeg.patch 3570 RMD160 584bb13d72353424c713aa2fdfb3081910f75f0d SHA1 ef0e9ff7d30b7649e4f7a73f7db13b02a13a7f8a SHA256 f310503c548aefa74f49bd8d4f2baf7a0bb294f6ca1df9f3639f3087b5263723
+MD5 15300df2f3fab34520ec047236b0aa54 files/gnash-0.8.0-ffmpeg.patch 3570
+RMD160 584bb13d72353424c713aa2fdfb3081910f75f0d files/gnash-0.8.0-ffmpeg.patch 3570
+SHA256 f310503c548aefa74f49bd8d4f2baf7a0bb294f6ca1df9f3639f3087b5263723 files/gnash-0.8.0-ffmpeg.patch 3570
 DIST gnash-0.8.0.tar.bz2 2053076 RMD160 6c885c283345973d27206f6e3f90635264a724ae SHA1 b03d3c03bb93b0ebaf5ad10cabd3d7fef2434f7e SHA256 ff8c3ca6f297ad4fa7cc8fecea45119dbaf8fef7f95901c04eccbf0d6424ef84
-EBUILD gnash-0.8.0.ebuild 4133 RMD160 18f82ed82996a002622fbd157d4aaf8a8346991c SHA1 01d5ff72f4d4c3eb7a5129a8210654c469beec60 SHA256 2681ff073c5490b9ea9badaa9c865c8e0b97e6cbef90784b52b4ce70e1ab7097
-MD5 c1a88c64721dfa6a4264a40cf79ce5c4 gnash-0.8.0.ebuild 4133
-RMD160 18f82ed82996a002622fbd157d4aaf8a8346991c gnash-0.8.0.ebuild 4133
-SHA256 2681ff073c5490b9ea9badaa9c865c8e0b97e6cbef90784b52b4ce70e1ab7097 gnash-0.8.0.ebuild 4133
+EBUILD gnash-0.8.0.ebuild 4090 RMD160 3aeca570f63e7481866c22a4442f3fa072d53996 SHA1 e04f9a36992990389692e3334ff9c93b9afe79e6 SHA256 a54b0257068f3170f85adaf629745d481459ebae8b0d480e7aab3ebe6626cc91
+MD5 25a1c3194913d9346a8dd67b7281bbd7 gnash-0.8.0.ebuild 4090
+RMD160 3aeca570f63e7481866c22a4442f3fa072d53996 gnash-0.8.0.ebuild 4090
+SHA256 a54b0257068f3170f85adaf629745d481459ebae8b0d480e7aab3ebe6626cc91 gnash-0.8.0.ebuild 4090
 EBUILD gnash-9999.ebuild 3994 RMD160 6a4b4e6e9fb128a0b0db4a22fea0cd53a92c84f9 SHA1 c3558b5f2320fd5bfcbd8ec88bd6ad0a15236dc0 SHA256 d4525d1b6b56a849883a1d3ef1dfbf4d501a48c947b92f487893e99f1b282d77
 MD5 0c46eeea1785083b248d1dfaaf9c9129 gnash-9999.ebuild 3994
 RMD160 6a4b4e6e9fb128a0b0db4a22fea0cd53a92c84f9 gnash-9999.ebuild 3994
 SHA256 d4525d1b6b56a849883a1d3ef1dfbf4d501a48c947b92f487893e99f1b282d77 gnash-9999.ebuild 3994
-MISC ChangeLog 8819 RMD160 79f2dcafbca90e4fae163ce95f050c00ab0aad58 SHA1 60be865db04b28831eb8665a7506df5d4ff7b876 SHA256 49efa03460ccb3d540aeb3135b8815320b0c40d1e3f4c40c34122ada8c02197e
-MD5 ac41bffb9a85258c8c2440c17f116d4c ChangeLog 8819
-RMD160 79f2dcafbca90e4fae163ce95f050c00ab0aad58 ChangeLog 8819
-SHA256 49efa03460ccb3d540aeb3135b8815320b0c40d1e3f4c40c34122ada8c02197e ChangeLog 8819
+MISC ChangeLog 9009 RMD160 0208cf3f65a85a9fb66d333f068d853ef9f5be72 SHA1 6ed0947fb4d6dbca809cfc26ccc4661bfd9fe766 SHA256 173f54e1b88bc1a20e6097025d8efb89496a71cd38c5cf0d4724f61d4de2dfed
+MD5 0f8c30e71189ef423141e107afd58799 ChangeLog 9009
+RMD160 0208cf3f65a85a9fb66d333f068d853ef9f5be72 ChangeLog 9009
+SHA256 173f54e1b88bc1a20e6097025d8efb89496a71cd38c5cf0d4724f61d4de2dfed ChangeLog 9009
 MISC metadata.xml 263 RMD160 3a7c4caf761fd53690c78d1352c1f7c2858a2c3b SHA1 0a3e12eb5d6d1c8e869b12ce442e89791f96d1a9 SHA256 05cfd5d6b86ee3f8cfda20636cefb676c252d2f4410b610d4f189ea8bfdff37e
 MD5 532ea834bddad203e998a8091c1b7c2d metadata.xml 263
 RMD160 3a7c4caf761fd53690c78d1352c1f7c2858a2c3b metadata.xml 263
diff --git a/net-www/gnash/files/gnash-0.8.0-ffmpeg.patch b/net-www/gnash/files/gnash-0.8.0-ffmpeg.patch
new file mode 100644
index 000000000000..b9b763ba4357
--- /dev/null
+++ b/net-www/gnash/files/gnash-0.8.0-ffmpeg.patch
@@ -0,0 +1,103 @@
+diff -ur gnash-0.8.0.orig/backend/sound_handler_sdl.h gnash-0.8.0/backend/sound_handler_sdl.h
+--- gnash-0.8.0.orig/backend/sound_handler_sdl.h	2007-05-28 18:40:58.000000000 +0300
++++ gnash-0.8.0/backend/sound_handler_sdl.h	2007-07-23 16:13:13.000000000 +0300
+@@ -26,7 +26,11 @@
+ #include "log.h"
+ 
+ #ifdef USE_FFMPEG
++
++extern "C" {
+ #include <ffmpeg/avcodec.h>
++}
++
+ #elif defined(USE_MAD)
+ #include <mad.h>
+ #endif
+diff -ur gnash-0.8.0.orig/configure.ac gnash-0.8.0/configure.ac
+--- gnash-0.8.0.orig/configure.ac	2007-06-09 03:48:15.000000000 +0300
++++ gnash-0.8.0/configure.ac	2007-07-23 17:14:05.000000000 +0300
+@@ -881,6 +881,7 @@
+ 
+ if test x"$media_handler" = x"ffmpeg"; then
+   GNASH_PATH_FFMPEG
++  PKG_CHECK_MODULES(FFMPEG, libavutil libavformat libavcodec libswscale, HAVE_FFMPEG=yes, AC_MSG_ERROR([FFMPEG not found.]))
+   if test x"${media_handler_specified}" = xfalse; then
+      # If the library is not found, or its version is not ok, we'll try gst
+      if test x"${ac_cv_path_ffmpeg_lib}" = x -o x"${ffmpeg_version}" != xok; then
+@@ -890,6 +891,8 @@
+   fi
+ fi
+ 
++AC_SUBST(FFMPEG_LIBS)
++
+ if test "$media_handler" = "gst"; then
+   GNASH_PKG_FIND(gstreamer, [gst/gst.h], [gstreamer library], gst_init, [0.10])
+   if test x"${media_handler_specified}" = xfalse; then
+diff -ur gnash-0.8.0.orig/libbase/embedVideoDecoderFfmpeg.cpp gnash-0.8.0/libbase/embedVideoDecoderFfmpeg.cpp
+--- gnash-0.8.0.orig/libbase/embedVideoDecoderFfmpeg.cpp	2007-06-08 21:44:16.000000000 +0300
++++ gnash-0.8.0/libbase/embedVideoDecoderFfmpeg.cpp	2007-07-23 16:10:45.000000000 +0300
+@@ -26,7 +26,11 @@
+ #include "embedVideoDecoderFfmpeg.h"
+ 
+ #ifdef HAVE_SWSCALE_H
++
++extern "C" {
+ #include <ffmpeg/swscale.h>
++}
++
+ #endif
+ 
+ #include <boost/scoped_array.hpp>
+diff -ur gnash-0.8.0.orig/libbase/embedVideoDecoderFfmpeg.h gnash-0.8.0/libbase/embedVideoDecoderFfmpeg.h
+--- gnash-0.8.0.orig/libbase/embedVideoDecoderFfmpeg.h	2007-06-08 07:18:37.000000000 +0300
++++ gnash-0.8.0/libbase/embedVideoDecoderFfmpeg.h	2007-07-23 16:10:37.000000000 +0300
+@@ -28,7 +28,11 @@
+ 
+ #include <vector>
+ #include "embedVideoDecoder.h"
++
++extern "C" {
+ #include <ffmpeg/avcodec.h>
++}
++
+ #include "image.h"
+ 
+ namespace gnash {
+diff -ur gnash-0.8.0.orig/libbase/Makefile.am gnash-0.8.0/libbase/Makefile.am
+--- gnash-0.8.0.orig/libbase/Makefile.am	2007-05-21 18:46:48.000000000 +0300
++++ gnash-0.8.0/libbase/Makefile.am	2007-07-23 17:01:18.000000000 +0300
+@@ -160,7 +160,7 @@
+ if USE_FFMPEG_ENGINE
+ libgnashbase_la_SOURCES += embedVideoDecoderFfmpeg.cpp
+ noinst_HEADERS += embedVideoDecoderFfmpeg.h
+-libgnashbase_la_LIBADD += $(FFMPEG_LIBS)
++libgnashbase_la_LIBADD += $(FFMPEG_LIBS) @FFMPEG_LIBS@
+ libgnashbase_la_CPPFLAGS += $(FFMPEG_CFLAGS)
+ endif
+ 
+diff -ur gnash-0.8.0.orig/server/asobj/NetStreamFfmpeg.h gnash-0.8.0/server/asobj/NetStreamFfmpeg.h
+--- gnash-0.8.0.orig/server/asobj/NetStreamFfmpeg.h	2007-06-04 15:02:16.000000000 +0300
++++ gnash-0.8.0/server/asobj/NetStreamFfmpeg.h	2007-07-23 16:11:27.000000000 +0300
+@@ -39,7 +39,9 @@
+ #include "impl.h"
+ #include "video_stream_instance.h"
+ 
++extern "C" {
+ #include <ffmpeg/avformat.h>
++}
+ 
+ #include "image.h"
+ #include "StreamProvider.h"	
+diff -ur gnash-0.8.0.orig/server/asobj/SoundFfmpeg.h gnash-0.8.0/server/asobj/SoundFfmpeg.h
+--- gnash-0.8.0.orig/server/asobj/SoundFfmpeg.h	2007-05-28 18:41:08.000000000 +0300
++++ gnash-0.8.0/server/asobj/SoundFfmpeg.h	2007-07-23 16:11:53.000000000 +0300
+@@ -32,7 +32,9 @@
+ #include <boost/bind.hpp> 
+ #include <boost/thread/mutex.hpp>
+ 
++extern "C" {
+ #include <ffmpeg/avformat.h>
++}
+ 
+ namespace gnash {
+ 
diff --git a/net-www/gnash/gnash-0.8.0.ebuild b/net-www/gnash/gnash-0.8.0.ebuild
index a9c0aead945e..11ffc62186e0 100644
--- a/net-www/gnash/gnash-0.8.0.ebuild
+++ b/net-www/gnash/gnash-0.8.0.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.8.0.ebuild,v 1.5 2007/07/22 07:44:54 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.8.0.ebuild,v 1.6 2007/07/23 14:36:24 drac Exp $
+
+WANT_AUTOMAKE="1.9"
 
 inherit nsplugins kde-functions qt3 multilib flag-o-matic autotools
-set-kdedir
+set-kdedir eutils
 
 DESCRIPTION="Gnash is a GNU Flash movie player that supports many SWF v7 features"
 HOMEPAGE="http://www.gnu.org/software/gnash"
@@ -49,6 +51,9 @@ RDEPEND="
 	agg? ( x11-libs/agg )"
 	#cairo? ( x11-libs/cairo )
 
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
 pkg_setup() {
 	if use agg && use kde; then
 		eerror "Building klash with the agg based renderer is not supported"
@@ -75,13 +80,10 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	#as-needed breaks, see bug 183714
-	#
-	# TODO - does not work for me
-	#epatch ${FILESDIR}/gnash-no-asneeded.patch
-	#filter-ldflags -Wl,--as-needed --as-needed
-	#eautoconf
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-ffmpeg.patch
+	eautoconf
+	eautomake
 }
 
 src_compile() {