From 543bac56a6379a0997ea93b48794c4edf72ad8ed Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 30 Nov 2005 23:21:02 +0000 Subject: [PATCH] Completely remove nsplugin logic in vlc 0.8.1, too bugged. Package-Manager: portage-2.0.53_rc7 --- media-video/vlc/ChangeLog | 5 ++++- media-video/vlc/Manifest | 10 +++++----- media-video/vlc/vlc-0.8.1-r1.ebuild | 30 ++++------------------------- 3 files changed, 13 insertions(+), 32 deletions(-) diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 0239cc0e0b77..c10ae475fa87 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/vlc # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.122 2005/11/29 12:08:22 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.123 2005/11/30 23:21:02 flameeyes Exp $ + + 30 Nov 2005; Diego Pettenò vlc-0.8.1-r1.ebuild: + Completely remove nsplugin logic in vlc 0.8.1, too bugged. 29 Nov 2005; Diego Pettenò vlc-0.8.4-r1.ebuild: Die if skins are requested but freetype is not enabled. Don't remove the diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 8193688d6965..37b4083446d2 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 31c434de847a00af9e98d17fb17399c5 ChangeLog 24644 +MD5 c0e164826ded27e0c3b30a9bb019761a ChangeLog 24780 MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r1 127 MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r2 127 MD5 d84791584b167d4cf96f365498050a62 files/digest-vlc-0.8.4 127 MD5 e7f91e71a2b7c89a96d477ac21852415 files/digest-vlc-0.8.4-r1 127 MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249 -MD5 b591b42c362967ecb4666f426314c737 vlc-0.8.1-r1.ebuild 6701 +MD5 d9578070019bfe4fe5674658b1afd8f7 vlc-0.8.1-r1.ebuild 6028 MD5 34c899e9870f05ff49336006f2a0ab92 vlc-0.8.2-r1.ebuild 7576 MD5 06b1c25d0b8b20d67db5a61f4c8078f5 vlc-0.8.2-r2.ebuild 7458 MD5 265366ae8cea8a25583309c9b89e420f vlc-0.8.4-r1.ebuild 7106 @@ -16,7 +16,7 @@ MD5 c7260ce34328b0bb07e6c71813959374 vlc-0.8.4.ebuild 7045 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDjETEAiZjviIA2XgRAuLpAKDNosltZpuZ818QgJFXegFI7zOuswCg6VxG -rIxzpUZ2+ZUnVlob5+iZLXY= -=1dYf +iD8DBQFDjjP5AiZjviIA2XgRAuQZAJ9MibZGwfEq6ZcKWSwp7SvC0P99JACg7+Dr +ZBjyzT77F89V/nq7opw0Cqs= +=hjqK -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-0.8.1-r1.ebuild b/media-video/vlc/vlc-0.8.1-r1.ebuild index bf52b4b7909d..7eb5b8d14dc1 100644 --- a/media-video/vlc/vlc-0.8.1-r1.ebuild +++ b/media-video/vlc/vlc-0.8.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r1.ebuild,v 1.22 2005/11/28 01:57:51 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r1.ebuild,v 1.23 2005/11/30 23:21:02 flameeyes Exp $ inherit libtool toolchain-funcs eutils wxwidgets @@ -13,7 +13,7 @@ SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 ~ppc sparc x86" -IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows xosd lirc joystick nsplugin stream mad xv bidi gtk2 sdl ssl" +IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows xosd lirc joystick stream mad xv bidi gtk2 sdl ssl" DEPEND="cdio? ( >=dev-libs/libcdio-0.70 ) cddb? ( >=media-libs/libcddb-0.9.4 ) @@ -46,7 +46,6 @@ DEPEND="cdio? ( >=dev-libs/libcdio-0.70 ) wxwindows? ( =x11-libs/wxGTK-2.4* ) xosd? ( x11-libs/xosd ) lirc? ( app-misc/lirc ) - nsplugin? ( www-client/mozilla ) 3dfx? ( media-libs/glide-v3 ) bidi? ( >=dev-libs/fribidi-0.10.4 ) gnutls? ( >=net-libs/gnutls-1.0.0 ) @@ -112,18 +111,6 @@ src_compile () { myconf="${myconf} --disable-cddax" fi - # reason why: - # mozilla-config is not in ${PATH} - # so the configure script won't find it - # unless we setup the proper variable - if use nsplugin ; then - myconf="${myconf} --enable-mozilla MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config" - else - myconf="${myconf} --disable-mozilla" - fi - - # Portaudio support needs at least v19 - econf \ $(use_enable altivec) \ $(use_enable unicode utf8) \ @@ -172,23 +159,14 @@ src_compile () { $(use_enable sdl) \ $(use_enable ssl gnutls) \ --disable-ncurses --disable-portaudio --disable-pth --disable-hal \ - --disable-x264 \ + --disable-x264 --disable-mozilla \ ${myconf} || die "configuration failed" if [[ $(gcc-major-version) == 2 ]]; then sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed" fi - # upstream fixed the previously lacking logic - # check for /usr/bin/xpidl and sed, otherwise - # assume the default. - ChrisWhite - if use nsplugin && [ -e /usr/bin/xpidl ] ; then - sed -e "s:^XPIDL = .*:XPIDL = /usr/bin/xpidl:" -i mozilla/Makefile \ - || die "could not fix XPIDL path" - fi - - MAKEOPTS="${MAKEOPTS} -j1" - emake || die "make of VLC failed" + emake -j1 || die "make of VLC failed" } src_install() { -- 2.26.2