diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-04-12 14:20:29 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-04-12 14:20:29 +0000 |
| commit | e46b14c88a91793853e876f899e82e413bf9e16e (patch) | |
| tree | 7fbd98fba6dc4fc33e27edb4303e8b4748cd3fd9 /media-video/vlc | |
| parent | keyword ~x86-fbsd thanks to Henning Schild <henning@wh9.tu-dresden.de>, bug #... (diff) | |
| download | historical-e46b14c88a91793853e876f899e82e413bf9e16e.tar.gz historical-e46b14c88a91793853e876f899e82e413bf9e16e.tar.bz2 historical-e46b14c88a91793853e876f899e82e413bf9e16e.zip | |
master now requires xulrunner 1.9.2
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-video/vlc')
| -rw-r--r-- | media-video/vlc/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/vlc/Manifest | 14 | ||||
| -rw-r--r-- | media-video/vlc/vlc-9999.ebuild | 16 |
3 files changed, 19 insertions, 16 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 142a12f54395..b64cc4452dde 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,9 @@ # 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.562 2010/04/12 08:04:32 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.563 2010/04/12 14:20:29 aballier Exp $ + + 12 Apr 2010; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild: + master now requires xulrunner 1.9.2 12 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> vlc-1.0.5.ebuild: x86 stable wrt bug #314011 diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 9035a9909227..2fa6373a1597 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST vlc-1.0.4.tar.bz2 21622966 RMD160 d4d9dae5dfe7d081d17197e5b94a43e54b213368 SHA1 59d99dd005f70b3442c1c44472640e10fdc15aa5 SHA256 dbff0ba0cd60a4323f85fd8b918f2a4477a11c5a8f628d1b868fb5947e8e9896 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 @@ -7,6 +10,13 @@ DIST vlc-patches-85.tar.bz2 3361 RMD160 59cee85e2f6ad560cd3102b83ab7e0a6ad990164 EBUILD vlc-1.0.4.ebuild 11941 RMD160 9401debb4d071980307ac583f7b8e8ea52ad8a50 SHA1 94bf1ecc7203cc3315ace8d02805018e794c9caa SHA256 d0ac3016fcef6e5fa1b943101e9e0d83d731d06da6a8d82d572d1d8e9006a3ea EBUILD vlc-1.0.5.ebuild 12062 RMD160 1309bd049b95b3e7bad4125cd500e1d5d8c934f0 SHA1 a355b81bc4d5c45e51e22d275a14a82b2de8df89 SHA256 677af3ef10d3e46205503a7e4e591cbc5e262c829812527a4a2d3f92f9f07c9c EBUILD vlc-1.0.9999.ebuild 12012 RMD160 01cd0e2f13cfc817768251dbfbcee8cbc3c93a15 SHA1 89d53b3a60fa8e335ae341e9cef11a22aed24886 SHA256 b3265530a61a3e4083d86cacf47cb2ab8313c9032672e378d4397bbab29fc691 -EBUILD vlc-9999.ebuild 11676 RMD160 261879cd4e5bde2eae6ca6be09c887611892c2e5 SHA1 a61ceb0f082cba493caa4f384c7bee9df0887e7d SHA256 eab9748f12898fa215f3f311d0f83f9de0010f3a14425861f0981e156653f93d -MISC ChangeLog 87372 RMD160 a1ef31d44e6d2b25a615f92f7f0c745c3c0f9982 SHA1 6455676ba2c8b5934f94161ce66864136c4f6d14 SHA256 4fddec02d3a984d9fb4c74818b0cd130a7ea3ddd76816ed7bf553928ffdca3bd +EBUILD vlc-9999.ebuild 11483 RMD160 a1a6e6b83f61265e67192884c95ab1c14696687e SHA1 3c087cf5b1774cc8989e6b9991ae5bff0fe42eb1 SHA256 330221eb627db5360c4ed44cd7c2a0a82788ddffb3cc4433df07c3342b9fd1c6 +MISC ChangeLog 87478 RMD160 663b6054a9ef0d97a4c1bf2af57c4319faf72f82 SHA1 1ee531b87e630b88f3027afc9591d7cf7f32adb3 SHA256 7abf8533f4bbe47216e778f4504e2b677e5f2758ca07353168264f3405886afe MISC metadata.xml 4152 RMD160 371740d72f49649ff3d8e3e9397730962c85d4a3 SHA1 69e10d0465819e595218136e1bdf6fe12f9ab099 SHA256 c5ca4cd5ddfbb0cf93c851eb9f12ac33d561cbeb8fcef9df64eb79c1f9023632 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkvDLDMACgkQvFcC4BYPU0pzcACgupcejT3ne+uiKiN9wMvrTP09 +6NYAn3Xwn4pyyBKxR0mIjr1cII9nsI4y +=V+mU +-----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 6985092b3352..65f94641c9b9 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-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-9999.ebuild,v 1.64 2010/04/09 09:39:49 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.65 2010/04/12 14:20:29 aballier Exp $ EAPI="2" @@ -106,7 +106,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.9.2 ) + nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) png? ( media-libs/libpng sys-libs/zlib ) @@ -221,16 +221,6 @@ src_configure() { # It would fail if -fforce-addr is used due to too few registers... use x86 && filter-flags -fforce-addr - local MOZILLA_PC - - if use nsplugin; then - if has_version 'net-libs/xulrunner:1.9' ; then - MOZILLA_PC=libxul - else - MOZILLA_PC=xulrunner-plugin - fi - fi - econf \ $(use_enable a52) \ $(use_enable aalib aa) \ @@ -284,7 +274,7 @@ src_configure() { $(use_enable mtp) \ $(use_enable musepack mpc) \ $(use_enable ncurses) \ - $(use_enable nsplugin mozilla) --with-mozilla-pkg="${MOZILLA_PC}" \ + $(use_enable nsplugin mozilla) --with-mozilla-pkg=libxul \ $(use_enable ogg) \ $(use_enable opengl glx) $(use_enable opengl) \ $(use_enable optimisememory optimize-memory) \ |