commit: 0425d8ce75bdad03a250065bfa2c3a53da88a4d4
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 06:52:03 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 06:52:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0425d8ce
media-video/mpv: add missing libcdio dep
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
.../mpv/{mpv-9999.ebuild => mpv-0.31.0-r1.ebuild} | 16 +++++-----------
.../mpv/{mpv-9999.ebuild => mpv-0.32.0-r1.ebuild} | 3 ++-
media-video/mpv/mpv-9999.ebuild | 3 ++-
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/media-video/mpv/mpv-9999.ebuild
b/media-video/mpv/mpv-0.31.0-r1.ebuild
similarity index 95%
copy from media-video/mpv/mpv-9999.ebuild
copy to media-video/mpv/mpv-0.31.0-r1.ebuild
index 404b09b47a9..df494bf3aec 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-0.31.0-r1.ebuild
@@ -8,14 +8,14 @@ PYTHON_REQ_USE='threads(+)'
WAF_PV=2.0.9
-inherit bash-completion-r1 eapi7-ver flag-o-matic gnome2-utils pax-utils
python-r1 toolchain-funcs waf-utils xdg-utils
+inherit eapi7-ver flag-o-matic gnome2-utils pax-utils python-r1
toolchain-funcs waf-utils xdg-utils
DESCRIPTION="Media player based on MPlayer and mplayer2"
HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv";
if [[ ${PV} != *9999* ]]; then
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux"
DOCS=( RELEASE_NOTES )
else
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git";
@@ -59,12 +59,12 @@ REQUIRED_USE="
RESTRICT="!test? ( test )"
COMMON_DEPEND="
- !!app-shells/mpv-bash-completion
>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?]
alsa? ( >=media-libs/alsa-lib-1.0.18 )
- archive? ( >=app-arch/libarchive-3.4.0:= )
+ archive? ( >=app-arch/libarchive-3.0.0:= )
bluray? ( >=media-libs/libbluray-0.3.0:= )
- cdda? ( dev-libs/libcdio-paranoia )
+ cdda? ( dev-libs/libcdio-paranoia
+ dev-libs/libcdio:= )
drm? ( x11-libs/libdrm )
dvd? (
>=media-libs/libdvdnav-4.2.0:=
@@ -232,7 +232,6 @@ src_configure() {
# HWaccels:
# Automagic Video Toolbox HW acceleration. See Gentoo bug
577332.
$(use_enable cuda cuda-hwaccel)
- $(use_enable cuda cuda-interop)
# TV features:
$(use_enable dvb dvbin)
@@ -262,11 +261,6 @@ src_configure() {
--disable-egl-angle-win32
)
- mywafargs+=(
- --bashdir="$(get_bashcompdir)"
- --zshdir="${EPREFIX}"/usr/share/zsh/site-functions
-)
-
# Create reproducible non-live builds.
[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
diff --git a/media-video/mpv/mpv-9999.ebuild
b/media-video/mpv/mpv-0.32.0-r1.ebuild
similarity index 99%
copy from media-video/mpv/mpv-9999.ebuild
copy to media-video/mpv/mpv-0.32.0-r1.ebuild
index 404b09b47a9..6180d768e59 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-0.32.0-r1.ebuild
@@ -64,7 +64,8 @@ COMMON_DEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.18 )
archive? ( >=app-arch/libarchive-3.4.0:= )
bluray? ( >=media-libs/libbluray-0.3.0:= )
- cdda? ( dev-libs/libcdio-paranoia )
+ cdda? ( dev-libs/libcdio-paranoia
+ dev-libs/libcdio:= )
drm? ( x11-libs/libdrm )
dvd? (
>=media-libs/libdvdnav-4.2.0:=
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 404b09b47a9..6180d768e59 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -64,7 +64,8 @@ COMMON_DEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.18 )
archive? ( >=app-arch/libarchive-3.4.0:= )
bluray? ( >=media-libs/libbluray-0.3.0:= )
- cdda? ( dev-libs/libcdio-paranoia )
+ cdda? ( dev-libs/libcdio-paranoia
+ dev-libs/libcdio:= )
drm? ( x11-libs/libdrm )
dvd? (
>=media-libs/libdvdnav-4.2.0:=
