diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-29 18:03:51 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-29 18:03:51 +0000 |
commit | d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch) | |
tree | 1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /media-libs/mlt | |
parent | abaa75b10f899ada8dd05b23cc03205064394bc6 (diff) |
gentoo resync : 29.01.2021
Diffstat (limited to 'media-libs/mlt')
-rw-r--r-- | media-libs/mlt/Manifest | 7 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch | 23 | ||||
-rw-r--r-- | media-libs/mlt/metadata.xml | 2 | ||||
-rw-r--r-- | media-libs/mlt/mlt-6.22.1-r1.ebuild | 201 | ||||
-rw-r--r-- | media-libs/mlt/mlt-6.24.0-r1.ebuild | 4 |
5 files changed, 4 insertions, 233 deletions
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest index 1649570cebae..e618f1374cbe 100644 --- a/media-libs/mlt/Manifest +++ b/media-libs/mlt/Manifest @@ -1,8 +1,5 @@ AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160 -AUX mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch 1093 BLAKE2B 12bf9abd2053868945df5e185a2a111118bfe886d3987070f75683be2f5c00bb5b6325119a99c2ed9f20e8f91b9dda8e90a712e05170c435bfc04cfa02d12306 SHA512 4869580800b3de0e68669d3ad6c4d7ae1c994d2cef7de444a130625c3ec806d9691973b0bc921a52c39361e35f11d319377a3330fbbecc7cf51afb62f1fcd99b AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd -DIST mlt-6.22.1.tar.gz 1343746 BLAKE2B 3178f9af8ee2695df3343d333d03a5e87a22d226915a19c90dd78bbe66684984d37549ef53e6583152b5f44267d0e908e6f887f18fb02289cc31e8c8b1520ddb SHA512 c620b68d35c90eab650c70768a4ae631dec83ece6dd3fd8e09f9300d837d8e0f3da1b098786188f9c1216800f848dd5db7c9e5fa03e816fba3fbcf3c63324c74 DIST mlt-6.24.0.tar.gz 1351427 BLAKE2B ea645f0fc6822c0fe3012ac4833062dcddff9859e35fc41aacd929c2dc0c80b49bb83b7714d234e0bcad9a4e300534e8637b1e6927c99cb84e9ce2959e619a7b SHA512 c9533191aad7be894152e305a4ce3f8c1dbd652ea887774866c74aed4794eae90bd15b0b9a070e6fc22f2979e210af6ca1a2c937adcc3b0be5d39ba900df6229 -EBUILD mlt-6.22.1-r1.ebuild 4814 BLAKE2B 7750e214aa0052178da1defe96742d7a67092c45d01a565ab0d049e625ca7d31fe9c8a5be7cc985d00565cd407937f6c8754380f618c1a14aba75a0b61cde912 SHA512 2d2a6e0d0e126a281b3ad07b9ae6df2feb8958e9e548bab4b83c5b8e5ddd477362369b61479381eae631432671f0513e145c0f42eb23fbd747c67d8a4ee27ab4 -EBUILD mlt-6.24.0-r1.ebuild 5323 BLAKE2B fe6e06c8b47aaea654668fc835b3bc95981ff948ccbeaf6569bf68f876db1f1e4b0bb91c1fe9e886fe2447a1800c001c340441a86cfe6e188f10340cc6727842 SHA512 9d4772005fb5a0e7bbd497243939a15d9d298ea4d2d9700564edacebd99ad614d9d34d128b7e3666ae1c606f7fb0d2099ea00e2f890c49c83e2f53e7ea305ecd -MISC metadata.xml 1673 BLAKE2B ab376b18df6085a95490cfe541fd0cd0af07b0d221aa693132d8f5ae4ec67e468df2e823943edc871c97ad15848a43acaf92c9fb341f07c9fdfcf504896ac23d SHA512 ddfc34505aa0ed7b32b2e6af160929e45aa508b5aad3e42178976836b784f10d6de8c820bb40e0f1be3e62d5723fe93459fdd53579aa65dc996bca4a14dc6c7a +EBUILD mlt-6.24.0-r1.ebuild 5347 BLAKE2B bda27b1eaa0ab139b06b029790b9528f3978b188eab9c75307c1128b60f0fa21ab34bae69e6f0efb0dec654f552fc8fc60fcf88d13a85ec85982465f907d8d3e SHA512 04e4f83c6efbb5a9d5fd7f307904f0473b82d385575332687b1c4ef87e69914605f75daa1ce116f913fdd6bf5ef7d8109c5bc469c39a566ec9cde110c7db8029 +MISC metadata.xml 1536 BLAKE2B eeec58dc42f229c4dfbb41841d82d2b3035bee6a07f42a08b0a396b2f4dfd498d85bfaf34a73d6b3d03c7109033b9158f930a0da531466ca81a0bb03dbc2a475 SHA512 34236fad3d304e6798f50f9bdbc7e2d6bb261ededa9fbde09ba535850ec908f6fefde2e4c717187d7b50fe195f2c8795f7d0ac8ccff1fabb70943a594e7348a1 diff --git a/media-libs/mlt/files/mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch b/media-libs/mlt/files/mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch deleted file mode 100644 index d60976c11855..000000000000 --- a/media-libs/mlt/files/mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8b778aaee121c6b381bd570c2b6f526989866f8e Mon Sep 17 00:00:00 2001 -From: Dan Dennedy <dan@dennedy.org> -Date: Fri, 11 Sep 2020 21:24:24 -0700 -Subject: [PATCH] fix regression in 2c354d6e with multiple affine filters - -See #9 in https://forum.shotcut.org/t/v20-09-beta-is-now-available-to- -test/20766/31 ---- - src/modules/plus/transition_affine.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/modules/plus/transition_affine.c b/src/modules/plus/transition_affine.c -index 63bbaa1df..b1147c8c6 100644 ---- a/src/modules/plus/transition_affine.c -+++ b/src/modules/plus/transition_affine.c -@@ -564,6 +564,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f - b_height = result.h; - // Set the rescale interpolation to match the frame - mlt_properties_set( b_props, "rescale.interp", mlt_properties_get( a_props, "rescale.interp" ) ); -+ mlt_properties_set_int( b_props, "distort", 1 ); - } else if (scale_width != 1.0 || scale_height != 1.0) { - // Scale request of b frame image to consumer scale maintaining its aspect ratio. - b_height = *height; diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml index 0a18c2e2c883..26411b90da30 100644 --- a/media-libs/mlt/metadata.xml +++ b/media-libs/mlt/metadata.xml @@ -12,9 +12,7 @@ <use> <flag name="compressed-lumas">Compress the luma files in png.</flag> <flag name="frei0r">Build the module for <pkg>media-plugins/frei0r-plugins</pkg></flag> - <flag name="kdenlive">Build support for <pkg>kde-apps/kdenlive</pkg></flag> <flag name="lua">Build SWIG bindings for Lua</flag> - <flag name="melt">Build the melt commandline tool</flag> <flag name="opencv">Build motion tracking module using <pkg>media-libs/opencv</pkg></flag> <flag name="python">Build SWIG bindings for Python</flag> <flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms</flag> diff --git a/media-libs/mlt/mlt-6.22.1-r1.ebuild b/media-libs/mlt/mlt-6.22.1-r1.ebuild deleted file mode 100644 index b40bee09cb66..000000000000 --- a/media-libs/mlt/mlt-6.22.1-r1.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9} ) -inherit python-single-r1 qmake-utils toolchain-funcs - -DESCRIPTION="Open source multimedia framework for television broadcasting" -HOMEPAGE="https://www.mltframework.org/" -SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64 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 libsamplerate lua melt opencv opengl python -qt5 rtaudio sdl vdpau vidstab xine xml" -# java perl php tcl - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -SWIG_DEPEND=">=dev-lang/swig-2.0" -# java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 ) -# perl? ( ${SWIG_DEPEND} ) -# php? ( ${SWIG_DEPEND} ) -# tcl? ( ${SWIG_DEPEND} ) -# ruby? ( ${SWIG_DEPEND} ) -BDEPEND=" - virtual/pkgconfig - compressed-lumas? ( virtual/imagemagick-tools[png] ) - lua? ( ${SWIG_DEPEND} virtual/pkgconfig ) - python? ( ${SWIG_DEPEND} ) -" -#rtaudio will use OSS on non linux OSes -DEPEND=" - >=media-libs/libebur128-1.2.2:= - ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] ) - fftw? ( sci-libs/fftw:3.0= ) - frei0r? ( media-plugins/frei0r-plugins ) - gtk? ( - media-libs/libexif - x11-libs/pango - ) - jack? ( - >=dev-libs/libxml2-2.5 - media-libs/ladspa-sdk - virtual/jack - ) - libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) - lua? ( >=dev-lang/lua-5.1.4-r4:0= ) - opencv? ( >=media-libs/opencv-3.2.0:= ) - opengl? ( media-video/movit ) - python? ( ${PYTHON_DEPS} ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/libexif - x11-libs/libX11 - ) - rtaudio? ( - >=media-libs/rtaudio-4.1.2 - kernel_linux? ( media-libs/alsa-lib ) - ) - sdl? ( - media-libs/libsdl2[X,opengl,video] - media-libs/sdl2-image - ) - vidstab? ( media-libs/vidstab ) - xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) - xml? ( >=dev-libs/libxml2-2.5 )" -# java? ( >=virtual/jre-1.5 ) -# perl? ( dev-lang/perl ) -# php? ( dev-lang/php ) -# ruby? ( ${RUBY_DEPS} ) -# sox? ( media-sound/sox ) -# tcl? ( dev-lang/tcl:0= ) -RDEPEND="${DEPEND}" - -DOCS=( AUTHORS NEWS README docs/{framework,melt,mlt{++,-xml}}.txt ) - -PATCHES=( - "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch - "${FILESDIR}"/${P}-fix-regression-w-multiple-affine-filters.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - # respect CFLAGS LDFLAGS when building shared libraries. Bug #308873 - for x in python lua; do - sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die - done - - use python && python_fix_shebang src/swig/python -} - -src_configure() { - tc-export CC CXX - - local myconf=( - --enable-gpl - --enable-gpl3 - --enable-motion-est - --target-arch=$(tc-arch) - --disable-gtk2 - --disable-kde - --disable-sdl - --disable-swfdec - $(use_enable debug) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable ffmpeg avformat) - $(use_enable fftw plus) - $(use_enable frei0r) - $(use_enable gtk gdk) - $(use_enable jack jackrack) - $(use_enable kdenlive) - $(use_enable libsamplerate resample) - $(use_enable melt) - $(use_enable opencv) - $(use_enable opengl) - $(use_enable qt5 qt) - $(use_enable rtaudio) - $(use_enable sdl sdl2) - $(use_enable vidstab vid.stab ) - $(use_enable xine) - $(use_enable xml) - --disable-sox - ) - #$(use_enable sox) FIXME - - use compressed-lumas && myconf+=( --luma-compress ) - use ffmpeg && myconf+=( --avformat-swscale ) - use vdpau && myconf+=( --avformat-vdpau ) - - if use qt5 ; then - myconf+=( - --qt-includedir=$(qt5_get_headerdir) - --qt-libdir=$(qt5_get_libdir) - ) - fi - - if use amd64 || use x86 ; then - myconf+=( $(use_enable cpu_flags_x86_mmx mmx) ) - else - myconf+=( --disable-mmx ) - fi - - if ! use melt ; then - sed -i -e "s;src/melt;;" Makefile || die - fi - - # TODO: add swig language bindings - # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover - - local swig_lang=() - # not done: java perl php ruby tcl - for i in lua python ; do - use $i && swig_lang+=( $i ) - done - [[ -z "${swig_lang}" ]] && swig_lang=( none ) - - econf "${myconf[@]}" --swig-languages="${swig_lang[*]}" - - sed -i -e s/^OPT/#OPT/ config.mak || die -} - -src_install() { - default - - insinto /usr/share/${PN} - doins -r demo - - docinto swig - - # Install SWIG bindings - if use lua; then - cd "${S}"/src/swig/lua || die - exeinto $(pkg-config --variable INSTALL_CMOD lua) - doexe mlt.so - dodoc play.lua - fi - - if use python; then - cd "${S}"/src/swig/python || die - python_domodule mlt.py _mlt.so - chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die - dodoc play.py - python_optimize - fi - - # not done: java perl php ruby tcl -} diff --git a/media-libs/mlt/mlt-6.24.0-r1.ebuild b/media-libs/mlt/mlt-6.24.0-r1.ebuild index 1f6ac4939d80..ae45ba932470 100644 --- a/media-libs/mlt/mlt-6.24.0-r1.ebuild +++ b/media-libs/mlt/mlt-6.24.0-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm64 ~ppc64 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 kernel_linux libsamplerate lua opencv opengl python qt5 rtaudio rubberband sdl vdpau vidstab xine xml" @@ -51,7 +51,7 @@ DEPEND=" ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( ${LUA_DEPS} ) - opencv? ( >=media-libs/opencv-3.2.0:= ) + opencv? ( >=media-libs/opencv-3.2.0:= <media-libs/opencv-4.5.1:= ) opengl? ( media-video/movit ) python? ( ${PYTHON_DEPS} ) qt5? ( |