- upstream removed ffmpeg support, rel 3

diff --git a/ffmpeg4.patch b/ffmpeg4.patch
deleted file mode 100644 (file)
index af70684..0000000
--- a/ffmpeg4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libextractor-1.6/src/plugins/thumbnailffmpeg_extractor.c~  2017-10-15 21:21:23.000000000 +0200
-+++ libextractor-1.6/src/plugins/thumbnailffmpeg_extractor.c   2018-04-29 22:57:40.989129194 +0200
-@@ -107,7 +107,7 @@
- /**
-  * Number of bytes to feed to libav in one go, with padding (padding is zeroed).
-  */
--#define PADDED_BUFFER_SIZE (BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE)
-+#define PADDED_BUFFER_SIZE (BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE)
- 
- /**
-  * Global handle to MAGIC data.
-@@ -355,7 +355,7 @@
-    encoder_codec_ctx->mb_lmin = encoder_codec_ctx->qmin * FF_QP2LAMBDA;
-    encoder_codec_ctx->mb_lmax = encoder_codec_ctx->qmax * FF_QP2LAMBDA;
- #endif
--   encoder_codec_ctx->flags          = CODEC_FLAG_QSCALE;
-+   encoder_codec_ctx->flags          = AV_CODEC_FLAG_QSCALE;
-    encoder_codec_ctx->global_quality = encoder_codec_ctx->qmin * FF_QP2LAMBDA;
- 
-    dst_frame->pts     = 1;

diff --git a/libextractor.spec b/libextractor.spec
index 629ae1b25ffdf50ff96a5079f42fdf317b622320..59b42f52ca65e47b637dc5ddd5427016b209ca7e 100644 (file)
--- a/libextractor.spec
+++ b/libextractor.spec
@@ -11,14 +11,15 @@ Summary:    Meta-data extraction library
 Summary(pl.UTF-8):     Biblioteka do ekstrakcji metadanych
 Name:          libextractor
 Version:       1.11
-Release:       2
+Release:       3
 License:       GPL v3+
 Group:         Libraries
 Source0:       https://ftp.gnu.org/gnu/libextractor/%{name}-%{version}.tar.gz
 # Source0-md5: 934a53749d263c1f5b8a6aae5741ea3f
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-rpm5.patch
-Patch2:                %{name}-exiv2-0.28.patch
+Patch2:                libextractor-exiv2-0.28.patch
+Patch3:                no-ffmpeg.patch
 URL:           http://www.gnu.org/software/libextractor/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.11
@@ -26,8 +27,6 @@ BuildRequires:        bzip2-devel
 BuildRequires: exiv2-devel
 BuildRequires: gdk-pixbuf2-devel >= 2.4
 BuildRequires: gettext-tools >= 0.16.1
-# libavformat libavcodec libavutil libswscale
-BuildRequires: ffmpeg-devel
 BuildRequires: flac-devel
 BuildRequires: giflib-devel >= 5.1.0
 BuildRequires: glib2-devel >= 2.0.0
@@ -58,6 +57,7 @@ BuildRequires:        zlib-devel
 %{?with_tests:BuildRequires:   zzuf}
 Obsoletes:     libextractor-printable < 0.6
 Obsoletes:     libextractor-thumbnail-qt < 1.0.1
+Obsoletes:     thumbnail-ffmpeg < 1.11-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -102,20 +102,6 @@ używane w podobny sposób, co "file". "file" zna więcej typów danych,
 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 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 plugins that supports thumbnails and audio preview
-through FFmpeg.
-
-%description thumbnail-ffmpeg -l pl.UTF-8
-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
 Summary(pl.UTF-8):     Wtyczka obsługująca miniaturki obrazów poprzez GTK+ dla biblioteki libextractor
@@ -166,6 +152,7 @@ Statyczna wersja bibliotek libextractor.
 %patch0 -p1
 %{?with_rpm5:%patch1 -p1}
 %patch2 -p1
+%patch3 -p1
 
 %{__rm} po/stamp-po
 
@@ -271,11 +258,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_zip.so
 %{_mandir}/man1/extract.1*
 
-%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
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/libextractor_thumbnailgtk.so

diff --git a/no-ffmpeg.patch b/no-ffmpeg.patch
new file mode 100644 (file)
index 0000000..11750a7
--- /dev/null
+++ b/no-ffmpeg.patch
@@ -0,0 +1,153 @@
+diff --git a/ChangeLog b/ChangeLog
+index a1ba981..6cd0e63 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++Tue 20 Apr 2021 06:33:46 PM CEST
++    Removing plugins depending on buggy, unstable libffmpeg library. -CG
++
+ Sat 30 Jan 2021 03:25:35 PM CET
+       Fix #6709: mask SIGPIPE to avoid test case failure
+       with latest librpm.  Remove plibc.h logic.
+diff --git a/configure.ac b/configure.ac
+index 456287a..80ce414 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -648,38 +648,6 @@ CPPFLAGS="$CPPFLAGS_OLD"
+ AC_CHECK_PROG([HAVE_ZZUF],[zzuf], 1, 0)
+ AM_CONDITIONAL(HAVE_ZZUF, test 0 != $HAVE_ZZUF)
+ 
+-AC_MSG_CHECKING([whether to enable the FFmpeg thumbnail extractor])
+-new_ffmpeg=0
+-AC_ARG_ENABLE(ffmpeg,
+- [AC_HELP_STRING([--enable-ffmpeg],[Enable FFmpeg support])
+-  AC_HELP_STRING([--disable-ffmpeg],[Disable FFmpeg support])],
+- [AS_CASE(["$enableval"],
+-   [no],[
+-      AC_MSG_RESULT(no)
+-      ffmpeg_enabled=0
+-   ],[
+-      AC_MSG_RESULT(yes)
+-      ffmpeg_enabled=1
+-   ])],
+-  [     AC_MSG_RESULT(yes)
+-        ffmpeg_enabled=1])
+-AS_IF([test x$ffmpeg_enabled = x1],
+- [ffmpeg_enabled=0
+-  new_ffmpeg=0
+-  AC_CHECK_HEADERS([libavutil/avutil.h libavformat/avformat.h libavcodec/avcodec.h libavutil/frame.h],
+-    AC_CHECK_HEADERS([libavresample/avresample.h],
+-      AC_CHECK_LIB(avutil, av_audio_fifo_alloc,
+-        new_ffmpeg=1)))
+-
+-  AC_CHECK_LIB(swscale, sws_getContext,
+-    AC_CHECK_LIB(avcodec, avcodec_alloc_context3,
+-      ffmpeg_enabled=1))
+-  AC_CHECK_HEADERS([libavutil/avutil.h ffmpeg/avutil.h libavformat/avformat.h ffmpeg/avformat.h libavcodec/avcodec.h ffmpeg/avcodec.h libswscale/swscale.h ffmpeg/swscale.h])
+- ])
+-AM_CONDITIONAL(HAVE_FFMPEG, test x$ffmpeg_enabled != x0)
+-AM_CONDITIONAL(HAVE_FFMPEG_NEW, test x$new_ffmpeg != x0)
+-
+-
+ LE_INTLINCL=""
+ LE_LIBINTL="$LTLIBINTL"
+ AC_ARG_ENABLE(framework, [  --enable-framework      enable Mac OS X framework build helpers],enable_framework_build=$enableval)
+@@ -775,12 +743,6 @@ AS_IF([test "x$HAVE_GIF_TRUE" = "x#"],
+ AS_IF([test "x$have_gsf" != "xtrue"],
+   [AC_MSG_NOTICE([NOTICE: libgsf not found, no OLE2 (MS Office) support])])
+ 
+-AS_IF([test "x$ffmpeg_enabled" = "x0"],
+-  [AC_MSG_NOTICE([NOTICE: FFmpeg thumbnailer plugin disabled])])
+-
+-AS_IF([test "x$new_ffmpeg" = "x0"],
+-  [AC_MSG_NOTICE([NOTICE: FFmpeg/opus audio preview plugin disabled, It needs libav >= 10, or a FFmpeg with --enable-libavresample])])
+-
+ AS_IF([test "x$have_gdk_pixbuf" = "x0"],
+   [AC_MSG_NOTICE([NOTICE: libgdk-pixbuf not found, gtk thumbnail support disabled])])
+ 
+diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
+index 8cdd905..69cb1f7 100644
+--- a/src/plugins/Makefile.am
++++ b/src/plugins/Makefile.am
+@@ -68,17 +71,6 @@ if HAVE_MAGIC
+ PLUGIN_MIME=libextractor_mime.la
+ TEST_MIME=test_mime
+ 
+-if HAVE_FFMPEG
+-# FFmpeg-thumbnailer requires MAGIC and FFMPEG
+-PLUGIN_FFMPEG=libextractor_thumbnailffmpeg.la
+-TEST_FFMPEG=test_thumbnailffmpeg
+-endif
+-
+-if HAVE_FFMPEG_NEW
+-PLUGIN_PREVIEWOPUS=libextractor_previewopus.la
+-TEST_PREVIEWOPUS=test_previewopus
+-endif
+-
+ if HAVE_GDK_PIXBUF
+ # Gtk-thumbnailer requires MAGIC and GDK_PIXBUF
+ PLUGIN_GTK=libextractor_thumbnailgtk.la
+@@ -188,7 +182,6 @@ plugin_LTLIBRARIES = \
+   libextractor_xm.la \
+   $(PLUGIN_ARCHIVE) \
+   $(PLUGIN_EXIV2) \
+-  $(PLUGIN_FFMPEG) \
+   $(PLUGIN_FLAC) \
+   $(PLUGIN_GIF) \
+   $(PLUGIN_GSF) \
+@@ -202,7 +195,6 @@ plugin_LTLIBRARIES = \
+   $(PLUGIN_MPEG) \
+   $(PLUGIN_OGG) \
+   $(PLUGIN_PDF) \
+-  $(PLUGIN_PREVIEWOPUS) \
+   $(PLUGIN_RPM) \
+   $(PLUGIN_TIFF) \
+   $(PLUGIN_ZLIB)
+@@ -228,8 +222,6 @@ check_PROGRAMS = \
+   test_zip \
+   $(TEST_ARCHIVE) \
+   $(TEST_EXIV2) \
+-  $(TEST_FFMPEG) \
+-  $(TEST_PREVIEWOPUS) \
+   $(TEST_FLAC) \
+   $(TEST_GIF) \
+   $(TEST_GSF) \
+@@ -615,19 +634,6 @@ test_sid_LDADD = \
+   $(top_builddir)/src/plugins/libtest.la
+ 
+ 
+-libextractor_thumbnailffmpeg_la_SOURCES = \
+-  thumbnailffmpeg_extractor.c
+-libextractor_thumbnailffmpeg_la_LDFLAGS = \
+-  $(PLUGINFLAGS)
+-libextractor_thumbnailffmpeg_la_LIBADD = \
+-  -lavutil -lavformat -lavcodec -lswscale -lmagic $(XLIB)
+-
+-test_thumbnailffmpeg_SOURCES = \
+-  test_thumbnailffmpeg.c
+-test_thumbnailffmpeg_LDADD = \
+-  $(top_builddir)/src/plugins/libtest.la
+-
+-
+ libextractor_thumbnailgtk_la_SOURCES = \
+   thumbnailgtk_extractor.c
+ libextractor_thumbnailgtk_la_LDFLAGS = \
+@@ -642,18 +648,6 @@ test_thumbnailgtk_SOURCES = \
+ test_thumbnailgtk_LDADD = \
+   $(top_builddir)/src/plugins/libtest.la
+ 
+-libextractor_previewopus_la_SOURCES = \
+-  previewopus_extractor.c
+-libextractor_previewopus_la_LDFLAGS = \
+-  $(PLUGINFLAGS)
+-libextractor_previewopus_la_LIBADD = \
+-  -lavutil -lavformat -lavcodec -lswscale -lavresample  -lmagic $(XLIB)
+-
+-test_previewopus_SOURCES = \
+-  test_previewopus.c
+-test_previewopus_LDADD = \
+-  $(top_builddir)/src/plugins/libtest.la
+-
+ 
+ libextractor_tiff_la_SOURCES = \
+   tiff_extractor.c