Allow building nsplugin against npapi-sdk, bug #383071.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 47 insertions, 5 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 61ba15f94709..f3a41412b411 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.77 2012/02/27 01:23:22 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.78 2012/02/27 11:28:38 chithanh Exp $
+
+  27 Feb 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  gnash-0.8.10.ebuild, +files/gnash-0.8.10-npapi-sdk.patch:
+  Allow building nsplugin against npapi-sdk, bug #383071.
 
   27 Feb 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gnash-0.8.10.ebuild:
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index a65bea49931a..778ca7684ba7 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -1,5 +1,6 @@
 AUX gnash-0.8.10-amf-include.patch 1245 RMD160 78108fb568c5ce5055f45fd388944d1e73206295 SHA1 2f82807f003b2f03cbd29e0ed27d14ff1442ebd9 SHA256 81f0cdf8246689614b1deaf36cf9c3e09d3501a55691ef95130d08ab1f6bc2e6
 AUX gnash-0.8.10-gettext-macro.patch 6296 RMD160 3898b588c07ae9786f429cb3d37c717d4783eeae SHA1 7f2fbd108eae2f0af15c5120c15afe31969b6c73 SHA256 ddacc3823ec0b87ceee618f48fbab87a083bf8047b4080bb8872b7bd19b07125
+AUX gnash-0.8.10-npapi-sdk.patch 964 RMD160 c30b2ba443f74985376de40aab287eb9a9599e9b SHA1 0c3e98702db6418a9c11b70b1d11f408645d9240 SHA256 16ad2ce72fc235ccce4de2962cdede30b46f057cce5c530bae2fbd1bbdd7c57c
 AUX gnash-0.8.3-boost-dynamic-link.patch 1474 RMD160 0ce418d9e7a0f4d5b3bc724c65dedc3c675b69ef SHA1 df6ae427a0efda13da822ca65700aebcb25ef504 SHA256 d3ada2ca33083b0b233051f66041eb57c402783b2cc177b126e4dccab2e32b76
 AUX gnash-0.8.5-klash.patch 4219 RMD160 f7d49ca32cf18d3d160ce8f0653fd12e5a278511 SHA1 fc44e119975ecc49d2d64450e0eeb92f6a84f893 SHA256 e1ad6b241bc28892ff9758d55851439b2b61b496dc2e73d96d9a13fdd44a4a08
 AUX gnash-0.8.7-amf-include.patch 1121 RMD160 5e17e26f5033816f011ccee9b943588fd55986a4 SHA1 955b1e17ddad3f2cca3cadb73e84c52714f57f3c SHA256 ea3a2324c061828142f715c9e40dbf21007e5230b1f81f8dbea7a8313bcc86bd
@@ -26,9 +27,9 @@ AUX gnash-0.8.9-no-deprecated-avformat-metadata.patch 1299 RMD160 a88e744b8886ad
 DIST gnash-0.8.10.tar.gz 6099894 RMD160 72debb3e64853450fe74b7f1d6e9b40b9ae70964 SHA1 4f8ace5af1a327718f353d5294b589f3251f41ae SHA256 61fbeec6826c89e6f3fc520336a152b17901e6d0e9db207d7c4db27eeb5ceb2b
 DIST gnash-0.8.8.tar.bz2 3850383 RMD160 621afbd14180ce770f60a6e158f9fda0b4d5ec02 SHA1 d349e0321e7fe9abcd265d63ce282cd2a7ce59d3 SHA256 dcac4b81f81ecd6cc7c5422d7c731fc5c2a7be7fb18b5570a7e6f8fb5fc6e220
 DIST gnash-0.8.9.tar.bz2 3777140 RMD160 34bb51cfe5b8593dc14bc2c21c0085277dbb23f1 SHA1 585c320c98b3304fcbba230f2c4b1fdf2a52aee0 SHA256 f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd
-EBUILD gnash-0.8.10.ebuild 7659 RMD160 204c24a9906e902d33d9749f7e09452a5e68a3b6 SHA1 77f95e6b8f05c242377fcefb09ddecd116103e0f SHA256 f2efd5f5da31976785f70adec2f47d7e0956dfad897e534ddfbbb858081b72b5
+EBUILD gnash-0.8.10.ebuild 7797 RMD160 46261b8c9786542678d95e6287fd37b5232255fa SHA1 ed51fa9cbe3ff8ecc310ff4430be795f6eded58a SHA256 2087d65fa3b4af32afc64bda3a22debcadd19e7d9af45b478a8327398b9d98cc
 EBUILD gnash-0.8.8.ebuild 9006 RMD160 cd9a10d9b7b121b638bac179c97de26771e66542 SHA1 f6b0ae7862286aabbbd34e99a318021136ae33bc SHA256 594842337ae216fa7a89112298f00e2a1c74609af4a4b48f3e39b4b2dc82b380
 EBUILD gnash-0.8.9-r2.ebuild 9118 RMD160 1d2c163338940197f734f7dfb8adb935ead89a2c SHA1 b4159f25a03280bc60c4562cfbef30973be1bd6c SHA256 52f4250e39beeada4c56d45f8fcd3e1de143287c91249c9c82de5a2c2cb2d720
 EBUILD gnash-0.8.9.ebuild 8830 RMD160 b3e6ab1a6a6ce84c502af1647e4e58b65e110809 SHA1 f6fd90d100132b8658428cf3cafc8cbe6bec1c8d SHA256 8a3c33a3a82619f22863e32fb83e264193cfe94132491535fb919a9ed863478a
