Attachment #197465 for bug #231695

View | Details | Raw Unified | Return to bug 231695
Collapse All | Expand All

Lines 2-9 Link Here

(-)textproc/libextractor/Makefile (-10 / +17 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libextractor	4	PORTNAME= libextractor
5	PORTVERSION= 1.3	5	PORTVERSION= 1.7
6	PORTREVISION= 11
7	CATEGORIES= textproc	6	CATEGORIES= textproc
8	MASTER_SITES= GNU	7	MASTER_SITES= GNU
9		8
Lines 10-27 Link Here
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Library for keyword extraction	10	COMMENT= Library for keyword extraction
12		11
13	LICENSE= GPLv3+	12	LICENSE= GPLv3
		13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	LIB_DEPENDS= libltdl.so:devel/libltdl	15	BUILD_DEPENDS= tidy-html5>0:www/tidy-html5
		16	LIB_DEPENDS= libltdl.so:devel/libltdl libogg.so:audio/libogg \
		17	libtiff.so:graphics/tiff
16		18
17	USES= iconv gettext libtool makeinfo pathfix pkgconfig python	19	USES= gnome iconv jpeg libarchive libtool \
18	USE_GNOME= gtk20	20	makeinfo pathfix pkgconfig python
		21
		22	USE_GNOME= gtk20 gdkpixbuf2
		23	USE_LDCONFIG= yes
		24
19	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
20	CONFIGURE_ARGS= --with-gtk-version=2 \	26	CONFIGURE_ARGS= --with-gtk-version=2 \
21	--with-ltdl=${LOCALBASE}	27	--with-ltdl=${LOCALBASE}
22	INSTALL_TARGET= install-strip	28	INSTALL_TARGET= install-strip
23	USE_LDCONFIG= yes
24	MAKE_JOBS_UNSAFE= yes
25		29
26	CPPFLAGS+= $$(pkg-config --cflags gtk+-2.0) \	30	CPPFLAGS+= $$(pkg-config --cflags gtk+-2.0) \
27	-I${LOCALBASE}/include	31	-I${LOCALBASE}/include
Lines 30-36 Link Here
30	INFO= libextractor	34	INFO= libextractor
31		35
32	OPTIONS_DEFINE= EXIV2 FFMPEG FLAC GIF GSF GSTREAMER MPEG2 MP4 \	36	OPTIONS_DEFINE= EXIV2 FFMPEG FLAC GIF GSF GSTREAMER MPEG2 MP4 \
33	RPM SMF TIDY VORBIS	37	NLS RPM SMF TIDY VORBIS
34	OPTIONS_DEFAULT= EXIV2 FFMPEG FLAC GIF GSF GSTREAMER MPEG2 MP4 \	38	OPTIONS_DEFAULT= EXIV2 FFMPEG FLAC GIF GSF GSTREAMER MPEG2 MP4 \
35	RPM SMF TIDY VORBIS	39	RPM SMF TIDY VORBIS
36	OPTIONS_SUB= yes	40	OPTIONS_SUB= yes
Lines 39-45 Link Here
39	EXIV2_CONFIGURE_ENV= EXIV2_H="<exiv2/image.hpp>"	43	EXIV2_CONFIGURE_ENV= EXIV2_H="<exiv2/image.hpp>"
40	EXIV2_CONFIGURE_ENV_OFF= EXIV2_H=""	44	EXIV2_CONFIGURE_ENV_OFF= EXIV2_H=""
41	FLAC_LIB_DEPENDS= libFLAC.so:audio/flac	45	FLAC_LIB_DEPENDS= libFLAC.so:audio/flac
42	FLAC_CONFIGURE_ENV_OFF= ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream=no	46	FLAC_CONFIGURE_ENV_OFF=ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream=no
43	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg	47	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
44	FFMPEG_CONFIGURE_ENABLE= ffmpeg	48	FFMPEG_CONFIGURE_ENABLE= ffmpeg
45	GIF_LIB_DEPENDS= libgif.so:graphics/giflib	49	GIF_LIB_DEPENDS= libgif.so:graphics/giflib
Lines 53-58 Link Here
53	MPEG2_CONFIGURE_ENV_OFF= ac_cv_lib_mpeg2_mpeg2_init=no	57	MPEG2_CONFIGURE_ENV_OFF= ac_cv_lib_mpeg2_mpeg2_init=no
54	MP4_LIB_DEPENDS= libmp4v2.so:multimedia/mp4v2	58	MP4_LIB_DEPENDS= libmp4v2.so:multimedia/mp4v2
55	MP4_CONFIGURE_ENV_OFF= ac_cv_lib_mp4v2_MP4ReadProvider=no	59	MP4_CONFIGURE_ENV_OFF= ac_cv_lib_mp4v2_MP4ReadProvider=no
		60	NLS_USES= gettext-runtime
		61	NLS_CONFIGURE_ENABLE= nls
56	RPM_DESC= RPM support	62	RPM_DESC= RPM support
57	RPM_LIB_DEPENDS= librpm.so:archivers/rpm4	63	RPM_LIB_DEPENDS= librpm.so:archivers/rpm4
58	RPM_CONFIGURE_ENV= ac_cv_lib_rpm_rpmReadPackageFile=yes	64	RPM_CONFIGURE_ENV= ac_cv_lib_rpm_rpmReadPackageFile=yes
Lines 74-78 Link Here
74	s\|<tidy/tidy.h>\|$${TIDY_H}\|' ${WRKSRC}/configure	80	s\|<tidy/tidy.h>\|$${TIDY_H}\|' ${WRKSRC}/configure
75	@${REINPLACE_CMD} -e \	81	@${REINPLACE_CMD} -e \
76	's\|-lpthread\|-pthread\|' ${WRKSRC}/src/plugins/Makefile.in	82	's\|-lpthread\|-pthread\|' ${WRKSRC}/src/plugins/Makefile.in
		83	${REINPLACE_CMD} -e 's\|tidy/tidybuffio.h\|tidybuffio.h\|' ${WRKSRC}/src/plugins/html_extractor.c
77		84
78	.include <bsd.port.mk>	85	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)textproc/libextractor/distinfo (-2 / +3 lines)
1	SHA256 (libextractor-1.3.tar.gz) = 868ad64c9a056d6b923d451d746935bffb1ddf5d89c3eb4f67d786001a3f7b7f	1	TIMESTAMP = 1537748923
2	SIZE (libextractor-1.3.tar.gz) = 7942021	2	SHA256 (libextractor-1.7.tar.gz) = e0a6fde824cf2212c4f217a5e0fc03391251cfb46ca000117f66cf7ae4368e8f
		3	SIZE (libextractor-1.7.tar.gz) = 8075299




