commit 6032acdddeb0cdc40ae530b2679ca8e45a5aa3e1
Author: Jakub Bogusz <[email protected]>
Date: Thu Dec 26 20:47:36 2013 +0100
- updated to 1.3
- updated rpm5 patch
- removed ffmpeg2 patch
- added pl.po-update patch
libextractor-ffmpeg2.patch | 15 -----------
libextractor-pl.po-update.patch | 51 ++++++++++++++++++++++++++++++++++++++
libextractor-rpm5.patch | 55 ++++++++++++++++++++---------------------
libextractor.spec | 18 ++++++++------
4 files changed, 88 insertions(+), 51 deletions(-)
---
diff --git a/libextractor.spec b/libextractor.spec
index fe95f35..91d4835 100644
--- a/libextractor.spec
+++ b/libextractor.spec
@@ -9,15 +9,15 @@
Summary: Meta-data extraction library
Summary(pl.UTF-8): Biblioteka do ekstrakcji metadanych
Name: libextractor
-Version: 1.2
+Version: 1.3
Release: 1
License: GPL v3+
Group: Libraries
Source0: http://ftp.gnu.org/gnu/libextractor/%{name}-%{version}.tar.gz
-# Source0-md5: d88c1b7fab9c59486badaa38ca68a600
+# Source0-md5: 35b8913dbebafe583a2781bf71509c48
Patch0: %{name}-info.patch
Patch1: %{name}-rpm5.patch
-Patch2: %{name}-ffmpeg2.patch
+Patch2: %{name}-pl.po-update.patch
URL: http://www.gnu.org/software/libextractor/
BuildRequires: autoconf >= 2.61
BuildRequires: automake >= 1:1.11
@@ -101,17 +101,18 @@ informacji na temat obsługiwanych formatów (HTML, JPEG,
Ogg, MP3, PNG,
GIF, RPM, RA, RM, PS, PDF, ZIP, QT, ASF).
%package thumbnail-ffmpeg
-Summary: FFmpeg Thumbnail plugin for libextractor
-Summary(pl.UTF-8): Wtyczka obsługująca miniaturki obrazów poprzez FFmpeg
dla biblioteki libextractor
+Summary: FFmpeg Thumbnail and audio preview plugins for libextractor
+Summary(pl.UTF-8): Wtyczki obsługująca miniaturki obrazów oraz podgląd
dźwięku poprzez FFmpeg dla biblioteki libextractor
Group: Libraries
Requires: %{name} = %{version}-%{release}
%description thumbnail-ffmpeg
-libextractor plugin that supports thumbnails through FFmpeg.
+libextractor plugins that supports thumbnails and audio preview
+through FFmpeg.
%description thumbnail-ffmpeg -l pl.UTF-8
-Wtyczka biblioteki libextractor obsługująca miniaturki obrazów poprzez
-FFmpeg.
+Wtyczki biblioteki libextractor obsługujące miniaturki obrazów oraz
+podgląd dźwięku poprzez FFmpeg.
%package thumbnail-gtk
Summary: GTK+ Thumbnail plugin for libextractor
@@ -267,6 +268,7 @@ rm -rf $RPM_BUILD_ROOT
%files thumbnail-ffmpeg
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/libextractor_previewopus.so
%attr(755,root,root) %{_libdir}/%{name}/libextractor_thumbnailffmpeg.so
%files thumbnail-gtk
diff --git a/libextractor-ffmpeg2.patch b/libextractor-ffmpeg2.patch
deleted file mode 100644
index 660496e..0000000
--- a/libextractor-ffmpeg2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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-pl.po-update.patch b/libextractor-pl.po-update.patch
new file mode 100644
index 0000000..90c6ca1
--- /dev/null
+++ b/libextractor-pl.po-update.patch
@@ -0,0 +1,51 @@
+--- libextractor-1.3/po/pl.po.orig 2013-12-22 23:11:22.000000000 +0100
++++ libextractor-1.3/po/pl.po 2013-12-26 20:33:06.570265595 +0100
+@@ -5,10 +5,10 @@
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: libextractor 1.0.0-pre1\n"
++"Project-Id-Version: libextractor 1.3\n"
+ "Report-Msgid-Bugs-To: [email protected]\n"
+ "POT-Creation-Date: 2013-12-22 23:11+0100\n"
+-"PO-Revision-Date: 2012-12-01 15:45+0100\n"
++"PO-Revision-Date: 2013-12-26 20:30+0100\n"
+ "Last-Translator: Jakub Bogusz <[email protected]>\n"
+ "Language-Team: Polish <[email protected]>\n"
+ "Language: pl\n"
+@@ -129,9 +129,8 @@
+ msgstr "Opcja --help pozwala uzyskać listę opcji.\n"
+
+ #: src/main/extract.c:964
+-#, fuzzy
+ msgid "% BiBTeX file\n"
+-msgstr "%% plik BiBTeX\n"
++msgstr "% plik BiBTeX\n"
+
+ #: src/main/extract.c:972
+ #, c-format
+@@ -1693,7 +1692,6 @@
+ msgstr "numer sezonu przestawienia/serialu"
+
+ #: src/main/extractor_metatypes.c:504
+-#, fuzzy
+ msgid "grouping"
+ msgstr "grupowanie"
+
+@@ -1854,14 +1852,12 @@
+ msgstr "czas trwania strumienia napisów"
+
+ #: src/main/extractor_metatypes.c:551
+-#, fuzzy
+ msgid "audio preview"
+-msgstr "prędkosć transmisji dźwięku"
++msgstr "podgląd dźwięku"
+
+ #: src/main/extractor_metatypes.c:552
+-#, fuzzy
+ msgid "a preview of the file audio stream"
+-msgstr "częstotliwość próbkowania ścieżki dźwiękowej"
++msgstr "podgląd strumienia dźwięku z pliku"
+
+ #: src/main/extractor_metatypes.c:554 src/main/extractor_metatypes.c:555
+ msgid "last"
diff --git a/libextractor-rpm5.patch b/libextractor-rpm5.patch
index 27be648..545be36 100644
--- a/libextractor-rpm5.patch
+++ b/libextractor-rpm5.patch
@@ -31,8 +31,8 @@ index 192a838..4ddd127 100644
# install plugins under:
---- libextractor-1.0.1/src/plugins/rpm_extractor.c.orig 2012-08-06
13:02:13.000000000 +0200
-+++ libextractor-1.0.1/src/plugins/rpm_extractor.c 2012-12-01
21:35:01.967430974 +0100
+--- libextractor-1.3/src/plugins/rpm_extractor.c.orig 2013-11-28
22:16:45.000000000 +0100
++++ libextractor-1.3/src/plugins/rpm_extractor.c 2013-12-26
20:29:36.083607762 +0100
@@ -25,9 +25,10 @@
#include "platform.h"
#include "extractor.h"
@@ -44,29 +44,28 @@ index 192a838..4ddd127 100644
+#include <rpmio.h>
+#include <rpmts.h>
+#include <rpmlog.h>
- #include <pthread.h>
- #include <sys/types.h>
- #include <signal.h>
-@@ -124,6 +125,7 @@ pipe_feeder (void * args)
+ #if SOMEBSD
+ #include <pthread_np.h>
+ #else
+@@ -128,6 +129,7 @@ pipe_feeder (void * args)
* LOG callback called by librpm. Does nothing, we
* just need this to override the default behavior.
*/
+#ifdef RPMLOG_DEFAULT
- static int
+ static int
discard_log_callback (rpmlogRec rec,
- void *ctx)
-@@ -131,7 +133,9 @@ discard_log_callback (rpmlogRec rec,
+ void *ctx)
+@@ -135,6 +137,9 @@ discard_log_callback (rpmlogRec rec,
/* do nothing! */
return 0;
}
--
+#else
+static void discard_log_callback() { }
+#endif
+
/**
- * Mapping from RPM tags to LE types.
-@@ -236,6 +240,12 @@ static struct Matches tests[] = {
+@@ -240,6 +245,12 @@ static struct Matches tests[] = {
{0, 0}
};
@@ -78,8 +77,8 @@ index 192a838..4ddd127 100644
+#endif
/**
- * Main entry method for the 'application/x-rpm' extraction plugin.
-@@ -251,7 +261,7 @@ EXTRACTOR_rpm_extract_method (struct EXT
+ * Main entry method for the 'application/x-rpm' extraction plugin.
+@@ -255,7 +266,7 @@ EXTRACTOR_rpm_extract_method (struct EXT
const char *str;
Header hdr;
HeaderIterator hi;
@@ -88,7 +87,7 @@ index 192a838..4ddd127 100644
int i;
FD_t fdi;
rpmRC rc;
-@@ -282,7 +292,11 @@ EXTRACTOR_rpm_extract_method (struct EXT
+@@ -286,7 +297,11 @@ EXTRACTOR_rpm_extract_method (struct EXT
CLOSE (parg.pi[1]);
return;
}
@@ -100,7 +99,7 @@ index 192a838..4ddd127 100644
fdi = fdDup (parg.pi[0]);
ts = rpmtsCreate();
rc = rpmReadPackageFile (ts, fdi, "GNU libextractor", &hdr);
-@@ -310,19 +324,38 @@ EXTRACTOR_rpm_extract_method (struct EXT
+@@ -314,19 +329,38 @@ EXTRACTOR_rpm_extract_method (struct EXT
goto END;
}
pthread_mutex_unlock (&parg.lock);
@@ -139,12 +138,12 @@ index 192a838..4ddd127 100644
case RPM_STRING_ARRAY_TYPE:
case RPM_I18NSTRING_TYPE:
- case RPM_STRING_TYPE:
-- while (NULL != (str = rpmtdNextString (p)))
+- while (NULL != (str = rpmtdNextString (p)))
+ for(p->ix = 0; p->ix < p->c; p->ix++)
{
pthread_mutex_lock (&parg.lock);
- if (0 != ec->proc (ec->cls,
-@@ -330,8 +363,8 @@ EXTRACTOR_rpm_extract_method (struct EXT
+ if (0 != ec->proc (ec->cls,
+@@ -334,8 +368,8 @@ EXTRACTOR_rpm_extract_method (struct EXT
tests[i].type,
EXTRACTOR_METAFORMAT_UTF8,
"text/plain",
@@ -152,10 +151,10 @@ index 192a838..4ddd127 100644
- strlen (str) + 1))
+ p->p.argv[p->ix],
+ strlen (p->p.argv[p->ix]) + 1))
-
- {
+
+ {
pthread_mutex_unlock (&parg.lock);
-@@ -340,12 +373,12 @@ EXTRACTOR_rpm_extract_method (struct EXT
+@@ -344,12 +378,12 @@ EXTRACTOR_rpm_extract_method (struct EXT
pthread_mutex_unlock (&parg.lock);
}
break;
@@ -170,20 +169,20 @@ index 192a838..4ddd127 100644
time_t tp = (time_t) *v;
ctime_r (&tp, tmp);
-@@ -367,7 +400,7 @@ EXTRACTOR_rpm_extract_method (struct EXT
+@@ -371,7 +405,7 @@ EXTRACTOR_rpm_extract_method (struct EXT
else
{
char tmp[14];
- uint32_t *s = rpmtdNextUint32 (p);
+ uint32_t *s = p->p.ui32p;
- snprintf (tmp,
- sizeof (tmp),
-@@ -394,7 +427,6 @@ EXTRACTOR_rpm_extract_method (struct EXT
- }
+ snprintf (tmp,
+ sizeof (tmp),
+@@ -398,7 +432,6 @@ EXTRACTOR_rpm_extract_method (struct EXT
+ }
}
CLEANUP:
- rpmtdFree (p);
headerFreeIterator (hi);
- END:
+ END:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libextractor.git/commitdiff/6032acdddeb0cdc40ae530b2679ca8e45a5aa3e1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
