Accepting request 260846 from multimedia:libs

1

OBS-URL: https://build.opensuse.org/request/show/260846
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmlt?expand=0&rev=22

libmlt.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Nov 11 10:36:56 UTC 2014 - dimstar@opensuse.org
+
+- Temporarly disabled vid.stab support, as the submission to
+  Tumbleweed hit a legal road bump. While it's enabled in the devel
+  project, other packages depending on libmlt are being blocked.
+
+-------------------------------------------------------------------
+Tue Nov  4 08:39:23 UTC 2014 - olaf@aepfle.de
+
+- Enable exif support
+- Add missing stdlib.h inclusion in qt 
+  (mlt-0.9.2-Add-missing-stdlib-include-for-getenv.patch)
+
+-------------------------------------------------------------------
+Sat Oct 25 21:04:41 UTC 2014 - reddwarf@opensuse.org
+
+- Add vid.stab support
+  Add BuildRequires: pkgconfig(vidstab)
+
 -------------------------------------------------------------------
 Thu Oct 16 15:45:45 UTC 2014 - nico.kruber@gmail.com
 

libmlt.spec

@@ -20,6 +20,9 @@
 # Dan Dennedy asked to disable it since it's buggy and unmaintained (see e.g. http://www.kdenlive.org/mantis/view.php?id=3070)
 %bcond_with vdpau
 
+# vidstab currently can't enter Factory due to legal review / unclarity. Temp disable
+%bcond_with vidstab
+
 %define _name mlt
 %define libname lib%{_name}
 %define soname 6
@@ -41,6 +44,8 @@ Patch1:         libmlt-0.8.2-vdpau.patch
 # PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with
 # 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
+# PATCH-FIX-UPSTREAM mlt-0.9.2-Add-missing-stdlib-include-for-getenv.patch -- Add missing stdlib include for getenv
+Patch3:         mlt-0.9.2-Add-missing-stdlib-include-for-getenv.patch
 BuildRequires:  gcc-c++
 BuildRequires:  ladspa-devel
 BuildRequires:  pkg-config
@@ -56,6 +61,7 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(jack)
 BuildRequires:  pkgconfig(libdv)
+BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(libquicktime)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(pango)
@@ -63,6 +69,9 @@ BuildRequires:  pkgconfig(pangoft2)
 BuildRequires:  pkgconfig(samplerate)
 BuildRequires:  pkgconfig(sdl)
 BuildRequires:  pkgconfig(sox)
+%if %{with vidstab}
+BuildRequires:  pkgconfig(vidstab)
+%endif
 BuildRequires:  pkgconfig(vorbisfile)
 %if %{with ffmpeg}
 BuildRequires:  pkgconfig(libavcodec)
@@ -210,6 +219,7 @@ This package is needed to use MLT from Python.
 %setup -q -n %{_name}-%{version}
 %patch1
 %patch2 -p1
+%patch3 -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.
@@ -301,7 +311,7 @@ rm -f %{buildroot}%{_datadir}/mlt
 
 %files -n melt
 %defattr(0644, root, root, 0755)
-%attr(0755, root, root) %{_bindir}/melt
+%{_bindir}/melt
 %{_mandir}/man1/melt.1%{ext_man}
 
 %files -n %{libname}%{soname}-modules -f module_data.dirs
@@ -315,6 +325,9 @@ rm -f %{buildroot}%{_datadir}/mlt
 %{_datadir}/%{_name}-%{soname}/metaschema.yaml
 %{_datadir}/%{_name}-%{soname}/profiles/
 %{_datadir}/%{_name}-%{soname}/presets/
+%if %{with vidstab}
+%{_datadir}/%{_name}-%{soname}/vid.stab/
+%endif
 
 %files -n python-%{_name}
 %defattr(0644, root, root, 0755)

mlt-0.9.2-Add-missing-stdlib-include-for-getenv.patch

@@ -0,0 +1,21 @@
+From 4035fc1177b355b0adc0f52616f5075feb88e2ba Mon Sep 17 00:00:00 2001
+From: Dan Dennedy <dan@dennedy.org>
+Date: Sun, 13 Jul 2014 11:26:49 -0700
+Subject: Add missing stdlib include for getenv().
+
+---
+ src/modules/qt/common.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/modules/qt/common.cpp b/src/modules/qt/common.cpp
+index 9cd4cac..8ae1708 100644
+--- a/src/modules/qt/common.cpp
++++ b/src/modules/qt/common.cpp
+@@ -22,6 +22,7 @@
+ 
+ #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+ #include <X11/Xlib.h>
++#include <cstdlib>
+ #endif
+ 
+ bool createQApplicationIfNeeded(mlt_service service)