diff options
Diffstat (limited to 'media-video/vlc/vlc-1.1.13.ebuild')
| -rw-r--r-- | media-video/vlc/vlc-1.1.13.ebuild | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/media-video/vlc/vlc-1.1.13.ebuild b/media-video/vlc/vlc-1.1.13.ebuild index e7c514bf7406..14ca5380081c 100644 --- a/media-video/vlc/vlc-1.1.13.ebuild +++ b/media-video/vlc/vlc-1.1.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.13.ebuild,v 1.7 2012/05/05 08:58:52 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.13.ebuild,v 1.8 2012/05/21 05:21:20 ssuominen Exp $ EAPI="3" @@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then fi fi -inherit eutils multilib autotools toolchain-funcs gnome2 nsplugins qt4 flag-o-matic ${SCM} +inherit eutils multilib autotools toolchain-funcs gnome2 qt4 flag-o-matic ${SCM} MY_PV="${PV/_/-}" MY_PV="${MY_PV/-beta/-test}" @@ -51,7 +51,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394 debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig +gcrypt ggi gme gnome gnutls httpd id3tag ieee1394 jack kate kde libass libcaca libnotify libproxy libtiger libv4l libv4l2 lirc live lua matroska mmx - modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss + modplug mp3 mpeg mtp musepack ncurses ogg opengl optimisememory oss png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba schroedinger sdl sdl-image shine shout skins speex sqlite sse stream svg svga taglib theora truetype twolame udev upnp v4l vaapi vcdx vlm @@ -102,7 +102,6 @@ RDEPEND=" mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses ) - nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) ) png? ( media-libs/libpng sys-libs/zlib ) @@ -182,7 +181,6 @@ pkg_setup() { vlc_use_force skins qt4 vlc_use_force vlm stream vlc_use_force vaapi ffmpeg - vlc_use_force nsplugin xcb vlc_use_force xosd X vlc_use_force sdl X vlc_use_force aalib X @@ -279,7 +277,7 @@ src_configure() { $(use_enable mtp) \ $(use_enable musepack mpc) \ $(use_enable ncurses) \ - $(use_enable nsplugin mozilla) --with-mozilla-pkg=libxul \ + --disable-mozilla \ $(use_enable ogg) \ $(use_enable opengl glx) $(use_enable opengl) \ $(use_enable optimisememory optimize-memory) \ @@ -337,7 +335,6 @@ src_configure() { $(vlc_use_enable_force remoteosd libgcrypt) \ $(vlc_use_enable_force gnutls libgcrypt) \ $(vlc_use_enable_force vaapi avcodec) \ - $(vlc_use_enable_force nsplugin xcb) \ $(use sdl && echo '--with-x') \ $(use xosd && echo '--with-x') \ $(use aalib && echo '--with-x') @@ -352,12 +349,6 @@ src_install() { rm -rf "${D}/usr/share/doc/vlc" \ "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico} - if use nsplugin; then - dodir "/usr/$(get_libdir)/${PLUGINS_DIR}" - mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \ - "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/" - fi - use skins || rm -rf "${D}/usr/share/vlc/skins2" } |