1 |
commit: 31afc5c7bc19f97bd19b8e2969947df38ca21aa2 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 26 19:20:05 2019 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 26 19:20:53 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31afc5c7 |
7 |
|
8 |
media-video/mpv: Sync live ebuild |
9 |
|
10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.16 |
11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
12 |
|
13 |
media-video/mpv/mpv-9999.ebuild | 59 +++++++++++++++++++++-------------------- |
14 |
1 file changed, 30 insertions(+), 29 deletions(-) |
15 |
|
16 |
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild |
17 |
index bbd2d4c179e..575ea9a56da 100644 |
18 |
--- a/media-video/mpv/mpv-9999.ebuild |
19 |
+++ b/media-video/mpv/mpv-9999.ebuild |
20 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://mpv.io/" |
21 |
|
22 |
if [[ ${PV} != *9999* ]]; then |
23 |
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
24 |
- KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" |
25 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" |
26 |
DOCS=( RELEASE_NOTES ) |
27 |
else |
28 |
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git" |
29 |
@@ -28,17 +28,17 @@ DOCS+=( README.md DOCS/{client-api,interface}-changes.rst ) |
30 |
# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. |
31 |
LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )" |
32 |
SLOT="0" |
33 |
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb |
34 |
- dvd +egl gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua |
35 |
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb |
36 |
+ dvd +egl gamepad gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua |
37 |
luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl |
38 |
- selinux test tools +uchardet v4l vaapi vdpau vulkan wayland +X +xv zlib |
39 |
- zsh-completion" |
40 |
+ selinux test tools +uchardet v4l vaapi vdpau vulkan wayland +X +xv zlib zimg" |
41 |
|
42 |
REQUIRED_USE=" |
43 |
|| ( cli libmpv ) |
44 |
aqua? ( opengl ) |
45 |
cuda? ( opengl ) |
46 |
egl? ( || ( gbm X wayland ) ) |
47 |
+ gamepad? ( sdl ) |
48 |
gbm? ( drm egl opengl ) |
49 |
lcms? ( opengl ) |
50 |
luajit? ( lua ) |
51 |
@@ -54,10 +54,11 @@ REQUIRED_USE=" |
52 |
wayland? ( egl ) |
53 |
X? ( egl? ( opengl ) ) |
54 |
xv? ( X ) |
55 |
- zsh-completion? ( cli ) |
56 |
${PYTHON_REQUIRED_USE} |
57 |
" |
58 |
|
59 |
+RESTRICT="!test? ( test )" |
60 |
+ |
61 |
COMMON_DEPEND=" |
62 |
>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] |
63 |
alsa? ( >=media-libs/alsa-lib-1.0.18 ) |
64 |
@@ -70,6 +71,7 @@ COMMON_DEPEND=" |
65 |
>=media-libs/libdvdread-4.1.0:= |
66 |
) |
67 |
egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) |
68 |
+ gamepad? ( media-libs/libsdl2 ) |
69 |
iconv? ( |
70 |
virtual/libiconv |
71 |
uchardet? ( app-i18n/uchardet ) |
72 |
@@ -99,7 +101,6 @@ COMMON_DEPEND=" |
73 |
vulkan? ( |
74 |
media-libs/shaderc |
75 |
media-libs/vulkan-loader[X?,wayland?] |
76 |
- >=media-libs/libplacebo-1.18.0[vulkan] |
77 |
) |
78 |
wayland? ( |
79 |
>=dev-libs/wayland-1.6.0 |
80 |
@@ -119,17 +120,17 @@ COMMON_DEPEND=" |
81 |
xv? ( x11-libs/libXv ) |
82 |
) |
83 |
zlib? ( sys-libs/zlib ) |
84 |
+ zimg? ( >=media-libs/zimg-2.9.2 ) |
85 |
" |
86 |
DEPEND="${COMMON_DEPEND} |
87 |
${PYTHON_DEPS} |
88 |
- dev-python/docutils |
89 |
virtual/pkgconfig |
90 |
cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 ) |
91 |
- doc? ( dev-python/rst2pdf ) |
92 |
+ doc? ( dev-python/docutils |
93 |
+ dev-python/rst2pdf ) |
94 |
dvb? ( virtual/linuxtv-dvb-headers ) |
95 |
test? ( >=dev-util/cmocka-1.0.0 ) |
96 |
v4l? ( virtual/os-headers ) |
97 |
- zsh-completion? ( dev-lang/perl ) |
98 |
" |
99 |
RDEPEND="${COMMON_DEPEND} |
100 |
cuda? ( x11-drivers/nvidia-drivers[X] ) |
101 |
@@ -137,14 +138,10 @@ RDEPEND="${COMMON_DEPEND} |
102 |
tools? ( ${PYTHON_DEPS} ) |
103 |
" |
104 |
|
105 |
-PATCHES=( |
106 |
- "${FILESDIR}/${PN}-0.29.0-make-ffmpeg-version-check-non-fatal.patch" |
107 |
-) |
108 |
- |
109 |
src_prepare() { |
110 |
cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die |
111 |
chmod +x "${S}"/waf || die |
112 |
- default_src_prepare |
113 |
+ default |
114 |
} |
115 |
|
116 |
src_configure() { |
117 |
@@ -156,10 +153,6 @@ src_configure() { |
118 |
append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib" |
119 |
fi |
120 |
|
121 |
- # Prevent access violations from zsh completion generation. |
122 |
- # See Gentoo bug 656086. |
123 |
- use zsh-completion && addpredict /dev/dri |
124 |
- |
125 |
local mywafargs=( |
126 |
--confdir="${EPREFIX}/etc/${PN}" |
127 |
--docdir="${EPREFIX}/usr/share/doc/${PF}" |
128 |
@@ -172,15 +165,14 @@ src_configure() { |
129 |
--disable-static-build |
130 |
# See deep down below for build-date. |
131 |
--disable-optimize # Don't add '-O2' to CFLAGS. |
132 |
- --disable-debug-build # Don't add '-g' to CFLAGS. |
133 |
- --enable-html-build |
134 |
+ $(use_enable debug debug-build) |
135 |
|
136 |
+ $(use_enable doc html-build) |
137 |
$(use_enable doc pdf-build) |
138 |
+ $(use_enable doc manpage build) |
139 |
$(use_enable cplugins) |
140 |
- $(use_enable zsh-completion zsh-comp) |
141 |
$(use_enable test) |
142 |
|
143 |
- --disable-android |
144 |
$(use_enable iconv) |
145 |
$(use_enable samba libsmbclient) |
146 |
$(use_enable lua) |
147 |
@@ -190,14 +182,12 @@ src_configure() { |
148 |
$(use_enable libass libass-osd) |
149 |
$(use_enable zlib) |
150 |
$(use_enable bluray libbluray) |
151 |
- $(use_enable dvd dvdread) |
152 |
$(use_enable dvd dvdnav) |
153 |
$(use_enable cdda) |
154 |
$(use_enable uchardet) |
155 |
$(use_enable rubberband) |
156 |
$(use_enable lcms lcms2) |
157 |
--disable-vapoursynth # Only available in overlays. |
158 |
- --disable-vapoursynth-lazy |
159 |
$(use_enable archive libarchive) |
160 |
|
161 |
--enable-libavdevice |
162 |
@@ -239,9 +229,9 @@ src_configure() { |
163 |
$(use_enable vulkan shaderc) |
164 |
$(use_enable raspberry-pi rpi) |
165 |
$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') |
166 |
- --disable-mali-fbdev # Only available in overlays. |
167 |
$(usex opengl '' '--disable-gl') |
168 |
$(use_enable vulkan) |
169 |
+ $(use_enable gamepad sdl2-gamepad) |
170 |
|
171 |
# HWaccels: |
172 |
# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. |
173 |
@@ -249,13 +239,11 @@ src_configure() { |
174 |
|
175 |
# TV features: |
176 |
$(use_enable v4l tv) |
177 |
- $(use_enable v4l tv-v4l2) |
178 |
- $(use_enable v4l libv4l2) |
179 |
- $(use_enable v4l audio-input) |
180 |
$(use_enable dvb dvbin) |
181 |
|
182 |
# Miscellaneous features: |
183 |
--disable-apple-remote # Needs testing first. See Gentoo bug 577332. |
184 |
+ $(use_enable zimg) |
185 |
) |
186 |
|
187 |
if use vaapi && use X; then |
188 |
@@ -265,6 +253,19 @@ src_configure() { |
189 |
) |
190 |
fi |
191 |
|
192 |
+ # Not for us |
193 |
+ mywafargs+=( |
194 |
+ --disable-android |
195 |
+ --disable-egl-android |
196 |
+ --disable-uwp |
197 |
+ --disable-audiounit |
198 |
+ --disable-wasapi |
199 |
+ --disable-ios-gl |
200 |
+ --disable-apple-remote |
201 |
+ --disable-macos-touchbar |
202 |
+ --disable-macos-cocoa-cb |
203 |
+ ) |
204 |
+ |
205 |
# Create reproducible non-live builds. |
206 |
[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date) |