--- configure.orig
+++ configure
@@ -22674,17 +22674,14 @@
   withval=$with_gtk_version; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gtk_version" >&5
 $as_echo "$with_gtk_version" >&6; }
     case $with_gtk_version in
-      *)
-        if test "x${with_gtk_version:0:1}" == "x2"
-        then
+      2*)
           check_for_3=false
           check_for_2=$with_gtk_version
-        elif test "x${with_gtk_version:0:1}" == "x3"
-        then
+      ;;
+      3*)
           check_for_3=$with_gtk_version
           check_for_2=false
-        fi
-        ;;
+      ;;
     esac
 
 else




Description: update to new API in FFmpeg 2.9, fix FTBS
Origin: upstream
Applied-Upstream: commit: r35548:r35549 and r36975
--- src/plugins/thumbnailffmpeg_extractor.c.orig
+++ src/plugins/thumbnailffmpeg_extractor.c
@@ -59,6 +59,20 @@
 #include <ffmpeg/swscale.h>
 #endif
 
+#if USE_JPEG
+#ifdef PIX_FMT_YUVJ420P
+#define PIX_OUTPUT_FORMAT PIX_FMT_YUVJ420P
+#else
+#define PIX_OUTPUT_FORMAT AV_PIX_FMT_YUVJ420P
+#endif
+#else
+#ifdef PIX_FMT_RGB24
+#define PIX_OUTPUT_FORMAT PIX_FMT_RGB24
+#else
+#define PIX_OUTPUT_FORMAT AV_PIX_FMT_RGB24
+#endif
+#endif
+
 /**
  * Set to 1 to enable debug output.
  */ 
@@ -82,7 +96,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.
@@ -153,7 +167,7 @@
 static size_t 
 create_thumbnail (int src_width, int src_height, 
 		  int src_stride[],
-		  enum PixelFormat src_pixfmt, 
+		  enum AVPixelFormat src_pixfmt, 
 		  const uint8_t * const src_data[],
 		  int dst_width, int dst_height,
 		  uint8_t **output_data, 
@@ -189,7 +203,8 @@
   if (NULL == 
       (scaler_ctx =
        sws_getContext (src_width, src_height, src_pixfmt,
-		       dst_width, dst_height, PIX_FMT_RGB24, 
+		       dst_width, dst_height,
+		       PIX_OUTPUT_FORMAT, 
 		       SWS_BILINEAR, NULL, NULL, NULL)))
     {
 #if DEBUG
@@ -199,7 +214,12 @@
       return 0;
     }
 
-  if (NULL == (dst_frame = avcodec_alloc_frame ()))
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+  dst_frame = av_frame_alloc ();
+#else
+  dst_frame = avcodec_alloc_frame();
+#endif
+  if (NULL == dst_frame)
     {
 #if DEBUG
       fprintf (stderr,
@@ -209,18 +229,24 @@
       return 0;
     }
   if (NULL == (dst_buffer =
-	       av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height))))
+	       av_malloc (avpicture_get_size (PIX_OUTPUT_FORMAT,
+                                              dst_width, dst_height))))
     {
 #if DEBUG
       fprintf (stderr,
                "Failed to allocate the destination image buffer\n");
 #endif
-      av_free (dst_frame);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+      av_frame_free (&dst_frame);
+#else
+      avcodec_free_frame (&dst_frame);
+#endif
       sws_freeContext (scaler_ctx);
       return 0;
     }
   avpicture_fill ((AVPicture *) dst_frame, dst_buffer,
-                  PIX_FMT_RGB24, dst_width, dst_height);
+                  PIX_OUTPUT_FORMAT,
+                  dst_width, dst_height);
   sws_scale (scaler_ctx,
              src_data, 
              src_stride,
@@ -236,7 +262,11 @@
                "Failed to allocate the encoder output buffer\n");
 #endif
       av_free (dst_buffer);
