rpms/mlt/devel mlt-0.9.0-fix_freetype.patch, NONE, 1.1 mlt.spec, 1.42, 1.43

Author: sergiomb Update of /cvs/free/rpms/mlt/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27613 Modified Files: mlt.spec Added Files: mlt-0.9.0-fix_freetype.patch Log Message: * Sun Mar 30 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 0.9.0-4 - Rebuilt for ffmpeg-2.2 and fix for freetype2 changes. mlt-0.9.0-fix_freetype.patch: producer_pango.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE mlt-0.9.0-fix_freetype.patch --- Modified for mlt-0.9.0 From: Dan Dennedy <dan(a)dennedy.org&gt; Date: Mon, 30 Dec 2013 12:35:49 -0800 Subject: [PATCH] Fix build on Freetype 2.5. Reported by Patrick Matthhai/Debian. diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c index 4969dd2..ba902bd 100644 --- a/src/modules/gtk2/producer_pango.c +++ b/src/modules/gtk2/producer_pango.c @@ -25,7 +25,7 @@ #include <string.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <pango/pangoft2.h> -#include <freetype/freetype.h> +#include <freetype.h> #include <iconv.h> #include <pthread.h> #include <ctype.h> -- 1.8.5.5 39a40 Index: mlt.spec =================================================================== RCS file: /cvs/free/rpms/mlt/devel/mlt.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- mlt.spec 4 Dec 2013 01:30:16 -0000 1.42 +++ mlt.spec 29 Mar 2014 23:08:37 -0000 1.43 @@ -7,13 +7,13 @@ Summary: Toolkit for broadcasters, video editors, media players, transcoders Name: mlt Version: 0.9.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3 and LGPLv2+ URL: http://www.mltframework.org/twiki/bin/view/MLT/ Group: System Environment/Libraries Source: http://downloads.sourceforge.net/mlt/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: mlt-0.9.0-fix_freetype.patch BuildRequires: frei0r-devel BuildRequires: ffmpeg-devel @@ -33,6 +33,7 @@ BuildRequires: swig BuildRequires: python-devel BuildRequires: SDL_image-devel +BuildRequires: freetype-devel %if 0%{?ruby:1} BuildRequires: ruby-devel ruby @@ -93,6 +94,9 @@ %prep %setup -q +%if 0%{?fedora} >= 21 +%patch1 -p1 -b .freetype_fix +%endif find ./ -name configure -exec chmod 755 {} \; chmod 755 src/modules/lumas/create_lumas @@ -196,6 +200,9 @@ %changelog +* Sun Mar 30 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 0.9.0-4 +- Rebuilt for ffmpeg-2.2 and fix for freetype2 changes. + * Wed Dec 04 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 0.9.0-3 - Update License tag .