[gentoo-commits] gentoo-x86 commit in media-video/vlc: vlc-9999.ebuild ChangeLog

["Alexis Ballier (aballier)" <aballier@gentoo.org>]

aballier    10/04/12 14:20:29

  Modified:             vlc-9999.ebuild ChangeLog
  Log:
  master now requires xulrunner 1.9.2
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.65                 media-video/vlc/vlc-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-9999.ebuild?r1=1.64&r2=1.65

Index: vlc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- vlc-9999.ebuild	9 Apr 2010 09:39:49 -0000	1.64
+++ vlc-9999.ebuild	12 Apr 2010 14:20:29 -0000	1.65
@@ -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 @@
 		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 @@
 	# 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 @@
 		$(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) \



1.563                media-video/vlc/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.563&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.563&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?r1=1.562&r2=1.563

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -r1.562 -r1.563
--- ChangeLog	12 Apr 2010 08:04:32 -0000	1.562
+++ ChangeLog	12 Apr 2010 14:20:29 -0000	1.563
@@ -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