[packages/libextractor] - fix build with ffmpeg2

baggins baggins at pld-linux.org
Thu Aug 29 09:55:57 CEST 2013


commit 93fd1e94761415733f01267f309b204426175c23
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Aug 29 09:55:48 2013 +0200

    - fix build with ffmpeg2

 libextractor-ffmpeg2.patch | 20 ++++++++++++++++++++
 libextractor.spec          |  2 ++
 2 files changed, 22 insertions(+)
---
diff --git a/libextractor.spec b/libextractor.spec
index 9c9eea7..79ee912 100644
--- a/libextractor.spec
+++ b/libextractor.spec
@@ -18,6 +18,7 @@ Source0:	http://ftp.gnu.org/gnu/libextractor/%{name}-%{version}.tar.gz
 # Source0-md5:	4a1496af12bf545582c0e9444429220d
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-rpm5.patch
+Patch2:		%{name}-ffmpeg2.patch
 URL:		http://gnunet.org/libextractor/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1:1.11
@@ -159,6 +160,7 @@ Statyczna wersja bibliotek libextractor.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 
 %{__rm} po/stamp-po
 %{__sed} -i -e 's,tidy/\(tidy\|buffio\)\.h,\1.h,' configure.ac src/plugins/html_extractor.c
diff --git a/libextractor-ffmpeg2.patch b/libextractor-ffmpeg2.patch
new file mode 100644
index 0000000..9a881b1
--- /dev/null
+++ b/libextractor-ffmpeg2.patch
@@ -0,0 +1,20 @@
+--- src/plugins/thumbnailffmpeg_extractor.c.ffmpeg	2013-03-23 18:18:55.532362683 -0300
++++ src/plugins/thumbnailffmpeg_extractor.c	2013-03-23 18:23:16.420980021 -0300
+@@ -325,7 +325,7 @@ calculate_thumbnail_dimensions (int src_
+  * @param ec extraction context to use
+  */
+ static void
+-extract_image (enum CodecID image_codec_id,
++extract_image (enum AVCodecID image_codec_id,
+                struct EXTRACTOR_ExtractContext *ec)
+ {
+   AVDictionary *opts;
+@@ -618,7 +618,7 @@ struct MIMEToDecoderMapping
+   /**
+    * Corresponding ffmpeg decoder ID.
+    */
+-  enum CodecID codec_id;
++  enum AVCodecID codec_id;
+ };
+ 
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libextractor.git/commitdiff/93fd1e94761415733f01267f309b204426175c23



More information about the pld-cvs-commit mailing list