new upstream release

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27.2 x86_64

4 files changed, 377 insertions, 6 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 8cc0d0035488..f6e8c72697ea 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.400 2008/10/22 03:41:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.401 2008/10/25 00:04:50 aballier Exp $
+
+*vlc-0.9.5 (25 Oct 2008)
+
+  25 Oct 2008; Alexis Ballier <aballier@gentoo.org> metadata.xml,
+  +vlc-0.9.5.ebuild:
+  new upstream release
 
   22 Oct 2008; Alexis Ballier <aballier@gentoo.org> vlc-0.9.4-r1.ebuild:
   vlc checks if the compiler supports fomit-frame-pointer, no need for the
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 99080e7a886b..18801776ffe4 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -5,17 +5,19 @@ AUX 0001-Fix-build-with-x264-build-65.patch 2490 RMD160 db1bf691a189495a37054064
 AUX embeddedvideo.patch 720 RMD160 5b6721052bd9c80b17ed04ed9555bef19cf75378 SHA1 7cd96e30dc2402e1159b9ee9f4d2b64fbb5685a5 SHA256 2a9abdfa1b47d6c16ad0c7e06a3e3291ff334f041673c745feef71db560900bc
 DIST vlc-0.8.6i.tar.bz2 11786172 RMD160 a5da4e1e0980594c678c04016491c8a373df4017 SHA1 4c6f45dffe3a8309ce201897040dc1f82b9cde99 SHA256 a866768f7dd8254c62e059327094073800ed968214b5b35e2682eb81f448214f
 DIST vlc-0.9.4.tar.bz2 16471217 RMD160 6f02a3cfbe50eb34f58fd1f4b9e6e9881f344152 SHA1 1325b29268bdcecfb5272433d1fde935171aefed SHA256 6e6ce0fc497d380b3ed1b8c77c4ce5d089a90070ef38626b9af71a13e52b4faf
+DIST vlc-0.9.5.tar.bz2 16457306 RMD160 8ec72d026f6fa086620f63d202d015fa14b4a4d7 SHA1 0f3f315353a09bf769f27bd07e20654b072cd209 SHA256 abf55aec95db9256d2056d3a6042ddd329f675414acf3a0abb34d306e0dd843e
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-59.tar.bz2 4685 RMD160 a01cba6d4af12ebd26faed4a7f8894529dc42e57 SHA1 387934801502ff82045ab446fb1421b14233cf03 SHA256 cf38f9398e62fad8c51dc1b0c8467236cbffb1d465ddbf5ab62d2bf4bbd1ec35
 DIST vlc-patches-61.tar.bz2 11855 RMD160 8f79c5594eca44c0f5bb4ed19e48ae39a8b17013 SHA1 6c7cc969ae4abbaccc8e1e8d3323d5a33bccf364 SHA256 01800e30ca1db5c5bbab8317195be1dc4c074452bbe41ed7f061e491baac6e24
 EBUILD vlc-0.8.6i-r2.ebuild 9095 RMD160 fa8c121127749ac5c21bc66e8646d4c6e2cf148a SHA1 1d1e5d6b5fe28df220314a1855c64facbb9670e8 SHA256 cf5e7e0727b694372b9a9d4cf77972089fb61d99d7accab6d0f6e5ea6fcceace
 EBUILD vlc-0.9.4-r1.ebuild 10969 RMD160 51c9f65821dec1610f4b03860c58c75e5fceba2b SHA1 62717cf2ea4cc1bf8b4e74d63f1c1dbfaeef3c7b SHA256 341b706b3bc9f4c985306020ce5e227e8e2086e4aa60adfa855e00284a65768c