-      av_free (dst_frame);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+      av_frame_free (&dst_frame);
+#else
+      avcodec_free_frame (&dst_frame);
+#endif
       sws_freeContext (scaler_ctx);
       return 0;
     }
@@ -249,13 +279,17 @@
 #endif
       av_free (encoder_output_buffer);
       av_free (dst_buffer);
-      av_free (dst_frame);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+      av_frame_free (&dst_frame);
+#else
+      avcodec_free_frame (&dst_frame);
+#endif
       sws_freeContext (scaler_ctx);
       return 0;
     }
   encoder_codec_ctx->width = dst_width;
   encoder_codec_ctx->height = dst_height;
-  encoder_codec_ctx->pix_fmt = PIX_FMT_RGB24;
+  encoder_codec_ctx->pix_fmt = PIX_OUTPUT_FORMAT;
   opts = NULL;
   if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0)
     {
@@ -263,10 +297,14 @@
       fprintf (stderr,
                "Failed to open the encoder\n");
 #endif
-      av_free (encoder_codec_ctx);
+      avcodec_free_context (&encoder_codec_ctx);
       av_free (encoder_output_buffer);
       av_free (dst_buffer);
-      av_free (dst_frame);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+      av_frame_free (&dst_frame);
+#else
+      avcodec_free_frame (&dst_frame);
+#endif
       sws_freeContext  (scaler_ctx);
       return 0;
     }
@@ -295,9 +333,13 @@
 cleanup:
   av_dict_free (&opts);
   avcodec_close (encoder_codec_ctx);
-  av_free (encoder_codec_ctx);
+  avcodec_free_context (&encoder_codec_ctx);
   av_free (dst_buffer);
-  av_free (dst_frame);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+  av_frame_free (&dst_frame);
+#else
+  avcodec_free_frame (&dst_frame);
+#endif
   sws_freeContext (scaler_ctx);
   *output_data = encoder_output_buffer;
 
@@ -406,18 +448,23 @@
       fprintf (stderr,
 	       "Failed to open image codec\n");
 #endif
-      av_free (codec_ctx);
+      avcodec_free_context (&codec_ctx);
       return;
     }
   av_dict_free (&opts);
-  if (NULL == (frame = avcodec_alloc_frame ()))
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+  frame = av_frame_alloc ();
+#else
+  frame = avcodec_alloc_frame();
+#endif
+  if (NULL == frame)
     {
 #if DEBUG
       fprintf (stderr,
                "Failed to allocate frame\n");
 #endif
       avcodec_close (codec_ctx);
-      av_free (codec_ctx);
+      avcodec_free_context (&codec_ctx);
       return;
     }
 
@@ -441,9 +488,13 @@
       fprintf (stderr,
 	       "Failed to decode a complete frame\n");
 #endif
-      av_free (frame);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+      av_frame_free (&frame);
+#else
+      avcodec_free_frame (&frame);
+#endif
       avcodec_close (codec_ctx);
-      av_free (codec_ctx);
+      avcodec_free_context (&codec_ctx);
       return;
     }
   calculate_thumbnail_dimensions (codec_ctx->width, codec_ctx->height,
@@ -467,9 +518,13 @@
 		err);
       av_free (encoded_thumbnail);
     }
-  av_free (frame);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+  av_frame_free (&frame);
+#else
+  avcodec_free_frame (&frame);
+#endif
   avcodec_close (codec_ctx);
-  av_free (codec_ctx);
+  avcodec_free_context (&codec_ctx);
 }
 
 
@@ -563,7 +618,12 @@
       return;
     }
 
-  if (NULL == (frame = avcodec_alloc_frame ()))
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+  frame = av_frame_alloc ();
+#else
+  frame = avcodec_alloc_frame();
+#endif
+  if (NULL == frame)
     {
 #if DEBUG
       fprintf (stderr,
@@ -616,7 +676,11 @@
       fprintf (stderr,
 	       "Failed to decode a complete frame\n");
 #endif
-      av_free (frame);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+      av_frame_free (&frame);
+#else
+      avcodec_free_frame (&frame);
+#endif
       avcodec_close (codec_ctx);
       avformat_close_input (&format_ctx);
       av_free (io_ctx);
@@ -643,7 +707,11 @@
 		err);
       av_free (encoded_thumbnail);
     }
