Update patchlevel to add a patch to build live555 as plugin when using system librari...

Package-Manager: portage-2.1.2_rc4-r2

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 5b615e3311d7f7f40f2f42c1b76919787abfde60..5eb195c54bf7ada928dfcf5ec83091a300dfc0e0 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.200 2006/12/21 15:50:43 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.201 2006/12/30 19:55:27 flameeyes Exp $
+
+  30 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.6.ebuild:
+  Update patchlevel to add a patch to build live555 as plugin when using
+  system libraries, use the correct path for the live555 tree when building
+  against old style ebuild, and allow using new-style live555 ebuilds.
 
   21 Dec 2006; Markus Rothe <corsair@gentoo.org> vlc-0.8.6.ebuild:
   Added ~ppc64; bug #139252

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 848a054cb304325f90dba820b9cfcc647b4a66c3..fb62e9781f7794bc03c172556f8b505ebcf2010f 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,10 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST vlc-0.8.4a.tar.bz2 7191539 RMD160 50ea307c1aa70d7189a8c7cd09bf5e1d60e4856b SHA1 043462db25e6eeb7f648c600d2dbca1524056580 SHA256 003b6bb71255af006ac3a36ff0184e0cb9d5e08589b2d500f73b3c8052d6adf9
 DIST vlc-0.8.5.tar.bz2 8562996 RMD160 d24140a5b4bf771754028090e103bb5c171e4fd8 SHA1 2f0a26a336a5211f32c7bcc653dfd0b27f1fb26b SHA256 48bc557bec16b48a304e5e760aef10e1c3cca2d74a011bc900bd1768d9ee79fa
 DIST vlc-0.8.6.tar.bz2 10506025 RMD160 0ec4cea5562d0aeaada9a9c533caa5489764d52d SHA1 86c038fdca2b6c8665e83e302a1a7a5e64a6b912 SHA256 17b114d1fe0177c6639b3fb0985c47362bcf1a405bf5fb401aeffb5dc9b3dba7
 DIST vlc-patches-16.tar.bz2 10206 RMD160 e9edce6e298a74cb08eec00bcadac6097f772cbf SHA1 81864732b0669dd944c9b6c7efbb3e2362b66471 SHA256 d537ec6e05cbeef04179435e2aabcc9bc9c876063000fd5b037184fabad8c5aa
 DIST vlc-patches-25.tar.bz2 11370 RMD160 ee95b5698cff2f3ccf347b0ed5bc7c43c0c13502 SHA1 5b72ce53fced638747228f9eedb3eec80ce32b2b SHA256 be82dbf2ceb476b1dc035ee90e7c1bb01f6efe52c3679751416c2133ba3c0dde
 DIST vlc-patches-28.tar.bz2 12689 RMD160 32e0c7a35e8492b4885e3ca41af1dc4563a383c8 SHA1 80fd57a0aaa1f2fc3a57b2c7f44ceedac2aa6233 SHA256 5b7d4e3b14682e889e0ec00d66999d24bf4d4494b88887f3fb7c32e360dd5393
-DIST vlc-patches-31.tar.bz2 9153 RMD160 bfd6b5207f55d057827128211770eb92dafd15d5 SHA1 80708be8996358524a72859fdced23ba909905b4 SHA256 dd0b4c797416fe1ad4f2a7c50fed140e4c860addae7672e01f04277650cd3ba3
+DIST vlc-patches-32.tar.bz2 9409 RMD160 b38a5c6df7d68b58379f53614bcc9366aed92d81 SHA1 f9e74133ba0cfc861cbd4f1775fd3164771a638e SHA256 52af8539833331104e07b9b7f2bb082ea5cb35eb7671164b3bca0ad954796e52
 EBUILD vlc-0.8.4a-r1.ebuild 7123 RMD160 7c33c38b070daff71acb59f83655d5c64b05b54a SHA1 767f5a46624002488571a443bc776a6efc72d330 SHA256 e3621a1941a365c4e5ee8d257b4d0d0878ac40d5a021627513cc4402053e5028
 MD5 661adeff1292bb17ab516387be301479 vlc-0.8.4a-r1.ebuild 7123
 RMD160 7c33c38b070daff71acb59f83655d5c64b05b54a vlc-0.8.4a-r1.ebuild 7123
