Synced to gentoo.org

(Portage version: 2.2_rc8/svn/Linux 2.6.25-tuxonice-r6 i686)

svn path=/testing/; revision=475

3 files changed, 79 insertions, 19 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index f6d0d2c..4f91761 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Aug 2008; Matthias Schwarzott <zzam@gentoo.org> metadata.xml,
+  -xine-lib-1.1.14.ebuild, +xine-lib-1.1.15.ebuild:
+  Synced to gentoo.org
+
   07 Aug 2008; Matthias Schwarzott <zzam@gentoo.org>
   +files/xine-lib-1.1.14-metadata-bugfix.patch, +xine-lib-1.1.14-r1.ebuild,
   xine-lib-9999.ebuild:
diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml
index 3bf9266..fde93f3 100644
--- a/media-libs/xine-lib/metadata.xml
+++ b/media-libs/xine-lib/metadata.xml
@@ -3,13 +3,77 @@
 <pkgmetadata>
 <herd>video</herd>
 <maintainer>
-<email>flameeyes@gentoo.org</email>
-<name>Diego Pettenò</name>
+  <email>media-video@gentoo.org</email>
 </maintainer>
 <maintainer>
-<email>vdr@gentoo.org</email>
-<name>gentoo-vdr-project</name>
+  <email>vdr@gentoo.org</email>
 </maintainer>
-<longdescription>An open source library for media applications
-On VDR relaveted parts, please contact only Gentoo VDR Project</longdescription>
+<longdescription>An open source library for media applications</longdescription>
+<use>
+  <flag name="real">
+    Enable support for loading and using RealPlayer binary codecs on x86 and
+    amd64 Linux. Enabling this USE flag might make the package
+    non-redistributable in binary form.
+  </flag>
+  <flag name="win32codecs">
+    Enable support for loading and using Windows 32-bit binary codecs on x86
+    Linux and FreeBSD. Enabling this USE flag might make the package
+    non-redistributable in binary form.
+  </flag>
+  <flag name="mad">
+    Build the <pkg>media-libs/libmad</pkg> based mp3 decoder. This mp3 decoder
+    has superior support compared to the one coming from FFmpeg that is used as
+    a fallback. If you experience any bad behaviour with mp3 files (skipping,
+    distorted sound) make sure you enabled this USE flag.
+  </flag>
+  <flag name="flac">
+    Build the <pkg>media-libs/flac</pkg> based FLAC demuxer and decoder. This
+    flag is not needed for playing FLAC content, neither standalone nor in Ogg
+    container (OggFLAC), but might have better support for exotic features like
+    24-bit samples or 96kHz sample rates.
+  </flag>
+  <flag name="gtk">
+    Build the gdkpixbuf-based image decoder plugin.
+  </flag>
+  <flag name="imagemagick">
+    Build the ImageMagick-based image decoder plugin.
+  </flag>
+  <flag name="gnome">
+    Build the <pkg>gnome-base/gnome-vfs</pkg> based input plugin. This plugin is
+    used to access any resource that can be accessed through Nautilus's (and
+    others') URLs.
+  </flag>
+  <flag name="mmap">
+    Use mmap() function while reading file from local disks. Using mmap() will
+    use more virtual memory space, but leaves to the Kernel the task of caching
+    the file's data. mmap() access should be faster, but might misbehave if the
+    device where the file resides in is removed during playback.
+  </flag>
+  <flag name="truetype">
+    Use <pkg>media-libs/freetype</pkg> for font rendering and
+    <pkg>media-libs/fontconfig</pkg> for font discovery. Enabling this USE flag
+    will allow OSD (such as subtitles) to use more advanced font and to more
+    easily select which font to use. The support for TrueType fonts in xine-lib
+    is still experimental, and might not be as good looking as the bitmap fonts
+    used with this USE flag disabled.
+  </flag>
+  <flag name="xvmc">
+	Enable support for XVideo Motion Compensation (accelerated mpeg playback).
+  </flag>
+  <flag name="dxr3">
+	Enable support for DXR3 mpeg accelleration cards.
+  </flag>
+  <flag name="vidix">
+	Enable support for vidix video output.
+  </flag>
+  <flag name="vis">
+	Adds support for SIMD optimizations for UltraSPARC processors.
+  </flag>
+  <flag name="vdr">
+	Adds support for Video Disc Recorder (VDR)
+  </flag>
+  <flag name="vdr-net">
+	Adds support for Video Disc Recorder (VDR) network connections
+  </flag>
+</use>
 </pkgmetadata>
diff --git a/media-libs/xine-lib/xine-lib-1.1.14.ebuild b/media-libs/xine-lib/xine-lib-1.1.15.ebuild
index 95c6412..1d8afcb 100644
--- a/media-libs/xine-lib/xine-lib-1.1.14.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.15.ebuild
@@ -26,13 +26,13 @@ HOMEPAGE="http://xine.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 IUSE="-aalib -libcaca -arts esd win32codecs nls +dvd +X directfb +vorbis +alsa
 gnome sdl speex +theora ipv6 altivec opengl aac -fbcon +xv xvmc
 -samba dxr3 vidix mng -flac -oss +v4l xinerama vcd +a52 +mad -imagemagick +dts
 -debug +modplug -gtk pulseaudio -mmap -truetype wavpack +musepack +xcb -jack
--real vdr"
+-real +vis vdr"
 
 RDEPEND="X? ( x11-libs/libXext
 	x11-libs/libX11 )
@@ -61,6 +61,7 @@ RDEPEND="X? ( x11-libs/libXext
 	mad? ( media-libs/libmad )
 	imagemagick? ( media-gfx/imagemagick )
 	dts? ( media-libs/libdca )
+	aac? ( >=media-libs/faad2-2.6.1 )
 	>=media-video/ffmpeg-0.4.9_p20070129
 	modplug? ( media-libs/libmodplug )
 	nls? ( virtual/libintl )
@@ -123,15 +124,6 @@ src_compile() {
 		is-flag -O? || append-flags -O2
 	fi
 
-	local myconf
-
-	# enable/disable appropiate optimizations on sparc
-	[[ "${PROFILE_ARCH}" == "sparc64" ]] && myconf="${myconf} --enable-vis"
-	[[ "${PROFILE_ARCH}" == "sparc" ]] && myconf="${myconf} --disable-vis"
-
-	# The default CFLAGS (-O) is the only thing working on hppa.
-	use hppa && unset CFLAGS
-
 	# Too many file names are the same (xine_decoder.c), change the builddir
 	# So that the relative path is used to identify them.
 	mkdir "${WORKDIR}/build"
@@ -149,7 +141,7 @@ src_compile() {
 		$(use_with imagemagick) \
 		$(use_enable gtk gdkpixbuf) \
 		\
-		$(use_enable aac faad) \
+		$(use_enable aac faad) --with-external-libfaad \
 		$(use_with flac libflac) \
 		$(use_with vorbis) \
 		$(use_with speex) \
@@ -190,11 +182,11 @@ src_compile() {
 		$(use_with truetype freetype) $(use_with truetype fontconfig) \
 		\
 		$(use_enable debug) \
+		$(use_enable vis) \
 		--enable-asf \
 		--with-external-ffmpeg \
 		--disable-optimizations \
 		--disable-syncfb \
-		${myconf} \
 		--with-xv-path=/usr/$(get_libdir) \
 		--with-w32-path=/usr/$(ABI=x86 get_libdir)/win32 \
 		--with-real-codecs-path=/usr/$(get_libdir)/codecs \