From 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 13 Mar 2018 16:55:35 +0000 Subject: gentoo resync : 13.03.2018 --- .../files/libextractor-1.3-exiv2-0.26.patch | 27 ----------- .../files/libextractor-1.3-ffmpeg-2.9.patch | 52 ---------------------- .../files/libextractor-1.3-giflib-5.patch | 37 --------------- 3 files changed, 116 deletions(-) delete mode 100644 media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch delete mode 100644 media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch delete mode 100644 media-libs/libextractor/files/libextractor-1.3-giflib-5.patch (limited to 'media-libs/libextractor/files') diff --git a/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch b/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch deleted file mode 100644 index b6e0b41773b3..000000000000 --- a/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/src/plugins/exiv2_extractor.cc 2013-06-25 13:02:05.000000000 +0200 -+++ b/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); diff --git a/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch b/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch deleted file mode 100644 index d9e50b698ac8..000000000000 --- a/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch +++ /dev/null @@ -1,52 +0,0 @@ -Description: Replace deprecated FFmpeg API -Author: Andreas Cadhalpun -Last-Update: <2015-11-28> - ---- libextractor-1.3.orig/src/plugins/thumbnailffmpeg_extractor.c -+++ libextractor-1.3/src/plugins/thumbnailffmpeg_extractor.c -@@ -153,7 +153,7 @@ seek_cb (void *opaque, - 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 +189,7 @@ create_thumbnail (int src_width, int src - if (NULL == - (scaler_ctx = - sws_getContext (src_width, src_height, src_pixfmt, -- dst_width, dst_height, PIX_FMT_RGB24, -+ dst_width, dst_height, AV_PIX_FMT_RGB24, - SWS_BILINEAR, NULL, NULL, NULL))) - { - #if DEBUG -@@ -214,7 +214,7 @@ create_thumbnail (int src_width, int src - return 0; - } - if (NULL == (dst_buffer = -- av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height)))) -+ av_malloc (avpicture_get_size (AV_PIX_FMT_RGB24, dst_width, dst_height)))) - { - #if DEBUG - fprintf (stderr, -@@ -229,7 +229,7 @@ create_thumbnail (int src_width, int src - return 0; - } - avpicture_fill ((AVPicture *) dst_frame, dst_buffer, -- PIX_FMT_RGB24, dst_width, dst_height); -+ AV_PIX_FMT_RGB24, dst_width, dst_height); - sws_scale (scaler_ctx, - src_data, - src_stride, -@@ -272,7 +272,7 @@ create_thumbnail (int src_width, int src - } - 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 = AV_PIX_FMT_RGB24; - opts = NULL; - if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0) - { - diff --git a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch deleted file mode 100644 index 4893f9784a58..000000000000 --- a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://bugs.gentoo.org/571902 - ------------------------------------------------------------------------- -r34095 | LRN | 2014-07-31 10:58:51 -0400 (Thu, 31 Jul 2014) | 1 line - -Add giflib-5.1.0 compatibility - -Index: src/plugins/gif_extractor.c -=================================================================== ---- a/src/plugins/gif_extractor.c (revision 34094) -+++ b/src/plugins/gif_extractor.c (revision 34095) -@@ -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 - EGifCloseFile (gif_file); -+#else -+ EGifCloseFile (gif_file, NULL); -+#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 defined (GIF_LIB_VERSION) || GIFLIB_MAJOR < 5 || GIFLIB_MINOR < 1 - DGifCloseFile (gif_file); -+#else -+ DGifCloseFile (gif_file, NULL); -+#endif - } - - /* end of gif_extractor.c */ - ------------------------------------------------------------------------- -- cgit v1.2.3