summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-12-26 13:57:23 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-12-26 13:57:23 +0000
commitce5f091fd2ce8d38a0deac0928b0815f86f6f533 (patch)
treef63bd783895576291cc044859a30458dc0241073 /media-video
parentrestrict to older polkit (diff)
downloadgentoo-2-ce5f091fd2ce8d38a0deac0928b0815f86f6f533.tar.gz
gentoo-2-ce5f091fd2ce8d38a0deac0928b0815f86f6f533.tar.bz2
gentoo-2-ce5f091fd2ce8d38a0deac0928b0815f86f6f533.zip
Add libsidplay-2 support
(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/vlc/ChangeLog6
-rw-r--r--media-video/vlc/metadata.xml1
-rw-r--r--media-video/vlc/vlc-9999.ebuild10
3 files changed, 14 insertions, 3 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 6097f7fc085e..d75f95e29471 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
# 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.644 2010/11/14 18:50:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.645 2010/12/26 13:57:23 aballier Exp $
+
+ 26 Dec 2010; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild,
+ metadata.xml:
+ Add libsidplay-2 support
14 Nov 2010; Raúl Porcel <armin76@gentoo.org> vlc-1.1.5.ebuild:
Re-add ~sparc wrt #345329
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 0f8334da4b35..62964e1c0f54 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -34,6 +34,7 @@
<flag name="rtsp">Enables real audio and RTSP modules.</flag>
<flag name="run-as-root">Allows vlc to start for root. Don't enable this unless you have a very specific (e.g. embedded) need for it!</flag>
<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
+ <flag name="sid">Adds support for playing C64 SID files through <pkg>media-libs/libsidplay-2</pkg>.</flag>
<flag name="sdl-image">Enables sdl image video decoder (depends on sdl)</flag>
<flag name="shine">Enables shine fixed point mp3 encoder.</flag>
<flag name="shout">Enables libshout output.</flag>
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index c56f38c152b2..a28b56c8701b 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -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.100 2010/11/07 19:14:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.101 2010/12/26 13:57:23 aballier Exp $
EAPI="3"
@@ -51,7 +51,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
libnotify libproxy libtiger libv4l2 lirc live lua matroska mmx
modplug mp3 mpeg mtp musepack ncurses 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
+ schroedinger sdl sdl-image shine shout sid skins speex sqlite sse stream
svg taglib theora truetype twolame udev upnp v4l2 vaapi vcdx vlm
vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
@@ -110,6 +110,7 @@ RDEPEND="
sdl? ( >=media-libs/libsdl-1.2.8
sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
shout? ( media-libs/libshout )
+ sid? ( media-libs/libsidplay:2 )
skins? (
x11-libs/qt-gui:4 x11-libs/qt-core:4
x11-libs/libXext x11-libs/libX11
@@ -209,6 +210,10 @@ src_configure() {
# It would fail if -fforce-addr is used due to too few registers...
use x86 && filter-flags -fforce-addr
+ # needs libresid-builder from libsidplay:2 which is in another directory...
+ # FIXME!
+ use sid && append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
econf \
--docdir=/usr/share/doc/${PF} \
$(use_enable a52) \
@@ -279,6 +284,7 @@ src_configure() {
$(use_enable sdl) \
$(use_enable sdl-image) \
$(use_enable shine) \
+ $(use_enable sid) \
$(use_enable shout) \
$(use_enable skins skins2) \
$(use_enable speex) \