Accepting request 259599 from home:olh:branches:multimedia:libs

- Enable exif support
- Add missing stdlib.h inclusion in qt

OBS-URL: https://build.opensuse.org/request/show/259599
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmlt?expand=0&rev=43
This commit is contained in:
Ismail Dönmez 2014-11-04 09:58:19 +00:00 committed by Git OBS Bridge
parent 0666de42c4
commit fcc45f78d6
3 changed files with 31 additions and 0 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Nov 4 08:39:23 UTC 2014 - olaf@aepfle.de
- Enable exif support
- Add missing stdlib.h inclusion in qt
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Oct 25 21:04:41 UTC 2014 - reddwarf@opensuse.org Sat Oct 25 21:04:41 UTC 2014 - reddwarf@opensuse.org

View File

@ -41,6 +41,8 @@ Patch1: libmlt-0.8.2-vdpau.patch
# PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with # 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 # 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 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: gcc-c++
BuildRequires: ladspa-devel BuildRequires: ladspa-devel
BuildRequires: pkg-config BuildRequires: pkg-config
@ -56,6 +58,7 @@ BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(libdv) BuildRequires: pkgconfig(libdv)
BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(libquicktime) BuildRequires: pkgconfig(libquicktime)
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pango)
@ -211,6 +214,7 @@ This package is needed to use MLT from Python.
%setup -q -n %{_name}-%{version} %setup -q -n %{_name}-%{version}
%patch1 %patch1
%patch2 -p1 %patch2 -p1
%patch3 -p1
# To complement libmlt-0.8.0-vdpau.patch. # 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. # When vdpau support is not compiled it will break the code. Doesn't matter because the code will not be used anyway.

View File

@ -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)