[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     7a37c9a76df76df42d230bc4e65bf471dee74cd1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 14:47:01 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 14:49:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a37c9a7

media-libs/mlt: drop 7.14.0-r1, 7.16.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/mlt/Manifest                            |   1 -
 .../mlt/files/mlt-7.14.0-int-conversion.patch      |  53 -------
 media-libs/mlt/mlt-7.14.0-r1.ebuild                | 158 ---------------------
 media-libs/mlt/mlt-7.16.0.ebuild                   | 158 ---------------------
 4 files changed, 370 deletions(-)

diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 7f9726ea8813..9932679fc00c 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,3 +1,2 @@
-DIST mlt-7.14.0.tar.gz 1509786 BLAKE2B 6a590bb85f9c1f35cffce393db0ae016351ed9713d37bb22232474df27fc8f647847e9aed6ba6a8a00787a69136533fbb9f2adfb7b4743e2bdee9b146ebbe02a SHA512 9f30b06fd4a38fe41547f3b3919a6cb809f2493ef71af2c7a16029ba7b4a7b633db56c0fabafb1745b6072cd9de4db4131fe55afc66c06fd3dd016c33eb828cc
 DIST mlt-7.16.0.tar.gz 1577046 BLAKE2B 810583888cbbd066a6addaf98fc0f9b9e5b7b0063f8442b8d1c26ca2454103bb199656d55348a3b325cf0ea44833296cbf61ae088631609b70c1918cfdb09e08 SHA512 35844a5fe6565ce8908c81f341fffe79e651fe1a6b05fde53338053a8dae774112f0caeb16059febba2a5a418d9674c17ddc2016899c8a24aefa501e812cc3df
 DIST mlt-7.18.0.tar.gz 1586572 BLAKE2B a0cd6728f0282733532b6d69f970428e868b372319ee1790aa0fb98d2f45e0487767ef983e80ed336d34de49a0240c577bff08515b71649d32befea6b3561d4e SHA512 36995dc0d246525ca026c2337c41f0a485f37f8f9842973733a081c05dbc8870a501acc8f51314853cd189306f9bb620f6172cba84e2363af57a0b2be3781a74

diff --git a/media-libs/mlt/files/mlt-7.14.0-int-conversion.patch b/media-libs/mlt/files/mlt-7.14.0-int-conversion.patch
deleted file mode 100644
index 8a3acdcc7048..000000000000
--- a/media-libs/mlt/files/mlt-7.14.0-int-conversion.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Upstream: https://github.com/mltframework/mlt/commit/db1f3ceff723912c2ff4b6207a3f446f6677e8f8
-
-From db1f3ceff723912c2ff4b6207a3f446f6677e8f8 Mon Sep 17 00:00:00 2001
-From: j-b-m <jb@kdenlive.org>
-Date: Sun, 2 Apr 2023 18:14:20 +0200
-Subject: [PATCH] Fix compilation: parameter type mismatch
-
-* Fix compilation: parameter type mismatch
-
-* Fix incompatible arg
---- a/src/modules/avformat/factory.c
-+++ b/src/modules/avformat/factory.c
-@@ -31,7 +31,7 @@ extern mlt_filter filter_swresample_init( mlt_profile profile, char *arg );
- extern mlt_filter filter_swscale_init( mlt_profile profile, char *arg );
- extern mlt_producer producer_avformat_init( mlt_profile profile, const char *service, char *file );
- extern mlt_filter filter_avfilter_init( mlt_profile, mlt_service_type, const char*, char* );
--extern mlt_link link_swresample_init( mlt_profile profile, char *arg );
-+extern mlt_link link_swresample_init( mlt_profile profile, mlt_service_type, const char *, char * );
- 
- // ffmpeg Header files
- #include <libavformat/avformat.h>
-@@ -94,7 +94,7 @@ static void *create_service( mlt_profile profile, mlt_service_type type, const c
- 		if ( type == mlt_service_filter_type )
- 			return filter_swresample_init( profile, arg );
- 		else if ( type == mlt_service_link_type )
--			return link_swresample_init( profile, arg );
-+            		return link_swresample_init( profile, type, id, arg );
- #endif
- 	return NULL;
- }
---- a/src/win32/win32.c
-+++ b/src/win32/win32.c
-@@ -70,7 +70,7 @@ int setenv(const char *name, const char *value, int overwrite)
- 
- static int iconv_from_utf8( mlt_properties properties, const char *prop_name, const char *prop_name_out, const char* encoding )
- {
--	char *text = mlt_properties_get( properties, prop_name );
-+	const char *text = mlt_properties_get( properties, prop_name );
- 	int result = 0;
- 
- 	if ( text ) {
-@@ -99,7 +99,7 @@ static int iconv_from_utf8( mlt_properties properties, const char *prop_name, co
- 
- static int iconv_to_utf8( mlt_properties properties, const char *prop_name, const char *prop_name_out, const char* encoding )
- {
--	char *text = mlt_properties_get( properties, prop_name );
-+	const char *text = mlt_properties_get( properties, prop_name );
- 	int result = 0;
- 
- 	if ( text ) {
--- 
-2.41.0
-

diff --git a/media-libs/mlt/mlt-7.14.0-r1.ebuild b/media-libs/mlt/mlt-7.14.0-r1.ebuild
deleted file mode 100644
index 2e4aa2447770..000000000000
--- a/media-libs/mlt/mlt-7.14.0-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1 cmake
-
-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/7"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt5 rtaudio rubberband sdl test vdpau vidstab xine xml"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Needs unpackaged 'kwalify'
-RESTRICT="test"
-
-# rtaudio will use OSS on non linux OSes
-# Qt already needs FFTW/PLUS so let's just always have it on to ensure
-# MLT is useful: bug #603168.
-DEPEND="
-	>=media-libs/libebur128-1.2.2:=
-	sci-libs/fftw:3.0=
-	ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
-	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 )
-	opencv? ( >=media-libs/opencv-4.5.1:=[contrib] )
-	opengl? (
-		media-libs/libglvnd
-		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 )
-	)
-	rubberband? ( media-libs/rubberband )
-	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.8:* )
-#	perl? ( dev-lang/perl )
-#	php? ( dev-lang/php )
-#	ruby? ( ${RUBY_DEPS} )
-#	sox? ( media-sound/sox )
-#	tcl? ( dev-lang/tcl:0= )
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0 )
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
-	"${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
-	"${FILESDIR}"/${PN}-7.0.1-cmake-symlink.patch
-	"${FILESDIR}"/${PN}-7.14.0-int-conversion.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
-	if use python; then
-		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/python/build || die
-		python_fix_shebang src/swig/python
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DGPL=ON
-		-DGPL3=ON
-		-DBUILD_TESTING=$(usex test)
-		-DMOD_KDENLIVE=ON
-		-DMOD_SDL1=OFF
-		-DMOD_SDL2=$(usex sdl)
-		-DMOD_AVFORMAT=$(usex ffmpeg)
-		-DMOD_PLUS=ON
-		-DMOD_FREI0R=$(usex frei0r)
-		-DMOD_GDK=$(usex gtk)
-		-DMOD_JACKRACK=$(usex jack)
-		-DMOD_GLAXNIMATE=OFF
-		-DMOD_RESAMPLE=$(usex libsamplerate)
-		-DMOD_OPENCV=$(usex opencv)
-		-DMOD_MOVIT=$(usex opengl)
-		-DMOD_QT=$(usex qt5)
-		-DMOD_RTAUDIO=$(usex rtaudio)
-		-DMOD_RUBBERBAND=$(usex rubberband)
-		-DMOD_VIDSTAB=$(usex vidstab)
-		-DMOD_XINE=$(usex xine)
-		-DMOD_XML=$(usex xml)
-		-DMOD_SOX=OFF
-	)
-
-	# TODO: rework upstream CMake to allow controlling MMX/SSE/SSE2
-	# TODO: add swig language bindings?
-	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
-	if use python; then
-		mycmakeargs+=( -DSWIG_PYTHON=ON )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/${PN}
-	doins -r demo
-
-	#
-	# Install SWIG bindings
-	#
-
-	docinto swig
-
-	if use python; then
-		dodoc "${S}"/src/swig/python/play.py
-		python_optimize
-	fi
-}

