commit: 9d04439fe95e386b32808973c1cf5ef75a25c21e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Mar 31 15:40:46 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Mar 31 15:41:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d04439f
media-libs/mlt: drop 7.28.0-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/mlt/Manifest | 1 - media-libs/mlt/files/mlt-7.28.0-fix-32bit.patch | 101 -------------- media-libs/mlt/mlt-7.28.0-r1.ebuild | 176 ------------------------ 3 files changed, 278 deletions(-) diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest index 9d2806a1cee3..e72c5bf0ad64 100644 --- a/media-libs/mlt/Manifest +++ b/media-libs/mlt/Manifest @@ -1,2 +1 @@ -DIST mlt-7.28.0.tar.gz 1713069 BLAKE2B 5f9ec615324cd2095131a57b9dc0f79138d48eaa91b62574a028370be2d1c7ec6818ee2b5a9c123d35ec73993c8b2271c8dec4f039273a8443c2674c31e86fbf SHA512 a252da56b668968e56a7b0e81283b0b8e0ec8cd28502e3ab6e0aff67e22620ba61bf4feb88134e0d483884e31f2d18efe2d60b6badf0b6ffae4ad26ee646baf9 DIST mlt-7.30.0.tar.gz 1725015 BLAKE2B 36950573a950281bc657fb6ec441c66c785af85b33f9d28caf44e457cd4d67953f11fef7896ed04d4d0b74cdc8355f4a8fe3d14deae09c5f5498416e2438ef58 SHA512 74cdf0504530c732f3b98358eea8f50079935f0c9782b051d4c2f7f2d001df96ed14684698fccb7d44a6fb2e6637fb3ceec01f13f458c4755aaf6e1f742c6b7d diff --git a/media-libs/mlt/files/mlt-7.28.0-fix-32bit.patch b/media-libs/mlt/files/mlt-7.28.0-fix-32bit.patch deleted file mode 100644 index a56dffe2c75d..000000000000 --- a/media-libs/mlt/files/mlt-7.28.0-fix-32bit.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 6f533e7b8999bc4017c1a6685bf2baea6570d44c Mon Sep 17 00:00:00 2001 -From: Dan Dennedy <[email protected]> -Date: Tue, 24 Sep 2024 09:47:46 -0700 -Subject: [PATCH 1/3] fix #1020 Mlt::Producer::set_creation_time() not exported - on i686 - ---- - src/mlt++/mlt++.vers | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/mlt++/mlt++.vers b/src/mlt++/mlt++.vers -index 1934decd..c47f017a 100644 ---- a/src/mlt++/mlt++.vers -+++ b/src/mlt++/mlt++.vers -@@ -540,7 +540,8 @@ MLTPP_6.14.0 { - "Mlt::Service::set_profile(mlt_profile_s*)"; - "Mlt::Playlist::reorder(int const*)"; - "Mlt::Transition::connect(Mlt::Service&, int, int)"; -- "Mlt::Producer::set_creation_time(long)"; -+# "Mlt::Producer::set_creation_time(long)"; -+ _ZN3Mlt8Producer17set_creation_timeE[lx]; - "Mlt::Producer::get_creation_time()"; - }; - } MLTPP_6.10.0; --- -2.46.1 - - -From 2072c6b3596854f1a7165d7ddd5994204e741db8 Mon Sep 17 00:00:00 2001 -From: Dan Dennedy <[email protected]> -Date: Tue, 24 Sep 2024 10:00:51 -0700 -Subject: [PATCH 2/3] fix mlt++.vers #1020 - ---- - src/mlt++/mlt++.vers | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/mlt++/mlt++.vers b/src/mlt++/mlt++.vers -index c47f017a..2d8c1dda 100644 ---- a/src/mlt++/mlt++.vers -+++ b/src/mlt++/mlt++.vers -@@ -540,10 +540,10 @@ MLTPP_6.14.0 { - "Mlt::Service::set_profile(mlt_profile_s*)"; - "Mlt::Playlist::reorder(int const*)"; - "Mlt::Transition::connect(Mlt::Service&, int, int)"; --# "Mlt::Producer::set_creation_time(long)"; -- _ZN3Mlt8Producer17set_creation_timeE[lx]; - "Mlt::Producer::get_creation_time()"; - }; -+# "Mlt::Producer::set_creation_time(long)"; -+ _ZN3Mlt8Producer17set_creation_timeE[lx]; - } MLTPP_6.10.0; - - MLTPP_6.18.0 { --- -2.46.1 - - -From 63953cf7338181c82eb6eb9f93c8c9a11aaee5f7 Mon Sep 17 00:00:00 2001 -From: Dan Dennedy <[email protected]> -Date: Tue, 24 Sep 2024 10:55:16 -0700 -Subject: [PATCH 3/3] fix Mlt::Properties::set(int64_t) symbol version - -Related to #1020 ---- - src/mlt++/mlt++.vers | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/mlt++/mlt++.vers b/src/mlt++/mlt++.vers -index 2d8c1dda..19300de3 100644 ---- a/src/mlt++/mlt++.vers -+++ b/src/mlt++/mlt++.vers -@@ -310,7 +310,6 @@ MLTPP_0.8.8 { - "Mlt::Properties::set(char const*, char const*)"; - "Mlt::Properties::set(char const*, double)"; - "Mlt::Properties::set(char const*, int)"; -- "Mlt::Properties::set(char const*, long)"; - "Mlt::Properties::set(char const*, void*, int, void (*)(void*), char* (*)(void*, int))"; - "Mlt::Properties::set_lcnumeric(char const*)"; - "Mlt::Properties::setup_wait_for(char const*)"; -@@ -414,6 +413,8 @@ MLTPP_0.8.8 { - "Mlt::Transition::Transition(Mlt::Transition&)"; - "Mlt::Transition::Transition(mlt_transition_s*)"; - }; -+# "Mlt::Properties::set(char const*, int64_t)"; -+ _ZN3Mlt10Properties3setEPKc[lx]; - - local: *; - }; -@@ -542,7 +543,7 @@ MLTPP_6.14.0 { - "Mlt::Transition::connect(Mlt::Service&, int, int)"; - "Mlt::Producer::get_creation_time()"; - }; --# "Mlt::Producer::set_creation_time(long)"; -+# "Mlt::Producer::set_creation_time(int64_t)"; - _ZN3Mlt8Producer17set_creation_timeE[lx]; - } MLTPP_6.10.0; - --- -2.46.1 - diff --git a/media-libs/mlt/mlt-7.28.0-r1.ebuild b/media-libs/mlt/mlt-7.28.0-r1.ebuild deleted file mode 100644 index ab6a9276f421..000000000000 --- a/media-libs/mlt/mlt-7.28.0-r1.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit python-single-r1 cmake flag-o-matic - -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 qt6 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?] ) - 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] - || ( - media-libs/opencv[ffmpeg] - media-libs/opencv[gstreamer] - ) - ) - opengl? ( - media-libs/libglvnd - media-video/movit - ) - python? ( ${PYTHON_DEPS} ) - qt6? ( - dev-qt/qt5compat:6 - dev-qt/qtbase:6[gui,network,opengl,widgets,xml] - dev-qt/qtsvg:6 - 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=( - # downstream - "${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 - # in git master, https://github.com/mltframework/mlt/issues/1020 - "${FILESDIR}"/${P}-fix-32bit.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() { - # Workaround for bug #919981 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=ON - -DCLANG_FORMAT=OFF - -DGPL=ON - -DGPL3=ON - -DMOD_QT=OFF - -DMOD_GLAXNIMATE=OFF - -DMOD_KDENLIVE=ON - -DMOD_PLUS=ON - -DMOD_SDL1=OFF - -DMOD_SOX=OFF - -DMOD_SPATIALAUDIO=OFF # TODO: package libspatialaudio - -DUSE_LV2=OFF # TODO - -DUSE_VST2=OFF # TODO - -DMOD_AVFORMAT=$(usex ffmpeg) - -DMOD_FREI0R=$(usex frei0r) - -DMOD_GDK=$(usex gtk) - -DMOD_JACKRACK=$(usex jack) - -DMOD_RESAMPLE=$(usex libsamplerate) - -DMOD_OPENCV=$(usex opencv) - -DMOD_MOVIT=$(usex opengl) - -DMOD_QT6=$(usex qt6) - -DMOD_GLAXNIMATE_QT6=$(usex qt6) - -DMOD_RTAUDIO=$(usex rtaudio) - -DMOD_RUBBERBAND=$(usex rubberband) - -DMOD_SDL2=$(usex sdl) - -DBUILD_TESTING=OFF # Needs unpackaged 'kwalify'; restricted anyway. - -DMOD_VIDSTAB=$(usex vidstab) - -DMOD_XINE=$(usex xine) - -DMOD_XML=$(usex xml) - ) - - # 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 - -DPython3_EXECUTABLE="${PYTHON}" - ) - 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 -}
