[gentoo-commits] proj/mozilla:master commit in: media-video/vlc/files/, media-video/vlc/

[gentoo-commits] proj/mozilla:master commit in: media-video/vlc/files/, media-video/vlc/

[Jory Pratt]

commit:     6522b3ba284d5f15a00c98c3303bcdd3a38eaba7
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 00:40:49 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 00:40:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=6522b3ba

update vlc to continue to use npapi-sdk in place of xulrunner

---
 media-video/vlc/Manifest                           |   18 +++---------------
 .../0001-Support-building-against-NPAPI-SDK.patch  |    9 +++------
 .../vlc/{vlc-1.1.11.ebuild => vlc-1.1.12.ebuild}   |    2 +-
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 58239fe..44e0e9f 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,17 +1,5 @@
------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
+AUX 0001-Support-building-against-NPAPI-SDK.patch 1441 RMD160 63dd43b85752f4f2dc671cfc1fada0cc71286ca2 SHA1 5e6336cf511e452e1b23f5da74d9a79bbeab8861 SHA256 66eefb895ab8b533e4e0499b66d74b41874a129464d89477d6ccb813cdad3d26
+DIST vlc-1.1.12.tar.bz2 26220996 RMD160 117530abc8bd3f38d9233b7a7c91a3aaa17af87c SHA1 b39de66711a33746ce12f16a50e41d3def7b1452 SHA256 6dc50d27d25a0fab55b66f9ae3aa4001082d2d86b96b0491a8dab35423be1a68
 DIST vlc-patches-99.tar.bz2 3353 RMD160 5e4961b7a6036ddcd609af1ce001f9be8cd6e525 SHA1 b26e969bcf05751fc0fe2ffd17b5be03d7a184aa SHA256 79b68b6879b737a714075d2437a7615525242412f7cf084277ace2cbeec567e9
-EBUILD vlc-1.1.11.ebuild 12481 RMD160 8eeefb9158407ea63ed1ee701e92117c97ab58f3 SHA1 0745c270209f97b3a3e45ae7c300bfc4bab2eb5b SHA256 3b1cd2dc06056c86164782cb5c0bf20ed68b4f78ae80c7246f3998e39a017d2c
+EBUILD vlc-1.1.12.ebuild 12536 RMD160 ab30e65e4c998b6aa2be95569106249512090ac1 SHA1 fc47544b44af9b888e7ec603e366a4db8cfe99b9 SHA256 bea670bb694ef3b2de23541a6cd2626bd1d2d61c60892e377954ea14ab9bddcf
 MISC metadata.xml 6478 RMD160 7ddf32170a0d306d753eb1c567bab738871f93ee SHA1 fc20ca23fbef32370d86fdaa1154d5eb744ca6a2 SHA256 c72d228750d1d28196388c2bedc79de711a14e0c1c664eaedbb1ad63467955f8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-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
index 1146565..00c9f86 100644
--- a/media-video/vlc/files/0001-Support-building-against-NPAPI-SDK.patch
+++ b/media-video/vlc/files/0001-Support-building-against-NPAPI-SDK.patch
@@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
 index 86a7eac..de86fca 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4555,12 +4555,19 @@ then
+@@ -4563,12 +4563,19 @@
        found=1
      else
        if test -n "$PKG_CONFIG"; then
@@ -20,8 +20,8 @@ index 86a7eac..de86fca 100644
            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
+-            AC_MSG_CHECKING([for $i >= 1.9.1])
+-            if $PKG_CONFIG --exists --print-errors "$i >= 1.9.1" 2>&AS_MESSAGE_LOG_FD
 +            
 +            AS_IF([test $i = npapi-sdk], [
 +              moz_ver=0.27
@@ -34,6 +34,3 @@ index 86a7eac..de86fca 100644
              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.12.ebuild
similarity index 99%
rename from media-video/vlc/vlc-1.1.11.ebuild
rename to media-video/vlc/vlc-1.1.12.ebuild
index 7abcaca..9d6ea6e 100644
--- a/media-video/vlc/vlc-1.1.11.ebuild
+++ b/media-video/vlc/vlc-1.1.12.ebuild
@@ -60,7 +60,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
 	vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
-		sys-libs/zlib
+		|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )
 		>=media-libs/libdvbpsi-0.1.6
 		a52? ( >=media-libs/a52dec-0.7.4-r3 )
 		aalib? ( media-libs/aalib x11-libs/libX11 )