From fc702c699f711e89df7eaf92999a6a858a275455eed422abd75128bba44fa406 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Fri, 9 Jun 2017 14:28:25 +0000 Subject: [PATCH 1/6] Accepting request 502647 from home:plater Add linked webvfx package OBS-URL: https://build.opensuse.org/request/show/502647 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmlt?expand=0&rev=68 --- libmlt.changes | 7 ++ libmlt.spec | 2 +- v6.4.1.tar.gz => mlt-6.4.1.tar.gz | 0 webvfx-0.44+git20160823.tar.gz | 3 + webvfx-versioned-libdir.patch | 11 +++ webvfx.changes | 8 ++ webvfx.spec | 146 ++++++++++++++++++++++++++++++ 7 files changed, 176 insertions(+), 1 deletion(-) rename v6.4.1.tar.gz => mlt-6.4.1.tar.gz (100%) create mode 100644 webvfx-0.44+git20160823.tar.gz create mode 100644 webvfx-versioned-libdir.patch create mode 100644 webvfx.changes create mode 100644 webvfx.spec diff --git a/libmlt.changes b/libmlt.changes index 0068fe2..6074d2c 100644 --- a/libmlt.changes +++ b/libmlt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 9 14:06:51 UTC 2017 - davejplater@gmail.com + +- Added files for linked package webvfx which provides qmelt needed + by shotcut for video export see boo#1043070. Webvfx has to build + within the mlt sources. + ------------------------------------------------------------------- Tue Feb 21 21:30:37 UTC 2017 - mrueckert@suse.de diff --git a/libmlt.spec b/libmlt.spec index 3d31121..9726795 100644 --- a/libmlt.spec +++ b/libmlt.spec @@ -38,7 +38,7 @@ Summary: Multimedia framework designed and developed for television broad License: GPL-3.0+ Group: System/Libraries Url: http://www.mltframework.org -Source0: https://github.com/mltframework/mlt/archive/v%{version}.tar.gz +Source0: https://github.com/mltframework/mlt/archive/v%{version}.tar.gz#/%{_name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE libmlt-0.8.2-vdpau.patch reddwarf@opensuse.org -- Make VDPAU support work without the devel package Patch1: libmlt-0.8.2-vdpau.patch # PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with diff --git a/v6.4.1.tar.gz b/mlt-6.4.1.tar.gz similarity index 100% rename from v6.4.1.tar.gz rename to mlt-6.4.1.tar.gz diff --git a/webvfx-0.44+git20160823.tar.gz b/webvfx-0.44+git20160823.tar.gz new file mode 100644 index 0000000..a049b96 --- /dev/null +++ b/webvfx-0.44+git20160823.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86555a5e96a71a7b7d7cf6f80bf7a6fdb3bfbaa68742567400a69db2f6558a3e +size 239423 diff --git a/webvfx-versioned-libdir.patch b/webvfx-versioned-libdir.patch new file mode 100644 index 0000000..5c0a1b4 --- /dev/null +++ b/webvfx-versioned-libdir.patch @@ -0,0 +1,11 @@ +Index: webvfx-e918ce4667e623c3d60735cb898223e730c6d7af/webvfx/webvfx.pro +=================================================================== +--- webvfx-e918ce4667e623c3d60735cb898223e730c6d7af/webvfx/webvfx.pro.orig 2016-08-23 20:36:10.000000000 +0200 ++++ webvfx-e918ce4667e623c3d60735cb898223e730c6d7af/webvfx/webvfx.pro 2017-06-08 13:45:28.132171602 +0200 +@@ -47,5 +47,5 @@ QT += opengl quick + + TARGET = webvfx + +-target.path = $$PREFIX/lib ++target.path = $$PREFIX/$$WLIB + INSTALLS += target diff --git a/webvfx.changes b/webvfx.changes new file mode 100644 index 0000000..3b6b2d2 --- /dev/null +++ b/webvfx.changes @@ -0,0 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 8 05:18:03 UTC 2017 - davejplater@gmail.com + +- Created initial package version 0.44+git20160823 from current + git rev: e918ce4667e623c3d60735cb898223e730c6d7af needed by + shotcut. See boo#1043070 +- Added webvfx-versioned-libdir.patch to enable arch dependent + library directory install diff --git a/webvfx.spec b/webvfx.spec new file mode 100644 index 0000000..6efd8b2 --- /dev/null +++ b/webvfx.spec @@ -0,0 +1,146 @@ +# +# spec file for package webvfx +# +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%define _name mlt +%define mltversion 6.4.1 +%define sover 1 +%define mltmaj %(echo %{mltversion} |cut -d "." -f 1) + +# Find qt version used to build +%define qt5version %(pkg-config --modversion Qt5Core) + +%define _rev e918ce4667e623c3d60735cb898223e730c6d7af + +Name: webvfx +Version: 0.44+git20160823 +Release: 0 +Summary: Video effects engine based on web technologies +License: BSD-3-Clause +Group: Productivity/Multimedia/Video/Editors and Convertors +Url: https://github.com/mltframework/webvfx +Source0: %{_name}-%{mltversion}.tar.gz +# This is needed by shotcut and will only build within the mlt sources. +Source1: https://github.com/mltframework/webvfx/archive/%{_rev}.tar.gz#/webvfx-%{version}.tar.gz +#PATCH-FIX-UPSTREAM webvfx-versioned-libdir.patch davejplater@gmail.com -- install webvfx lib in versioned _libdir +Patch4: webvfx-versioned-libdir.patch +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: pkg-config +BuildRequires: pkgconfig(Qt5Core) >= 5.5.0 +BuildRequires: pkgconfig(Qt5Multimedia) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5WebSockets) +BuildRequires: pkgconfig(Qt5WebSockets) +BuildRequires: pkgconfig(mlt++) +BuildRequires: pkgconfig(mlt-framework) + +#Requires: +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +WebVfx is a video effects library that allows effects to be +implemented using WebKit HTML or Qt QML. + +%package -n libwebvfx%{sover} +Summary: Video effects engine based on web technologies +Group: System/Libraries + +%description -n libwebvfx%{sover} +WebVfx is a video effects library that allows effects to be +implemented using WebKit HTML or Qt QML. + +%package devel +Summary: Video effects engine based on web technologies +Group: Development/Libraries/C and C++ +Requires: libwebvfx%{sover} = %{version} + +%description devel +WebVfx is a video effects library that allows effects to be +implemented using WebKit HTML or Qt QML. This package contains +the development library link. + +%package module +Summary: Webvfx module for MLT +Group: Productivity/Multimedia/Video/Editors and Convertors + +%description module +A module plugin for the MLT multimedia framework. + +%package -n qmelt +Summary: A Melt that works with webvfx +Group: Productivity/Multimedia/Video/Editors and Convertors + +%description -n qmelt +MLT is an open source multimedia framework, designed and developed for +television broadcasting. It provides a toolkit for broadcasters, video editors, +media players, transcoders, web streamers and many more types of applications. +The functionality of the system is provided via an assortment of ready to use +tools, XML authoring components, and an extensible plug-in based API. +This version of melt works with webvfx + + +%prep +%setup -q -n %{_name}-%{mltversion} -a 1 +%patch4 + +%build +pushd webvfx-%{_rev} +%qmake5 \ + QMAKE_STRIP="" \ + MLT_SOURCE="%{_builddir}/%{_name}-%{mltversion}/" \ + WLIB=%{_lib} \ + PREFIX="%{_prefix}" -Wall -recursive + +make %{_smp_mflags} VERBOSE=1 +popd + +%install +pushd webvfx-%{_rev} +%qmake5_install +popd +#Add webvfx module to versioned mlt module directory +mv %{buildroot}%{_libdir}/mlt %{buildroot}%{_libdir}/mlt-%{mltmaj} +chmod 0755 %{buildroot}%{_bindir}/* + +%post -n libwebvfx%{sover} -p /sbin/ldconfig + +%postun -n libwebvfx%{sover} -p /sbin/ldconfig + +%files +%defattr(0755, root, root, 0755) +%{_bindir}/webvfx* + +%files module +%defattr(0755, root, root, 0755) +%{_libdir}/mlt-%{mltmaj}/ + +%files -n libwebvfx%{sover} +%defattr(0755, root, root, 0755) +%{_libdir}/libwebvfx.so.* + +%files devel +%defattr(0755, root, root, 0755) +%{_libdir}/libwebvfx.so + +%files -n qmelt +%defattr(0755, root, root, 0755) +%{_bindir}/qmelt + +%changelog From 5ccb61716cf20e23ac6934b802256dfea732f4bcb9480cff095203f50f278678 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Wed, 5 Jul 2017 13:23:23 +0000 Subject: [PATCH 2/6] Accepting request 508348 from home:kfreitag:branches:multimedia:libs - Add patch from upstream that prevents crashes of apps in some circumstances, as reported on openSUSE ML. https://github.com/mltframework/mlt/commit/a3188e301b5a9a1f25dbb98a510e366363348e64 OBS-URL: https://build.opensuse.org/request/show/508348 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmlt?expand=0&rev=69 --- libmlt.changes | 7 +++++++ libmlt.spec | 3 +++ rem_close.patch | 25 +++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 rem_close.patch diff --git a/libmlt.changes b/libmlt.changes index 6074d2c..786a615 100644 --- a/libmlt.changes +++ b/libmlt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 5 12:29:54 UTC 2017 - klaas.freitag@suse.com + +- Add patch from upstream that prevents crashes of apps in some + circumstances, as reported on openSUSE ML. + https://github.com/mltframework/mlt/commit/a3188e301b5a9a1f25dbb98a510e366363348e64 + ------------------------------------------------------------------- Fri Jun 9 14:06:51 UTC 2017 - davejplater@gmail.com diff --git a/libmlt.spec b/libmlt.spec index 9726795..7133835 100644 --- a/libmlt.spec +++ b/libmlt.spec @@ -45,6 +45,8 @@ Patch1: libmlt-0.8.2-vdpau.patch # ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions Patch2: use-recommended-freetype-include.patch Patch3: 6c658e5d8cd11933bf799a2a985aa4b24cfbcb60.patch +# PATCH-FIX-UPSTREAM remove superflous close to avoid crashes in for example kdenlive +Patch4: rem_close.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: ladspa-devel @@ -233,6 +235,7 @@ This package is needed to use MLT from Python. %patch1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # To complement libmlt-0.8.0-vdpau.patch. # When vdpau support is not compiled it will break the code. Doesn't matter because the code will not be used anyway. diff --git a/rem_close.patch b/rem_close.patch new file mode 100644 index 0000000..45d928e --- /dev/null +++ b/rem_close.patch @@ -0,0 +1,25 @@ +From a3188e301b5a9a1f25dbb98a510e366363348e64 Mon Sep 17 00:00:00 2001 +From: Dan Dennedy +Date: Sun, 19 Feb 2017 12:50:59 -0800 +Subject: [PATCH] Allow Mlt::Repository to be deleted without bad side effect. + +mlt_repository_close() is run by mlt_factory_close() when called either +directly, which requires all Mlt objects to be destroyed prior, or +atexit(). +--- + src/mlt++/MltRepository.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/mlt++/MltRepository.cpp b/src/mlt++/MltRepository.cpp +index 47a598bc..45522e40 100644 +--- a/src/mlt++/MltRepository.cpp ++++ b/src/mlt++/MltRepository.cpp +@@ -35,8 +35,6 @@ Repository::Repository( mlt_repository repository ) : + + Repository::~Repository( ) + { +- if ( instance ) +- mlt_repository_close( instance ); + instance = NULL; + } + From 66926fec0090a80a0ba59c83203df941e15dd28d097d3c956947e3627645c7db Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Wed, 5 Jul 2017 14:42:35 +0000 Subject: [PATCH 3/6] Accepting request 508362 from home:plater Fix changes file OBS-URL: https://build.opensuse.org/request/show/508362 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmlt?expand=0&rev=70 --- libmlt.changes | 4 ++-- webvfx.changes | 5 +++++ webvfx.spec | 9 +++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/libmlt.changes b/libmlt.changes index 786a615..bfb3fe1 100644 --- a/libmlt.changes +++ b/libmlt.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Wed Jul 5 12:29:54 UTC 2017 - klaas.freitag@suse.com -- Add patch from upstream that prevents crashes of apps in some - circumstances, as reported on openSUSE ML. +- Add rem_close.patch from upstream that prevents crashes of apps + in some circumstances, as reported on openSUSE ML. https://github.com/mltframework/mlt/commit/a3188e301b5a9a1f25dbb98a510e366363348e64 ------------------------------------------------------------------- diff --git a/webvfx.changes b/webvfx.changes index 3b6b2d2..9efedaf 100644 --- a/webvfx.changes +++ b/webvfx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jun 11 09:35:09 UTC 2017 - davejplater@gmail.com + +- Added man pages for binaries. + ------------------------------------------------------------------- Thu Jun 8 05:18:03 UTC 2017 - davejplater@gmail.com diff --git a/webvfx.spec b/webvfx.spec index 6efd8b2..80ed659 100644 --- a/webvfx.spec +++ b/webvfx.spec @@ -40,6 +40,7 @@ Source1: https://github.com/mltframework/webvfx/archive/%{_rev}.tar.gz#/w Patch4: webvfx-versioned-libdir.patch BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: help2man BuildRequires: pkg-config BuildRequires: pkgconfig(Qt5Core) >= 5.5.0 BuildRequires: pkgconfig(Qt5Multimedia) @@ -118,6 +119,12 @@ popd #Add webvfx module to versioned mlt module directory mv %{buildroot}%{_libdir}/mlt %{buildroot}%{_libdir}/mlt-%{mltmaj} chmod 0755 %{buildroot}%{_bindir}/* +#Create man pages for executables. +mkdir -p %{buildroot}%{_mandir}/man1 +pushd %{buildroot}%{_bindir} +for i in `ls -1` ;do help2man -N --no-discard-stderr ./${i} -o %{buildroot}%{_mandir}/man1/${i}.1 \ +;done +popd %post -n libwebvfx%{sover} -p /sbin/ldconfig @@ -126,6 +133,7 @@ chmod 0755 %{buildroot}%{_bindir}/* %files %defattr(0755, root, root, 0755) %{_bindir}/webvfx* +%{_mandir}/man1/webvfx* %files module %defattr(0755, root, root, 0755) @@ -142,5 +150,6 @@ chmod 0755 %{buildroot}%{_bindir}/* %files -n qmelt %defattr(0755, root, root, 0755) %{_bindir}/qmelt +%{_mandir}/man1/qmelt* %changelog From 2b72eb0e323b479619d106799d2b73341fd93850ed05d67bdcbbd28988911869 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Fri, 7 Jul 2017 03:49:01 +0000 Subject: [PATCH 4/6] Accepting request 508649 from home:jengelh:branches:multimedia:libs - Trim filler wording from descriptions; fix identical descriptions being used in different subpackages. - Trim filler wording from descriptions; fix identical descriptions being used in different subpackages. - Cure "useless use of cat" (`ls -1`) by replacing with just *. OBS-URL: https://build.opensuse.org/request/show/508649 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmlt?expand=0&rev=71 --- libmlt.changes | 6 +++ libmlt.spec | 113 +++++++++++++++++++++++++------------------------ webvfx.changes | 7 +++ webvfx.spec | 17 ++++---- 4 files changed, 78 insertions(+), 65 deletions(-) diff --git a/libmlt.changes b/libmlt.changes index bfb3fe1..bf181fb 100644 --- a/libmlt.changes +++ b/libmlt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 6 22:21:18 UTC 2017 - jengelh@inai.de + +- Trim filler wording from descriptions; fix identical + descriptions being used in different subpackages. + ------------------------------------------------------------------- Wed Jul 5 12:29:54 UTC 2017 - klaas.freitag@suse.com diff --git a/libmlt.spec b/libmlt.spec index 7133835..7807166 100644 --- a/libmlt.spec +++ b/libmlt.spec @@ -34,9 +34,9 @@ Name: %{libname} Version: 6.4.1 Release: 0 -Summary: Multimedia framework designed and developed for television broadcasting +Summary: Multimedia framework for television broadcasting License: GPL-3.0+ -Group: System/Libraries +Group: Development/Libraries/C and C++ Url: http://www.mltframework.org Source0: https://github.com/mltframework/mlt/archive/v%{version}.tar.gz#/%{_name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE libmlt-0.8.2-vdpau.patch reddwarf@opensuse.org -- Make VDPAU support work without the devel package @@ -102,89 +102,91 @@ BuildRequires: pkgconfig(x11) %endif %description -MLT is an open source multimedia framework, designed and developed for -television broadcasting. It provides a toolkit for broadcasters, video editors, -media players, transcoders, web streamers and many more types of applications. -The functionality of the system is provided via an assortment of ready to use -tools, XML authoring components, and an extensible plug-in based API. +MLT is a multimedia framework for television broadcasting. It +provides a toolkit for broadcasters, video editors, media players, +transcoders and web streamers. The functionality of the system is +provided via an assortment of tools, XML authoring components, and an +plug-in based API. %package -n %{libname}%{soname} -Summary: Multimedia framework designed and developed for television broadcasting +Summary: C library API for the MLT multimedia framework Group: System/Libraries Recommends: %{libname}%{soname}-data Recommends: %{libname}%{soname}-modules %description -n %{libname}%{soname} -MLT is an open source multimedia framework, designed and developed for -television broadcasting. It provides a toolkit for broadcasters, video editors, -media players, transcoders, web streamers and many more types of applications. -The functionality of the system is provided via an assortment of ready to use -tools, XML authoring components, and an extensible plug-in based API. +MLT is a multimedia framework for television broadcasting. It +provides a toolkit for broadcasters, video editors, media players, +transcoders and web streamers. + +This subpackage contains the C library API for MLT. %package devel -Summary: Multimedia framework designed and developed for television broadcasting +Summary: Development files for MLT's C language API Group: Development/Libraries/C and C++ Requires: %{libname}%{soname} = %{version} %description devel -MLT is an open source multimedia framework, designed and developed for -television broadcasting. It provides a toolkit for broadcasters, video editors, -media players, transcoders, web streamers and many more types of applications. -The functionality of the system is provided via an assortment of ready to use -tools, XML authoring components, and an extensible plug-in based API. +MLT is a multimedia framework for television broadcasting. It +provides a toolkit for broadcasters, video editors, media players, +transcoders and web streamers. + +This subpackage contains the headers to make use of the MLT C API. %package -n %{libname_pp}%{soname_pp} -Summary: Multimedia framework designed and developed for television broadcasting +Summary: C++ library API for the MLT multimedia framework Group: System/Libraries %description -n %{libname_pp}%{soname_pp} -MLT is an open source multimedia framework, designed and developed for -television broadcasting. It provides a toolkit for broadcasters, video editors, -media players, transcoders, web streamers and many more types of applications. -The functionality of the system is provided via an assortment of ready to use -tools, XML authoring components, and an extensible plug-in based API. +MLT is a multimedia framework for television broadcasting. It +provides a toolkit for broadcasters, video editors, media players, +transcoders and web streamers. + +This subpackage contains the C++ library API for MLT. %package -n %{libname_pp}-devel -Summary: Multimedia framework designed and developed for television broadcasting +Summary: Development files for MLT's C++ language API Group: Development/Libraries/C and C++ Requires: %{libname_pp}%{soname_pp} = %{version} Requires: %{libname}-devel = %{version} %description -n %{libname_pp}-devel -MLT is an open source multimedia framework, designed and developed for -television broadcasting. It provides a toolkit for broadcasters, video editors, -media players, transcoders, web streamers and many more types of applications. -The functionality of the system is provided via an assortment of ready to use -tools, XML authoring components, and an extensible plug-in based API. +MLT is a multimedia framework for television broadcasting. It +provides a toolkit for broadcasters, video editors, media players, +transcoders and web streamers. + +This subpackage contains the headers to make use of the MLT C++ API. %package -n melt%{soname} -Summary: Multimedia framework designed and developed for television broadcasting +Summary: Multimedia framework for television broadcasting Group: Productivity/Multimedia/Video/Editors and Convertors Requires: melt %description -n melt%{soname} -MLT is an open source multimedia framework, designed and developed for -television broadcasting. It provides a toolkit for broadcasters, video editors, -media players, transcoders, web streamers and many more types of applications. -The functionality of the system is provided via an assortment of ready to use -tools, XML authoring components, and an extensible plug-in based API. +MLT is a multimedia framework for television broadcasting. It +provides a toolkit for broadcasters, video editors, media players, +transcoders and web streamers. + +The functionality of the system is provided via an assortment of +tools, XML authoring components, and an plug-in based API. %package -n melt -Summary: Multimedia framework designed and developed for television broadcasting +Summary: Multimedia framework for television broadcasting Group: Productivity/Multimedia/Video/Editors and Convertors Requires: melt%{soname} Conflicts: melt > %{version} Conflicts: melt < %{version} %description -n melt -MLT is an open source multimedia framework, designed and developed for -television broadcasting. It provides a toolkit for broadcasters, video editors, -media players, transcoders, web streamers and many more types of applications. -The functionality of the system is provided via an assortment of ready to use -tools, XML authoring components, and an extensible plug-in based API. +MLT is a multimedia framework for television broadcasting. It +provides a toolkit for broadcasters, video editors, media players, +transcoders and web streamers. + +This subpackage contains a symlink to refer to a specific +version of MLT. %package -n %{libname}%{soname}-modules -Summary: Multimedia framework designed and developed for television broadcasting +Summary: Modules for the MLT multimedia framework Group: Productivity/Multimedia/Video/Editors and Convertors Requires: %{_bindir}/melt Requires: %{libname}%{soname} = %{version} @@ -198,27 +200,26 @@ Suggests: %(rpm -qf $(readlink -e %{_libdir}/libvdpau.so) --qf '%{NAME}') %endif %description -n %{libname}%{soname}-modules -MLT is an open source multimedia framework, designed and developed for -television broadcasting. It provides a toolkit for broadcasters, video editors, -media players, transcoders, web streamers and many more types of applications. -The functionality of the system is provided via an assortment of ready to use -tools, XML authoring components, and an extensible plug-in based API. +MLT is a multimedia framework for television broadcasting. It +provides a toolkit for broadcasters, video editors, media players, +transcoders and web streamers. + +The functionality of the system is provided via an assortment of +tools, XML authoring components, and an plug-in based API. %package -n %{libname}%{soname}-data -Summary: Multimedia framework designed and developed for television broadcasting +Summary: Architecture-independent data files for the MLT multimedia framework Group: Productivity/Multimedia/Video/Editors and Convertors Requires: %{libname}%{soname} = %{version} BuildArch: noarch %description -n %{libname}%{soname}-data -MLT is an open source multimedia framework, designed and developed for -television broadcasting. It provides a toolkit for broadcasters, video editors, -media players, transcoders, web streamers and many more types of applications. -The functionality of the system is provided via an assortment of ready to use -tools, XML authoring components, and an extensible plug-in based API. +MLT is a multimedia framework for television broadcasting. It +provides a toolkit for broadcasters, video editors, media players, +transcoders and web streamers. %package -n python-%{_name} -Summary: Python bindings for MLT +Summary: Python bindings for the MLT multimedia framework Group: Development/Languages/Python BuildRequires: python-devel BuildRequires: swig diff --git a/webvfx.changes b/webvfx.changes index 9efedaf..b6b72a3 100644 --- a/webvfx.changes +++ b/webvfx.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jul 6 22:21:18 UTC 2017 - jengelh@inai.de + +- Trim filler wording from descriptions; fix identical + descriptions being used in different subpackages. +- Cure "useless use of cat" (`ls -1`) by replacing with just *. + ------------------------------------------------------------------- Sun Jun 11 09:35:09 UTC 2017 - davejplater@gmail.com diff --git a/webvfx.spec b/webvfx.spec index 80ed659..43edc43 100644 --- a/webvfx.spec +++ b/webvfx.spec @@ -89,13 +89,11 @@ Summary: A Melt that works with webvfx Group: Productivity/Multimedia/Video/Editors and Convertors %description -n qmelt -MLT is an open source multimedia framework, designed and developed for -television broadcasting. It provides a toolkit for broadcasters, video editors, -media players, transcoders, web streamers and many more types of applications. -The functionality of the system is provided via an assortment of ready to use -tools, XML authoring components, and an extensible plug-in based API. -This version of melt works with webvfx - +MLT is a multimedia framework, designed and developed for television +broadcasting. It provides a toolkit for broadcasters, video editors, +media players, transcoders, web streamers and many more types of +applications. The functionality of the system is provided via an +assortment of tools, XML authoring components, and an plug-in based API. %prep %setup -q -n %{_name}-%{mltversion} -a 1 @@ -122,8 +120,9 @@ chmod 0755 %{buildroot}%{_bindir}/* #Create man pages for executables. mkdir -p %{buildroot}%{_mandir}/man1 pushd %{buildroot}%{_bindir} -for i in `ls -1` ;do help2man -N --no-discard-stderr ./${i} -o %{buildroot}%{_mandir}/man1/${i}.1 \ -;done +for i in *; do + help2man -N --no-discard-stderr ./${i} -o %{buildroot}%{_mandir}/man1/${i}.1 +done popd %post -n libwebvfx%{sover} -p /sbin/ldconfig From 09633b0d56196126a6e11e51a2aa93bbfe750a222f7deafd3b52983055160029 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Thu, 13 Jul 2017 12:22:39 +0000 Subject: [PATCH 5/6] Accepting request 510066 from home:plater Fix 42.2/3 build with gcc6 OBS-URL: https://build.opensuse.org/request/show/510066 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmlt?expand=0&rev=72 --- libmlt.changes | 6 ++++++ libmlt.spec | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/libmlt.changes b/libmlt.changes index bf181fb..a0d2a68 100644 --- a/libmlt.changes +++ b/libmlt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 13 12:18:18 UTC 2017 - davejplater@gmail.com + +- Build with gcc6, fix build failure for 42.2/3 due to movit + building with gcc6. + ------------------------------------------------------------------- Thu Jul 6 22:21:18 UTC 2017 - jengelh@inai.de diff --git a/libmlt.spec b/libmlt.spec index 7807166..a0b8e9a 100644 --- a/libmlt.spec +++ b/libmlt.spec @@ -48,7 +48,13 @@ Patch3: 6c658e5d8cd11933bf799a2a985aa4b24cfbcb60.patch # PATCH-FIX-UPSTREAM remove superflous close to avoid crashes in for example kdenlive Patch4: rem_close.patch BuildRequires: fdupes +%if 0%{?suse_version} > 1320 BuildRequires: gcc-c++ +%else +BuildRequires: gcc6 +BuildRequires: gcc6-c++ +#!Buildignore: libgcc_s1 +%endif BuildRequires: ladspa-devel BuildRequires: pkg-config %if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}) @@ -244,6 +250,10 @@ VDPAU_SONAME=$(objdump -p $(readlink -e %{_libdir}/libvdpau.so) | grep SONAME | sed "s/__VDPAU_SONAME__/${VDPAU_SONAME}/" -i src/modules/avformat/vdpau.c %build +test -x "$(type -p gcc-6)" && export CC=gcc-6 +test -x "$(type -p gcc-7)" && export CC=gcc-7 +test -x "$(type -p g++-6)" && export CXX=g++-6 +test -x "$(type -p g++-7)" && export CXX=g++-7 %configure \ %ifnarch %{ix86} x86_64 --disable-mmx \ From 2c622d857da7fe9b04fcaf48ebe371e03764829b884394885fcbd5118c0e19f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 5 Aug 2017 06:45:33 +0000 Subject: [PATCH 6/6] Accepting request 514626 from home:olh:branches:multimedia:libs - Build with Qt5 unconditional because PackageHub has a recent Qt5 OBS-URL: https://build.opensuse.org/request/show/514626 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmlt?expand=0&rev=73 --- libmlt.changes | 5 +++++ libmlt.spec | 9 +-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libmlt.changes b/libmlt.changes index a0d2a68..f59895f 100644 --- a/libmlt.changes +++ b/libmlt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Aug 5 05:59:16 UTC 2017 - olaf@aepfle.de + +- Build with Qt5 unconditional because PackageHub has a recent Qt5 + ------------------------------------------------------------------- Thu Jul 13 12:18:18 UTC 2017 - davejplater@gmail.com diff --git a/libmlt.spec b/libmlt.spec index a0b8e9a..d538d1b 100644 --- a/libmlt.spec +++ b/libmlt.spec @@ -57,19 +57,11 @@ BuildRequires: gcc6-c++ %endif BuildRequires: ladspa-devel BuildRequires: pkg-config -%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Xml) -%else -BuildRequires: pkgconfig(QtCore) -BuildRequires: pkgconfig(QtGui) -BuildRequires: pkgconfig(QtSvg) -BuildRequires: pkgconfig(QtXml) -%endif -BuildRequires: movit-devel BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(frei0r) @@ -83,6 +75,7 @@ BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libquicktime) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(movit) BuildRequires: pkgconfig(opencv) >= 3.1.0 BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pangoft2)