-MISC ChangeLog 26740 RMD160 30598b2e2ecf42b0c6390cfdb719e3bbac42aa28 SHA1 c968acfd92699d95a55e62995c90dc3a33dd9b8b SHA256 7c8dd18f2cf239994f057576c6f429278bc94b4e315995b87b907c180e990c1d
+MISC ChangeLog 26928 RMD160 2b44592d80158e37d97286cac4320ba24933bbff SHA1 9c909b3a0fd33975ccd6b2717120a830f93af6b5 SHA256 04356cf9d71d5c3457058a2e103fe3feb64eeea44468ecb8f09e657bb3ac20e0
 MISC metadata.xml 1027 RMD160 aa9f8e70f4b29c20af06375e49f072cd47b099b0 SHA1 26fe0b3c8699f8de6038163488e71b82449ee3bd SHA256 071f3c3f214ac2346bbec08cf2a129be0b1edea5e1e0d7401b884ece564de5ce
diff --git a/www-plugins/gnash/files/gnash-0.8.10-npapi-sdk.patch b/www-plugins/gnash/files/gnash-0.8.10-npapi-sdk.patch
new file mode 100644
index 000000000000..eb542959e3be
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.10-npapi-sdk.patch
@@ -0,0 +1,29 @@
+From 983a675c94ecec54ae14593744aa9a2198466499 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 15 Sep 2011 12:59:55 +0200
+Subject: [PATCH] Support building against NPAPI-SDK as well.
+
+---
+ macros/npapi.m4 |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/macros/npapi.m4 b/macros/npapi.m4
+index e3bde2f..522bbb1 100644
+--- a/macros/npapi.m4
++++ b/macros/npapi.m4
+@@ -34,7 +34,11 @@ AC_DEFUN([GNASH_PATH_NPAPI],
+ 
+   if test x$cross_compiling = xno; then
+     if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_npapi_incl}" = x; then
+-      $PKG_CONFIG --exists mozilla-plugin && NPAPI_CFLAGS="`$PKG_CONFIG --cflags mozilla-plugin`"
++      if $PKG_CONFIG --exists npapi-sdk; then
++        NPAPI_CFLAGS="`$PKG_CONFIG --cflags npapi-sdk`"
++      elif $PKG_CONFIG --exists mozilla-plugin; then
++        NPAPI_CFLAGS="`$PKG_CONFIG --cflags mozilla-plugin`"
++      fi
+     fi
+   fi
+ 
+-- 
+1.7.3.4
+
diff --git a/www-plugins/gnash/gnash-0.8.10.ebuild b/www-plugins/gnash/gnash-0.8.10.ebuild
index 00c082d87ded..ea1c0c7a4c24 100644
--- a/www-plugins/gnash/gnash-0.8.10.ebuild
+++ b/www-plugins/gnash/gnash-0.8.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10.ebuild,v 1.4 2012/02/27 01:23:22 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10.ebuild,v 1.5 2012/02/27 11:28:38 chithanh Exp $
 
 EAPI=4
 CMAKE_REQUIRED="never"
@@ -90,7 +90,12 @@ RDEPEND=">=dev-libs/boost-1.41.0
 	openvg? (
 		media-libs/mesa[openvg]
 	)
-	nsplugin? ( >=net-libs/xulrunner-1.9.2:1.9 )
+	nsplugin? (
+		|| (
+			net-misc/npapi-sdk
+			>=net-libs/xulrunner-1.9.2:1.9
+		)
+	)
 	sdl? ( media-libs/libsdl[X] )
 	sdl-sound? ( media-libs/libsdl )
 	media-libs/speex[ogg]
@@ -150,6 +155,9 @@ src_prepare() {
 	# Fix libamf includes
 	epatch "${FILESDIR}"/${PN}-0.8.10-amf-include.patch
 
+	# Allow building against npapi-sdk, bug #383071
+	epatch "${FILESDIR}"/${PN}-0.8.10-npapi-sdk.patch
+
 	eautoreconf
 }
 src_configure() {