[gentoo-commits] dev/mgorny:master commit in: media-video/vlc/files/, media-video/vlc/

[Michał Górny]

commit:     35faaa2e63bff2c86051f8daf871950d84b256d1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 08:59:03 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 08:59:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=35faaa2e

media-video/vlc: Support building against NPAPI-SDK.

(Portage version: 2.2.0_alpha51_p82/git/Linux x86_64, signed Manifest commit with key 42B9401D)

---
 media-video/vlc/Manifest                           |   13 ++++---
 .../0001-Support-building-against-NPAPI-SDK.patch  |   39 ++++++++++++++++++++
 media-video/vlc/vlc-1.1.11.ebuild                  |    4 ++-
 3 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 3cc9a5b..58239fe 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0001-Support-building-against-NPAPI-SDK.patch 1459 RMD160 7213594ec7d33ed1061a5f4dc0c96091bc4a78c9 SHA1 fe3e7d1f220b8bfbbcdc5ba47965cde73908f7cb SHA256 915cbfc4a555a67c372e1ee336e123bd64db7f07ea11f594e631bf097b251ae7
 DIST vlc-1.1.11.tar.bz2 26319862 RMD160 fa8a32a8e81a5f707b3cace6fa9808d5d7cb9fe6 SHA1 068e75bdbfe6e595a4db14ad49e05688c8b1d5ad SHA256 682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb
 DIST vlc-patches-99.tar.bz2 3353 RMD160 5e4961b7a6036ddcd609af1ce001f9be8cd6e525 SHA1 b26e969bcf05751fc0fe2ffd17b5be03d7a184aa SHA256 79b68b6879b737a714075d2437a7615525242412f7cf084277ace2cbeec567e9
-EBUILD vlc-1.1.11.ebuild 12384 RMD160 baebd0d8c7a926d61176191d3aff5fa284ab8e78 SHA1 cbfcec81d702064b389d40b292c0227b353dd102 SHA256 d952dcb9df1c097fc21f09aad4baa30c2a3d86abc3560b32167a71df93c694cb
+EBUILD vlc-1.1.11.ebuild 12481 RMD160 8eeefb9158407ea63ed1ee701e92117c97ab58f3 SHA1 0745c270209f97b3a3e45ae7c300bfc4bab2eb5b SHA256 3b1cd2dc06056c86164782cb5c0bf20ed68b4f78ae80c7246f3998e39a017d2c
 MISC metadata.xml 6478 RMD160 7ddf32170a0d306d753eb1c567bab738871f93ee SHA1 fc20ca23fbef32370d86fdaa1154d5eb744ca6a2 SHA256 c72d228750d1d28196388c2bedc79de711a14e0c1c664eaedbb1ad63467955f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk5kiCAACgkQfXuS5UK5QB1YOQP/anwX4LpRK2kED6pRlQ9+Alg+
-1LpN0MbR11apgfo1j+cv7OGiZPokWhbn2jl4Jh0b88i6aWxw/FDyK5/FPwaTN2w3
-s3RqULbCicQIcZhOrbaYpf4AEEgXZau9KcS4QpGThypBCCCkJ9HryiFuslQC6Yho
-fwiJJsn5+VJDc0zFQzc=
-=5BG5
+iJwEAQEIAAYFAk5kj1cACgkQfXuS5UK5QB07ngQAldMObOjoqde2JoOx6YYCvH5M
+a+kfjbE2kHiYRDRxUSRGtcTHjf/Pa5X6a0pRPfW8bkrqf+14XkZb73eXXp2eOCDU
+n2tPJp5fQZ6KMziwaFHpNYp+WLlxZMlhzgEIVg1wAZzcQy9z04nRiGgfy6xa6laQ
+AdWtKPY5hTytksUL7Gg=
+=RVrP
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/files/0001-Support-building-against-NPAPI-SDK.patch b/media-video/vlc/files/0001-Support-building-against-NPAPI-SDK.patch
new file mode 100644
index 0000000..1146565
--- /dev/null
+++ b/media-video/vlc/files/0001-Support-building-against-NPAPI-SDK.patch
@@ -0,0 +1,39 @@
+From 8d7943b1b19870b1aaa5d3058d79273661bbc25a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
+Date: Mon, 5 Sep 2011 10:43:39 +0200
+Subject: [PATCH] Support building against NPAPI-SDK.
+
+---
+ configure.ac |   13 ++++++++++---
+ 1 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 86a7eac..de86fca 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4555,12 +4555,19 @@ then
+       found=1
+     else
+       if test -n "$PKG_CONFIG"; then
+-        for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
++        for i in "${with_mozilla_pkg}" npapi-sdk {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin libxul; do
+           if test -n "$i"
+           then
+             echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD
+-            AC_MSG_CHECKING([for $i >= 1.9.2])
+-            if $PKG_CONFIG --exists --print-errors "$i >= 1.9.2" 2>&AS_MESSAGE_LOG_FD
++            
++            AS_IF([test $i = npapi-sdk], [
++              moz_ver=0.27
++            ], [
++              moz_ver=1.9.2
++            ])
++            
++            AC_MSG_CHECKING([for $i >= $moz_ver])
++            if $PKG_CONFIG --exists --print-errors "$i >= $moz_ver" 2>&AS_MESSAGE_LOG_FD
+             then
+               echo "Using $i pkg-config package." >&AS_MESSAGE_LOG_FD
+               echo "Using $i package." >&AS_MESSAGE_FD
+-- 
+1.7.6.1
+

diff --git a/media-video/vlc/vlc-1.1.11.ebuild b/media-video/vlc/vlc-1.1.11.ebuild
index 160deb6..7abcaca 100644
--- a/media-video/vlc/vlc-1.1.11.ebuild
+++ b/media-video/vlc/vlc-1.1.11.ebuild
@@ -104,7 +104,8 @@ RDEPEND="
 		mtp? ( >=media-libs/libmtp-1.0.0 )
 		musepack? ( >=media-sound/musepack-tools-444 )
 		ncurses? ( sys-libs/ncurses )
-		nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util )
+		nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.2 )
+			x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util )
 		ogg? ( media-libs/libogg )
 		opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) )
 		png? ( media-libs/libpng sys-libs/zlib )
@@ -220,6 +221,7 @@ src_prepare() {
 	rm -f m4/lt* m4/libtool.m4
 
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	epatch "${FILESDIR}"/0001-Support-building-against-NPAPI-SDK.patch
 	eautoreconf
 }