diff options
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg-mpv/ffmpeg-mpv-scm.ebuild | 2 | ||||
| -rw-r--r-- | media-video/mpv/files/mpv-fix-ffmpeg-mpv-version-check.patch | 46 | ||||
| -rw-r--r-- | media-video/mpv/mpv-scm.ebuild | 10 |
3 files changed, 10 insertions, 48 deletions
diff --git a/media-video/ffmpeg-mpv/ffmpeg-mpv-scm.ebuild b/media-video/ffmpeg-mpv/ffmpeg-mpv-scm.ebuild index 3ed1177..334e61a 100644 --- a/media-video/ffmpeg-mpv/ffmpeg-mpv-scm.ebuild +++ b/media-video/ffmpeg-mpv/ffmpeg-mpv-scm.ebuild @@ -401,6 +401,8 @@ multilib_src_configure() { --shlibdir="${EPREFIX}/usr/lib/ffmpeg-mpv/$(get_libdir)" \ --docdir="${EPREFIX}/usr/share/doc/ffmpeg-mpv/${PF}/html" \ --mandir="${EPREFIX}/usr/share/man/ffmpeg-mpv" \ + --incdir="${EPREFIX}/usr/include/ffmpeg-mpv" \ + --bindir="${EPREFIX}/usr/libexec/ffmpeg-mpv/bin" \ --enable-shared \ --cc="$(tc-getCC)" \ --cxx="$(tc-getCXX)" \ diff --git a/media-video/mpv/files/mpv-fix-ffmpeg-mpv-version-check.patch b/media-video/mpv/files/mpv-fix-ffmpeg-mpv-version-check.patch deleted file mode 100644 index 99fb32e..0000000 --- a/media-video/mpv/files/mpv-fix-ffmpeg-mpv-version-check.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/wscript b/wscript -index 8db26d5b1c..9aaba07ac5 100644 ---- a/wscript -+++ b/wscript -@@ -412,20 +412,20 @@ iconv support use --disable-iconv.", - ] - - ffmpeg_pkg_config_checks = [ -- 'libavutil', '>= 56.0.100', -- 'libavcodec', '>= 58.6.102', -- 'libavformat', '>= 58.0.102', -- 'libswscale', '>= 5.0.101', -- 'libavfilter', '>= 7.0.101', -- 'libswresample', '>= 3.0.100', -+ 'libavutil', '>= 1.0.100', -+ 'libavcodec', '>= 1.6.102', -+ 'libavformat', '>= 1.0.102', -+ 'libswscale', '>= 1.0.101', -+ 'libavfilter', '>= 1.0.101', -+ 'libswresample', '>= 1.0.100', - ] - libav_pkg_config_checks = [ -- 'libavutil', '>= 56.6.0', -- 'libavcodec', '>= 58.5.0', -- 'libavformat', '>= 58.1.0', -- 'libswscale', '>= 5.0.0', -- 'libavfilter', '>= 7.0.0', -- 'libavresample', '>= 4.0.0', -+ 'libavutil', '>= 1.6.0', -+ 'libavcodec', '>= 1.5.0', -+ 'libavformat', '>= 1.1.0', -+ 'libswscale', '>= 1.0.0', -+ 'libavfilter', '>= 1.0.0', -+ 'libavresample', '>= 1.0.0', - ] - - def check_ffmpeg_or_libav_versions(): -@@ -447,7 +447,7 @@ libav_dependencies = [ - 'name': 'ffmpeg', - 'desc': 'libav* is FFmpeg', - # FFmpeg <=> LIBAVUTIL_VERSION_MICRO>=100 -- 'func': check_statement('libavcodec/version.h', -+ 'func': check_statement('/usr/lib/ffmpeg-mpv/include/libavcodec/version.h', - 'int x[LIBAVCODEC_VERSION_MICRO >= 100 ? 1 : -1]', - use='libavcodec'), - }, { diff --git a/media-video/mpv/mpv-scm.ebuild b/media-video/mpv/mpv-scm.ebuild index 201b92c..f818863 100644 --- a/media-video/mpv/mpv-scm.ebuild +++ b/media-video/mpv/mpv-scm.ebuild @@ -8,7 +8,7 @@ PYTHON_REQ_USE='threads(+)' WAF_PV=1.9.8 -inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils git-r3 +inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils git-r3 flag-o-matic DESCRIPTION="Media player based on MPlayer and mplayer2" HOMEPAGE="https://mpv.io/" @@ -134,7 +134,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" - "${FILESDIR}/${PN}-fix-ffmpeg-mpv-version-check.patch" +# "${FILESDIR}/${PN}-fix-ffmpeg-mpv-version-check.patch" ) pkg_setup() { @@ -147,9 +147,15 @@ src_prepare() { default_src_prepare } +PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/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" + append-ldflags "-L/usr/lib/ffmpeg-mpv/lib64 -L/usr/lib/ffmpeg-mpv/lib32" #TODO: madke it right + + 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" |