diff options
author | Alexis Ballier <aballier@gentoo.org> | 2007-10-10 11:08:21 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2007-10-10 11:08:21 +0000 |
commit | 78c1e2441ada9035955cee227981821a6ba676b2 (patch) | |
tree | 01b0880659ab39180b49a45a86a9de51e8ce0940 /media-video | |
parent | app-editors/pico is a dumb ebuild not installing anything, so removing from R... (diff) | |
download | gentoo-2-78c1e2441ada9035955cee227981821a6ba676b2.tar.gz gentoo-2-78c1e2441ada9035955cee227981821a6ba676b2.tar.bz2 gentoo-2-78c1e2441ada9035955cee227981821a6ba676b2.zip |
add support to build against xulrunner, thanks to Frittella Laurento <mrfree@infinito.it>, bug #161340
(Portage version: 2.1.3.12)
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/vlc/ChangeLog | 7 | ||||
-rw-r--r-- | media-video/vlc/vlc-0.9.0_alpha20071009.ebuild | 14 |
2 files changed, 15 insertions, 6 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 065bb1f5feef..f52d2853c0b1 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.261 2007/10/10 09:45:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.262 2007/10/10 11:08:21 aballier Exp $ + + 10 Oct 2007; Alexis Ballier <aballier@gentoo.org> + vlc-0.9.0_alpha20071009.ebuild: + add support to build against xulrunner, thanks to Frittella Laurento + <mrfree@infinito.it>, bug #161340 10 Oct 2007; Alexis Ballier <aballier@gentoo.org> vlc-0.9.0_alpha20071009.ebuild: diff --git a/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild b/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild index 09ecad144892..c350e3580994 100644 --- a/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild +++ b/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild,v 1.3 2007/10/10 09:45:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20071009.ebuild,v 1.4 2007/10/10 11:08:21 aballier Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -46,7 +46,7 @@ oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc stream mp3 xv bidi sdl sdl-image png xml samba daap mod speex shout rtsp win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey optimisememory libnotify jack musepack x264 dc1394 lua gnome pvr taglib -musicbrainz dbus libgcrypt id3tag cdio ffmpeg twolame" +musicbrainz dbus libgcrypt id3tag cdio ffmpeg twolame xulrunner" RDEPEND=" ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 ) @@ -115,8 +115,9 @@ RDEPEND=" directfb? ( dev-libs/DirectFB ) upnp? ( net-libs/libupnp ) nsplugin? ( - !seamonkey? ( www-client/mozilla-firefox ) - seamonkey? ( www-client/seamonkey ) + xulrunner? ( net-libs/xulrunner ) + !xulrunner? ( seamonkey? ( www-client/seamonkey ) ) + !xulrunner? ( !seamonkey? ( www-client/mozilla-firefox ) ) ) libnotify? ( x11-libs/libnotify ) musepack? ( media-libs/libmpcdec ) @@ -197,7 +198,10 @@ src_compile () { myconf="${myconf} --disable-vlm" if use nsplugin; then - if use seamonkey; then + if use xulrunner; then + XPIDL=/usr/$(get_libdir)/xulrunner + MOZILLA_CONFIG=/usr/bin/xulrunner-config + elif use seamonkey; then XPIDL=/usr/$(get_libdir)/seamonkey MOZILLA_CONFIG=/usr/$(get_libdir)/seamonkey/seamonkey-config else |