diff --git a/libextractor-1.2-ffmpeg-2.2.patch b/libextractor-1.2-ffmpeg-2.2.patch new file mode 100644 index 0000000..660496e --- /dev/null +++ b/libextractor-1.2-ffmpeg-2.2.patch @@ -0,0 +1,15 @@ +--- 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 + + diff --git a/libextractor.spec b/libextractor.spec index 3ae95b9..8d6066e 100644 --- a/libextractor.spec +++ b/libextractor.spec @@ -1,6 +1,6 @@ Name: libextractor Version: 1.2 -Release: 1mamba +Release: 2mamba Summary: A library used to extract meta-data from files of arbitrary type Group: System/Libraries Vendor: openmamba @@ -8,7 +8,44 @@ Distribution: openmamba Packager: Aleph0 URL: http://www.gnu.org/software/libextractor/ Source: http://ftp.gnu.org/gnu/libextractor/libextractor-%{version}.tar.gz +Patch0: libextractor-1.2-ffmpeg-2.2.patch License: LGPL +## AUTOBUILDREQ-BEGIN +BuildRequires: glibc-devel +BuildRequires: libarchive-devel +BuildRequires: libatk-devel +BuildRequires: libavcodec-ffmpeg-devel +BuildRequires: libavformat-ffmpeg-devel +BuildRequires: libavutil-ffmpeg-devel +BuildRequires: libbzip2-devel +BuildRequires: libcairo-devel +BuildRequires: libexiv2-devel +BuildRequires: libflac-devel +BuildRequires: libfontconfig-devel +BuildRequires: libfreetype-devel +BuildRequires: libgcc +BuildRequires: libgdk-pixbuf-devel +BuildRequires: libgif-devel +BuildRequires: libglib-devel +BuildRequires: libgsf-devel +BuildRequires: libgst-plugins-base-devel +BuildRequires: libgstreamer-devel +BuildRequires: libgtk2-devel +BuildRequires: libjpeg-devel +BuildRequires: libltdl-devel +BuildRequires: libmagic-devel +BuildRequires: libmpeg2-devel +BuildRequires: libogg-devel +BuildRequires: libpango-devel +BuildRequires: libsmf-devel +BuildRequires: libstdc++6-devel +BuildRequires: libswscale-ffmpeg-devel +BuildRequires: libtidy-devel +BuildRequires: libtiff-devel +BuildRequires: libvorbis-devel +BuildRequires: libxml2-devel +BuildRequires: libz-devel +## AUTOBUILDREQ-END BuildRequires: libz-devel BuildRequires: libbzip2-devel BuildRequires: mpeg2dec-devel @@ -40,6 +77,7 @@ This package contains static libraries and header files need for development. %prep %setup -q +%patch0 -p1 %build %configure @@ -92,6 +130,9 @@ exit 0 %doc ChangeLog NEWS README TODO %changelog +* Thu May 15 2014 Silvan Calarco 1.2-2mamba +- ffmpeg 2.2 rebuild + * Fri Oct 25 2013 Automatic Build System 1.2-1mamba - automatic update by autodist