From: Alexis Ballier Date: Wed, 24 Feb 2010 13:13:36 +0000 (+0000) Subject: Add a conditional patch for 1.0.x series to build against xulrunner 1.9.2, bug #290318 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2c53b726c60d8be16359cd543561703d309dc591;p=gentoo.git Add a conditional patch for 1.0.x series to build against xulrunner 1.9.2, bug #290318 Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 9adfc0cccbdf..47fd6377be86 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.557 2010/02/24 12:30:21 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.558 2010/02/24 13:13:36 aballier Exp $ + + 24 Feb 2010; Alexis Ballier vlc-1.0.5.ebuild, + vlc-1.0.9999.ebuild: + Add a conditional patch for 1.0.x series to build against xulrunner 1.9.2, + bug #290318 24 Feb 2010; Alexis Ballier vlc-9999.ebuild: Do not generate the plugin cache at buildtime and do it in postinst diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 101bb183c91d..eef17058fdf8 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -5,18 +5,18 @@ DIST vlc-1.0.4.tar.bz2 21622966 RMD160 d4d9dae5dfe7d081d17197e5b94a43e54b213368 DIST vlc-1.0.5.tar.bz2 21887131 RMD160 de50206ddce59d1487ea7d4efa8bbd37f55b928e SHA1 a2c415923850720dc4499de0b6f6dbe40e98f90f SHA256 f7f1994c936fbb8c392481a13abfd6a6b76c5aac4406fa7a78d4786dfc206dcd DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54 DIST vlc-patches-79.tar.bz2 6483 RMD160 f4bb903049b35c411ead3d812c865ac97d42c905 SHA1 b650ae71e4a59397be5a74cb7de5101d030ee04a SHA256 c2956b049de208408d64175792c936f8fcd325bd51c21d76158ba38107dda800 -DIST vlc-patches-81.tar.bz2 6859 RMD160 f1d4a3f6b896bba5ee2c864a35d0c330dc9c861c SHA1 f0b79f1c9a9e3b3bf954c5911c50ca8a3bf38b48 SHA256 f5bf4faa83fd7c8135dafcd728fce2e206620fe8180ed96e89d486861b6c26aa DIST vlc-patches-82.tar.bz2 5209 RMD160 d44813b8033303507a4a65411cf46d3963be9349 SHA1 e0adbc632af430c93573dc2539cdee66dfd20bf1 SHA256 7b3afbb9565352888265ddc9b1ce03b6097824e402d00e5711e426289946b0be +DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506 SHA1 91bcd66f3b393202153595e8c44926cc051d7451 SHA256 c3c2b7841bde69762feed36758d95ccd5cc0ee390310cfad91bbfa3bca72b1e3 EBUILD vlc-1.0.4.ebuild 11944 RMD160 6b11b400fbd13fb09dab6720d4e6dd85b377f5b9 SHA1 38c2db38a27aa6ae03d6aff685d80b0289e68e04 SHA256 1bb7ec981c0c2518e6b46711f71336c340c0f8be58789ad4eddee6a3200b17c2 -EBUILD vlc-1.0.5.ebuild 12001 RMD160 9890031fefd76079f2c31feec159f2a2e182c367 SHA1 10e69e16365dc9cb640f5d998e87249fc270d4fa SHA256 b2e481aeeebdd8b297526a314aa4e178e8522e866027ce40b61fcf85a90f442f -EBUILD vlc-1.0.9999.ebuild 11953 RMD160 19742ae8ea36f8be129a91434f5a5ee0dc7d9e00 SHA1 c0c450992c45e678b14b29b18bca0098c13500f8 SHA256 cfea2fb4c8fa330c23c23ccbd7bad7e979b0a8b14c4ab6595af2a05492e94f3b +EBUILD vlc-1.0.5.ebuild 12064 RMD160 cd4b0efc8871ae051d540271590181a78bbbefd0 SHA1 fc91424ebaea8438ff2716799c69956462ca4804 SHA256 bf50d19c6eb96a235ce42bfd04b645ac9c4212fd5577dd6ceb261add9495e755 +EBUILD vlc-1.0.9999.ebuild 12016 RMD160 e33004803ad2459cc8e0205572b355b97dbe5e82 SHA1 50a8d12feb671972054d80e964b654c89de1aa9d SHA256 7c8eedd4ad29f5de0d7620e341aaa1f2b92f57e8c747332a152930953d93cc8c EBUILD vlc-9999.ebuild 11679 RMD160 20a48aef3d36bc967ef68ad9d1c5dc1614f39621 SHA1 508a93cba03da6038d553aff62993a3e2486cf2c SHA256 ef743e290fd4e0027fbd2c6b3215b3d91bb63c48baad53a9f4981ae08c385c11 -MISC ChangeLog 86718 RMD160 26ffc31bea63eee884a0cdb6815991ec2342b998 SHA1 bbbf7f0a90318d33ac9fbdedc03bf952553958d7 SHA256 170b89fd941dd9b6c35aa40568001f31c017c4159396044b18df8f256d8df0e4 +MISC ChangeLog 86903 RMD160 d8b352792d8e95e012458460339fbe9d2d8f83a8 SHA1 125e5a75368e2fd471d094604e51b62f209610b1 SHA256 eed52761672e5d893a1695ce1baa0095136b7a352d76089dcf923345d7453f54 MISC metadata.xml 4152 RMD160 371740d72f49649ff3d8e3e9397730962c85d4a3 SHA1 69e10d0465819e595218136e1bdf6fe12f9ab099 SHA256 c5ca4cd5ddfbb0cf93c851eb9f12ac33d561cbeb8fcef9df64eb79c1f9023632 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuFG+MACgkQvFcC4BYPU0qWiwCfd6Q//O0GkkZL+I9Pay0FM7HG -QNUAnRNSoo9YW+PkOjmSvLVrukjFqleX -=JGjx +iEYEARECAAYFAkuFJgcACgkQvFcC4BYPU0pwBgCcDRz2YJ+omHCSnVane7770WpT +vvkAoIVS2tdj96nPFx1KdGeh4l/aNFs6 +=ehi4 -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-1.0.5.ebuild b/media-video/vlc/vlc-1.0.5.ebuild index 0e718d804732..8ab60efcda01 100644 --- a/media-video/vlc/vlc-1.0.5.ebuild +++ b/media-video/vlc/vlc-1.0.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.5.ebuild,v 1.2 2010/02/23 10:24:14 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.5.ebuild,v 1.3 2010/02/24 13:13:36 aballier Exp $ EAPI="2" @@ -24,7 +24,7 @@ MY_PV="${MY_PV/-beta/-test}" MY_P="${PN}-${MY_PV}" VLC_SNAPSHOT_TIME="0013" -PATCHLEVEL="81" +PATCHLEVEL="83" M4_TARBALL_VERSION="1" DESCRIPTION="VLC media player - Video player and streamer" HOMEPAGE="http://www.videolan.org/vlc/" @@ -113,7 +113,7 @@ RDEPEND=" mtp? ( >=media-libs/libmtp-0.3.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses ) - nsplugin? ( >=net-libs/xulrunner-1.8 x11-libs/libXpm x11-libs/libXt =net-libs/xulrunner-1.8 x11-libs/libXpm x11-libs/libXt ) ogg? ( media-libs/libogg ) pda? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng ) @@ -230,6 +230,7 @@ src_prepare() { # Make it build with libtool 1.5 rm -f m4/lt* m4/libtool.m4 + has_version '>=net-libs/xulrunner-1.9.2' || EPATCH_EXCLUDE="550_all_xulrunner192.patch" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf } diff --git a/media-video/vlc/vlc-1.0.9999.ebuild b/media-video/vlc/vlc-1.0.9999.ebuild index af485a77ff5d..068004ee9dba 100644 --- a/media-video/vlc/vlc-1.0.9999.ebuild +++ b/media-video/vlc/vlc-1.0.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.37 2010/02/23 10:24:14 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.38 2010/02/24 13:13:36 aballier Exp $ EAPI="2" @@ -24,7 +24,7 @@ MY_PV="${MY_PV/-beta/-test}" MY_P="${PN}-${MY_PV}" VLC_SNAPSHOT_TIME="0013" -PATCHLEVEL="81" +PATCHLEVEL="83" M4_TARBALL_VERSION="1" DESCRIPTION="VLC media player - Video player and streamer" HOMEPAGE="http://www.videolan.org/vlc/" @@ -113,7 +113,7 @@ RDEPEND=" mtp? ( >=media-libs/libmtp-0.3.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses ) - nsplugin? ( >=net-libs/xulrunner-1.8 x11-libs/libXpm x11-libs/libXt =net-libs/xulrunner-1.8 x11-libs/libXpm x11-libs/libXt ) ogg? ( media-libs/libogg ) pda? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng ) @@ -230,6 +230,7 @@ src_prepare() { # Make it build with libtool 1.5 rm -f m4/lt* m4/libtool.m4 + has_version '>=net-libs/xulrunner-1.9.2' || EPATCH_EXCLUDE="550_all_xulrunner192.patch" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf }