изменено: media-sound/cantata/cantata-scm.ebuild

	изменено:      media-tv/kodi/kodi-scm.ebuild
	изменено:      media-video/ffmpeg/ffmpeg-scm.ebuild
	изменено:      media-video/mplayer/mplayer-scm.ebuild
	изменено:      media-video/mpv/mpv-scm.ebuild
	изменено:      net-im/qtox/qtox-scm.ebuild
	изменено:      profiles/package.use.mask

7 files changed, 24 insertions, 18 deletions

diff --git a/media-sound/cantata/cantata-scm.ebuild b/media-sound/cantata/cantata-scm.ebuild
index d8ebd7c..471c6b5 100644
--- a/media-sound/cantata/cantata-scm.ebuild
+++ b/media-sound/cantata/cantata-scm.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PLOCALES="cs de en_GB es fr hu ko pl ru zh_CN"
 inherit cmake-utils gnome2-utils l10n qmake-utils xdg git-r3
@@ -16,7 +16,7 @@ EGIT_REPO_URI="git://github.com/CDrummond/cantata"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="cdda cddb http-server kde mtp musicbrainz qt5 replaygain taglib udisks"
+IUSE="cdda cddb http-server kde mtp musicbrainz qt5 replaygain taglib udisks ffmpeg"
 REQUIRED_USE="
 	cdda? ( udisks || ( cddb musicbrainz ) )
 	cddb? ( cdda taglib )
@@ -99,6 +99,7 @@ src_configure() {
 		-DENABLE_REMOTE_DEVICES=OFF
 		-DENABLE_UDISKS2=ON
 		-DUSE_SYSTEM_MENU_ICON=OFF
+		-DENABLE_FFMPEG=$(usex ffmpeg)
 	)
 
 	if ! use kde; then
diff --git a/media-tv/kodi/kodi-scm.ebuild b/media-tv/kodi/kodi-scm.ebuild
index 73b8874..6cfec7e 100644
--- a/media-tv/kodi/kodi-scm.ebuild
+++ b/media-tv/kodi/kodi-scm.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 
 inherit eutils git-r3 cmake-utils
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-IUSE+=" cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 cpu_flags_x86_avx"
+IUSE+=" cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 cpu_flags_x86_avx +internal-ffmpeg"
 
 COMMON_DEPEND="
 	app-arch/bzip2
@@ -53,7 +53,7 @@ COMMON_DEPEND="
 	media-libs/libvorbis
 	media-libs/tiff
 	media-sound/wavpack
-	>=media-video/ffmpeg-2.6:=[encode]
+	|| ( >=media-video/ffmpeg-3:=[encode]  >=media-video/libav-12:=[encode] )
 	net-misc/curl
 	dev-libs/rapidjson
 	sys-libs/zlib
@@ -80,16 +80,17 @@ src_unpack() {
 	git-r3_src_unpack
 }
 
-src_prepare() {
-
-	epatch_user #293109
-
-}
+#src_prepare() {
+#
+#	epatch_user #293109
+#
+#}
 
 src_configure() {
 	local mycmakeargs=(
 		DWERROR=OFF
 		DBUILD_TESTING=false
+		$(cmake_utils_use_enable internal-ffmpeg INTERNAL_FFMPEG)
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-video/ffmpeg/ffmpeg-scm.ebuild b/media-video/ffmpeg/ffmpeg-scm.ebuild
index 58e9632..d5c86ea 100644
--- a/media-video/ffmpeg/ffmpeg-scm.ebuild
+++ b/media-video/ffmpeg/ffmpeg-scm.ebuild
@@ -16,7 +16,7 @@ EAPI=6
 FFMPEG_SUBSLOT=55.57.57
 
 SCM="git-r3"
-EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
 
 inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
 
@@ -282,9 +282,9 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
 )
 
-PATCHES=(
-	"$FILESDIR"/4a98362b2b5daf7bb9c092404ac7e73e4f282963.diff
-)
+#PATCHES=(
+#	"$FILESDIR"/4a98362b2b5daf7bb9c092404ac7e73e4f282963.diff
+#)
 
 src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
diff --git a/media-video/mplayer/mplayer-scm.ebuild b/media-video/mplayer/mplayer-scm.ebuild
index 22f467c..a2539f8 100644
--- a/media-video/mplayer/mplayer-scm.ebuild
+++ b/media-video/mplayer/mplayer-scm.ebuild
@@ -51,7 +51,7 @@ RDEPEND+="
 	sys-libs/ncurses
 	app-arch/bzip2
 	sys-libs/zlib
-	>=media-video/ffmpeg-2.6:0=
+	|| ( >=media-video/ffmpeg-3:=[vdpau?] >=media-video/libav-12:=[vdpau?] )
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-video/mpv/mpv-scm.ebuild b/media-video/mpv/mpv-scm.ebuild
index 9977839..2db5b7a 100644
--- a/media-video/mpv/mpv-scm.ebuild
+++ b/media-video/mpv/mpv-scm.ebuild
@@ -122,8 +122,10 @@ RDEPEND="${COMMON_DEPEND}
 	tools? ( ${PYTHON_DEPS} )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" )
-
+PATCHES=(
+ "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
+  )
+ 
 mpv_check_compiler() {
 	if [[ ${MERGE_TYPE} != "binary" ]] && use vaapi && use egl && ! tc-has-tls; then
 		die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
@@ -239,6 +241,7 @@ 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
diff --git a/net-im/qtox/qtox-scm.ebuild b/net-im/qtox/qtox-scm.ebuild
index 706fd0b..a22a28c 100644
--- a/net-im/qtox/qtox-scm.ebuild
+++ b/net-im/qtox/qtox-scm.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-qt/qtxml:5
 	media-gfx/qrencode
 	media-libs/openal
-	>=media-video/ffmpeg-2.6.3[webp,v4l]
+	|| ( >=media-video/ffmpeg-3[webp,v4l] >=media-video/libav-12[webp,v4l] )
 	gtk? (	dev-libs/atk
 			dev-libs/glib:2
 			x11-libs/gdk-pixbuf[X]
diff --git a/profiles/package.use.mask b/profiles/package.use.mask
index c2f7abd..afd3090 100644
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -1 +1,2 @@
 games-action/minetest -luajit
+media-video/mpv -libav