-MISC ChangeLog 65307 RMD160 94549133928bccfbec482f7909c7dbfe852b54b2 SHA1 acc51a48ce518d09d05d71b24faf97b29f0baaac SHA256 c84bb20d44ad0c76e5b3c9df326a0e184798b579fff03c3a1c927e3ddcd57091
-MISC metadata.xml 3268 RMD160 8106a671502d94ffddfd38caa96901b9c1334020 SHA1 ab6d85ac6a1c5693727816100079afcd3507ad02 SHA256 5eba1f569e6de9eb02e2251ca0526e104f1772033e1e354efd3360d805528490
+EBUILD vlc-0.9.5.ebuild 10948 RMD160 a082efdccf8547412a6ae4c6fdba05f7b68ae4f0 SHA1 16637addcb8e90d11cf5b8e1dc47bc41deae19ae SHA256 186219a85d9073fa2ec3c4203b2c7ef87d8b32d88321aa0073cb841a034db777
+MISC ChangeLog 65444 RMD160 fb782685c0dca5fcda78ed312881a0d0063ae193 SHA1 943deba3a7024961478dccb566c7dd35ec4b51b5 SHA256 f35db75ad9fbf06ff84c71bad3504a86af13317c98c266138e1c961ee24f963f
+MISC metadata.xml 3452 RMD160 40628b71a7c1d60430bbab665e7de5d05067cfef SHA1 e332279d90b5998123a76b897d2c0a811d1f232d SHA256 efeba5a1bb9eac379da733eb42f505990609b43d4bf920c2d894807970f44e03
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj+oNIACgkQvFcC4BYPU0oHuQCfXW7uFj6J8iwsmfB6s0eMx99+
-eEsAnioV113TXabcsHGQjmrwVT0QHNCu
-=w5O6
+iEYEARECAAYFAkkCYqsACgkQvFcC4BYPU0roMgCaAvthO3L47faA5X1Cp7w8mcOs
+quwAnjW9AIWA2j/r08s3o2iDP7OQk+RU
+=oo6i
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 6f42e7657518..da5ee308d9fd 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -20,6 +20,9 @@
     <flag name="kate">Adds support for Ogg Kate subtitles via libkate.</flag>
     <flag name="libass">Enables subtitles support using libass.</flag>
     <flag name="libgcrypt">Enables cryptography support via libgcrypt.</flag>
+    <flag name="libv4l2">Enables Libv4l2 Video4Linux2 support (for conversion
+		from various video formats to standard ones, needed to use v4l2 devices
+		with strange formats).</flag>
     <flag name="live">Enables LIVE.com support.</flag>
     <flag name="optimisememory">Enable optimisation for memory rather than performance.</flag>
     <flag name="pvr">Enables PVR cards access module.</flag>