@@ -17,14 +20,14 @@ EBUILD vlc-0.8.5-r5.ebuild 7479 RMD160 d87443d301afdc32f29b74beb908852bd309c737
 MD5 81ff77133353f46a2181354d2978d73e vlc-0.8.5-r5.ebuild 7479
 RMD160 d87443d301afdc32f29b74beb908852bd309c737 vlc-0.8.5-r5.ebuild 7479
 SHA256 9a7e6659a999ac2749b9222d58ed8816ab7f0bae848a588f618837ed927f0761 vlc-0.8.5-r5.ebuild 7479
-EBUILD vlc-0.8.6.ebuild 8072 RMD160 2da088f4671e2a2769ffa6e2a15dc741643fea26 SHA1 5a0631393787560f05738be2106c365643e042e8 SHA256 70dbfa3f106e15861ce16f4059016b3a7b3e48aad87b98cdf0644bf39d45179c
-MD5 6f6404c8200ab1431d40e28dd02db988 vlc-0.8.6.ebuild 8072
-RMD160 2da088f4671e2a2769ffa6e2a15dc741643fea26 vlc-0.8.6.ebuild 8072
-SHA256 70dbfa3f106e15861ce16f4059016b3a7b3e48aad87b98cdf0644bf39d45179c vlc-0.8.6.ebuild 8072
-MISC ChangeLog 37388 RMD160 7b37a33477937b9d6793ab4c8b6f6cb8e64b2c72 SHA1 d086537dd8144a2556af8d934172fb8e6dceec13 SHA256 d0c285d077fb2ed118b36d793f5a952f93544becb86a378622d53040f65acb98
-MD5 0f34bff3c993461cb8da908b921c66e8 ChangeLog 37388
-RMD160 7b37a33477937b9d6793ab4c8b6f6cb8e64b2c72 ChangeLog 37388
-SHA256 d0c285d077fb2ed118b36d793f5a952f93544becb86a378622d53040f65acb98 ChangeLog 37388
+EBUILD vlc-0.8.6.ebuild 8190 RMD160 98a81e11dc0df7e913c64b3c032143cb07861547 SHA1 bd0549cc843a1304250e6900290595b210108c6c SHA256 ed9b24ea048fe27768948aa1c8c121ae944c0c962f5bbec95e789aa6b16e21f7
+MD5 078b11431b7c0ce0a036f5f948761091 vlc-0.8.6.ebuild 8190
+RMD160 98a81e11dc0df7e913c64b3c032143cb07861547 vlc-0.8.6.ebuild 8190
+SHA256 ed9b24ea048fe27768948aa1c8c121ae944c0c962f5bbec95e789aa6b16e21f7 vlc-0.8.6.ebuild 8190
+MISC ChangeLog 37682 RMD160 f53f33d9a813718ca755ace86d3fbeb9e420a9c7 SHA1 1b5d12e5a2aefdecdbdf7ad1c7486c725519a64d SHA256 c04e7ee546c3d7eaca12da0231130a115c8548dfe1f6b117df1aaebeb8f7884c
+MD5 3af5429a9e41e145a059d6e341e08cc3 ChangeLog 37682
+RMD160 f53f33d9a813718ca755ace86d3fbeb9e420a9c7 ChangeLog 37682
+SHA256 c04e7ee546c3d7eaca12da0231130a115c8548dfe1f6b117df1aaebeb8f7884c ChangeLog 37682
 MISC metadata.xml 158 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 SHA1 9ac37da489ebe6e58e32fe8e037b1ef2d99c6638 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158
@@ -38,6 +41,13 @@ SHA256 bfd1f44477c295414873d4caa10fe213eed6a193d129c1b0f2a619fa8b3db1f8 files/di
 MD5 cf41ef50eba316f28accddd936186d61 files/digest-vlc-0.8.5-r5 479
 RMD160 1e715798d907f8e77c151260cc5b130bdec6741a files/digest-vlc-0.8.5-r5 479
 SHA256 71ab8cd26defa0b2ab1517c7fc93188a38657475a9099907c87f7ed03dca32b4 files/digest-vlc-0.8.5-r5 479
