From 4c383f1c76995bd425bc7ec238ea05fbfe95ed8c Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Mon, 6 Nov 2017 01:14:16 +0300 Subject: let's do forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of forks of ffmpeg congrats mpv team, cool solution --- media-video/ffmpeg/ffmpeg-scm.ebuild | 20 ++++++++++++++------ media-video/mpv/mpv-scm.ebuild | 3 +-- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-scm.ebuild b/media-video/ffmpeg/ffmpeg-scm.ebuild index d5c86ea..628d5fa 100644 --- a/media-video/ffmpeg/ffmpeg-scm.ebuild +++ b/media-video/ffmpeg/ffmpeg-scm.ebuild @@ -16,14 +16,17 @@ EAPI=6 FFMPEG_SUBSLOT=55.57.57 SCM="git-r3" -EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git" inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec" HOMEPAGE="http://ffmpeg.org/" SRC_URI="" -FFMPEG_REVISION="${PV#*_p}" +EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git" +EGIT_MPV_REPO_URI="https://github.com/mpv-player/ffmpeg-mpv.git" + + + SLOT="0/${FFMPEG_SUBSLOT}" LICENSE=" @@ -85,11 +88,14 @@ FFMPEG_ENCODER_FLAG_MAP=( ) IUSE=" - alsa doc +encode jack oss pic static-libs test v4l + alsa doc +encode jack oss mpv-fork pic static-libs test v4l ${FFMPEG_FLAG_MAP[@]%:*} ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} " + + + # Strings for CPU features in the useflag[:configure_option] form # if :configure_option isn't set, it will use 'useflag' as configure option ARM_CPU_FEATURES=( @@ -282,9 +288,11 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/libavutil/avconfig.h ) -#PATCHES=( -# "$FILESDIR"/4a98362b2b5daf7bb9c092404ac7e73e4f282963.diff -#) + +src_unpack() { + use mpv-fork && EGIT_REPO_URI=$EGIT_MPV_REPO_URI + git-r3_src_unpack +} src_prepare() { if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot diff --git a/media-video/mpv/mpv-scm.ebuild b/media-video/mpv/mpv-scm.ebuild index 2db5b7a..c390f04 100644 --- a/media-video/mpv/mpv-scm.ebuild +++ b/media-video/mpv/mpv-scm.ebuild @@ -50,7 +50,7 @@ REQUIRED_USE=" " COMMON_DEPEND=" - !libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) + !libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?,mpv-fork] ) libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib alsa? ( >=media-libs/alsa-lib-1.0.18 ) @@ -241,7 +241,6 @@ src_configure() { # Miscellaneous features: --disable-apple-remote # Needs testing first. See Gentoo bug 577332. - $(usex libav '' '--enable-ffmpeg-upstream') ) if use vaapi && use X; then -- cgit v1.2.3