live ebuild for the 1.1 branch

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 378 insertions, 6 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index dc88f716c5ec..07a71f5bd815 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.570 2010/04/22 19:26:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.571 2010/04/23 11:08:49 aballier Exp $
+
+*vlc-1.1.9999 (23 Apr 2010)
+
+  23 Apr 2010; Alexis Ballier <aballier@gentoo.org> +vlc-1.1.9999.ebuild:
+  live ebuild for the 1.1 branch
 
 *vlc-1.1.0_pre2 (22 Apr 2010)
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index b5e8b9fd9932..2a75c01c43aa 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -14,13 +14,14 @@ EBUILD vlc-1.0.5.ebuild 12055 RMD160 827dd3c7f1ba1bb6e7b9b1d688c11b703aa6c205 SH
 EBUILD vlc-1.0.6.ebuild 12061 RMD160 0b00e160e20da914e4bb3ebdf58f4e0fd910ae82 SHA1 7ffbeace779f070c20ca181626110717e37ef920 SHA256 3d15c1dc583213399f369579977780d11e81cca7bd8e8c8d94496df6ace35b42
 EBUILD vlc-1.0.9999.ebuild 12012 RMD160 01cd0e2f13cfc817768251dbfbcee8cbc3c93a15 SHA1 89d53b3a60fa8e335ae341e9cef11a22aed24886 SHA256 b3265530a61a3e4083d86cacf47cb2ab8313c9032672e378d4397bbab29fc691
 EBUILD vlc-1.1.0_pre2.ebuild 11656 RMD160 9c7ef7b180ce03cd3ff68a3e0b23e0488d1867b3 SHA1 f3fb31e13756be79ced600eebda47d5fefe4b634 SHA256 ec54d493da2e4974d1c8ff8c564f14912c6c663effc7c75ad0fa20d30bacbe4d
+EBUILD vlc-1.1.9999.ebuild 11602 RMD160 c92c9980eeb9ea27b4457a9793ce964c64683f74 SHA1 2ac86a41730a8f7b69a2812d6f1328ae81921593 SHA256 67493fd892938244f5ff6d19b74c45a94d1bbc00fcc58fae04c6cbbb30a8bec6
 EBUILD vlc-9999.ebuild 11599 RMD160 23255ecedbb9681eb3702de358ccea780011e645 SHA1 84b0657c20b4a9ef228ecb2f51bef5d94fbc5396 SHA256 a51937cbc2a3361dd871f38c42611a68eb1828e8e70297c65a44e9a3a5e261a2
