From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- media-libs/giflib/files/giflib-4.1.6-gif2rle.patch | 18 ------------ .../giflib-4.1.6-giffix-null-Extension-fix.patch | 15 ---------- media-libs/giflib/files/giflib-5.1.8-gentoo.patch | 16 ----------- ...ib-5.2.1-fix-missing-quantize-API-symbols.patch | 32 ++++++++++++++++++++++ 4 files changed, 32 insertions(+), 49 deletions(-) delete mode 100644 media-libs/giflib/files/giflib-4.1.6-gif2rle.patch delete mode 100644 media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch delete mode 100644 media-libs/giflib/files/giflib-5.1.8-gentoo.patch create mode 100644 media-libs/giflib/files/giflib-5.2.1-fix-missing-quantize-API-symbols.patch (limited to 'media-libs/giflib/files') diff --git a/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch b/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch deleted file mode 100644 index 95334016648e..000000000000 --- a/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://sourceforge.net/tracker/index.php?func=detail&aid=1829712&group_id=102202&atid=631304 - ---- giflib/util/gif2rle.c -+++ giflib/util/gif2rle.c -@@ -222,11 +222,8 @@ - ColorMap = (GifFile->Image.ColorMap ? - GifFile->Image.ColorMap->Colors : - GifFile->SColorMap->Colors); -- if (ColorMap == NULL) { -- fprintf(stderr, "Gif Image does not have a colormap\n"); -- exit(EXIT_FAILURE); -- } -- ColorMapSize = 1 << ColorMap->BitsPerPixel; -+ ColorMapSize = 1 << (GifFile->Image.ColorMap ? GifFile->Image.ColorMap->BitsPerPixel : -+ GifFile->SColorMap->BitsPerPixel); - DumpScreen2Rle(ScreenBuffer, GifFile->SWidth, GifFile->SHeight); - - if (DGifCloseFile(GifFile) == GIF_ERROR) { diff --git a/media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch b/media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch deleted file mode 100644 index 3e99e66c0d15..000000000000 --- a/media-libs/giflib/files/giflib-4.1.6-giffix-null-Extension-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru giflib-4.1.6/util/giffix.c giflib-4.1.6.new/util/giffix.c ---- giflib-4.1.6/util/giffix.c 2005-10-09 23:22:23.000000000 -0700 -+++ giflib-4.1.6.new/util/giffix.c 2008-09-04 14:00:41.000000000 -0700 -@@ -181,8 +181,8 @@ - /* Skip any extension blocks in file: */ - if (DGifGetExtension(GifFileIn, &ExtCode, &Extension) == GIF_ERROR) - QuitGifError(GifFileIn, GifFileOut); -- if (EGifPutExtension(GifFileOut, ExtCode, Extension[0], -- Extension) == GIF_ERROR) -+ if (Extension && EGifPutExtension(GifFileOut, ExtCode, -+ Extension[0], Extension) == GIF_ERROR) - QuitGifError(GifFileIn, GifFileOut); - - /* No support to more than one extension blocks, so discard: */ - diff --git a/media-libs/giflib/files/giflib-5.1.8-gentoo.patch b/media-libs/giflib/files/giflib-5.1.8-gentoo.patch deleted file mode 100644 index 90a72685d343..000000000000 --- a/media-libs/giflib/files/giflib-5.1.8-gentoo.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- giflib-5.1.8/Makefile -+++ giflib-5.1.8/Makefile -@@ -61,12 +61,11 @@ - LDLIBS=libgif.a -lm - - all: libgif.so libgif.a $(UTILS) -- $(MAKE) -C doc - - $(UTILS):: libgif.a - - libgif.so: $(OBJECTS) $(HEADERS) -- $(CC) $(CFLAGS) -shared $(OFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) -+ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) - - libgif.a: $(OBJECTS) $(HEADERS) - $(AR) rcs libgif.a $(OBJECTS) diff --git a/media-libs/giflib/files/giflib-5.2.1-fix-missing-quantize-API-symbols.patch b/media-libs/giflib/files/giflib-5.2.1-fix-missing-quantize-API-symbols.patch new file mode 100644 index 000000000000..5948f4546858 --- /dev/null +++ b/media-libs/giflib/files/giflib-5.2.1-fix-missing-quantize-API-symbols.patch @@ -0,0 +1,32 @@ +From ff8d9a59e79b79657e64430730c35835a84db619 Mon Sep 17 00:00:00 2001 +From: anthraxx +Date: Tue, 2 Apr 2019 11:46:18 +0200 +Subject: [PATCH] fix missing quantize API symbols + +GifQuantizeBuffer is required by many libs and applications +like mplayer, libgdiplus (mono) and others. +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index e4ded69..17d0a5c 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,11 +29,11 @@ LIBPOINT=0 + LIBVER=$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT) + + SOURCES = dgif_lib.c egif_lib.c gifalloc.c gif_err.c gif_font.c \ +- gif_hash.c openbsd-reallocarray.c ++ gif_hash.c openbsd-reallocarray.c quantize.c + HEADERS = gif_hash.h gif_lib.h gif_lib_private.h + OBJECTS = $(SOURCES:.c=.o) + +-USOURCES = qprintf.c quantize.c getarg.c ++USOURCES = qprintf.c getarg.c + UHEADERS = getarg.h + UOBJECTS = $(USOURCES:.c=.o) + +-- +2.21.0 + -- cgit v1.2.3