diff options
Diffstat (limited to 'media-libs/mlt')
| -rw-r--r-- | media-libs/mlt/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/mlt/files/mlt-7.28.0-fix-32bit.patch | 101 | ||||
| -rw-r--r-- | media-libs/mlt/mlt-7.28.0.ebuild (renamed from media-libs/mlt/mlt-7.24.0-r1.ebuild) | 41 |
3 files changed, 124 insertions, 22 deletions
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest index 07aeb7e7718f..89beda90d613 100644 --- a/media-libs/mlt/Manifest +++ b/media-libs/mlt/Manifest @@ -2,7 +2,9 @@ AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed8 AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd AUX mlt-7.0.1-cmake-symlink.patch 569 BLAKE2B 06f7c8e7ec78206bb1344bab98f1d9ec816b16c458300964fe31ff30f8f2cc64d8f25a795773fd64db7249b031a164c350b55b6326c4d07d73ffd27f8786a911 SHA512 6deb458c3a89f800b4770460330c1e545c22d3a7304f0713b7ae214145d1413a3061c7c026ab2f6fc44801d1d7505352f03c0da7034e817b684e0ebb25d9a94f AUX mlt-7.24.0-musl-build-fix.patch 3927 BLAKE2B a8d0d2a5597745cfb078477fd0118e77159723a4628d9272d0891c98c2f8f9aa495ee06b1f5717f612e6045dbc35b38bd7652de18141aa020459e835c5eb63a9 SHA512 19861879d68becd2122d4ad8b81b4017f2df671c12e245888496a0b079b9856d1ac4f5c8af6246b5b35be2e2766bd29d2cce4a9659e92bfd86dbf925e096a774 +AUX mlt-7.28.0-fix-32bit.patch 3262 BLAKE2B 6842c442669b0abb1af2ef60892ee8cb494d7888bb21cab42dc4314fcba14f7cc0fef3ef7fc2f19e885d4ac76d58d0229e1ee5326ba6b45d4366bc5337160616 SHA512 498b19bd031fb384ff2786ab5a2a3e54c76a2913510ab4af7f8cda3b2063ac44cde45dea7006e8e8a53cfa430fe77567384047d979bd2ef075f2a6029a6de334 DIST mlt-7.24.0.tar.gz 1662552 BLAKE2B f6e83b3c3fd9e3bf64366a6f6165b1839003b0fd058e1368e0648e011eff6da1a9af9fa7652aff032bc4ed4465be4648b5f1ae25fc102397aa9ae2d19981643a SHA512 a9e7fd5dc04152e523456bad244416b4fdeb5961ee7cadb816dd1393277d1d801200db595dcd28e520d76e6b2caca17e65c39b0256beb7c42a58ef241b85471d -EBUILD mlt-7.24.0-r1.ebuild 4130 BLAKE2B 0696093d54eae8edc8384eebd59c8e16d67a8ca5f5e8048736d64de6a5ab4c6f22e02ec0dffd2522f3c41df32a898246bc90c3aa1e8a393cb6c88628a75a8032 SHA512 c57a92b98196d6574279872041a1144899d04e6a9acc125141f686772094a861684bc99794e161bef592dcfcf141b5623c7926caa1f94c61542d8b64f46716a0 +DIST mlt-7.28.0.tar.gz 1713069 BLAKE2B 5f9ec615324cd2095131a57b9dc0f79138d48eaa91b62574a028370be2d1c7ec6818ee2b5a9c123d35ec73993c8b2271c8dec4f039273a8443c2674c31e86fbf SHA512 a252da56b668968e56a7b0e81283b0b8e0ec8cd28502e3ab6e0aff67e22620ba61bf4feb88134e0d483884e31f2d18efe2d60b6badf0b6ffae4ad26ee646baf9 EBUILD mlt-7.24.0.ebuild 4077 BLAKE2B 751b8720dba5aa2df8ce12cde88604983b25887b88abf4b8c8a7a97d0546993383d6a0112d73ca7f5641cf668e0b3c5d88248e32ff86073c2308e083dc5b2690 SHA512 f797e0200874a6ac284fee89abd7634b5c6b7710e170765cc0bb3884d6302af5ce796acd9a7d281b8a82b4d3b096ce35b2320882bc3d21517ae6b8b05b04838a +EBUILD mlt-7.28.0.ebuild 4124 BLAKE2B 96c09c95f49d7a1c5cb2c4fc53e31c7f927dd5e0bf2ffe43a6f22e3fd76d337f9df50f8176fdb4b2e42bb1a1d8ea7ef252be6dc570f427cc137a267de599df0e SHA512 329b283671796a02eace44f9d00b01d3520c76b5ede5bc29ef2c28a6d5c115a529e42551f6eb085b8557c78b651ad279555e30d5e5e45ecabe165d2c4b2b194c MISC metadata.xml 1412 BLAKE2B 8d4eed394f1d1e95e5559466ef1840978966e8f1f7b89fdfd2549b2a35b6ce8f114c9373374fdaefe320cc34a4dc8cbd9f6c4433740d1ae9680de54484b5e3d1 SHA512 b19c711dc3798f952e0223dc0628b25aa3c9a296d66ee2f2b7f46a55b82e71c0c583ee64517be88dcc55eb1e9c31aa782b9043eb7630a853077afb1bf8b4dedd 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 new file mode 100644 index 000000000000..a56dffe2c75d --- /dev/null +++ b/media-libs/mlt/files/mlt-7.28.0-fix-32bit.patch @@ -0,0 +1,101 @@ +From 6f533e7b8999bc4017c1a6685bf2baea6570d44c Mon Sep 17 00:00:00 2001 +From: Dan Dennedy <dan@dennedy.org> +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 <dan@dennedy.org> +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 <dan@dennedy.org> +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.24.0-r1.ebuild b/media-libs/mlt/mlt-7.28.0.ebuild index f29e65ccd11d..65b63e9a0624 100644 --- a/media-libs/mlt/mlt-7.24.0-r1.ebuild +++ b/media-libs/mlt/mlt-7.28.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit python-single-r1 cmake flag-o-matic DESCRIPTION="Open source multimedia framework for television broadcasting" @@ -13,7 +13,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar 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 qt6 rtaudio rubberband sdl test vdpau vidstab xine xml" +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} )" @@ -38,22 +38,18 @@ DEPEND=" virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) - opencv? ( >=media-libs/opencv-4.5.1:=[contrib] ) + 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} ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/libexif - x11-libs/libX11 - ) qt6? ( dev-qt/qt5compat:6 dev-qt/qtbase:6[gui,network,opengl,widgets,xml] @@ -93,7 +89,8 @@ 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.24.0-musl-build-fix.patch + # in git master, https://github.com/mltframework/mlt/issues/1020 + "${FILESDIR}"/${P}-fix-32bit.patch ) pkg_setup() { @@ -119,29 +116,31 @@ src_configure() { -DCLANG_FORMAT=OFF -DGPL=ON -DGPL3=ON - -DBUILD_TESTING=$(usex test) + -DMOD_QT=OFF + -DMOD_GLAXNIMATE=OFF -DMOD_KDENLIVE=ON + -DMOD_PLUS=ON -DMOD_SDL1=OFF - -DMOD_SDL2=$(usex sdl) + -DMOD_SOX=OFF + -DMOD_SPATIALAUDIO=OFF # TODO: package libspatialaudio + -DUSE_LV2=OFF # TODO + -DUSE_VST2=OFF # TODO -DMOD_AVFORMAT=$(usex ffmpeg) - -DMOD_PLUS=ON -DMOD_FREI0R=$(usex frei0r) -DMOD_GDK=$(usex gtk) -DMOD_JACKRACK=$(usex jack) -DMOD_RESAMPLE=$(usex libsamplerate) -DMOD_OPENCV=$(usex opencv) - -DMOD_SPATIALAUDIO=OFF # TODO: package libspatialaudio -DMOD_MOVIT=$(usex opengl) - -DMOD_QT=$(usex qt5) - -DMOD_GLAXNIMATE=$(usex qt5) -DMOD_QT6=$(usex qt6) -DMOD_GLAXNIMATE_QT6=$(usex qt6) -DMOD_RTAUDIO=$(usex rtaudio) -DMOD_RUBBERBAND=$(usex rubberband) + -DMOD_SDL2=$(usex sdl) + -DBUILD_TESTING=$(usex test) -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 |