From 15ee734594baac1e83c8bcb8d0c8888ad4dfd2c3 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Mon, 6 Nov 2017 00:21:55 +0300 Subject: =?UTF-8?q?=09=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20?= =?UTF-8?q?=20=20=20=20=20media-sound/cantata/cantata-scm.ebuild=20=09?= =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20=20=20=20?= =?UTF-8?q?=20=20media-tv/kodi/kodi-scm.ebuild=20=09=D0=B8=D0=B7=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20=20=20=20=20=20media-video/ff?= =?UTF-8?q?mpeg/ffmpeg-scm.ebuild=20=09=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE:=20=20=20=20=20=20media-video/mplayer/mplaye?= =?UTF-8?q?r-scm.ebuild=20=09=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE:=20=20=20=20=20=20media-video/mpv/mpv-scm.ebuild=20=09?= =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20=20=20=20?= =?UTF-8?q?=20=20net-im/qtox/qtox-scm.ebuild=20=09=D0=B8=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=BE:=20=20=20=20=20=20profiles/package.use?= =?UTF-8?q?.mask?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- media-tv/kodi/kodi-scm.ebuild | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'media-tv') 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 } -- cgit v1.2.3