Accepting request 210636 from multimedia:libs

Added use-recommended-freetype-include.patch -- needed for freetype2 2.5.1 (forwarded request 210595 from sumski)

OBS-URL: https://build.opensuse.org/request/show/210636
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmlt?expand=0&rev=19
This commit is contained in:
Stephan Kulow 2013-12-13 12:08:11 +00:00 committed by Git OBS Bridge
commit 386faaaad9
3 changed files with 25 additions and 0 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Dec 11 18:59:43 UTC 2013 - hrvoje.senjan@gmail.com
- Added 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 version
-------------------------------------------------------------------
Sun Jun 30 07:56:10 UTC 2013 - tittiatcoke@gmail.com

View File

@ -38,6 +38,9 @@ Url: http://%{_name}.sourceforge.net/
Source0: http://downloads.sourceforge.net/project/%{_name}/%{_name}/%{_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
# 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
BuildRequires: gcc-c++
BuildRequires: ladspa-devel
BuildRequires: pkg-config
@ -206,6 +209,7 @@ This package is needed to use MLT from Python.
%prep
%setup -q -n %{_name}-%{version}
%patch1
%patch2 -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.

View File

@ -0,0 +1,13 @@
diff -Naur mlt-0.9.0.orig/src/modules/gtk2/producer_pango.c mlt-0.9.0/src/modules/gtk2/producer_pango.c
--- mlt-0.9.0.orig/src/modules/gtk2/producer_pango.c 2013-06-03 05:34:35.000000000 +0200
+++ mlt-0.9.0/src/modules/gtk2/producer_pango.c 2013-12-11 19:59:06.975420338 +0100
@@ -25,7 +25,8 @@
#include <string.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <pango/pangoft2.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include <iconv.h>
#include <pthread.h>
#include <ctype.h>