[packages/libextractor] - updated to 1.2 - updated ffmpeg2 patch

qboosh qboosh at pld-linux.org
Sun Oct 27 07:56:25 CET 2013


commit 654f15d6b71f143731dca2b17b5ea85947e54586
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Oct 27 07:56:06 2013 +0100

    - updated to 1.2
    - updated ffmpeg2 patch

 libextractor-ffmpeg2.patch | 31 +++++++++++++------------------
 libextractor.spec          |  8 ++++----
 2 files changed, 17 insertions(+), 22 deletions(-)
---
diff --git a/libextractor.spec b/libextractor.spec
index 1174087..fe95f35 100644
--- a/libextractor.spec
+++ b/libextractor.spec
@@ -9,16 +9,16 @@
 Summary:	Meta-data extraction library
 Summary(pl.UTF-8):	Biblioteka do ekstrakcji metadanych
 Name:		libextractor
-Version:	1.1
+Version:	1.2
 Release:	1
 License:	GPL v3+
 Group:		Libraries
 Source0:	http://ftp.gnu.org/gnu/libextractor/%{name}-%{version}.tar.gz
-# Source0-md5:	4a1496af12bf545582c0e9444429220d
+# Source0-md5:	d88c1b7fab9c59486badaa38ca68a600
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-rpm5.patch
 Patch2:		%{name}-ffmpeg2.patch
-URL:		http://gnunet.org/libextractor/
+URL:		http://www.gnu.org/software/libextractor/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	bzip2-devel
@@ -160,7 +160,7 @@ Statyczna wersja bibliotek libextractor.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
+%patch2 -p1
 
 %{__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
index 9a881b1..660496e 100644
--- a/libextractor-ffmpeg2.patch
+++ b/libextractor-ffmpeg2.patch
@@ -1,20 +1,15 @@
---- 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;
- };
+--- libextractor-1.2/src/plugins/thumbnailffmpeg_extractor.c.orig	2013-08-28 11:30:31.000000000 +0200
++++ libextractor-1.2/src/plugins/thumbnailffmpeg_extractor.c	2013-10-27 07:03:46.045814925 +0100
+@@ -327,10 +327,10 @@
+ #endif
+ }
+ 
+-#if AV_VERSION_INT(54,25,0) > LIBAVUTIL_VERSION_INT
++#if AV_VERSION_INT(54,25,0) > LIBAVCODEC_VERSION_INT
+ #define ENUM_CODEC_ID enum CodecID
+ #else
+-#define ENUM_CODEC_ID enum AvCodecID
++#define ENUM_CODEC_ID enum AVCodecID
+ #endif
  
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libextractor.git/commitdiff/654f15d6b71f143731dca2b17b5ea85947e54586



More information about the pld-cvs-commit mailing list