diff --git a/media-libs/mlt/mlt-7.16.0.ebuild b/media-libs/mlt/mlt-7.16.0.ebuild
deleted file mode 100644
index b26754c92e32..000000000000
--- a/media-libs/mlt/mlt-7.16.0.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1 cmake
-
-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/7"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt5 rtaudio rubberband sdl test vdpau vidstab xine xml"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Needs unpackaged 'kwalify'
-RESTRICT="test"
-
-# rtaudio will use OSS on non linux OSes
-# Qt already needs FFTW/PLUS so let's just always have it on to ensure
-# MLT is useful: bug #603168.
-DEPEND="
-	>=media-libs/libebur128-1.2.2:=
-	sci-libs/fftw:3.0=
-	ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
-	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 )
-	opencv? ( >=media-libs/opencv-4.5.1:=[contrib] )
-	opengl? (
-		media-libs/libglvnd
-		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 )
-	)
-	rubberband? ( media-libs/rubberband )
-	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.8:* )
-#	perl? ( dev-lang/perl )
-#	php? ( dev-lang/php )
-#	ruby? ( ${RUBY_DEPS} )
-#	sox? ( media-sound/sox )
-#	tcl? ( dev-lang/tcl:0= )
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0 )
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
-	"${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
-	"${FILESDIR}"/${PN}-7.0.1-cmake-symlink.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
-	if use python; then
-		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/python/build || die
-		python_fix_shebang src/swig/python
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DCLANG_FORMAT=OFF
-		-DGPL=ON
-		-DGPL3=ON
-		-DBUILD_TESTING=$(usex test)
-		-DMOD_KDENLIVE=ON
-		-DMOD_SDL1=OFF
-		-DMOD_SDL2=$(usex sdl)
-		-DMOD_AVFORMAT=$(usex ffmpeg)
-		-DMOD_PLUS=ON
-		-DMOD_FREI0R=$(usex frei0r)
-		-DMOD_GDK=$(usex gtk)
-		-DMOD_JACKRACK=$(usex jack)
-		-DMOD_GLAXNIMATE=OFF
-		-DMOD_RESAMPLE=$(usex libsamplerate)
-		-DMOD_OPENCV=$(usex opencv)
-		-DMOD_MOVIT=$(usex opengl)
-		-DMOD_QT=$(usex qt5)
-		-DMOD_RTAUDIO=$(usex rtaudio)
-		-DMOD_RUBBERBAND=$(usex rubberband)
-		-DMOD_VIDSTAB=$(usex vidstab)
-		-DMOD_XINE=$(usex xine)
-		-DMOD_XML=$(usex xml)
-		-DMOD_SOX=OFF
-	)
-
-	# TODO: rework upstream CMake to allow controlling MMX/SSE/SSE2
-	# TODO: add swig language bindings?
-	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
-	if use python; then
-		mycmakeargs+=( -DSWIG_PYTHON=ON )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/${PN}
-	doins -r demo
-
-	#
-	# Install SWIG bindings
-	#
-
-	docinto swig
-
-	if use python; then
-		dodoc "${S}"/src/swig/python/play.py
-		python_optimize
-	fi
-}