From 121ed4eec41fbf03e1998d09eede1bf449da63b9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jul 2019 22:05:27 +0100 Subject: gentoo resync : 19.07.2019 --- media-libs/mlt/Manifest | 4 ++-- media-libs/mlt/mlt-6.16.0-r1.ebuild | 12 ++++++++---- media-libs/mlt/mlt-6.16.0-r2.ebuild | 10 +++++++--- 3 files changed, 17 insertions(+), 9 deletions(-) (limited to 'media-libs/mlt') diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest index fa83cb62c476..7a5671ed82ba 100644 --- a/media-libs/mlt/Manifest +++ b/media-libs/mlt/Manifest @@ -10,6 +10,6 @@ AUX mlt-6.16.0-rotoscoping-interpolation.patch 998 BLAKE2B 22ae634e46fa61cc60113 DIST mlt-6.12.0.tar.gz 1395646 BLAKE2B 18dc06c4075d8d51bc7f62d027adda92c359275b9ad2131cc015b4402b1b7a9438fe87b617075017b9fd5e9696b82c4c840fa6dd83188bd0cedb7f01d2158283 SHA512 ed2cc0eeda45558ae6f1ec8780dfd413641953dc12dc32dccf655649f68f8e6088d39fefb7bef7bae042a41096976004446019d82ea162785bc487009cb97680 DIST mlt-6.16.0.tar.gz 1414374 BLAKE2B 6c031360721d535e95cbaf890c1f42f5f5dd914e0c6c20992bd3aec4ecbcc0b53370fe6b82b5d11c8242bb0a1f2d94f28bc61b4e5a920e5afb41ca8bb5229433 SHA512 554e8b9baa7a8578cc52315fe0583c61762bf6fbbcdd4a1e4f25753846d92f013e7d74745498625fcc781de993aa0526fd761920450b4314e67105783b9bde26 EBUILD mlt-6.12.0.ebuild 5545 BLAKE2B 0b8e14bc305c14ad7b100d710881ae581c9224bd9af1be0476048f2906342ba543992cf02f6cad61a19a058e93559420be51fc0ba6a6f4b8c4e4dbad41e0be20 SHA512 8822ffe4b895abf16978c06f874d34f800c4f6ef486e415432c3f06c561b5380b8d98ba69e9010487482953cf6817c65cc1c50688fbf49b31167ad73acfb3451 -EBUILD mlt-6.16.0-r1.ebuild 5665 BLAKE2B d7e1363d159c463edad67d98ea695060db5c16a5cb5914ef922231cfb2917afabcc30472691530fb05f1459d365f6495485c3b9ffcfa8bdab72a4e314884fe90 SHA512 cd13f5a1caa1c3b955228f11ab1f7bcc9c2caecf48023ecb5c8fed0de806ef2d0cc133dd3e439858065b193b2b01c8604190530b6a860fc9d1a54904d7b49358 -EBUILD mlt-6.16.0-r2.ebuild 5665 BLAKE2B 90bb2409c4a3caba4f2dc5243fa66203b20c5b8f1c5b46d414f902718fe5500a1435edeb0438ec7379a086417204e939c9905b34128bc43e1e04f8354888d630 SHA512 66bc3a7e656b4fec2f502079f131c0fd2ba8c4285773e29e6175a75d3d521b528da8c97f88c01e3ce7effdfb4c07161545c6bb333b926f017fcde86c76362b61 +EBUILD mlt-6.16.0-r1.ebuild 5756 BLAKE2B f6184a6457e96053c8b7f33064054f76d76790d0d1505f24fb70f31f34cf1403fff8b657c76884b265f3807fd46e3d5e19a308cace838e82686d2be8a8b03cbf SHA512 b7e93909507a61d5e3fc1ed71d123d7e08d34fa40c710f61c4a0e03a3a45616afcee94bd726164ab9e3f2d46ca8f76e9205d2e81692d38ecd6186195860f1e51 +EBUILD mlt-6.16.0-r2.ebuild 5757 BLAKE2B c8719b417038fad701b9a8a4f7d0a6298e5cc9ec8ce0d9dbf8d87f1926bab0c2515e103857ac36cc376609eebb78a9bf34ad9ab9ccb101fa70eebb4616c72163 SHA512 7c9c6bd8d79c452b5f1589249a500b814912f790ead14779675ad3128215d9ad0da57445f09490b563ebb4759495a5577789966e3a3a173553ddcded3657db28 MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8 diff --git a/media-libs/mlt/mlt-6.16.0-r1.ebuild b/media-libs/mlt/mlt-6.16.0-r1.ebuild index 6161697e042f..f2a3118ce6ba 100644 --- a/media-libs/mlt/mlt-6.16.0-r1.ebuild +++ b/media-libs/mlt/mlt-6.16.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python2_7 python3_{6,7} ) # this ebuild currently only supports installing ruby bindings for a single ruby version # so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls # /usr/bin/${USE_RUBY} directly @@ -16,7 +16,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux" IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau vidstab xine xml" @@ -112,8 +112,12 @@ src_prepare() { sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die - # fix python3 include dir - sed -i -e 's/python{}.{}/python{}.{}m/' src/swig/python/build || die + # fix python include dir + if use python; then + python_export PYTHON_INCLUDEDIR + sed -e "/PYTHON_INCLUDE=/s:=.*:=${PYTHON_INCLUDEDIR}:" \ + -i src/swig/python/build || die + fi } src_configure() { diff --git a/media-libs/mlt/mlt-6.16.0-r2.ebuild b/media-libs/mlt/mlt-6.16.0-r2.ebuild index 1605afaedced..31ed25573ff9 100644 --- a/media-libs/mlt/mlt-6.16.0-r2.ebuild +++ b/media-libs/mlt/mlt-6.16.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python2_7 python3_{6,7} ) # this ebuild currently only supports installing ruby bindings for a single ruby version # so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls # /usr/bin/${USE_RUBY} directly @@ -112,8 +112,12 @@ src_prepare() { sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die - # fix python3 include dir - sed -i -e 's/python{}.{}/python{}.{}m/' src/swig/python/build || die + # fix python include dir + if use python; then + python_export PYTHON_INCLUDEDIR + sed -e "/PYTHON_INCLUDE=/s:=.*:=${PYTHON_INCLUDEDIR}:" \ + -i src/swig/python/build || die + fi } src_configure() { -- cgit v1.2.3