Hello community,
here is the log from the commit of package libmlt for openSUSE:Factory checked
in at 2019-01-11 14:05:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libmlt (Old)
and /work/SRC/openSUSE:Factory/.libmlt.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmlt"
Fri Jan 11 14:05:37 2019 rev:44 rq:664385 version:6.12.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libmlt/webvfx.changes 2018-05-13
16:05:06.686230361 +0200
+++ /work/SRC/openSUSE:Factory/.libmlt.new.28833/webvfx.changes 2019-01-11
14:06:37.783731185 +0100
@@ -1,0 +2,8 @@
+Thu Jan 10 13:33:27 UTC 2019 - davejpla...@gmail.com
+
+- Update to release version 1.0.0
+- Add webvfx-nobrowser.patch to fix Factory build.
+- Upstream changes:
+ Set version to 1.0.0
+
+-------------------------------------------------------------------
Old:
----
webvfx-0.44+git20180223.tar.gz
New:
----
webvfx-1.0.0.tar.gz
webvfx-nobrowser.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libmlt.spec ++++++
--- /var/tmp/diff_new_pack.KCBVdv/_old 2019-01-11 14:06:38.419730545 +0100
+++ /var/tmp/diff_new_pack.KCBVdv/_new 2019-01-11 14:06:38.423730542 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libmlt
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
++++++ webvfx.spec ++++++
--- /var/tmp/diff_new_pack.KCBVdv/_old 2019-01-11 14:06:38.447730517 +0100
+++ /var/tmp/diff_new_pack.KCBVdv/_new 2019-01-11 14:06:38.447730517 +0100
@@ -1,7 +1,7 @@
#
# spec file for package webvfx
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -23,9 +23,9 @@
%define mltmaj %(echo %{mltversion} |cut -d "." -f 1)
# Find qt version used to build
%define qt5version %(pkg-config --modversion Qt5Core)
-%define _rev d65a42d25a887d11fd5cf5e485c1561dc802b671
+%define _rev 5ef18121b8765ecbc6a90094b1d51059fc7e7f66
Name: webvfx
-Version: 0.44+git20180223
+Version: 1.0.0
Release: 0
Summary: Video effects engine based on web technologies
License: BSD-3-Clause
@@ -33,11 +33,12 @@
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
+Source1:
https://github.com/mltframework/webvfx/archive/%{version}.tar.gz#/webvfx-%{version}.tar.gz
# PATCH-FIX-OPENSUSE libmlt-0.8.2-vdpau.patch reddw...@opensuse.org -- Make
VDPAU support work without the devel package
Patch1: libmlt-0.8.2-vdpau.patch
#PATCH-FIX-UPSTREAM webvfx-versioned-libdir.patch davejpla...@gmail.com --
install webvfx lib in versioned _libdir
Patch10: webvfx-versioned-libdir.patch
+Patch11: webvfx-nobrowser.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: help2man
@@ -49,7 +50,6 @@
BuildRequires: pkgconfig(Qt5WebSockets)
BuildRequires: pkgconfig(mlt++)
BuildRequires: pkgconfig(mlt-framework)
-#Requires:
%description
WebVfx is a video effects library that allows effects to be
@@ -94,22 +94,21 @@
%prep
%setup -q -n %{_name}-%{mltversion} -a 1
-%patch1
-%patch10
+%autopatch -p0
%build
-pushd webvfx-%{_rev}
+pushd webvfx-%{version}
%qmake5 \
QMAKE_STRIP="" \
MLT_SOURCE="%{_builddir}/%{_name}-%{mltversion}/" \
WLIB=%{_lib} \
PREFIX="%{_prefix}" -Wall -recursive
-make %{?_smp_mflags} VERBOSE=1
+make VERBOSE=1 %{?_smp_mflags}
popd
%install
-pushd webvfx-%{_rev}
+pushd webvfx-%{version}
%qmake5_install
chmod 0644 LICENSE README.md
popd
@@ -130,8 +129,8 @@
%files
%{_bindir}/webvfx*
%{_mandir}/man1/webvfx*
-%license webvfx-%{_rev}/LICENSE
-%doc webvfx-%{_rev}/README.md
+%license webvfx-%{version}/LICENSE
+%doc webvfx-%{version}/README.md
%files module
%defattr(0755, root, root, 0755)
++++++ webvfx-0.44+git20180223.tar.gz -> webvfx-1.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/webvfx-d65a42d25a887d11fd5cf5e485c1561dc802b671/.gitmodules
new/webvfx-1.0.0/.gitmodules
--- old/webvfx-d65a42d25a887d11fd5cf5e485c1561dc802b671/.gitmodules
1970-01-01 01:00:00.000000000 +0100
+++ new/webvfx-1.0.0/.gitmodules 2018-11-26 01:25:07.000000000 +0100
@@ -0,0 +1,3 @@
+[submodule "mlt/qmelt/mlt"]
+ path = mlt/qmelt/mlt
+ url = ../mlt.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/webvfx-d65a42d25a887d11fd5cf5e485c1561dc802b671/README.md
new/webvfx-1.0.0/README.md
--- old/webvfx-d65a42d25a887d11fd5cf5e485c1561dc802b671/README.md
2018-02-24 20:17:19.000000000 +0100
+++ new/webvfx-1.0.0/README.md 2018-11-26 01:25:07.000000000 +0100
@@ -13,7 +13,15 @@
In the webvfx directory run `qmake -r PREFIX=/usr/local` and then `make
install`. `PREFIX` determines where WebVfx will be installed. If MLT is
installed in a non-standard location, you may need to set the `PKG_CONFIG_PATH`
environment variable to where its pkgconfig file lives, e.g.
`PKG_CONFIG_PATH=/usr/local/lib/pkgconfig`.
-The [MLT melt](https://www.mltframework.org/twiki/bin/view/MLT/MltMelt)
command will not work with WebVfx on Windows or OS X because the Qt event loop
must run on the main thread. If you set `MLT_SOURCE` to the root of your MLT
source code directory, then a `qmelt` executable will be installed which
behaves the same as `melt` but works with WebVfx on Windows or OS X. e.g.
`qmake -r PREFIX=/usr/local MLT_SOURCE=~/Projects/mlt`.
+The [MLT melt](https://www.mltframework.org/twiki/bin/view/MLT/MltMelt) command
+will not work with WebVfx on Windows or macOS because the Qt event loop must
run
+on the main thread. If you set `MLT_SOURCE` to the root of your MLT source code
+directory, then a `qmelt` executable will be installed which behaves the same
as
+`melt` but works with WebVfx on Windows or macOS. e.g. `qmake -r
+PREFIX=/usr/local MLT_SOURCE=~/Projects/mlt`.
+The MLT source is available as a git submodule to make this more convenient. If
+you checkout the git submodule, then it is detected and there is no need to set
+MLT_SOURCE.
`make doxydoc` to generate the documentation using Doxygen.
You can also `make uninstall`, `make clean` and `make distclean`.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/webvfx-d65a42d25a887d11fd5cf5e485c1561dc802b671/common.pri
new/webvfx-1.0.0/common.pri
--- old/webvfx-d65a42d25a887d11fd5cf5e485c1561dc802b671/common.pri
2018-02-24 20:17:19.000000000 +0100
+++ new/webvfx-1.0.0/common.pri 2018-11-26 01:25:07.000000000 +0100
@@ -20,3 +20,7 @@
UI_DIR = $$DESTDIR/.ui/$$TARGET
INCLUDEPATH += $$PWD
+
+exists(mlt/qmelt/mlt/README) {
+ MLT_SOURCE = mlt
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/webvfx-d65a42d25a887d11fd5cf5e485c1561dc802b671/mlt/qmelt/qmelt.pro
new/webvfx-1.0.0/mlt/qmelt/qmelt.pro
--- old/webvfx-d65a42d25a887d11fd5cf5e485c1561dc802b671/mlt/qmelt/qmelt.pro
2018-02-24 20:17:19.000000000 +0100
+++ new/webvfx-1.0.0/mlt/qmelt/qmelt.pro 2018-11-26 01:25:07.000000000
+0100
@@ -1,8 +1,8 @@
+include(../../common.pri)
isEmpty(MLT_SOURCE) {
error("qmelt can only be built when MLT_SOURCE is set to the MLT source
code directory.")
}
-include(../../common.pri)
TEMPLATE = app
SOURCES += qmelt.cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/webvfx-d65a42d25a887d11fd5cf5e485c1561dc802b671/webvfx/webvfx.pro
new/webvfx-1.0.0/webvfx/webvfx.pro
--- old/webvfx-d65a42d25a887d11fd5cf5e485c1561dc802b671/webvfx/webvfx.pro
2018-02-24 20:17:19.000000000 +0100
+++ new/webvfx-1.0.0/webvfx/webvfx.pro 2018-11-26 01:25:07.000000000 +0100
@@ -4,7 +4,7 @@
include(../common.pri)
TEMPLATE = lib
-#VERSION =
+VERSION = 1.0.0
HEADERS += content.h
HEADERS += content_context.h
++++++ webvfx-nobrowser.patch ++++++
Index: webvfx-1.0.0/all.pro
===================================================================
--- webvfx-1.0.0/all.pro.orig 2018-11-26 02:25:07.000000000 +0200
+++ webvfx-1.0.0/all.pro 2019-01-10 15:28:26.062060871 +0200
@@ -14,7 +14,7 @@ CONFIG += ordered
SUBDIRS += webvfx
SUBDIRS += viewer
SUBDIRS += tools/render
-SUBDIRS += tools/browser
+#SUBDIRS += tools/browser
system(pkg-config --exists mlt-framework) {
SUBDIRS += mlt
++++++ webvfx-versioned-libdir.patch ++++++
--- /var/tmp/diff_new_pack.KCBVdv/_old 2019-01-11 14:06:38.559730405 +0100
+++ /var/tmp/diff_new_pack.KCBVdv/_new 2019-01-11 14:06:38.559730405 +0100
@@ -1,7 +1,7 @@
Index: webvfx-d65a42d25a887d11fd5cf5e485c1561dc802b671/webvfx/webvfx.pro
===================================================================
---- webvfx-d65a42d25a887d11fd5cf5e485c1561dc802b671/webvfx/webvfx.pro.orig
2018-02-24 21:17:19.000000000 +0200
-+++ webvfx-d65a42d25a887d11fd5cf5e485c1561dc802b671/webvfx/webvfx.pro
2018-05-06 12:24:57.399644007 +0200
+--- webvfx-1.0.0/webvfx/webvfx.pro.orig 2018-02-24 21:17:19.000000000
+0200
++++ webvfx-1.0.0/webvfx/webvfx.pro 2018-05-06 12:24:57.399644007 +0200
@@ -47,5 +47,5 @@ QT += opengl quick
TARGET = webvfx