-MD5 b995d133a0026052f951b0397d7d5c66 files/digest-vlc-0.8.6 479
-RMD160 61aa9cee004dea950ee4e75055ce3e566e7cbe9d files/digest-vlc-0.8.6 479
-SHA256 3221d684e5644bd346c7b72d62a543d600bbdd4413cd50ce166ee75792490ef8 files/digest-vlc-0.8.6 479
+MD5 b03752e8602e576b0593a45d81e041d5 files/digest-vlc-0.8.6 479
+RMD160 61ca14042a4d8424710aa00593d6ad543899ccbb files/digest-vlc-0.8.6 479
+SHA256 2dc21d46ee9e9d307410c1cd4bbe2700962d4e5e48efe8111f724929425ef41b files/digest-vlc-0.8.6 479
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFlsRFAiZjviIA2XgRApLIAJ4yvt8zBsZD84guSNkzw7KmQKbCiQCgw+MX
+dkkIIj62ZDMG2XF1nXhVTNM=
+=djCK
+-----END PGP SIGNATURE-----

diff --git a/media-video/vlc/files/digest-vlc-0.8.6 b/media-video/vlc/files/digest-vlc-0.8.6
index 8cf9494bd5576daa2506151e088339702a071c3e..44b6a98f1c907f0fc5ad4094c3ac3bcd929a16ca 100644 (file)
--- a/media-video/vlc/files/digest-vlc-0.8.6
+++ b/media-video/vlc/files/digest-vlc-0.8.6
@@ -1,6 +1,6 @@
 MD5 77a275f3408c4c9feae451d4eae47f89 vlc-0.8.6.tar.bz2 10506025
 RMD160 0ec4cea5562d0aeaada9a9c533caa5489764d52d vlc-0.8.6.tar.bz2 10506025
 SHA256 17b114d1fe0177c6639b3fb0985c47362bcf1a405bf5fb401aeffb5dc9b3dba7 vlc-0.8.6.tar.bz2 10506025
-MD5 4183603323a21b2aa38717051c8a3487 vlc-patches-31.tar.bz2 9153
-RMD160 bfd6b5207f55d057827128211770eb92dafd15d5 vlc-patches-31.tar.bz2 9153
-SHA256 dd0b4c797416fe1ad4f2a7c50fed140e4c860addae7672e01f04277650cd3ba3 vlc-patches-31.tar.bz2 9153
+MD5 3be810ccf43a4e1919fff0c69dfe3029 vlc-patches-32.tar.bz2 9409
+RMD160 b38a5c6df7d68b58379f53614bcc9366aed92d81 vlc-patches-32.tar.bz2 9409
+SHA256 52af8539833331104e07b9b7f2bb082ea5cb35eb7671164b3bca0ad954796e52 vlc-patches-32.tar.bz2 9409

diff --git a/media-video/vlc/vlc-0.8.6.ebuild b/media-video/vlc/vlc-0.8.6.ebuild
index 1d8528fcd1bc7c5105005f0553bfee2efdb64148..ab2c3cfab34e0ec13beec1de9781816831c9f062 100644 (file)
--- a/media-video/vlc/vlc-0.8.6.ebuild
+++ b/media-video/vlc/vlc-0.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6.ebuild,v 1.3 2006/12/21 15:50:43 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6.ebuild,v 1.4 2006/12/30 19:55:27 flameeyes Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -13,7 +13,7 @@ MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
 MY_P="${PN}-${MY_PV}"
 
-PATCHLEVEL="31"
+PATCHLEVEL="32"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
 
@@ -168,6 +168,12 @@ src_compile () {
                fi
        fi
 
+       if use live && ! has_version '>=media-plugins/live-2006.12.08'; then
+               myconf="--enable-live555 --with-live555-tree=/usr/$(get_libdir)/live"
+       else
+               myconf="$(use_enable live live555)"
+       fi
+
        econf \
                $(use_enable altivec) \
                $(use_enable stream sout) \
@@ -203,7 +209,6 @@ src_compile () {
                $(use_enable ncurses) \
                $(use_enable xosd) \
                $(use_enable lirc) \
-               $(use_enable live live555) $(use_with live live555-tree /usr/lib/live) \
                $(use_enable mp3 mad) \
                $(use_enable a52) \
                $(use_enable dts) \