| 1 |
commit: 2595477f802151b5a86c441c934de52d4db4271a |
| 2 |
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Nov 1 20:20:54 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 4 07:30:51 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2595477f |
| 7 |
|
| 8 |
media-video/mpv: bump required ffmpeg/libav versions in 9999 |
| 9 |
|
| 10 |
ffmpeg/libav-9999 are now required. Even these are not enough, as mpv |
| 11 |
upstream wants everyone to use their custom ffmpeg fork and relies on |
| 12 |
changes not yet merged into upstream ffmpeg. See Gentoo bug 635650. |
| 13 |
|
| 14 |
Also drop now obsolete patches, version checks and configure options. |
| 15 |
|
| 16 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
| 17 |
|
| 18 |
media-video/mpv/mpv-9999.ebuild | 20 ++++---------------- |
| 19 |
1 file changed, 4 insertions(+), 16 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild |
| 22 |
index 0323a501e93..5737a81e9ef 100644 |
| 23 |
--- a/media-video/mpv/mpv-9999.ebuild |
| 24 |
+++ b/media-video/mpv/mpv-9999.ebuild |
| 25 |
@@ -57,13 +57,12 @@ REQUIRED_USE=" |
| 26 |
" |
| 27 |
|
| 28 |
COMMON_DEPEND=" |
| 29 |
- !libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) |
| 30 |
- libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) |
| 31 |
+ !libav? ( ~media-video/ffmpeg-${PV}:0=[encode?,threads,vaapi?,vdpau?] ) |
| 32 |
+ libav? ( ~media-video/libav-${PV}:0=[encode?,threads,vaapi?,vdpau?] ) |
| 33 |
alsa? ( >=media-libs/alsa-lib-1.0.18 ) |
| 34 |
archive? ( >=app-arch/libarchive-3.0.0:= ) |
| 35 |
bluray? ( >=media-libs/libbluray-0.3.0:= ) |
| 36 |
cdda? ( dev-libs/libcdio-paranoia ) |
| 37 |
- cuda? ( >=media-video/ffmpeg-3.3:0 ) |
| 38 |
drm? ( x11-libs/libdrm ) |
| 39 |
dvd? ( |
| 40 |
>=media-libs/libdvdnav-4.2.0 |
| 41 |
@@ -94,16 +93,8 @@ COMMON_DEPEND=" |
| 42 |
samba? ( net-fs/samba ) |
| 43 |
sdl? ( media-libs/libsdl2[sound,threads,video] ) |
| 44 |
v4l? ( media-libs/libv4l ) |
| 45 |
- vaapi? ( |
| 46 |
- !libav? ( >=media-video/ffmpeg-3.3:0 ) |
| 47 |
- libav? ( >=media-video/libav-13:0 ) |
| 48 |
- x11-libs/libva[drm?,X?,wayland?] |
| 49 |
- ) |
| 50 |
- vdpau? ( |
| 51 |
- !libav? ( >=media-video/ffmpeg-3.3:0 ) |
| 52 |
- libav? ( >=media-video/libav-13:0 ) |
| 53 |
- x11-libs/libvdpau |
| 54 |
- ) |
| 55 |
+ vaapi? ( x11-libs/libva[drm?,X?,wayland?] ) |
| 56 |
+ vdpau? ( x11-libs/libvdpau ) |
| 57 |
wayland? ( |
| 58 |
>=dev-libs/wayland-1.6.0 |
| 59 |
>=x11-libs/libxkbcommon-0.3.0 |
| 60 |
@@ -140,7 +131,6 @@ RDEPEND="${COMMON_DEPEND} |
| 61 |
|
| 62 |
PATCHES=( |
| 63 |
"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" |
| 64 |
- "${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch" |
| 65 |
) |
| 66 |
|
| 67 |
pkg_setup() { |
| 68 |
@@ -245,8 +235,6 @@ src_configure() { |
| 69 |
|
| 70 |
# HWaccels: |
| 71 |
# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. |
| 72 |
- $(use_enable vaapi vaapi-hwaccel) |
| 73 |
- $(use_enable vdpau vdpau-hwaccel) |
| 74 |
$(use_enable cuda cuda-hwaccel) |
| 75 |
|
| 76 |
# TV features: |
Archives