Add patch to not crash firefox if built with --as-needed. PulseAudio is used at build time as well.

Package-Manager: portage-2.2_rc55/cvs/Linux x86_64

4 files changed, 35 insertions, 11 deletions

diff --git a/www-plugins/libflashsupport/ChangeLog b/www-plugins/libflashsupport/ChangeLog
index b95146cb7e7b..ff1f2b7df839 100644
--- a/www-plugins/libflashsupport/ChangeLog
+++ b/www-plugins/libflashsupport/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-plugins/libflashsupport
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/ChangeLog,v 1.1 2009/04/10 13:15:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/ChangeLog,v 1.2 2009/12/05 16:42:56 flameeyes Exp $
+
+  05 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  libflashsupport-1.2.ebuild, +files/libflashsupport-1.2-asneeded.patch:
+  Add patch to not crash firefox if built with --as-needed. PulseAudio is
+  used at build time as well.
 
   10 Apr 2009; Ulrich Mueller <ulm@gentoo.org> +metadata.xml,
   +libflashsupport-1.2.ebuild:
diff --git a/www-plugins/libflashsupport/Manifest b/www-plugins/libflashsupport/Manifest
index 65e7e58fff24..83318d778b74 100644
--- a/www-plugins/libflashsupport/Manifest
+++ b/www-plugins/libflashsupport/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libflashsupport-1.2-asneeded.patch 580 RMD160 d01293e8235a1e9f22fa9417079430add85c2c27 SHA1 88ada2de98fe1d566092b97da990c8fa7a675735 SHA256 d639ec064feb8065ee95dbae0e0f4faff02d140c99b990e622063cb2ed0d7a63
 DIST libflashsupport-1.2.tar.bz2 13381 RMD160 0b4936a4bf80078247ccc8f0bcca4827774768c6 SHA1 1bfd7f48ac4031c9936bf3799cf2ea615a678bca SHA256 343dd2726944adb84fe175b0f638ab078fa29fcfccb5700eb1ca34f42eaf9154
-EBUILD libflashsupport-1.2.ebuild 2191 RMD160 055cf83e8b4dac6caef6f4cdb25b30cfcf6a45c2 SHA1 7f39b55f688573729723165b27882dac2e7c3934 SHA256 932fc1932cc8b071a9a176d4725087ec0a6d0295a791a9b00c62c9ab84e10192
-MISC ChangeLog 827 RMD160 0b5d43c235d62fceffc69fad0ba3755f654711c4 SHA1 3be4538941ceaee803b35b37db706a87d96bc7ad SHA256 1a108ffadf7ad0687bd05104ed4329b4194c83079432e1652a781aff9025314c
+EBUILD libflashsupport-1.2.ebuild 2247 RMD160 86de14d5a0fa7ae18ff88287f70d3d4507a6c421 SHA1 6194448b1265ce81c7d507f7b0d9687fa2e3f12a SHA256 b9db7c0733c6509cd15deaf01836205a222d68aaa26d97a8b390a4b6c3235b57
+MISC ChangeLog 1067 RMD160 e0ecba45073ba7ccf645efa917408f34cbe16e59 SHA1 657207314a1ee1519af61d21962f4259fe627347 SHA256 f6f023784f0f14de9c5d1c58a01b208d4c337ff5300bcdbb03288d19cd12cdf4
 MISC metadata.xml 254 RMD160 1f5a6322e4956b30592a1e0caf7edc67613ecc43 SHA1 f0813ac26740fae9e0f0899b5dad74b5a6fd5b3c SHA256 740784d71bef88214e4d8508e351a376d8908f4c4b6175d98b6b77e107799f12
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAknfRrYACgkQOeoy/oIi7uxPjwCgn7gB/yMC+yFh2kQImrTpwhHT
-w6QAn0WmM0j9W7Q4so0tfAbzNQhDs9kW
-=4Bje
+iEYEARECAAYFAksajYAACgkQAiZjviIA2Xg0dwCbBnN6C4xcFj33YmJp1O5AVcE+
+NyQAoO0cSi0c8hgamQUZNmXR6st2+AZw
+=ftla
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/libflashsupport/files/libflashsupport-1.2-asneeded.patch b/www-plugins/libflashsupport/files/libflashsupport-1.2-asneeded.patch
new file mode 100644
index 000000000000..c2ff7717e1b5
--- /dev/null
+++ b/www-plugins/libflashsupport/files/libflashsupport-1.2-asneeded.patch
@@ -0,0 +1,16 @@
+Index: libflashsupport-1.2/Makefile
+===================================================================
+--- libflashsupport-1.2.orig/Makefile
++++ libflashsupport-1.2/Makefile
+@@ -50,9 +50,9 @@ all: libflashsupport.so
+ 
+ libflashsupport.so: flashsupport.c
+ 	$(CC) $(CFLAGS) $(LIBS) -DLIBDIR=$(LIBDIR) \
++	flashsupport.c -o libflashsupport.so \
+ 	$(ALSA) $(ALSALIBS) $(PULSE) $(LIBPULSEPATH) $(ESD) $(LIBESDPATH) \
+-	$(OSS) $(SSL) $(SSLLIBS) $(V4L) $(ICULIBS)\
+-	flashsupport.c -o libflashsupport.so
++	$(OSS) $(SSL) $(SSLLIBS) $(V4L) $(ICULIBS)
+ 
+ install: all
+ 	mkdir -p ${LIBDIR}
diff --git a/www-plugins/libflashsupport/libflashsupport-1.2.ebuild b/www-plugins/libflashsupport/libflashsupport-1.2.ebuild
index ead16de57e8d..f5027bdd6b98 100644
--- a/www-plugins/libflashsupport/libflashsupport-1.2.ebuild
+++ b/www-plugins/libflashsupport/libflashsupport-1.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/libflashsupport-1.2.ebuild,v 1.1 2009/04/10 13:15:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/libflashsupport-1.2.ebuild,v 1.2 2009/12/05 16:42:56 flameeyes Exp $
 
-inherit multilib
+inherit multilib eutils
 
 DESCRIPTION="Adds pulseaudio/esd/oss audio output and HTTPS/RTMPS support to
 Adobe Flash 9"
@@ -18,10 +18,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="pulseaudio esd oss ssl gnutls"
 
 DEPEND="gnutls? ( net-libs/gnutls )
-	!gnutls? ( ssl? ( dev-libs/openssl ) )"
+	!gnutls? ( ssl? ( dev-libs/openssl ) )
+	pulseaudio? ( media-sound/pulseaudio )"
 
 RDEPEND="${DEPEND}
-	pulseaudio? ( media-sound/pulseaudio )
 	esd? ( media-sound/esound )"
 
 src_unpack() {
@@ -29,6 +29,8 @@ src_unpack() {
 	cd "${S}"
 	sed -i -e 's:/var/lib/run/pulse/native:/var/run/pulse/native:' \
 		README flashsupport.c || die "sed failed"
+
+	epatch "${FILESDIR}"/${P}-asneeded.patch
 }
 
 src_compile() {