add sdl USE flag wrt #506982

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

4 files changed, 38 insertions, 18 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 56f1569b7136..1431f9c97d24 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mpv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.71 2014/04/18 13:04:46 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.72 2014/04/20 12:38:29 hasufell Exp $
+
+  20 Apr 2014; Julian Ospald <hasufell@gentoo.org> mpv-0.3.8.ebuild,
+  mpv-9999.ebuild, metadata.xml:
+  add sdl USE flag wrt #506982
 
 *mpv-0.3.8 (18 Apr 2014)
 
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 42de60d01bab..5fb8b8dae633 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -8,20 +8,34 @@
 <herd>proxy-maintainers</herd>
 <use>
 	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
-	<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
-	<flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag>
+	<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone
+		filter</flag>
+	<flag name="cdio">Use libcdio for CD support
+		(instead of cdparanoia)</flag>
 	<flag name='doc-pdf'>Build documentation in pdf format</flag>
-	<flag name='dvdnav'>Enable support for DVD navigation using <pkg>media-libs/libdvdnav</pkg></flag>
-	<flag name="enca">Enables support for charset discovery and conversion using <pkg>app-i18n/enca</pkg></flag>
-	<flag name="libguess">Enables support for charset discovery and conversion using <pkg>app-i18n/libguess</pkg></flag>
-	<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
-	<flag name="mpg123">Enable support for mp3 decoding over <pkg>media-sound/mpg123</pkg> instead of relying on ffmpeg support.</flag>
-	<flag name="postproc">Enable image post-processing via libpostproc</flag>
+	<flag name='dvdnav'>Enable support for DVD navigation using
+		<pkg>media-libs/libdvdnav</pkg></flag>
+	<flag name="enca">Enables support for charset discovery and conversion
+		using <pkg>app-i18n/enca</pkg></flag>
+	<flag name="libguess">Enables support for charset discovery and
+		conversion using <pkg>app-i18n/libguess</pkg></flag>
+	<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
+		<pkg>dev-lang/lua</pkg></flag>
+	<flag name="mpg123">Enable support for mp3 decoding over
+		<pkg>media-sound/mpg123</pkg> instead of relying on ffmpeg
+		support.</flag>
+	<flag name="postproc">Enable image post-processing via
+		libpostproc</flag>
 	<flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
-	<flag name="quvi">Enable support for streaming sites using <pkg>media-libs/libquvi</pkg></flag>
+	<flag name="quvi">Enable support for streaming sites using
+		<pkg>media-libs/libquvi</pkg></flag>
 	<flag name="radio">Enable V4L2 radio interface and support</flag>
+	<flag name="sdl">Enable video and audio support via
+		<pkg>media-libs/libsdl2</pkg></flag>
 	<flag name="shm">Enable support for shm</flag>
-	<flag name="vaapi">Enable VAAPI (Video Acceleration API) for hardware decoding</flag>
-	<flag name="vf-dlopen">Install additional video filters for using with -vf dlopen</flag>
+	<flag name="vaapi">Enable VAAPI (Video Acceleration API) for
+		hardware decoding</flag>
+	<flag name="vf-dlopen">Install additional video filters for using
+		with -vf dlopen</flag>
 </use>
 </pkgmetadata>
diff --git a/media-video/mpv/mpv-0.3.8.ebuild b/media-video/mpv/mpv-0.3.8.ebuild
index 5d90851f0c66..baeae8ccabcf 100644
--- a/media-video/mpv/mpv-0.3.8.ebuild
+++ b/media-video/mpv/mpv-0.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.3.8.ebuild,v 1.1 2014/04/18 13:04:46 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.3.8.ebuild,v 1.2 2014/04/20 12:38:29 hasufell Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd dvdnav +enca encode +iconv jack -joystick
 jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl
-oss portaudio +postproc pulseaudio pvr +quvi -radio samba selinux +shm v4l vaapi vcd vdpau
+oss portaudio +postproc pulseaudio pvr +quvi -radio samba sdl selinux +shm v4l vaapi vcd vdpau
 vf-dlopen wayland +X xinerama +xscreensaver +xv"
 
 REQUIRED_USE="
@@ -108,6 +108,7 @@ RDEPEND+="
 		)
 	)
 	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[threads] )
 	selinux? ( sec-policy/selinux-mplayer )
 	v4l? ( media-libs/libv4l )
 	wayland? (
@@ -174,7 +175,7 @@ src_configure() {
 		--disable-build-date \
 		--disable-debug-build \
 		--disable-sdl \
-		--disable-sdl2 \
+		$(use_enable sdl sdl2) \
 		--disable-rsound \
 		$(use_enable encode encoding) \
 		$(use_enable joystick) \
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 5a55a467df76..79419adbc25c 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.46 2014/04/18 09:56:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.47 2014/04/20 12:38:29 hasufell Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd dvdnav +enca encode +iconv jack -joystick
 jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl
-oss portaudio +postproc pulseaudio pvr +quvi samba selinux +shm v4l vaapi vcd vdpau
+oss portaudio +postproc pulseaudio pvr +quvi samba sdl selinux +shm v4l vaapi vcd vdpau
 vf-dlopen wayland +X xinerama +xscreensaver +xv"
 
 REQUIRED_USE="
@@ -107,6 +107,7 @@ RDEPEND+="
 		)
 	)
 	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[threads] )
 	selinux? ( sec-policy/selinux-mplayer )
 	v4l? ( media-libs/libv4l )
 	wayland? (
@@ -169,7 +170,7 @@ src_configure() {
 		--disable-build-date \
 		--disable-debug-build \
 		--disable-sdl1 \
-		--disable-sdl2 \
+		$(use_enable sdl sdl2) \
 		--disable-rsound \
 		--disable-vapoursynth \
 		$(use_enable encode encoding) \