-  av_free (frame);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+  av_frame_free (&frame);
+#else
+  avcodec_free_frame (&frame);
+#endif
   avcodec_close (codec_ctx);
   avformat_close_input (&format_ctx);
   av_free (io_ctx);
--- src/plugins/previewopus_extractor.c.orig
+++ src/plugins/previewopus_extractor.c
@@ -296,7 +296,12 @@
 /** Initialize one audio frame for reading from the input file */
 static int init_input_frame(AVFrame **frame)
 {
-    if (!(*frame = avcodec_alloc_frame())) {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+    *frame = av_frame_alloc ();
+#else
+    *frame = avcodec_alloc_frame();
+#endif
+    if (NULL == *frame) {
  #if DEBUG
         fprintf(stderr, "Could not allocate input frame\n");
 #endif
@@ -655,7 +660,11 @@
         av_freep(&converted_input_samples[0]);
         free(converted_input_samples);
     }
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+    av_frame_free (&input_frame);
+#else
     avcodec_free_frame(&input_frame);
+#endif
 
     return ret;
 }
@@ -671,7 +680,12 @@
     int error;
 
     /** Create a new frame to store the audio samples. */
-    if (!(*frame = avcodec_alloc_frame())) {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+    *frame = av_frame_alloc ();
+#else
+    *frame = avcodec_alloc_frame();
+#endif
+    if (NULL == *frame) {
         #if DEBUG
 		fprintf(stderr, "Could not allocate output frame\n");
 		#endif
@@ -702,7 +716,11 @@
         #if DEBUG
 		fprintf(stderr, "Could allocate output frame samples (error '%s')\n", get_error_text(error));
 		#endif
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+        av_frame_free (frame);
+#else
         avcodec_free_frame(frame);
+#endif
         return error;
     }
 
@@ -783,17 +801,29 @@
         #if DEBUG
 		fprintf(stderr, "Could not read data from FIFO\n");
 		#endif
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+        av_frame_free (&output_frame);
+#else
         avcodec_free_frame(&output_frame);
+#endif
         return AVERROR_EXIT;
     }
 
     /** Encode one frame worth of audio samples. */
     if (encode_audio_frame(output_frame, output_format_context,
                            output_codec_context, &data_written)) {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+        av_frame_free (&output_frame);
+#else
         avcodec_free_frame(&output_frame);
+#endif
         return AVERROR_EXIT;
     }
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+    av_frame_free (&output_frame);
+#else
     avcodec_free_frame(&output_frame);
+#endif
     return 0;
 }
 /** Write the trailer of the output file container. */
@@ -907,7 +937,12 @@
       return;
     }
 