-MISC ChangeLog 88271 RMD160 de29e2d341443208ec06cd8515b4e186fa1002f8 SHA1 45955b9728c3b7336492434792b88bbad99bda79 SHA256 f41daa6faa114603ab9f18baad64eabdeee59e948404618be02384d22222b869
+MISC ChangeLog 88408 RMD160 a0ff5a4f7b7f61d59596c75f348d0f32e17f1e83 SHA1 43ad670123d031b795c896d28b7646c2f49f407d SHA256 f1e227076a6e31c2d2abd7423846370ed7969342b914ae935a96c3dbaf898453
 MISC metadata.xml 4152 RMD160 371740d72f49649ff3d8e3e9397730962c85d4a3 SHA1 69e10d0465819e595218136e1bdf6fe12f9ab099 SHA256 c5ca4cd5ddfbb0cf93c851eb9f12ac33d561cbeb8fcef9df64eb79c1f9023632
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvQovYACgkQvFcC4BYPU0oTnwCgin/PhjLx8H92s6OXl0Nk/2dA
-exAAn0lWhk7kHcF18C2RcjHhlNQe/AEZ
-=8tJc
+iEYEARECAAYFAkvRf8gACgkQvFcC4BYPU0peyQCggCvToaEIXQMoJj7rs+4XSUP2
+BsMAoKQELHGp3nV4chjviX10EIDdJBf/
+=IXRV
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
new file mode 100644
index 000000000000..8beb20456b44
--- /dev/null
+++ b/media-video/vlc/vlc-1.1.9999.ebuild
@@ -0,0 +1,366 @@
+# 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-1.1.9999.ebuild,v 1.1 2010/04/23 11:08:49 aballier Exp $
+
+EAPI="2"
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then
+	SCM=git
+	EGIT_BOOTSTRAP="bootstrap"
+	EGIT_BRANCH=master
+	EGIT_PROJECT=${P}
+	if [ "${PV%.9999}" != "${PV}" ] ; then
+		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
+	fi
+fi
+
+inherit eutils multilib autotools toolchain-funcs gnome2 nsplugins qt4 flag-o-matic ${SCM}
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+VLC_SNAPSHOT_TIME="0013"
+
+PATCHLEVEL="85"
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+elif [[ "${P}" == *_alpha* ]]; then # Snapshots taken from nightlies.videolan.org
+	SRC_URI="http://nightlies.videolan.org/build/source/trunk-${PV/*_alpha/}-${VLC_SNAPSHOT_TIME}/${PN}-snapshot-${PV/*_alpha/}.tar.bz2"
+	MY_P="${P/_alpha*/}-git"
+elif [[ "${MY_P}" == "${P}" ]]; then
+	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+else
+	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2"
+fi
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS=""
+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 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
+	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 v4l2 vcdx vlm
+	vorbis win32codecs wma-fixed x264 +xcb xml xosd xv zvbi"
+
+RDEPEND="
+		!!<=media-video/vlc-1.0.99999
+		sys-libs/zlib
+		>=media-libs/libdvbpsi-0.1.6
+		a52? ( >=media-libs/a52dec-0.7.4-r3 )
+		aalib? ( media-libs/aalib )
+		aac? ( >=media-libs/faad2-2.6.1 )
+		alsa? ( media-libs/alsa-lib )
+		avahi? ( >=net-dns/avahi-0.6 )
+		bidi? ( >=dev-libs/fribidi-0.10.4 )
+		cdda? (	cddb? ( >=media-libs/libcddb-1.2.0 ) )
+		dbus? ( >=sys-apps/dbus-1.0.2 )
+		dc1394? ( >=sys-libs/libraw1394-2.0.1
+			>=media-libs/libdc1394-2.0.2 )
+		dirac? ( >=media-video/dirac-0.10.0 )
+		directfb? ( dev-libs/DirectFB sys-libs/zlib )
+		dts? ( media-libs/libdca )
+		dvd? (	media-libs/libdvdread
+				>=media-libs/libdvdnav-0.1.9
+				media-libs/libdvdplay )
+		elibc_glibc? ( >=sys-libs/glibc-2.8 )
+		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 )
+		flac? ( media-libs/libogg
+			>=media-libs/flac-1.1.2 )
+		fluidsynth? ( media-sound/fluidsynth )
+		fontconfig? ( media-libs/fontconfig )
+		gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
+		ggi? ( media-libs/libggi )
+		gnome? ( gnome-base/gnome-vfs )
+		gnutls? ( >=net-libs/gnutls-1.7.4 )
+		id3tag? ( media-libs/libid3tag sys-libs/zlib )
+		ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
+		kate? ( >=media-libs/libkate-0.1.1 )
+		libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig )
+		libcaca? ( >=media-libs/libcaca-0.99_beta14 )
+		libnotify? ( x11-libs/libnotify )
+		libproxy? ( net-libs/libproxy )
+		libtiger? ( media-libs/libtiger )
+		lirc? ( app-misc/lirc )
+		live? ( >=media-plugins/live-2008.07.06 )
+		lua? ( >=dev-lang/lua-5.1 )
+		matroska? (
+			>=dev-libs/libebml-0.7.6
+			>=media-libs/libmatroska-0.8.0 )
+		modplug? ( >=media-libs/libmodplug-0.8 )
+		mp3? ( media-libs/libmad )
+		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
+		mtp? ( >=media-libs/libmtp-0.3.0 )
+		musepack? ( >=media-sound/musepack-tools-444 )
+		ncurses? ( sys-libs/ncurses )
+		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 )
+		projectm? ( media-libs/libprojectm )
+		pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
+		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
+		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
+		samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
+			<net-fs/samba-3.4 ) )
+		schroedinger? ( >=media-libs/schroedinger-1.0.6 )
+		sdl? ( >=media-libs/libsdl-1.2.8
+			sdl-image? ( media-libs/sdl-image sys-libs/zlib	) )
+		shout? ( media-libs/libshout )
+		skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 )
+		speex? ( media-libs/speex )
+		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
+		svg? ( >=gnome-base/librsvg-2.9.0 )
+		svga? ( media-libs/svgalib )
+		taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
+		theora? ( >=media-libs/libtheora-1.0_beta3 )
+		truetype? ( media-libs/freetype
+			media-fonts/dejavu )
+		twolame? ( media-sound/twolame )
+		udev? ( >=sys-fs/udev-142 )
+		upnp? ( net-libs/libupnp )
+		v4l2? ( libv4l2? ( media-libs/libv4l ) )
+		v4l? ( libv4l? ( media-libs/libv4l ) )
+		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
+		vorbis? ( media-libs/libvorbis )
+		win32codecs? ( media-libs/win32codecs )
+		x264? ( >=media-libs/x264-0.0.20090923 )
+		xcb? ( x11-libs/libxcb x11-libs/xcb-util )
+		xml? ( dev-libs/libxml2 )
+		xosd? ( x11-libs/xosd )
+		zvbi? ( >=media-libs/zvbi-0.2.25 )
+		"
+
+DEPEND="${RDEPEND}
+	dvb? ( sys-kernel/linux-headers )
+	kde? ( >=kde-base/kdelibs-4 )
+	v4l? ( sys-kernel/linux-headers )
+	v4l2? ( >=sys-kernel/linux-headers-2.6.25 )
+	xcb? ( x11-proto/xproto )
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+# Displays a warning if the first use flag is set but the second is not
+vlc_use_needs() {
+	use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled."
+}
+
+# Notify the user that some useflag have been forced on
+vlc_use_force() {
+	use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
+}
+
+# Use when $2 depends strictly on $3
+# if use $1 then enable $2 and $3, otherwise disable $2
+vlc_use_enable_force() {
+	if use $1 ; then
+		echo "--enable-$2 --enable-$3"
+	else
+		echo "--disable-$2"
+	fi
+}
+
+pkg_setup() {
+	if has_version '<=media-video/vlc-1.0.99999'; then
+		eerror "Please unmerge vlc-1.0.x first before installing ${P}"
+		eerror "If you don't do that, some plugins will get linked against"
+		eerror "the old ${PN} version and will not work."
+		die "Unmerge vlc 1.0.x first"
+	fi
+	vlc_use_needs skins truetype
+	vlc_use_force skins qt4
+	vlc_use_needs bidi truetype
+	vlc_use_force remoteosd gcrypt
+	vlc_use_needs fontconfig truetype
+	vlc_use_needs libv4l2 v4l2
+	vlc_use_needs libv4l v4l
+	vlc_use_needs libtiger kate
+	vlc_use_needs xv xcb
+	vlc_use_needs cddb cdda
+	if use qt4 || use skins ; then
+		qt4_pkg_setup
+	else
+		ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
+		ewarn "graphical interface. Maybe that is not what you want..."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	if [ "${PV%9999}" != "${PV}" ] ; then
+		git_src_unpack
+	fi
+}
+
+src_prepare() {
+	if [ "${PV%9999}" != "${PV}" ] ; then
+		git_src_prepare
+	fi
+	# Make it build with libtool 1.5
+	rm -f m4/lt* m4/libtool.m4
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	eautoreconf
+}
+
+src_configure() {
+
+	# It would fail if -fforce-addr is used due to too few registers...
+	use x86 && filter-flags -fforce-addr
+
+	econf \
+		$(use_enable a52) \
+		$(use_enable aalib aa) \
+		$(use_enable aac faad) \
+		$(use_enable alsa) \
+		$(use_enable altivec) \
+		--disable-asademux \
+		$(use_enable atmo) \
+		$(use_enable avahi bonjour) \
+		$(use_enable bidi fribidi) \
+		$(use_enable cdda vcd) \
+		$(use_enable cddb libcddb) \
+		$(use_enable dbus) $(use_enable dbus dbus-control) \
+		$(use_enable dirac) \
+		$(use_enable directfb) \
+		$(use_enable dc1394) \
+		$(use_enable debug) \
+		$(use_enable dts dca) \
+		$(use_enable dvb) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+		$(use_enable fbcon fb) \
+		$(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(use_enable ffmpeg swscale) $(use_enable ffmpeg postproc) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable fontconfig) \
+		$(use_enable ggi) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable gnutls) \
+		$(use_enable httpd) \
+		$(use_enable id3tag) \
+		$(use_enable ieee1394 dv) \
+		$(use_enable jack) \
+		$(use_enable kate) \
+		$(use_with kde kde-solid) \
+		$(use_enable libass) \
+		$(use_enable libcaca caca) \
+		$(use_enable gcrypt libgcrypt) \
+		$(use_enable libnotify notify) \
+		$(use_enable libproxy) \
+		--disable-libtar \
+		$(use_enable libtiger tiger) \
+		$(use_enable libv4l) \
+		$(use_enable libv4l2) \
+		$(use_enable lirc) \
+		$(use_enable live live555) \
+		$(use_enable lua) \
+		$(use_enable matroska mkv) \
+		$(use_enable mmx) \
+		$(use_enable modplug mod) \
+		$(use_enable mp3 mad) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable mtp) \
+		$(use_enable musepack mpc) \
+		$(use_enable ncurses) \
+		$(use_enable nsplugin mozilla) --with-mozilla-pkg=libxul \
+		$(use_enable ogg) \
+		$(use_enable opengl glx) $(use_enable opengl) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable oss) \
+		$(use_enable png) \
+		--disable-portaudio \
+		$(use_enable projectm) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable pvr) \
+		$(use_enable qt4) \
+		$(use_enable rtsp realrtsp) \
+		$(use_enable run-as-root) \
+		$(use_enable samba smb) \
+		$(use_enable schroedinger) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable shine) \
+		$(use_enable shout) \
+		$(use_enable skins skins2) \
+		$(use_enable speex) \
+		$(use_enable sqlite) \
+		$(use_enable sse) \
+		$(use_enable stream sout) \
+		$(use_enable svg) \
+		$(use_enable svga svgalib) \
+		$(use_enable taglib) \
+		$(use_enable theora) \
+		$(use_enable truetype freetype) \
+		$(use_enable twolame) \
+		$(use_enable udev) \
+		$(use_enable upnp) \
+		$(use_enable v4l) \
+		$(use_enable v4l2) \
+		$(use_enable vcdx) \
+		$(use_enable vorbis) \
+		$(use_enable win32codecs loader) \
+		$(use_enable wma-fixed) \
+		$(use_enable x264) \
+		$(use_enable xcb) \
+		$(use_enable xml libxml2) \
+		$(use_enable xosd) \
+		$(use_enable xv xvideo) \
+		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--disable-snapshot \
+		--disable-growl \
+		--disable-optimizations \
+		--enable-fast-install \
+		$(vlc_use_enable_force vlm vlm sout) \
+		$(vlc_use_enable_force skins skins2 qt4) \
+		$(vlc_use_enable_force remoteosd remoteosd libgcrypt)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS HACKING THANKS NEWS README \
+		doc/fortunes.txt doc/intf-vcd.txt
+
+	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"
+
+	for res in 16 32 48; do
+		insinto /usr/share/icons/hicolor/${res}x${res}/apps/
+		newins "${S}"/share/vlc${res}x${res}.png vlc.png
+	done
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+}