commit 3b1a81b3fffeef618f2be8d8aa9a086a3f2d423b
parent 12c1baf75784c6ecc7590066cfdead8fbb712725
Author: Christian Grothoff <christian@grothoff.org>
Date: Tue, 4 Sep 2012 18:35:34 +0000
docu updates, version bump
Diffstat:
6 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([libextractor], [0.7.0], [bug-libextractor@gnu.org])
+AC_INIT([libextractor], [1.0.0], [bug-libextractor@gnu.org])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
AH_TOP([#define _GNU_SOURCE 1])
@@ -8,9 +8,9 @@ AC_CANONICAL_TARGET
AC_CANONICAL_HOST
AC_CANONICAL_SYSTEM
-LIB_VERSION_CURRENT=3
-LIB_VERSION_REVISION=2
-LIB_VERSION_AGE=0
+LIB_VERSION_CURRENT=4
+LIB_VERSION_REVISION=0
+LIB_VERSION_AGE=1
AC_SUBST(LIB_VERSION_CURRENT)
AC_SUBST(LIB_VERSION_REVISION)
AC_SUBST(LIB_VERSION_AGE)
diff --git a/doc/extract.1 b/doc/extract.1
@@ -1,4 +1,4 @@
-.TH EXTRACT 1 "Aug 7, 2012" "libextractor 0.7.0"
+.TH EXTRACT 1 "Aug 7, 2012" "libextractor 1.0.0"
.\" $Id
.SH NAME
extract
@@ -24,7 +24,7 @@ extract
\&...
.br
.SH DESCRIPTION
-This manual page documents version 0.7.0 of the
+This manual page documents version 1.0.0 of the
.B extract
command.
.PP
@@ -73,7 +73,7 @@ Be verbose. This option can be specified multiple times to increase verbosity f
.TP 8
.I \-x " type"
Exclude keywords of the specified type from the output. By default, all keywords that are found and not removed as duplicates are printed.
-.SH SEE ALSO
+.SH "SEE ALSO"
.BR libextractor (3)
\- description of the libextractor library
.br
@@ -95,7 +95,7 @@ Keywords for file test/test.jpg:
Keywords for file test/test.png:
comment \- Testing keyword extraction
-.SH LEGAL NOTICE
+.SH "LEGAL NOTICE"
libextractor and the extract tool are released under the GPL. libextractor is a GNU package.
.SH BUGS
diff --git a/doc/extractor.texi b/doc/extractor.texi
@@ -405,9 +405,9 @@ roughly the following binary packages:
@item
libextractor (main library only, only hard dependency for other packages depending on GNU libextractor)
@item
-extract (command-line tool and man page)
+extract (command-line tool and man page extract.1)
@item
-libextractor-dev (extractor.h header and man page)
+libextractor-dev (extractor.h header and man page libextractor.3)
@item
libextractor-doc (this manual)
@item
@@ -415,13 +415,17 @@ libextractor-plugins (plugins without external dependencies; recommended but not
@item
libextractor-plugin-XXX (plugin with dependency on libXXX, for example for XXX=mpeg this would be @file{libextractor_mpeg.so})
@item
-libextractor-plugins-all (meta package that requires all plugins)
+libextractor-plugins-all (meta package that requires all plugins except experimental plugins)
@end itemize
This would enable minimal installations (i.e. for embedded systems) to
not include any plugins, as well as moderate-size installations (that
-do not trigger GTK, QT and X11) for systems that have limited
-resources.
+do not trigger GTK and X11) for systems that have limited resources.
+Right now, the MP4 plugin is experimental and does nothing and should
+thus never be included at all. The gstreamer plugin is experimental
+but largely works with the correct version of gstreamer and can thus
+be packaged (especially if the dependency is available on the target
+system) but should probably not be part of libextractor-plugins-all.
@node Generalities
@@ -551,7 +555,7 @@ time is not safe.
All plugin code is expected required to be reentrant and state-less,
but due to the extensive use of 3rd party libraries this cannot
-be guaranteed.
+be guaranteed.
@deftp {C Struct} EXTRACTOR_PluginList
@@ -798,19 +802,19 @@ ARCHIVE (using libarchive)
@item
DVI
@item
-EXIV2 (using libexiv2)
+EXIV2 (using libexiv2, 0.23 or later preferred)
@item
FLAC (using libFLAC)
@item
GIF (using libgif)
@item
-GSTREAMER (using libgstreamer)
+GSTREAMER (using libgstreamer v1.0 or later)
@item
HTML (using libtidy)
@item
IT
@item
-JPEG (using libjpeg)
+JPEG (using libjpeg v8 or later)
@item
MAN
@item
@@ -842,11 +846,11 @@ S3M
@item
SID
@item
-ThumbnailFFMPEG (using libavformat)
+ThumbnailFFMPEG (using libavformat and related libav-libraries, including libswscale)
@item
ThumbnailGtk (using libgtk)
@item
-TIFF (with libtiff)
+TIFF (with libtiff, tested with v4)
@item
WAV
@item
@@ -986,7 +990,7 @@ caller, so storing the string in the keyword list is acceptable.
@chapter Reporting bugs
@cindex bug
-@gnule{} uses the @url{http://gnunet.org/bugs/,Mantis bugtracking
+@gnule{} uses the @url{https://gnunet.org/bugs/,Mantis bugtracking
system}. If possible, please report bugs there. You can also e-mail
the @gnule{} mailinglist at @url{libextractor@@gnu.org}.
diff --git a/doc/libextractor.3 b/doc/libextractor.3
@@ -1,6 +1,6 @@
-.TH LIBEXTRACTOR 3 "Aug 8, 2012" "libextractor 0.7.0"
+.TH LIBEXTRACTOR 3 "Sept 4, 2012" "GNU libextractor 1.0.0"
.SH NAME
-libextractor \- meta\-information extraction library 0.7.0
+GNU libextractor \- meta\-information extraction library 1.0.0
.SH SYNOPSIS
\fB#include <extractor.h>
@@ -48,7 +48,7 @@ Textual meta data obtained from libextractor is supposed to be UTF-8 encoded if
.SH "SEE ALSO"
extract(1)
-.SH LEGAL NOTICE
+.SH "LEGAL NOTICE"
libextractor is released under the GPL and a GNU package (http://www.gnu.org/).
.SH BUGS
diff --git a/src/include/extractor.h b/src/include/extractor.h
@@ -32,7 +32,7 @@ extern "C" {
* 0.2.6-1 => 0x00020601
* 4.5.2-0 => 0x04050200
*/
-#define EXTRACTOR_VERSION 0x00070000
+#define EXTRACTOR_VERSION 0x01000000
#include <stdio.h>
@@ -54,12 +54,7 @@ enum EXTRACTOR_Options
EXTRACTOR_OPTION_DEFAULT_POLICY = 0,
/**
- * Run plugins out-of-process, starting the process
- * once at the time the plugin is loaded. This will
- * prevent the main process crashing if a plugin dies.
- * Ignored on platforms where out-of-process starts
- * are not supported (in-process execution will be
- * attempted, unless the plugin itself forbids it).
+ * Deprecated option. Ignored.
*/
EXTRACTOR_OPTION_OUT_OF_PROCESS_NO_RESTART = 1,
diff --git a/src/main/test_trivial.c b/src/main/test_trivial.c
@@ -57,7 +57,6 @@ main (int argc, char *argv[])
ret += testLoadPlugins (EXTRACTOR_OPTION_DEFAULT_POLICY);
ret += testLoadPlugins (EXTRACTOR_OPTION_DEFAULT_POLICY);
ret += testLoadPlugins (EXTRACTOR_OPTION_DEFAULT_POLICY);
- ret += testLoadPlugins (EXTRACTOR_OPTION_OUT_OF_PROCESS_NO_RESTART);
return ret;
}
