commit e47a823607a156e43fef83645d276c2838c013cc
Author: Jan Rękorajski <[email protected]>
Date: Tue Nov 13 12:48:08 2012 +0100
- fix build with ffmpeg 1.0
ffmpeg10.patch | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mlt.spec | 7 ++++---
2 files changed, 64 insertions(+), 3 deletions(-)
---
diff --git a/mlt.spec b/mlt.spec
index e17b585..20c9e7a 100644
--- a/mlt.spec
+++ b/mlt.spec
@@ -13,7 +13,8 @@ Group: X11/Applications/Multimedia
Source0: http://downloads.sourceforge.net/mlt/%{name}-%{version}.tar.gz
# Source0-md5: c7a8c4ca7485bb615cbcf851d8742a1c
URL: http://www.mltframework.org/
-Patch1: %{name}-linuxppc.patch
+Patch0: %{name}-linuxppc.patch
+Patch1: ffmpeg10.patch
BuildRequires: QtGui-devel
BuildRequires: QtSvg-devel
BuildRequires: QtXml-devel
@@ -78,10 +79,10 @@ Ten pakiet zawiera pliki nagłówkowe dla MLT.
%prep
%setup -q
-
%ifarch ppc ppc64
-%patch1 -p1
+%patch0 -p1
%endif
+%patch1 -p1
%build
%configure \
diff --git a/ffmpeg10.patch b/ffmpeg10.patch
new file mode 100644
index 0000000..b72ceb1
--- /dev/null
+++ b/ffmpeg10.patch
@@ -0,0 +1,60 @@
+commit 1a6470a0344e61c9561a637e370eb36bb0daf2d3
+Author: Dan Dennedy <[email protected]>
+Date: Wed Sep 19 10:02:28 2012 -0700
+
+ fix build due to removal of deprecated encode() from AVCodec
+
+diff --git a/src/modules/avformat/consumer_avformat.c
b/src/modules/avformat/consumer_avformat.c
+index 4b0896d..640e2b0 100644
+--- a/src/modules/avformat/consumer_avformat.c
++++ b/src/modules/avformat/consumer_avformat.c
+@@ -237,7 +237,9 @@ static int consumer_start( mlt_consumer consumer )
+ mlt_properties_set_data( properties, "acodec", codecs, 0,
(mlt_destructor) mlt_properties_close, NULL );
+ mlt_properties_set_data( doc, "audio_codecs", codecs, 0, NULL,
NULL );
+ while ( ( codec = av_codec_next( codec ) ) )
+-#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0)
++#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(56<<8)+100)
++ if ( codec->encode2 && codec->type == CODEC_TYPE_AUDIO )
++#elif LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0)
+ if ( ( codec->encode || codec->encode2 ) && codec->type
== CODEC_TYPE_AUDIO )
+ #else
+ if ( codec->encode && codec->type == CODEC_TYPE_AUDIO )
+@@ -261,7 +263,9 @@ static int consumer_start( mlt_consumer consumer )
+ mlt_properties_set_data( properties, "vcodec", codecs, 0,
(mlt_destructor) mlt_properties_close, NULL );
+ mlt_properties_set_data( doc, "video_codecs", codecs, 0, NULL,
NULL );
+ while ( ( codec = av_codec_next( codec ) ) )
+-#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0)
++#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(56<<8)+100)
++ if ( codec->encode2 && codec->type == CODEC_TYPE_VIDEO )
++#elif LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0)
+ if ( (codec->encode || codec->encode2) && codec->type
== CODEC_TYPE_VIDEO )
+ #else
+ if ( codec->encode && codec->type == CODEC_TYPE_VIDEO )
+commit a5f11c2ad1d4aab20a0b69ff167bded6455ced81
+Author: Dan Dennedy <[email protected]>
+Date: Sun Sep 23 16:39:25 2012 -0700
+
+ fix build against libav master
+
+diff --git a/src/modules/avformat/consumer_avformat.c
b/src/modules/avformat/consumer_avformat.c
+index 640e2b0..da7f7af 100644
+--- a/src/modules/avformat/consumer_avformat.c
++++ b/src/modules/avformat/consumer_avformat.c
+@@ -237,7 +237,7 @@ static int consumer_start( mlt_consumer consumer )
+ mlt_properties_set_data( properties, "acodec", codecs, 0,
(mlt_destructor) mlt_properties_close, NULL );
+ mlt_properties_set_data( doc, "audio_codecs", codecs, 0, NULL,
NULL );
+ while ( ( codec = av_codec_next( codec ) ) )
+-#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(56<<8)+100)
++#if (defined(FFUDIV) && LIBAVCODEC_VERSION_INT >= ((54<<16)+(56<<8)+100)) ||
(LIBAVCODEC_VERSION_INT >= ((54<<16)+(27<<8)+0))
+ if ( codec->encode2 && codec->type == CODEC_TYPE_AUDIO )
+ #elif LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0)
+ if ( ( codec->encode || codec->encode2 ) && codec->type
== CODEC_TYPE_AUDIO )
+@@ -263,7 +263,7 @@ static int consumer_start( mlt_consumer consumer )
+ mlt_properties_set_data( properties, "vcodec", codecs, 0,
(mlt_destructor) mlt_properties_close, NULL );
+ mlt_properties_set_data( doc, "video_codecs", codecs, 0, NULL,
NULL );
+ while ( ( codec = av_codec_next( codec ) ) )
+-#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(56<<8)+100)
++#if (defined(FFUDIV) && LIBAVCODEC_VERSION_INT >= ((54<<16)+(56<<8)+100)) ||
(LIBAVCODEC_VERSION_INT >= ((54<<16)+(27<<8)+0))
+ if ( codec->encode2 && codec->type == CODEC_TYPE_VIDEO )
+ #elif LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0)
+ if ( (codec->encode || codec->encode2) && codec->type
== CODEC_TYPE_VIDEO )
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mlt.git/commitdiff/e47a823607a156e43fef83645d276c2838c013cc
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
