summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2013-11-29 10:39:40 +0000
committerSergey Popov <pinkbyte@gentoo.org>2013-11-29 10:39:40 +0000
commit9a52e0a45056ae188258e96d98e456e0f51d0c69 (patch)
treea5b48b4967464f742da4f70db4dc6d1068005e3f /media-video/mpv
parentsci-chemistry/relax: Fix icons (diff)
downloadgentoo-2-9a52e0a45056ae188258e96d98e456e0f51d0c69.tar.gz
gentoo-2-9a52e0a45056ae188258e96d98e456e0f51d0c69.tar.bz2
gentoo-2-9a52e0a45056ae188258e96d98e456e0f51d0c69.zip
Update live ebuild, thanks to Nikoli
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'media-video/mpv')
-rw-r--r--media-video/mpv/ChangeLog5
-rw-r--r--media-video/mpv/mpv-9999.ebuild17
2 files changed, 11 insertions, 11 deletions
diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 1cb99072eddf..b82a0c1d1ab2 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.42 2013/11/27 08:07:23 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.43 2013/11/29 10:39:40 pinkbyte Exp $
+
+ 29 Nov 2013; Sergey Popov <pinkbyte@gentoo.org> mpv-9999.ebuild:
+ Update live ebuild, thanks to Nikoli
27 Nov 2013; Sergey Popov <pinkbyte@gentoo.org> mpv-9999.ebuild:
Remove workaround for building with gcc's PIE per
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 7afa575848bf..914224a997a4 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.29 2013/11/27 08:07:23 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.30 2013/11/29 10:39:40 pinkbyte Exp $
EAPI=5
@@ -21,9 +21,9 @@ SLOT="0"
[[ ${PV} == *9999* ]] || \
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd +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 +shm +threads v4l vaapi
-vcd vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv"
+jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl
+oss portaudio +postproc pulseaudio pvr +quvi -radio samba +shm v4l vaapi vcd vdpau
+vf-dlopen wayland +X xinerama +xscreensaver +xv"
REQUIRED_USE="
enca? ( iconv )
@@ -31,10 +31,8 @@ REQUIRED_USE="
libguess? ( iconv )
luajit? ( lua )
opengl? ( || ( wayland X ) )
- portaudio? ( threads )
pvr? ( v4l )
radio? ( v4l || ( alsa oss ) )
- v4l? ( threads )
vaapi? ( X )
vdpau? ( X )
wayland? ( opengl )
@@ -45,8 +43,8 @@ REQUIRED_USE="
RDEPEND+="
|| (
- >=media-video/libav-9:=[encode?,threads?,vaapi?,vdpau?]
- >=media-video/ffmpeg-1.2:0=[encode?,threads?,vaapi?,vdpau?]
+ >=media-video/libav-9:=[encode?,threads,vaapi?,vdpau?]
+ >=media-video/ffmpeg-1.2:0=[encode?,threads,vaapi?,vdpau?]
)
sys-libs/ncurses
sys-libs/zlib
@@ -94,7 +92,7 @@ RDEPEND+="
postproc? (
|| (
media-libs/libpostproc
- >=media-video/ffmpeg-1.2:0[encode?,threads?,vaapi?,vdpau?]
+ >=media-video/ffmpeg-1.2:0[encode?,threads,vaapi?,vdpau?]
)
)
pulseaudio? ( media-sound/pulseaudio )
@@ -212,7 +210,6 @@ src_configure() {
$(use_enable openal) \
$(use_enable oss oss-audio) \
$(use_enable pulseaudio pulse) \
- $(use_enable threads pthreads) \
$(use_enable shm) \
$(use_enable X x11) \
$(use_enable vaapi) \