-  if (NULL == (frame = avcodec_alloc_frame ()))
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
+  frame = av_frame_alloc ();
+#else
+  frame = avcodec_alloc_frame();
+#endif
+  if (NULL == frame)
     {
 #if DEBUG
       fprintf (stderr,




Obtained from:
        https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch?id=00c65df99751d235e08fe2f54613dac2eeb2f80b

From 00c65df99751d235e08fe2f54613dac2eeb2f80b Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 17 Jun 2017 22:36:09 +0200
Subject: media-libs/libextractor: Fix build with media-gfx/exiv2-0.26

Gentoo-bug: 621242

Package-Manager: Portage-2.3.5, Repoman-2.3.1

--- src/plugins/exiv2_extractor.cc        2013-06-25 13:02:05.000000000 +0200
+++ src/plugins/exiv2_extractor.cc        2017-06-10 14:22:57.000000000 +0200
@@ -180,7 +180,11 @@
    *
    * @return -1 on error
    */
+#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
+  virtual size_t size (void) const;
+#else
   virtual long int size (void) const;
+#endif
 
   /**
    * Check if file is open.
@@ -445,7 +449,11 @@
  *
  * @return -1 on error
  */
-long int 
+#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
+size_t
+#else
+long int
+#endif
 ExtractorIO::size (void) const
 {
   return (long) ec->get_size (ec->cls);




--- src/plugins/gif_extractor.c.orig	2013-06-21 16:00:16 UTC
+++ src/plugins/gif_extractor.c
@@ -78,7 +78,11 @@ EXTRACTOR_gif_extract_method (struct EXT
   if (gif_file == NULL || gif_error != 0)
   {
     if (gif_file != NULL)
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+      EGifCloseFile (gif_file, NULL);
+#else
       EGifCloseFile (gif_file);
+#endif
     return; /* not a GIF */
   }
 #endif
@@ -133,7 +137,11 @@ EXTRACTOR_gif_extract_method (struct EXT
 	       DGifGetExtensionNext(gif_file, &ext)) &&
 	      (NULL != ext) ) ; /* keep going */
     }
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+  DGifCloseFile (gif_file, NULL);
+#else
   DGifCloseFile (gif_file);
+#endif
 }
 
 /* end of gif_extractor.c */

Lines 3-13 Link Here

(-)textproc/libextractor/pkg-plist (-16 / +20 lines)
3	lib/libextractor.a	3	lib/libextractor.a
4	lib/libextractor.so	4	lib/libextractor.so
5	lib/libextractor.so.3	5	lib/libextractor.so.3
6	lib/libextractor.so.3.1.3	6	lib/libextractor.so.3.1.6
7	lib/libextractor_common.a
8	lib/libextractor_common.so
9	lib/libextractor_common.so.1
10	lib/libextractor_common.so.1.0.0
11	lib/libextractor/libextractor_archive.a	7	lib/libextractor/libextractor_archive.a
12	lib/libextractor/libextractor_archive.so	8	lib/libextractor/libextractor_archive.so
13	lib/libextractor/libextractor_deb.a	9	lib/libextractor/libextractor_deb.a
Lines 46-51 Link Here
46	%%VORBIS%%lib/libextractor/libextractor_ogg.so	42	%%VORBIS%%lib/libextractor/libextractor_ogg.so
47	%%GSF%%lib/libextractor/libextractor_ole2.a	43	%%GSF%%lib/libextractor/libextractor_ole2.a
48	%%GSF%%lib/libextractor/libextractor_ole2.so	44	%%GSF%%lib/libextractor/libextractor_ole2.so
		45	lib/libextractor/libextractor_pdf.a
		46	lib/libextractor/libextractor_pdf.so
49	lib/libextractor/libextractor_png.a	47	lib/libextractor/libextractor_png.a
50	lib/libextractor/libextractor_png.so	48	lib/libextractor/libextractor_png.so
51	%%FFMPEG%%lib/libextractor/libextractor_previewopus.a	49	%%FFMPEG%%lib/libextractor/libextractor_previewopus.a
Lines 72-88 Link Here
72	lib/libextractor/libextractor_xm.so	70	lib/libextractor/libextractor_xm.so
73	lib/libextractor/libextractor_zip.a	71	lib/libextractor/libextractor_zip.a
74	lib/libextractor/libextractor_zip.so	72	lib/libextractor/libextractor_zip.so
		73	lib/libextractor_common.a
		74	lib/libextractor_common.so
		75	lib/libextractor_common.so.1
		76	lib/libextractor_common.so.1.0.0
75	libdata/pkgconfig/libextractor.pc	77	libdata/pkgconfig/libextractor.pc
76	man/man1/extract.1.gz	78	man/man1/extract.1.gz
77	man/man3/libextractor.3.gz	79	man/man3/libextractor.3.gz
78	share/locale/de/LC_MESSAGES/libextractor.mo	80	%%NLS%%share/locale/de/LC_MESSAGES/libextractor.mo
79	share/locale/fr/LC_MESSAGES/libextractor.mo	81	%%NLS%%share/locale/es/LC_MESSAGES/libextractor.mo
80	share/locale/ga/LC_MESSAGES/libextractor.mo	82	%%NLS%%share/locale/fr/LC_MESSAGES/libextractor.mo
81	share/locale/it/LC_MESSAGES/libextractor.mo	83	%%NLS%%share/locale/ga/LC_MESSAGES/libextractor.mo
82	share/locale/nl/LC_MESSAGES/libextractor.mo	84	%%NLS%%share/locale/it/LC_MESSAGES/libextractor.mo
83	share/locale/pl/LC_MESSAGES/libextractor.mo	85	%%NLS%%share/locale/nl/LC_MESSAGES/libextractor.mo
84	share/locale/ro/LC_MESSAGES/libextractor.mo	86	%%NLS%%share/locale/pl/LC_MESSAGES/libextractor.mo
85	share/locale/rw/LC_MESSAGES/libextractor.mo	87	%%NLS%%share/locale/ro/LC_MESSAGES/libextractor.mo
86	share/locale/sv/LC_MESSAGES/libextractor.mo	88	%%NLS%%share/locale/rw/LC_MESSAGES/libextractor.mo
87	share/locale/uk/LC_MESSAGES/libextractor.mo	89	%%NLS%%share/locale/sr/LC_MESSAGES/libextractor.mo
88	share/locale/vi/LC_MESSAGES/libextractor.mo	90	%%NLS%%share/locale/sv/LC_MESSAGES/libextractor.mo
		91	%%NLS%%share/locale/uk/LC_MESSAGES/libextractor.mo
		92	%%NLS%%share/locale/vi/LC_MESSAGES/libextractor.mo

Return to bug 231695

Lines 1-24 Link Here

(-)textproc/libextractor/files/patch-configure (-24 lines)
1	--- configure.orig
2	+++ configure
3	@@ -22674,17 +22674,14 @@
4	withval=$with_gtk_version; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gtk_version" >&5
5	$as_echo "$with_gtk_version" >&6; }
6	case $with_gtk_version in
7	- *)
8	- if test "x${with_gtk_version:0:1}" == "x2"
9	- then
10	+ 2*)
11	check_for_3=false
12	check_for_2=$with_gtk_version
13	- elif test "x${with_gtk_version:0:1}" == "x3"
14	- then
15	+ ;;
16	+ 3*)
17	check_for_3=$with_gtk_version
18	check_for_2=false
19	- fi
20	- ;;
21	+ ;;
22	esac
23
24	else

