diff options
Diffstat (limited to 'media-video/mpv/mpv-scm.ebuild')
| -rw-r--r-- | media-video/mpv/mpv-scm.ebuild | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/media-video/mpv/mpv-scm.ebuild b/media-video/mpv/mpv-scm.ebuild index fcc4d60..b31b456 100644 --- a/media-video/mpv/mpv-scm.ebuild +++ b/media-video/mpv/mpv-scm.ebuild @@ -51,13 +51,13 @@ REQUIRED_USE=" " COMMON_DEPEND=" - !libav? ( media-video/ffmpeg-mpv:=[encode?,threads,vaapi?,vdpau?] ) + !libav? ( media-video/ffmpeg:=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0 ) cdda? ( dev-libs/libcdio-paranoia ) - cuda? ( media-video/ffmpeg-mpv ) + cuda? ( media-video/ffmpeg ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 @@ -89,12 +89,12 @@ COMMON_DEPEND=" sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( - !libav? ( media-video/ffmpeg-mpv ) + !libav? ( media-video/ffmpeg ) libav? ( >=media-video/libav-13:0 ) x11-libs/libva[drm?,X?,wayland?] ) vdpau? ( - !libav? ( >=media-video/ffmpeg-mpv-9999:0 ) + !libav? ( media-video/ffmpeg ) libav? ( >=media-video/libav-13:0 ) x11-libs/libvdpau ) @@ -134,7 +134,6 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" -# "${FILESDIR}/${PN}-fix-ffmpeg-mpv-version-check.patch" ) pkg_setup() { @@ -147,19 +146,10 @@ src_prepare() { default_src_prepare } -PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/lib/ffmpeg-mpv/lib/pkgconfig:/usr/lib/ffmpeg-mpv/lib64/pkgconfig:/usr/lib/ffmpeg-mpv/lib32/pkgconfig" src_configure() { tc-export CC PKG_CONFIG AR - append-cflags "-I/usr/include/ffmpeg-mpv" - - #TODO: make it right - append-ldflags "-L/usr/lib/ffmpeg-mpv/lib -L/usr/lib/ffmpeg-mpv/lib64 -L/usr/lib/ffmpeg-mpv/lib32" - - - local -x CFLAGS="${CFLAGS} -I/usr/lib/ffmpeg-mpv/include -L/usr/lib/ffmpeg-mpv/lib64" - local -x LDFLAGS="${CFLAGS} -Wl,-rpath=/usr/lib/ffmpeg-mpv/lib64" if tc-is-cross-compiler && use raspberry-pi; then export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig" |