From 09d6b41a50a4d3517cf1a0bee222eda9f8498607c45fc9cd384bdcab178a0bff Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Tue, 20 Dec 2022 14:04:21 +0000 Subject: [PATCH] Accepting request 1043895 from home:krop:branches:multimedia:libs - Build the glaxnimate module. Kdenlive complains if the plugin is missing (boo#1206127) - Change the source URL to get the glaxnimate sources OBS-URL: https://build.opensuse.org/request/show/1043895 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmlt?expand=0&rev=148 --- libmlt.changes | 7 +++++++ libmlt.spec | 16 ++++++++++++---- mlt-7.12.0.tar.gz | 4 ++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/libmlt.changes b/libmlt.changes index f33e7fb..67671ea 100644 --- a/libmlt.changes +++ b/libmlt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Dec 20 10:38:23 UTC 2022 - Christophe Marin + +- Build the glaxnimate module. Kdenlive complains if the plugin + is missing (boo#1206127) +- Change the source URL to get the glaxnimate sources + ------------------------------------------------------------------- Sun Nov 27 10:18:16 UTC 2022 - Christophe Giboudeaux diff --git a/libmlt.spec b/libmlt.spec index 8d08217..5112494 100644 --- a/libmlt.spec +++ b/libmlt.spec @@ -26,9 +26,11 @@ %define sover_pp 7 %define lversion_pp 7.12.0 %define libpp_pkgname %{libname_pp}-%{sover_pp}-%{sover_pp} -# Qt 6 is not available in Leap 15.3 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 +# Qt 6 is not available in Leap 15.3 %bcond_without Qt6 +# The glaxnimate module fails to build on 15.3 +%bcond_without glaxnimate %endif Name: %{libname} Version: 7.12.0 @@ -37,7 +39,7 @@ Summary: Multimedia framework for television broadcasting License: GPL-3.0-or-later Group: Development/Libraries/C and C++ URL: https://www.mltframework.org -Source0: https://github.com/mltframework/mlt/archive/v%{version}.tar.gz#/%{_name}-%{version}.tar.gz +Source0: https://github.com/mltframework/mlt/releases/download/v%{version}/mlt-%{version}.tar.gz BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -67,6 +69,9 @@ BuildRequires: pkgconfig(frei0r) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(jack) +%if %{with glaxnimate} +BuildRequires: pkgconfig(libarchive) +%endif BuildRequires: pkgconfig(libavcodec) >= 58 BuildRequires: pkgconfig(libavdevice) >= 58 BuildRequires: pkgconfig(libavformat) >= 58 @@ -77,7 +82,7 @@ BuildRequires: pkgconfig(libpulse-simple) BuildRequires: pkgconfig(libswscale) >= 5 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(movit) -%if 0%{?suse_version} > 1501 +%if 0%{?suse_version} > 1500 BuildRequires: pkgconfig(opencv4) %endif BuildRequires: pkgconfig(pango) @@ -216,7 +221,7 @@ export CC=gcc-10 CXX=g++-10 # WARNING: building opencv module causes multicore issues - boo#1068792 %cmake \ -%if 0%{?suse_version} > 1501 +%if 0%{?suse_version} > 1500 -DMOD_OPENCV=ON \ %else -DMOD_OPENCV=OFF \ @@ -225,6 +230,9 @@ export CC=gcc-10 CXX=g++-10 -DGPL3=ON \ -DSWIG_PYTHON=ON \ -DCMAKE_SKIP_RPATH=1 \ +%if %{with glaxnimate} + -DMOD_GLAXNIMATE=ON \ +%endif %if %{with Qt6} -DMOD_QT6=ON %endif diff --git a/mlt-7.12.0.tar.gz b/mlt-7.12.0.tar.gz index 25c0730..44a92f2 100644 --- a/mlt-7.12.0.tar.gz +++ b/mlt-7.12.0.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41af600a5b223e067dff529d4ebe83bf8dee4efa807c8f928141e1174f13c45c -size 1253958 +oid sha256:48b385e83cbd5bf68bfc88631273868fbee36a41b3b7e2acd97f12b095b0083c +size 1481720