diff options
-rw-r--r-- | TODO | 10 | ||||
-rw-r--r-- | configure.ac | 10 | ||||
-rw-r--r-- | doc/extractor.texi | 48 | ||||
-rw-r--r-- | doc/version.texi | 2 | ||||
-rw-r--r-- | po/POTFILES.in | 21 | ||||
-rw-r--r-- | src/plugins/Makefile.am | 28 | ||||
-rw-r--r-- | src/plugins/test_lib.c | 4 | ||||
-rw-r--r-- | src/plugins/thumbnailffmpeg_extractor.c | 1 |
8 files changed, 98 insertions, 26 deletions
@@ -1,19 +1,15 @@ | |||
1 | * Update plugins to new API (and cleanup code): | 1 | * tests needed: |
2 | - elf | ||
3 | - applefile | ||
4 | |||
5 | |||
6 | * plugins without tests: | ||
7 | - gstreamer (testcase file exists, but does not test everything important) | 2 | - gstreamer (testcase file exists, but does not test everything important) |
8 | 3 | ||
9 | |||
10 | Desirable missing formats: | 4 | Desirable missing formats: |
11 | * mbox / various e-mail formats | 5 | * mbox / various e-mail formats |
12 | * info pages (scan for 'Node: %s^?ID' - see end of .info files!) | 6 | * info pages (scan for 'Node: %s^?ID' - see end of .info files!) |
13 | * sources (Java, C, C++, see doxygen!) | 7 | * sources (Java, C, C++, see doxygen!) |
14 | * a.out (== ar?) | 8 | * a.out (== ar?) |
15 | * rtf | 9 | * rtf |
10 | * applefile (0.6.x-plugin exists) | ||
16 | * EXE | 11 | * EXE |
12 | * ELF (linkage information, 0.6.x-plugin exists) | ||
17 | * PRC (Palm module, http://web.mit.edu/tytso/www/pilot/prc-format.html) | 13 | * PRC (Palm module, http://web.mit.edu/tytso/www/pilot/prc-format.html) |
18 | * KOffice | 14 | * KOffice |
19 | * TGA | 15 | * TGA |
diff --git a/configure.ac b/configure.ac index c4b49a4..06c4469 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -322,6 +322,16 @@ AC_CHECK_LIB(archive, archive_read_open, | |||
322 | AM_CONDITIONAL(HAVE_ARCHIVE, false))], | 322 | AM_CONDITIONAL(HAVE_ARCHIVE, false))], |
323 | AM_CONDITIONAL(HAVE_ARCHIVE, false)) | 323 | AM_CONDITIONAL(HAVE_ARCHIVE, false)) |
324 | 324 | ||
325 | # should experimental code be compiled (code that may not yet compile)? | ||
326 | AC_MSG_CHECKING(whether to compile experimental code) | ||
327 | AC_ARG_ENABLE([experimental], | ||
328 | [AS_HELP_STRING([--enable-experimental], [enable compiling experimental code])], | ||
329 | [enable_experimental=${enableval}], | ||
330 | [enable_experimental=no]) | ||
331 | AC_MSG_RESULT($enable_experimental) | ||
332 | AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"]) | ||
333 | |||
334 | |||
325 | AC_MSG_CHECKING(for ImageFactory::iptcData in -lexiv2) | 335 | AC_MSG_CHECKING(for ImageFactory::iptcData in -lexiv2) |
326 | AC_LANG_PUSH(C++) | 336 | AC_LANG_PUSH(C++) |
327 | SAVED_LDFLAGS=$LDFLAGS | 337 | SAVED_LDFLAGS=$LDFLAGS |
diff --git a/doc/extractor.texi b/doc/extractor.texi index 6fe55fe..3074e68 100644 --- a/doc/extractor.texi +++ b/doc/extractor.texi | |||
@@ -794,23 +794,65 @@ The @verb{|EXTRACTOR_meta_data_print|} is a simple function which prints the met | |||
794 | 794 | ||
795 | @itemize @bullet | 795 | @itemize @bullet |
796 | @item | 796 | @item |
797 | ARCHIVE (using libarchive) | ||
798 | @item | ||
799 | DVI | ||
800 | @item | ||
797 | EXIV2 (using libexiv2) | 801 | EXIV2 (using libexiv2) |
798 | @item | 802 | @item |
799 | FLAC (using libFLAC) | 803 | FLAC (using libFLAC) |
800 | @item | 804 | @item |
801 | GIF (using libgif) | 805 | GIF (using libgif) |
802 | @item | 806 | @item |
803 | JPEG | 807 | GSTREAMER (using libgstreamer) |
804 | @item | 808 | @item |
805 | MIME (using libmagic) | 809 | HTML (using libtidy) |
810 | @item | ||
811 | IT | ||
812 | @item | ||
813 | JPEG (using libjpeg) | ||
814 | @item | ||
815 | MAN | ||
806 | @item | 816 | @item |
807 | MP3 (ID3v1) | 817 | MIDI (using libsmf) |
818 | @item | ||
819 | MIME (using libmagic) | ||
808 | @item | 820 | @item |
809 | MPEG (using libmpeg2) | 821 | MPEG (using libmpeg2) |
810 | @item | 822 | @item |
823 | NSF | ||
824 | @item | ||
825 | NSFE | ||
826 | @item | ||
827 | ODF | ||
828 | @item | ||
829 | OLE2 (with libgsf) | ||
830 | @item | ||
831 | OGG (with libogg) | ||
832 | @item | ||
811 | PNG | 833 | PNG |
812 | @item | 834 | @item |
835 | PS | ||
836 | @item | ||
837 | RIFF | ||
838 | @item | ||
813 | RPM (using librpm) | 839 | RPM (using librpm) |
840 | @item | ||
841 | S3M | ||
842 | @item | ||
843 | SID | ||
844 | @item | ||
845 | ThumbnailFFMPEG (using libavformat) | ||
846 | @item | ||
847 | ThumbnailGtk (using libgtk) | ||
848 | @item | ||
849 | TIFF (with libtiff) | ||
850 | @item | ||
851 | WAV | ||
852 | @item | ||
853 | XM | ||
854 | @item | ||
855 | ZIP | ||
814 | @end itemize | 856 | @end itemize |
815 | 857 | ||
816 | @file{gzip} and @file{bzip2} compressed versions of these formats are | 858 | @file{gzip} and @file{bzip2} compressed versions of these formats are |
diff --git a/doc/version.texi b/doc/version.texi index 09ade0a..b7f4560 100644 --- a/doc/version.texi +++ b/doc/version.texi | |||
@@ -1,4 +1,4 @@ | |||
1 | @set UPDATED 7 August 2012 | 1 | @set UPDATED 26 August 2012 |
2 | @set UPDATED-MONTH August 2012 | 2 | @set UPDATED-MONTH August 2012 |
3 | @set EDITION 0.7.0 | 3 | @set EDITION 0.7.0 |
4 | @set VERSION 0.7.0 | 4 | @set VERSION 0.7.0 |
diff --git a/po/POTFILES.in b/po/POTFILES.in index 1186d38..590aea9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -20,23 +20,44 @@ src/main/getopt1.c | |||
20 | src/main/getopt.c | 20 | src/main/getopt.c |
21 | src/main/iconv.c | 21 | src/main/iconv.c |
22 | src/main/test2_extractor.c | 22 | src/main/test2_extractor.c |
23 | src/plugins/archive_extractor.c | ||
23 | src/plugins/deb_extractor.c | 24 | src/plugins/deb_extractor.c |
25 | src/plugins/dvi_extractor.c | ||
24 | src/plugins/flac_extractor.c | 26 | src/plugins/flac_extractor.c |
25 | src/plugins/gif_extractor.c | 27 | src/plugins/gif_extractor.c |
28 | src/plugins/gstreamer_extractor.c | ||
29 | src/plugins/html_extractor.c | ||
26 | src/plugins/it_extractor.c | 30 | src/plugins/it_extractor.c |
27 | src/plugins/jpeg_extractor.c | 31 | src/plugins/jpeg_extractor.c |
32 | src/plugins/man_extractor.c | ||
33 | src/plugins/midi_extractor.c | ||
28 | src/plugins/mime_extractor.c | 34 | src/plugins/mime_extractor.c |
35 | src/plugins/mp4_extractor.c | ||
29 | src/plugins/mpeg_extractor.c | 36 | src/plugins/mpeg_extractor.c |
30 | src/plugins/nsfe_extractor.c | 37 | src/plugins/nsfe_extractor.c |
31 | src/plugins/nsf_extractor.c | 38 | src/plugins/nsf_extractor.c |
32 | src/plugins/odf_extractor.c | 39 | src/plugins/odf_extractor.c |
33 | src/plugins/ogg_extractor.c | 40 | src/plugins/ogg_extractor.c |
41 | src/plugins/old/applefile_extractor.c | ||
42 | src/plugins/old/asf_extractor.c | ||
43 | src/plugins/old/ebml_extractor.c | ||
44 | src/plugins/old/elf_extractor.c | ||
45 | src/plugins/old/flv_extractor.c | ||
46 | src/plugins/old/mkv_extractor.c | ||
47 | src/plugins/old/mp3_extractor.c | ||
48 | src/plugins/old/qt_extractor.c | ||
49 | src/plugins/old/real_extractor.c | ||
34 | src/plugins/ole2_extractor.c | 50 | src/plugins/ole2_extractor.c |
35 | src/plugins/png_extractor.c | 51 | src/plugins/png_extractor.c |
52 | src/plugins/ps_extractor.c | ||
53 | src/plugins/riff_extractor.c | ||
36 | src/plugins/rpm_extractor.c | 54 | src/plugins/rpm_extractor.c |
37 | src/plugins/s3m_extractor.c | 55 | src/plugins/s3m_extractor.c |
38 | src/plugins/sid_extractor.c | 56 | src/plugins/sid_extractor.c |
39 | src/plugins/template_extractor.c | 57 | src/plugins/template_extractor.c |
58 | src/plugins/thumbnailffmpeg_extractor.c | ||
59 | src/plugins/thumbnailgtk_extractor.c | ||
60 | src/plugins/tiff_extractor.c | ||
40 | src/plugins/wav_extractor.c | 61 | src/plugins/wav_extractor.c |
41 | src/plugins/xm_extractor.c | 62 | src/plugins/xm_extractor.c |
42 | src/plugins/zip_extractor.c | 63 | src/plugins/zip_extractor.c |
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index 3bfca47..d55b720 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am | |||
@@ -110,9 +110,11 @@ TEST_JPEG=test_jpeg | |||
110 | endif | 110 | endif |
111 | 111 | ||
112 | if HAVE_MP4 | 112 | if HAVE_MP4 |
113 | if HAVE_EXPERIMENTAL | ||
113 | PLUGIN_MP4=libextractor_mp4.la | 114 | PLUGIN_MP4=libextractor_mp4.la |
114 | TEST_MP4=test_mp4 | 115 | TEST_MP4=test_mp4 |
115 | endif | 116 | endif |
117 | endif | ||
116 | 118 | ||
117 | if HAVE_MPEG2 | 119 | if HAVE_MPEG2 |
118 | PLUGIN_MPEG=libextractor_mpeg.la | 120 | PLUGIN_MPEG=libextractor_mpeg.la |
@@ -230,6 +232,19 @@ libtest_la_LIBADD = \ | |||
230 | $(top_builddir)/src/main/libextractor.la | 232 | $(top_builddir)/src/main/libextractor.la |
231 | 233 | ||
232 | 234 | ||
235 | libextractor_archive_la_SOURCES = \ | ||
236 | archive_extractor.c | ||
237 | libextractor_archive_la_LDFLAGS = \ | ||
238 | $(PLUGINFLAGS) | ||
239 | libextractor_archive_la_LIBADD = \ | ||
240 | -larchive | ||
241 | |||
242 | test_archive_SOURCES = \ | ||
243 | test_archive.c | ||
244 | test_archive_LDADD = \ | ||
245 | $(top_builddir)/src/plugins/libtest.la | ||
246 | |||
247 | |||
233 | libextractor_deb_la_SOURCES = \ | 248 | libextractor_deb_la_SOURCES = \ |
234 | deb_extractor.c | 249 | deb_extractor.c |
235 | libextractor_deb_la_LDFLAGS = \ | 250 | libextractor_deb_la_LDFLAGS = \ |
@@ -542,19 +557,6 @@ test_sid_LDADD = \ | |||
542 | $(top_builddir)/src/plugins/libtest.la | 557 | $(top_builddir)/src/plugins/libtest.la |
543 | 558 | ||
544 | 559 | ||
545 | libextractor_archive_la_SOURCES = \ | ||
546 | archive_extractor.c | ||
547 | libextractor_archive_la_LDFLAGS = \ | ||
548 | $(PLUGINFLAGS) | ||
549 | libextractor_archive_la_LIBADD = \ | ||
550 | -larchive | ||
551 | |||
552 | test_archive_SOURCES = \ | ||
553 | test_archive.c | ||
554 | test_archive_LDADD = \ | ||
555 | $(top_builddir)/src/plugins/libtest.la | ||
556 | |||
557 | |||
558 | libextractor_thumbnailffmpeg_la_SOURCES = \ | 560 | libextractor_thumbnailffmpeg_la_SOURCES = \ |
559 | thumbnailffmpeg_extractor.c | 561 | thumbnailffmpeg_extractor.c |
560 | libextractor_thumbnailffmpeg_la_LDFLAGS = \ | 562 | libextractor_thumbnailffmpeg_la_LDFLAGS = \ |
diff --git a/src/plugins/test_lib.c b/src/plugins/test_lib.c index df8771a..1dec938 100644 --- a/src/plugins/test_lib.c +++ b/src/plugins/test_lib.c | |||
@@ -155,10 +155,10 @@ ET_main (const char *plugin_name, | |||
155 | fprintf (stderr, | 155 | fprintf (stderr, |
156 | "Failed to update my environment, plugin loading may fail: %s\n", | 156 | "Failed to update my environment, plugin loading may fail: %s\n", |
157 | strerror (errno)); | 157 | strerror (errno)); |
158 | ret = run (plugin_name, ps, EXTRACTOR_OPTION_IN_PROCESS); | 158 | ret = run (plugin_name, ps, EXTRACTOR_OPTION_DEFAULT_POLICY); |
159 | if (0 != ret) | 159 | if (0 != ret) |
160 | return ret; | 160 | return ret; |
161 | ret = run (plugin_name, ps, EXTRACTOR_OPTION_DEFAULT_POLICY); | 161 | ret = run (plugin_name, ps, EXTRACTOR_OPTION_IN_PROCESS); |
162 | if (0 != ret) | 162 | if (0 != ret) |
163 | return ret; | 163 | return ret; |
164 | return 0; | 164 | return 0; |
diff --git a/src/plugins/thumbnailffmpeg_extractor.c b/src/plugins/thumbnailffmpeg_extractor.c index b742431..9c52242 100644 --- a/src/plugins/thumbnailffmpeg_extractor.c +++ b/src/plugins/thumbnailffmpeg_extractor.c | |||
@@ -716,6 +716,7 @@ thumbnailffmpeg_lib_init (void) | |||
716 | } | 716 | } |
717 | } | 717 | } |
718 | 718 | ||
719 | |||
719 | /** | 720 | /** |
720 | * Destructor for the library, cleans up. | 721 | * Destructor for the library, cleans up. |
721 | */ | 722 | */ |