diff --git a/media-video/vlc/vlc-0.9.5.ebuild b/media-video/vlc/vlc-0.9.5.ebuild
new file mode 100644
index 000000000000..a0e993307727
--- /dev/null
+++ b/media-video/vlc/vlc-0.9.5.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.5.ebuild,v 1.1 2008/10/25 00:04:50 aballier Exp $
+
+EAPI="1"
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+
+inherit eutils multilib autotools toolchain-funcs gnome2 nsplugins qt4 flag-o-matic
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+VLC_SNAPSHOT_TIME="0013"
+
+PATCHLEVEL="59"
+M4_TARBALL_VERSION="1"
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+if [[ "${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 [[ "${P}" == *_p* ]]; then # Snapshots
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	MY_P="${P}"
+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
+	mirror://gentoo/${PN}-m4-${M4_TARBALL_VERSION}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd"
+IUSE="a52 aac aalib alsa altivec arts atmo avahi bidi cdda cddb cdio dbus dc1394
+	debug dirac directfb dts dvb dvd esd fbcon fluidsynth +ffmpeg flac fontconfig ggi gnome gnutls hal httpd
+	id3tag jack kate libass libcaca +libgcrypt libnotify libv4l2 lirc live lua matroska mmx modplug mp3 mpeg
+	musepack ncurses nsplugin ogg opengl optimisememory oss png	pulseaudio pvr +qt4
+	remoteosd rtsp samba schroedinger sdl sdl-image seamonkey shout skins speex sse stream svg svga taglib
+	theora truetype twolame upnp v4l v4l2 vcd vcdx vlm vorbis win32codecs
+	X x264 xinerama xml xosd xv zvbi"
+
+RDEPEND="
+		sys-libs/zlib
+		media-libs/libdvbpsi
+		a52? ( >=media-libs/a52dec-0.7.4-r3 )
+		aalib? ( media-libs/aalib )
+		aac? ( >=media-libs/faad2-2.6.1 )
+		alsa? ( media-libs/alsa-lib )
+		arts? ( kde-base/arts )
+		avahi? ( >=net-dns/avahi-0.6 )
+		bidi? ( >=dev-libs/fribidi-0.10.4 )
+		cdda? ( >=dev-libs/libcdio-0.72
+			cddb? ( >=media-libs/libcddb-1.2.0 ) )
+		cdio? ( >=dev-libs/libcdio-0.78.2
+			>=media-video/vcdimager-0.7.22 )
+		dbus? ( >=sys-apps/dbus-1.0.2 )
+		dc1394? ( sys-libs/libraw1394
+			<media-libs/libdc1394-1.9.99 )
+		dirac? ( >=media-video/dirac-0.10.0 )
+		directfb? ( dev-libs/DirectFB )
+		dts? ( media-libs/libdca )
+		dvd? (	media-libs/libdvdread
+				media-libs/libdvdcss
+				>=media-libs/libdvdnav-0.1.9
+				media-libs/libdvdplay )
+		esd? ( media-sound/esound )
+		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616 )
+		flac? ( media-libs/libogg
+			>=media-libs/flac-1.1.2 )
+		fluidsynth? ( media-sound/fluidsynth )
+		fontconfig? ( media-libs/fontconfig )
+		ggi? ( media-libs/libggi )
+		gnome? ( gnome-base/gnome-vfs )
+		gnutls? ( >=net-libs/gnutls-1.3.3 )
+		hal? ( sys-apps/hal )
+		id3tag? ( media-libs/libid3tag
+			sys-libs/zlib )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
+		kate? ( >=media-libs/libkate-0.1.1 )
+		libass? ( >=media-libs/libass-0.9.5 media-libs/fontconfig )
+		libcaca? ( media-libs/libcaca )
+		libgcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
+		libnotify? ( x11-libs/libnotify )
+		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 )
+		mp3? ( media-libs/libmad )
+		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
+		musepack? ( media-libs/libmpcdec )
+		ncurses? ( sys-libs/ncurses )
+		nsplugin? (
+			seamonkey?  ( =www-client/seamonkey-1* )
+			!seamonkey? ( >=net-libs/xulrunner-1.8 )
+		)
+		ogg? ( media-libs/libogg )
+		png? ( media-libs/libpng )
+		pulseaudio? ( >=media-sound/pulseaudio-0.9.8 )
+		qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
+		samba? ( net-fs/samba )
+		schroedinger? ( >=media-libs/schroedinger-1.0 )
+		sdl? ( >=media-libs/libsdl-1.2.8
+			sdl-image? ( media-libs/sdl-image ) )
+		shout? ( media-libs/libshout )
+		skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+		speex? ( media-libs/speex )
+		svg? ( >=gnome-base/librsvg-2.9.0 )
+		svga? ( media-libs/svgalib )
+		taglib? ( media-libs/taglib )
+		theora? ( media-libs/libtheora )
+		truetype? ( media-libs/freetype
+			media-fonts/ttf-bitstream-vera )
+		twolame? ( media-sound/twolame )
+		upnp? ( net-libs/libupnp )
+		v4l2? ( libv4l2? ( media-libs/libv4l ) )
+		vorbis? ( media-libs/libvorbis )
+		win32codecs? ( media-libs/win32codecs )
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			xv? ( x11-libs/libXv )
+			xinerama? ( x11-libs/libXinerama )
+			opengl? ( virtual/opengl )
+		)
+		x264? ( media-libs/x264 )
+		xml? ( dev-libs/libxml2 )
+		xosd? ( x11-libs/xosd )
+		zvbi? ( >=media-libs/zvbi-0.2.25 )
+		"
+
+# Disabled features and reasons:
+# xvmc? ( x11-libs/libXvMC )
+#	Will probably compile only on x86
+
+DEPEND="${RDEPEND}
+	dvb? ( sys-kernel/linux-headers )
+	v4l? ( sys-kernel/linux-headers )
+	v4l2? ( sys-kernel/linux-headers )
+	X? ( xinerama? ( x11-proto/xineramaproto ) )
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+# Dispalys a warning if the first use flag is set but not the second
+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
+}
+
+# Prints the configure argument for the ffmpeg scaling api to use
+vlc_ffmpeg_scaling_api() {
+	if use ffmpeg ; then
+		if has_version ">=media-video/ffmpeg-0.4.9_p20070616-r20" || has_version "=media-video/ffmpeg-0.4.9_p20070616-r2" || has_version "=media-video/ffmpeg-0.4.9_p20070616-r1"; then
+			echo "--enable-swscale --disable-imgresample"
+		else
+			echo "--disable-swscale --enable-imgresample"
+		fi
+	else
+		echo "--disable-swscale --disable-imgresample"
+	fi
+}
+
+pkg_setup() {
+	vlc_use_needs skins truetype
+	vlc_use_force skins qt4
+	vlc_use_needs cdda cdio
+	vlc_use_needs vcdx cdio
+	vlc_use_needs bidi truetype
+	vlc_use_force remoteosd libgcrypt
+	vlc_use_needs fontconfig truetype
+	vlc_use_needs libv4l2 v4l2
+	if ( use qt4 || use skins ) ; then
+		QT4_BUILT_WITH_USE_CHECK="png" 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}
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf
+}
+
+src_compile () {
+
+	# 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 use seamonkey; then
+			MOZILLA_PC=seamonkey-plugin
+		else
+			if has_version 'net-libs/xulrunner:1.9' ; then
+				MOZILLA_PC=libxul
+			else
+				MOZILLA_PC=xulrunner-plugin
+			fi
+		fi
+	fi
+
+	econf \
+		$(use_enable a52) \
+		$(use_enable aalib aa) \
+		$(use_enable aac faad) \
+		$(use_enable alsa) \
+		$(use_enable altivec) \
+		$(use_enable arts) \
+		--disable-asademux \
+		$(use_enable atmo) \
+		$(use_enable avahi bonjour) \
+		$(use_enable bidi fribidi) \
+		$(use_enable cdda) $(use_enable cdda cddax)\
+		$(use_enable cddb libcddb) \
+		$(use_enable cdio libcdio) \
+		--disable-csri \
+		$(use_enable dbus) $(use_enable dbus dbus-control) \
+		$(use_enable dirac) \
+		$(use_enable directfb) \
+		$(use_enable dc1394) \
+		$(use_enable debug) \
+		$(use_enable dts dca) \
+		--disable-dv \
+		$(use_enable dvb) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+		$(use_enable esd) \
+		$(use_enable fbcon fb) \
+		$(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(vlc_ffmpeg_scaling_api) $(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 hal) \
+		$(use_enable httpd) \
+		$(use_enable id3tag) \
+		$(use_enable jack) \
+		$(use_enable kate) \
+		$(use_enable libass) \
+		$(use_enable libcaca caca) \
+		$(use_enable libgcrypt) \
+		$(use_enable libnotify notify) \
+		--disable-libproxy \
+		--disable-libtar \
+		$(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 musepack mpc) \
+		$(use_enable ncurses) \
+		$(use_enable nsplugin mozilla) --with-mozilla-pkg="${MOZILLA_PC}" \
+		$(use_enable ogg) \
+		$(use_enable opengl glx) $(use_enable opengl) $(use_enable opengl galaktos) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable oss) \
+		$(use_enable png) \
+		--disable-portaudio \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable pvr) \
+		$(use_enable qt4) \
+		$(use_enable rtsp realrtsp) \
+		$(use_enable samba smb) \
+		$(use_enable schroedinger) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable shout) \
+		$(use_enable skins skins2) \
+		$(use_enable speex) \
+		$(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 upnp) \
+		$(use_enable v4l) \
+		$(use_enable v4l2) \
+		$(use_enable vcd) \
+		$(use_enable vcdx) \
+		$(use_enable vorbis) \
+		$(use_enable win32codecs loader) \
+		$(use_enable X x11) $(use_enable X screen) \
+		$(use_enable x264) \
+		$(use_enable xinerama) \
+		$(use_enable xml libxml2) \
+		$(use_enable xosd) \
+		$(use_enable xv xvideo) \
+		--disable-xvmc \
+		$(use_enable zvbi) \
+		--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)
+
+	emake || die "make of VLC failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS MAINTAINERS HACKING THANKS NEWS README \
+		doc/fortunes.txt doc/intf-cdda.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
+}