summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2013-04-27 18:57:40 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2013-04-27 18:57:40 +0000
commite12c445a7c1e9d245551d82f0a6f3f44a744b4ca (patch)
tree5caa46945b0055dc28d50ff6f02209df9155d866 /media-video
parentmaven config path corrected, see bug 466486. Thanks jeremiah for reporting! (diff)
downloadgentoo-2-e12c445a7c1e9d245551d82f0a6f3f44a744b4ca.tar.gz
gentoo-2-e12c445a7c1e9d245551d82f0a6f3f44a744b4ca.tar.bz2
gentoo-2-e12c445a7c1e9d245551d82f0a6f3f44a744b4ca.zip
Try to enable wayland stuff via useflag.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mpv/ChangeLog5
-rw-r--r--media-video/mpv/mpv-9999.ebuild9
2 files changed, 8 insertions, 6 deletions
diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 6ef6af18ba66..2a8ad136083b 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mpv
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.2 2013/04/27 17:44:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.3 2013/04/27 18:57:40 scarabeus Exp $
+
+ 27 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> mpv-9999.ebuild:
+ Try to enable wayland stuff via useflag.
27 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> mpv-9999.ebuild:
Update bit. Patch by Nikoli.
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index fca461e2a812..f7be87b65ef0 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.2 2013/04/27 17:44:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.3 2013/04/27 18:57:40 scarabeus Exp $
EAPI=5
@@ -21,7 +21,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
IUSE="+alsa aqua bluray bs2b cddb +cdio debug +dts dvb +dvd +enca encode fbcon ftp
+iconv ipv6 jack joystick jpeg kernel_linux ladspa lcms +libass libcaca lirc mng +mp3
+network -openal +opengl oss portaudio +postproc pulseaudio pvr quvi radio samba +shm
-v4l vcd vdpau +X xinerama +xscreensaver +xv"
+v4l vcd vdpau wayland +X xinerama +xscreensaver +xv"
REQUIRED_USE="
cddb? ( cdio network )
@@ -83,6 +83,7 @@ RDEPEND+="
pulseaudio? ( media-sound/pulseaudio )
quvi? ( >=media-libs/libquvi-0.4.1 )
samba? ( net-fs/samba )
+ wayland? ( >=dev-libs/wayland-1.1.0 )
>=virtual/ffmpeg-9[encode?]
"
ASM_DEP="dev-lang/yasm"
@@ -150,8 +151,6 @@ src_configure() {
###################
# SDL output is fallback for platforms where nothing better is available
myconf+=" --disable-sdl --disable-sdl2"
- # wayland needs xkbcommon, not in portage yet
- myconf+=" --disable-wayland"
use encode || myconf+=" --disable-encoding"
use network || myconf+=" --disable-networking"
myconf+=" $(use_enable joystick)"
@@ -265,7 +264,7 @@ src_configure() {
# X enabled configuration #
###########################
use X || myconf+=" --disable-x11"
- uses="vdpau xinerama xv"
+ uses="vdpau wayland xinerama xv"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done