[gentoo-commits] repo/gentoo:master commit in: media-libs/giflib/, media-libs/giflib/files/
commit: 76ebdaa3d46dc8fcc23375cd365039ef272fd74d
Author: David Seifert gentoo org>
AuthorDate: Wed Dec 25 17:43:39 2019 +
Commit: David Seifert gentoo org>
CommitDate: Wed Dec 25 17:43:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ebdaa3
media-libs/giflib: Add patch for GifQuantizeBuffer API
* Patch taken from Archlinux
Bug: https://bugs.gentoo.org/682198
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: David Seifert gentoo.org>
...ib-5.2.1-fix-missing-quantize-API-symbols.patch | 32 ++
...{giflib-5.2.1.ebuild => giflib-5.2.1-r1.ebuild} | 1 +
2 files changed, 33 insertions(+)
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 000..5948f454685
--- /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
+
diff --git a/media-libs/giflib/giflib-5.2.1.ebuild
b/media-libs/giflib/giflib-5.2.1-r1.ebuild
similarity index 96%
rename from media-libs/giflib/giflib-5.2.1.ebuild
rename to media-libs/giflib/giflib-5.2.1-r1.ebuild
index 55389387dae..00d52ae80e3 100644
--- a/media-libs/giflib/giflib-5.2.1.ebuild
+++ b/media-libs/giflib/giflib-5.2.1-r1.ebuild
@@ -18,6 +18,7 @@ DEPEND="doc? ( app-text/xmlto )"
PATCHES=(
"${FILESDIR}"/${PN}-5.1.9-gentoo.patch
+ "${FILESDIR}"/${PN}-5.2.1-fix-missing-quantize-API-symbols.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/giflib/, media-libs/giflib/files/
commit: 9564db86ded70f1d6cb82b4555dab862a2e74450
Author: Lars Wendler gentoo org>
AuthorDate: Fri Mar 29 17:10:54 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Mar 29 17:11:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9564db86
media-libs/giflib: Removed old.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
media-libs/giflib/Manifest| 1 -
media-libs/giflib/files/giflib-5.1.6-gentoo.patch | 16 -
media-libs/giflib/giflib-5.1.7.ebuild | 78 ---
3 files changed, 95 deletions(-)
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 968bc5d2cd3..35697dc45ac 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,6 +1,5 @@
DIST giflib-4.1.6.tar.bz2 506050 BLAKE2B
154c95425a570a822447d1fc5bddbecf31fd81473e18d49fdeb93e72ade7541197fc6147b2d4cdf6857b3326b2f4c40e01f026041369242f4e9fbe892cc8e150
SHA512
f47954218ed7d3415cc195a1031a688fcb7dd2bc2b394491830e6b5f5332903ed7c4433b795cd3da9ac53bfc969fe94bec2a4e66b15c0385c732c01b1b7e5057
DIST giflib-5.0.6.tar.bz2 621073 BLAKE2B
ae162c281755cae4d00bcbd07273f7c7488ae67c42fef819abae1011eddf801bc4525e326417d3e8a036b18b75d7064de59ceda370e5ded956b22d319c67d3a9
SHA512
117e20319f2df32bdf094678cdececad2b6f33a40baff172d4df68ade86547825ebca81186071bff51e60126692df84dbd7bb5cc4877ba68448f7c47a2cc2491
DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B
5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4
SHA512
32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
-DIST giflib-5.1.7.tar.gz 391525 BLAKE2B
d994941f4da324f62a16af973b443660b6cf3ee764e9b7f8c165656037f11d482ccd141e9ac8a81ae1096faa4e264602191ebd039cbf5dd2f55e435aef0ab546
SHA512
b30c3707839a6d66a3e54d92607c303e5ca3d04d6a02d2037fdc8b80386f9a7fa4148727705014481c3c167bdfac2e99d7e4db1ff7f277b64bd2d9193a89f8b0
DIST giflib-5.1.8.tar.gz 419065 BLAKE2B
4a42120758be15e765dae249d98d25164b40e64f933415412420163c0ed7fd6967d3958fff70478d5635a5bb9a6ed397f06ad6de510f2e97de5574b7c68d84d2
SHA512
d390917837a64de1912720ab8968e6b077c6be9f9a2f835faced44420f54d6d55d4e3543b9779ec65d399858856188fea93c170b253d0b83928f15548a14aba3
DIST giflib-5.1.9.tar.gz 385068 BLAKE2B
0c6765eb9a017fee8de28c9440434f3054f87ae65139a3f9f4a41145d4d86dfbd88ece54ea6f40c58054e0ab728a1d346c2f725843bcc34bfd75825e58b8f650
SHA512
b6350b39755e3eeba58b5fccf319bbaeee2db6564e13c8ce44d3652cc32d243c391def74b6b1529bc5e0d4573eff94b2ffa5faa90fc564a049122d3e23f1d184
diff --git a/media-libs/giflib/files/giflib-5.1.6-gentoo.patch
b/media-libs/giflib/files/giflib-5.1.6-gentoo.patch
deleted file mode 100644
index c8432c20584..000
--- a/media-libs/giflib/files/giflib-5.1.6-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
giflib-5.1.6/Makefile
-+++ giflib-5.1.6/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) -o libgif.so $(OBJECTS)
-+ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libgif.so.$(LIBMAJOR) -o
libgif.so $(OBJECTS)
-
- libgif.a: $(OBJECTS) $(HEADERS)
- ar rcs libgif.a $(OBJECTS)
diff --git a/media-libs/giflib/giflib-5.1.7.ebuild
b/media-libs/giflib/giflib-5.1.7.ebuild
deleted file mode 100644
index 9f1609ae182..000
--- a/media-libs/giflib/giflib-5.1.7.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="Library to handle, display and manipulate GIF images"
-HOMEPAGE="https://sourceforge.net/projects/giflib/";
-SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-text/xmlto )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.1.6-gentoo.patch
-)
-
-src_prepare() {
- default
- multilib_copy_sources
-}
-
-multilib_src_compile() {
- # Use reallocarray() from libc if available.
- if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_GNU_SOURCE -o
"${T}/reallocarray_test" -x c - <<< $'#include \nint main() {void *p
= reallocarray(NULL, 0, 0);}' 2> /dev/null; then
- local -x CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE
-DHAVE_REALLOCARRAY"
- sed -e "s/ openbsd-reallocarray\.c//" -i Makefile || die
- rm openbsd-reallocarray.c || die
- fi
-
- emake \
- CC="$(tc-getCC)" \
- CFLAGS="$
[gentoo-commits] repo/gentoo:master commit in: media-libs/giflib/, media-libs/giflib/files/
commit: cfcc540a7836d90b3e1b55cfcdfdffa5c3e4eb1f
Author: Lars Wendler gentoo org>
AuthorDate: Wed Feb 13 22:28:39 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Feb 13 22:41:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfcc540a
media-libs/giflib: Bump to version 5.1.6
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
media-libs/giflib/Manifest| 1 +
media-libs/giflib/files/giflib-5.1.6-gentoo.patch | 16 +
media-libs/giflib/giflib-5.1.6.ebuild | 71 +++
3 files changed, 88 insertions(+)
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 11bcf3685b9..a90902bd860 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,3 +1,4 @@
DIST giflib-4.1.6.tar.bz2 506050 BLAKE2B
154c95425a570a822447d1fc5bddbecf31fd81473e18d49fdeb93e72ade7541197fc6147b2d4cdf6857b3326b2f4c40e01f026041369242f4e9fbe892cc8e150
SHA512
f47954218ed7d3415cc195a1031a688fcb7dd2bc2b394491830e6b5f5332903ed7c4433b795cd3da9ac53bfc969fe94bec2a4e66b15c0385c732c01b1b7e5057
DIST giflib-5.0.6.tar.bz2 621073 BLAKE2B
ae162c281755cae4d00bcbd07273f7c7488ae67c42fef819abae1011eddf801bc4525e326417d3e8a036b18b75d7064de59ceda370e5ded956b22d319c67d3a9
SHA512
117e20319f2df32bdf094678cdececad2b6f33a40baff172d4df68ade86547825ebca81186071bff51e60126692df84dbd7bb5cc4877ba68448f7c47a2cc2491
DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B
5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4
SHA512
32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
+DIST giflib-5.1.6.tar.gz 391894 BLAKE2B
e961236459d7312b41668f19cfb26006af0f0dc1a9741abee3f00d8eeba0dceebe5b03709dfc8170c1b73a6687dd926c5ef92ac2817fe78ab65160e8012d9044
SHA512
a148e3ebee6ad00ac24eb2241e5d7f51c0a22e6e931ebd751ca57b921a2a3d1a17a6d1e0e949ca0401589b539ec1458a57a9e306fadaf03dcd2ec40c11ca28be
diff --git a/media-libs/giflib/files/giflib-5.1.6-gentoo.patch
b/media-libs/giflib/files/giflib-5.1.6-gentoo.patch
new file mode 100644
index 000..c8432c20584
--- /dev/null
+++ b/media-libs/giflib/files/giflib-5.1.6-gentoo.patch
@@ -0,0 +1,16 @@
+--- giflib-5.1.6/Makefile
giflib-5.1.6/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) -o libgif.so $(OBJECTS)
++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libgif.so.$(LIBMAJOR) -o
libgif.so $(OBJECTS)
+
+ libgif.a: $(OBJECTS) $(HEADERS)
+ ar rcs libgif.a $(OBJECTS)
diff --git a/media-libs/giflib/giflib-5.1.6.ebuild
b/media-libs/giflib/giflib-5.1.6.ebuild
new file mode 100644
index 000..decea553a76
--- /dev/null
+++ b/media-libs/giflib/giflib-5.1.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Library to handle, display and manipulate GIF images"
+HOMEPAGE="https://sourceforge.net/projects/giflib/";
+SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs"
+
+DEPEND="doc? ( app-text/xmlto )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.1.6-gentoo.patch
+)
+
+src_prepare() {
+ default
+ multilib_copy_sources
+}
+
+multilib_src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS} -std=gnu99 -fPIC -Wno-format-truncation" \
+ LDFLAGS="${LDFLAGS}" \
+ OFLAGS="" \
+ all
+
+ if use doc && multilib_is_native_abi; then
+ emake -C doc
+ fi
+}
+
+multilib_src_install() {
+ emake \
+ DESTDIR="${ED}" \
+ PREFIX="${EPREFIX}/usr" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ MANDIR="${EPREFIX}/usr/share/man/man1" \
+ install
+
+ if ! use static-libs ; then
+ find "${ED}" -name "*.a" -delete || die
+ fi
+
+ if use doc && multilib_is_native_abi; then
+ docinto html
+ dodoc doc/*.html
+ fi
+}
+
+multilib_src_install_all() {
+ docinto
+ dodoc ChangeLog NEWS README TODO
+ if use doc ; then
+ dodoc doc/*.txt
+ docinto html
+ dodoc -r doc/whatsinagif
+ fi
+}
+
+multilib_src_test() {
+ emake -j1 check
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/giflib/, media-libs/giflib/files/
commit: 563462332a85910db21a6308523177ff9c80afc8
Author: Sebastian Pipping gentoo org>
AuthorDate: Sat Mar 31 15:33:26 2018 +
Commit: Sebastian Pipping gentoo org>
CommitDate: Sat Mar 31 15:35:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56346233
media-libs/giflib: Fix 5.1.4-r1 segfaults
Bug: https://bugs.gentoo.org/651820
Package-Manager: Portage-2.3.26, Repoman-2.3.7
.../files/giflib-5.1.4-reallocarray-export.patch | 23 +++---
...flib-5.1.4-r1.ebuild => giflib-5.1.4-r2.ebuild} | 0
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
b/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
index 08d4f3d3d4e..1c2a433c29c 100644
--- a/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
+++ b/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
@@ -1,4 +1,4 @@
-From 9805c76d4f76c77aad9f285e81f4090cdf661fac Mon Sep 17 00:00:00 2001
+From dfba2b34d35ddfd47233293f2f28978e8acfc87c Mon Sep 17 00:00:00 2001
From: Sebastian Pipping
Date: Wed, 14 Mar 2018 21:18:14 +0100
Subject: [PATCH] Address clash of export reallocarray with glibc
@@ -6,8 +6,8 @@ MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
-.. by not exporting that internal symbol any more,
-and renaming the function in code and where it's used
+.. by renaming the exported symbol and the related
+function in code and where it's used.
Bug: https://bugs.gentoo.org/637438
@@ -21,10 +21,10 @@ Compile error was:
extern void *reallocarray (void *__ptr, size_t __nmemb, size_t __size)
---
lib/dgif_lib.c | 4 ++--
- lib/gif_lib.h | 3 ---
+ lib/gif_lib.h | 2 +-
lib/gifalloc.c | 10 +-
lib/openbsd-reallocarray.c | 2 +-
- 4 files changed, 8 insertions(+), 11 deletions(-)
+ 4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c
index 66a1d6a..f0e0385 100644
@@ -49,19 +49,18 @@ index 66a1d6a..f0e0385 100644
if (sp->RasterBits == NULL) {
diff --git a/lib/gif_lib.h b/lib/gif_lib.h
-index 078930c..7914a69 100644
+index 078930c..cefc3bb 100644
--- a/lib/gif_lib.h
+++ b/lib/gif_lib.h
-@@ -244,9 +244,6 @@ extern ColorMapObject *GifUnionColorMap(const
ColorMapObject *ColorIn1,
- GifPixelType ColorTransIn2[]);
+@@ -245,7 +245,7 @@ extern ColorMapObject *GifUnionColorMap(const
ColorMapObject *ColorIn1,
extern int GifBitSize(int n);
--extern void *
+ extern void *
-reallocarray(void *optr, size_t nmemb, size_t size);
--
++openbsd_reallocarray(void *optr, size_t nmemb, size_t size);
+
/**
Support for the in-core structures allocation (slurp mode).
-
**/
diff --git a/lib/gifalloc.c b/lib/gifalloc.c
index 3b51868..1394cfa 100644
--- a/lib/gifalloc.c
@@ -125,5 +124,5 @@ index aa70686..b922b01 100644
if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
nmemb > 0 && SIZE_MAX / nmemb < size) {
--
-2.16.2
+2.17.0.rc2
diff --git a/media-libs/giflib/giflib-5.1.4-r1.ebuild
b/media-libs/giflib/giflib-5.1.4-r2.ebuild
similarity index 100%
rename from media-libs/giflib/giflib-5.1.4-r1.ebuild
rename to media-libs/giflib/giflib-5.1.4-r2.ebuild
