- up to 0.9.2

diff --git a/02-crash-empty-ladspa-path.diff b/02-crash-empty-ladspa-path.diff
deleted file mode 100644 (file)
index 1b8f80d..0000000
--- a/02-crash-empty-ladspa-path.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-# Upstream patch to fix crash if LADSPA_PATH is empty.
-# Closes: #726197
-
-diff -Naur mlt-0.9.0.orig/src/modules/jackrack/plugin_mgr.c mlt-0.9.0/src/modules/jackrack/plugin_mgr.c
---- mlt-0.9.0.orig/src/modules/jackrack/plugin_mgr.c   2013-06-03 05:34:35.000000000 +0200
-+++ mlt-0.9.0/src/modules/jackrack/plugin_mgr.c        2013-10-17 14:49:57.147889337 +0200
-@@ -237,10 +237,8 @@
-     ladspa_path = g_strdup ("/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/lib64/ladspa");
- #endif
-   
--  dir = strtok (ladspa_path, ":");
--  do
-+  for (dir = strtok (ladspa_path, ":"); dir; dir = strtok (NULL, ":"))
-     plugin_mgr_get_dir_plugins (plugin_mgr, dir);
--  while ((dir = strtok (NULL, ":")));
- 
-   g_free (ladspa_path);
- }

diff --git a/03-freetype-ftbfs.diff b/03-freetype-ftbfs.diff
deleted file mode 100644 (file)
index ad051b5..0000000
--- a/03-freetype-ftbfs.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-# Upstream patch to fix FTBFS with newer freetype versions.
-# Closes: #733375
-
-diff -Naur mlt-0.9.0.orig/src/modules/gtk2/Makefile mlt-0.9.0/src/modules/gtk2/Makefile
---- mlt-0.9.0.orig/src/modules/gtk2/Makefile   2013-06-03 05:34:35.000000000 +0200
-+++ mlt-0.9.0/src/modules/gtk2/Makefile        2014-01-03 11:43:13.518109987 +0100
-@@ -37,6 +37,7 @@
- OBJS += producer_count.o
- OBJS += filter_dynamictext.o
- CFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2`
-+CFLAGS += `pkg-config --cflags-only-I freetype2 | sed 's/ *$$//g'`/freetype
- LDFLAGS += `pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2`
- ifeq ($(targetos),Darwin)
- LDFLAGS += -liconv
-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        2014-01-03 11:41:10.270113314 +0100
-@@ -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>

diff --git a/mlt.spec b/mlt.spec
index 0195b01b7246e5b2774ba54debda2132c0cc5c29..ce4c73e20cae22587204d91efe97e8cefa422265 100644 (file)
--- a/mlt.spec
+++ b/mlt.spec
@@ -7,19 +7,19 @@
 Summary:       MLT - open source multimedia framework
 Summary(pl.UTF-8):     MLT - szkielet multimedialny o otwartych źródłach
 Name:          mlt
-Version:       0.9.0
-Release:       4
+Version:       0.9.2
+Release:       1
 License:       GPL
 Group:         X11/Applications/Multimedia
 Source0:       http://downloads.sourceforge.net/mlt/%{name}-%{version}.tar.gz
-# Source0-md5: 1cd2d73f3ffe77a43980e99aaa4ea06c
-Patch0:                02-crash-empty-ladspa-path.diff
-Patch1:                03-freetype-ftbfs.diff
+# Source0-md5: f88ead8fcea628a65ebf329cc4470b6d
 URL:           http://www.mltframework.org/
 BuildRequires: QtGui-devel
 BuildRequires: QtSvg-devel
 BuildRequires: QtXml-devel
 BuildRequires: SDL-devel
+BuildRequires: SDL_image-devel
+BuildRequires: exiv2-devel
 BuildRequires: ffmpeg-devel
 BuildRequires: gtk+2-devel
 #BuildRequires:        ladspa-devel
@@ -34,8 +34,8 @@ BuildRequires:        pkgconfig
 BuildRequires: python-devel
 BuildRequires: rpm-pythonprov
 BuildRequires: sox-devel
-BuildRequires: swig-python
 BuildRequires: swfdec-devel
+BuildRequires: swig-python
 BuildRequires: which
 Obsoletes:     mlt++ < %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -81,8 +81,6 @@ Ten pakiet zawiera pliki nagłówkowe dla MLT.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 # current
 sed -i -e 's#/usr/lib/libvdpau.so#%{_libdir}/libvdpau.so.1#g' ./src/modules/avformat/vdpau.c
@@ -127,7 +125,7 @@ install -d $RPM_BUILD_ROOT%{py_sitedir}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install src/swig/python/{*.py,*.so} $RPM_BUILD_ROOT%{py_sitedir}
+cp -p src/swig/python/{*.py,*.so} $RPM_BUILD_ROOT%{py_sitedir}
 
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}