Lines 1-359 Link Here

(-)textproc/libextractor/files/patch-ffmpeg29 (-359 lines)
1	Description: update to new API in FFmpeg 2.9, fix FTBS
2	Origin: upstream
3	Applied-Upstream: commit: r35548:r35549 and r36975
4	--- src/plugins/thumbnailffmpeg_extractor.c.orig
5	+++ src/plugins/thumbnailffmpeg_extractor.c
6	@@ -59,6 +59,20 @@
7	#include <ffmpeg/swscale.h>
8	#endif
9
10	+#if USE_JPEG
11	+#ifdef PIX_FMT_YUVJ420P
12	+#define PIX_OUTPUT_FORMAT PIX_FMT_YUVJ420P
13	+#else
14	+#define PIX_OUTPUT_FORMAT AV_PIX_FMT_YUVJ420P
15	+#endif
16	+#else
17	+#ifdef PIX_FMT_RGB24
18	+#define PIX_OUTPUT_FORMAT PIX_FMT_RGB24
19	+#else
20	+#define PIX_OUTPUT_FORMAT AV_PIX_FMT_RGB24
21	+#endif
22	+#endif
23	+
24	/**
25	* Set to 1 to enable debug output.
26	*/
27	@@ -82,7 +96,7 @@
28	/**
29	* Number of bytes to feed to libav in one go, with padding (padding is zeroed).
30	*/
31	-#define PADDED_BUFFER_SIZE (BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE)
32	+#define PADDED_BUFFER_SIZE (BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE)
33
34	/**
35	* Global handle to MAGIC data.
36	@@ -153,7 +167,7 @@
37	static size_t
38	create_thumbnail (int src_width, int src_height,
39	int src_stride[],
40	- enum PixelFormat src_pixfmt,
41	+ enum AVPixelFormat src_pixfmt,
42	const uint8_t * const src_data[],
43	int dst_width, int dst_height,
44	uint8_t **output_data,
45	@@ -189,7 +203,8 @@
46	if (NULL ==
47	(scaler_ctx =
48	sws_getContext (src_width, src_height, src_pixfmt,
49	- dst_width, dst_height, PIX_FMT_RGB24,
50	+ dst_width, dst_height,
51	+ PIX_OUTPUT_FORMAT,
52	SWS_BILINEAR, NULL, NULL, NULL)))
53	{
54	#if DEBUG
55	@@ -199,7 +214,12 @@
56	return 0;
57	}
58
59	- if (NULL == (dst_frame = avcodec_alloc_frame ()))
60	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
61	+ dst_frame = av_frame_alloc ();
62	+#else
63	+ dst_frame = avcodec_alloc_frame();
64	+#endif
65	+ if (NULL == dst_frame)
66	{
67	#if DEBUG
68	fprintf (stderr,
69	@@ -209,18 +229,24 @@
70	return 0;
71	}
72	if (NULL == (dst_buffer =
73	- av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height))))
74	+ av_malloc (avpicture_get_size (PIX_OUTPUT_FORMAT,
75	+ dst_width, dst_height))))
76	{
77	#if DEBUG
78	fprintf (stderr,
79	"Failed to allocate the destination image buffer\n");
80	#endif
81	- av_free (dst_frame);
82	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
83	+ av_frame_free (&dst_frame);
84	+#else
85	+ avcodec_free_frame (&dst_frame);
86	+#endif
87	sws_freeContext (scaler_ctx);
88	return 0;
89	}
90	avpicture_fill ((AVPicture *) dst_frame, dst_buffer,
91	- PIX_FMT_RGB24, dst_width, dst_height);
92	+ PIX_OUTPUT_FORMAT,
93	+ dst_width, dst_height);
94	sws_scale (scaler_ctx,
95	src_data,
96	src_stride,
97	@@ -236,7 +262,11 @@
98	"Failed to allocate the encoder output buffer\n");
99	#endif
100	av_free (dst_buffer);
101	- av_free (dst_frame);
102	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
103	+ av_frame_free (&dst_frame);
104	+#else
105	+ avcodec_free_frame (&dst_frame);
106	+#endif
107	sws_freeContext (scaler_ctx);
108	return 0;
109	}
110	@@ -249,13 +279,17 @@
111	#endif
112	av_free (encoder_output_buffer);
113	av_free (dst_buffer);
114	- av_free (dst_frame);
115	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
116	+ av_frame_free (&dst_frame);
117	+#else
118	+ avcodec_free_frame (&dst_frame);
119	+#endif
120	sws_freeContext (scaler_ctx);
121	return 0;
122	}
123	encoder_codec_ctx->width = dst_width;
124	encoder_codec_ctx->height = dst_height;
125	- encoder_codec_ctx->pix_fmt = PIX_FMT_RGB24;
126	+ encoder_codec_ctx->pix_fmt = PIX_OUTPUT_FORMAT;
127	opts = NULL;
128	if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0)
129	{
130	@@ -263,10 +297,14 @@
131	fprintf (stderr,
132	"Failed to open the encoder\n");
133	#endif
134	- av_free (encoder_codec_ctx);
135	+ avcodec_free_context (&encoder_codec_ctx);
136	av_free (encoder_output_buffer);
137	av_free (dst_buffer);
138	- av_free (dst_frame);
139	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
140	+ av_frame_free (&dst_frame);
141	+#else
142	+ avcodec_free_frame (&dst_frame);
143	+#endif
144	sws_freeContext (scaler_ctx);
145	return 0;
146	}
147	@@ -295,9 +333,13 @@
148	cleanup:
149	av_dict_free (&opts);
150	avcodec_close (encoder_codec_ctx);
151	- av_free (encoder_codec_ctx);
152	+ avcodec_free_context (&encoder_codec_ctx);
153	av_free (dst_buffer);
154	- av_free (dst_frame);
155	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
156	+ av_frame_free (&dst_frame);
157	+#else
158	+ avcodec_free_frame (&dst_frame);
159	+#endif
160	sws_freeContext (scaler_ctx);
161	*output_data = encoder_output_buffer;
162
163	@@ -406,18 +448,23 @@
164	fprintf (stderr,
165	"Failed to open image codec\n");
166	#endif
167	- av_free (codec_ctx);
168	+ avcodec_free_context (&codec_ctx);
169	return;
170	}
171	av_dict_free (&opts);
172	- if (NULL == (frame = avcodec_alloc_frame ()))
173	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
174	+ frame = av_frame_alloc ();
175	+#else
176	+ frame = avcodec_alloc_frame();
177	+#endif
178	+ if (NULL == frame)
179	{
180	#if DEBUG
181	fprintf (stderr,
182	"Failed to allocate frame\n");
183	#endif
184	avcodec_close (codec_ctx);
185	- av_free (codec_ctx);
186	+ avcodec_free_context (&codec_ctx);
187	return;
188	}
189
190	@@ -441,9 +488,13 @@
191	fprintf (stderr,
192	"Failed to decode a complete frame\n");
193	#endif
194	- av_free (frame);
195	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
196	+ av_frame_free (&frame);
197	+#else
198	+ avcodec_free_frame (&frame);
199	+#endif
200	avcodec_close (codec_ctx);
201	- av_free (codec_ctx);
202	+ avcodec_free_context (&codec_ctx);
203	return;
204	}
205	calculate_thumbnail_dimensions (codec_ctx->width, codec_ctx->height,
206	@@ -467,9 +518,13 @@
207	err);
208	av_free (encoded_thumbnail);
209	}
210	- av_free (frame);
211	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
212	+ av_frame_free (&frame);
213	+#else
214	+ avcodec_free_frame (&frame);
215	+#endif
216	avcodec_close (codec_ctx);
217	- av_free (codec_ctx);
218	+ avcodec_free_context (&codec_ctx);
219	}
220
221
222	@@ -563,7 +618,12 @@
223	return;
224	}
225
226	- if (NULL == (frame = avcodec_alloc_frame ()))
227	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
228	+ frame = av_frame_alloc ();
229	+#else
230	+ frame = avcodec_alloc_frame();
231	+#endif
232	+ if (NULL == frame)
233	{
234	#if DEBUG
235	fprintf (stderr,
236	@@ -616,7 +676,11 @@
237	fprintf (stderr,
238	"Failed to decode a complete frame\n");
239	#endif
240	- av_free (frame);
241	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
242	+ av_frame_free (&frame);
243	+#else
244	+ avcodec_free_frame (&frame);
245	+#endif
246	avcodec_close (codec_ctx);
247	avformat_close_input (&format_ctx);
248	av_free (io_ctx);
249	@@ -643,7 +707,11 @@
250	err);
251	av_free (encoded_thumbnail);
252	}
253	- av_free (frame);
254	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
255	+ av_frame_free (&frame);
256	+#else
257	+ avcodec_free_frame (&frame);
258	+#endif
259	avcodec_close (codec_ctx);
260	avformat_close_input (&format_ctx);
261	av_free (io_ctx);
262	--- src/plugins/previewopus_extractor.c.orig
263	+++ src/plugins/previewopus_extractor.c
264	@@ -296,7 +296,12 @@
265	/** Initialize one audio frame for reading from the input file */
266	static int init_input_frame(AVFrame **frame)
267	{
268	- if (!(*frame = avcodec_alloc_frame())) {
269	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
270	+ *frame = av_frame_alloc ();
271	+#else
272	+ *frame = avcodec_alloc_frame();
273	+#endif
274	+ if (NULL == *frame) {
275	#if DEBUG
276	fprintf(stderr, "Could not allocate input frame\n");
277	#endif
278	@@ -655,7 +660,11 @@
279	av_freep(&converted_input_samples[0]);
280	free(converted_input_samples);
281	}
282	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
283	+ av_frame_free (&input_frame);
284	+#else
285	avcodec_free_frame(&input_frame);
286	+#endif
287
288	return ret;
289	}
290	@@ -671,7 +680,12 @@
291	int error;
292
293	/** Create a new frame to store the audio samples. */
294	- if (!(*frame = avcodec_alloc_frame())) {
295	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
296	+ *frame = av_frame_alloc ();
297	+#else
298	+ *frame = avcodec_alloc_frame();
299	+#endif
300	+ if (NULL == *frame) {
301	#if DEBUG
302	fprintf(stderr, "Could not allocate output frame\n");
303	#endif
304	@@ -702,7 +716,11 @@
305	#if DEBUG
306	fprintf(stderr, "Could allocate output frame samples (error '%s')\n", get_error_text(error));
307	#endif
308	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
309	+ av_frame_free (frame);
310	+#else
311	avcodec_free_frame(frame);
312	+#endif
313	return error;
314	}
315
316	@@ -783,17 +801,29 @@
317	#if DEBUG
318	fprintf(stderr, "Could not read data from FIFO\n");
319	#endif
320	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
321	+ av_frame_free (&output_frame);
322	+#else
323	avcodec_free_frame(&output_frame);
324	+#endif
325	return AVERROR_EXIT;
326	}
327
328	/** Encode one frame worth of audio samples. */
329	if (encode_audio_frame(output_frame, output_format_context,
330	output_codec_context, &data_written)) {
331	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
332	+ av_frame_free (&output_frame);
333	+#else
334	avcodec_free_frame(&output_frame);
335	+#endif
336	return AVERROR_EXIT;
337	}
338	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
339	+ av_frame_free (&output_frame);
340	+#else
341	avcodec_free_frame(&output_frame);
342	+#endif
343	return 0;
344	}
345	/** Write the trailer of the output file container. */
346	@@ -907,7 +937,12 @@
347	return;
348	}
349
350	- if (NULL == (frame = avcodec_alloc_frame ()))
351	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
352	+ frame = av_frame_alloc ();
353	+#else
354	+ frame = avcodec_alloc_frame();
355	+#endif
356	+ if (NULL == frame)
357	{
358	#if DEBUG
359	fprintf (stderr,

Lines 1-39 Link Here

(-)textproc/libextractor/files/patch-gentoo_git-00c65df (-39 lines)
1	Obtained from:
2	https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch?id=00c65df99751d235e08fe2f54613dac2eeb2f80b
3
4	From 00c65df99751d235e08fe2f54613dac2eeb2f80b Mon Sep 17 00:00:00 2001
5	From: Andreas Sturmlechner <asturm@gentoo.org>
6	Date: Sat, 17 Jun 2017 22:36:09 +0200
7	Subject: media-libs/libextractor: Fix build with media-gfx/exiv2-0.26
8
9	Gentoo-bug: 621242
10
11	Package-Manager: Portage-2.3.5, Repoman-2.3.1
12
13	--- src/plugins/exiv2_extractor.cc 2013-06-25 13:02:05.000000000 +0200
14	+++ src/plugins/exiv2_extractor.cc 2017-06-10 14:22:57.000000000 +0200
15	@@ -180,7 +180,11 @@
16	*
17	* @return -1 on error
18	*/
19	+#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
20	+ virtual size_t size (void) const;
21	+#else
22	virtual long int size (void) const;
23	+#endif
24
25	/**
26	* Check if file is open.
27	@@ -445,7 +449,11 @@
28	*
29	* @return -1 on error
30	*/
31	-long int
32	+#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
33	+size_t
34	+#else
35	+long int
36	+#endif
37	ExtractorIO::size (void) const
38	{
39	return (long) ec->get_size (ec->cls);

Lines 1-26 Link Here

(-)textproc/libextractor/files/patch-src_plugins_gif__extractor.c (-26 lines)
1	--- src/plugins/gif_extractor.c.orig 2013-06-21 16:00:16 UTC
2	+++ src/plugins/gif_extractor.c
3	@@ -78,7 +78,11 @@ EXTRACTOR_gif_extract_method (struct EXT
4	if (gif_file == NULL \|\| gif_error != 0)
5	{
6	if (gif_file != NULL)
7	+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 \|\| GIFLIB_MAJOR > 5
8	+ EGifCloseFile (gif_file, NULL);
9	+#else
10	EGifCloseFile (gif_file);
11	+#endif
12	return; /* not a GIF */
13	}
14	#endif
15	@@ -133,7 +137,11 @@ EXTRACTOR_gif_extract_method (struct EXT
16	DGifGetExtensionNext(gif_file, &ext)) &&
17	(NULL != ext) ) ; /* keep going */
18	}
19	+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 \|\| GIFLIB_MAJOR > 5
20	+ DGifCloseFile (gif_file, NULL);
21	+#else
22	DGifCloseFile (gif_file);
23	+#endif
24	}
25
26	/* end of gif_extractor.c */