Date: Thu, 3 Mar 2016 12:26:16 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410035 - in head/graphics/giflib: . files Message-ID: <201603031226.u23CQGAI032869@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Thu Mar 3 12:26:16 2016 New Revision: 410035 URL: https://svnweb.freebsd.org/changeset/ports/410035 Log: graphics/giflib: Unbreak DF (reallocarray) OSVERSION was used without OPSYS, but it turns out that DragonFly needs a dedicated extra patch due to having a different name for the cdefs macro. Approved by: blankets (restore working DF port/non-invasive DF support) Added: head/graphics/giflib/files/extra-patch-hide-reallocarray-dfly (contents, props changed) Modified: head/graphics/giflib/Makefile Modified: head/graphics/giflib/Makefile ============================================================================== --- head/graphics/giflib/Makefile Thu Mar 3 12:09:26 2016 (r410034) +++ head/graphics/giflib/Makefile Thu Mar 3 12:26:16 2016 (r410035) @@ -30,10 +30,14 @@ BUILD_DEPENDS+= xmlto:${PORTSDIR}/textpr CONFIGURE_ENV+= have_xmlto=no .endif -.if ${OSVERSION} >= 1100072 +.if ${OPSYS} == FreeBSD +. if ${OSVERSION} >= 1100072 EXTRA_PATCHES= ${FILESDIR}/extra-patch-unbundle-reallocarray -.else +. else EXTRA_PATCHES= ${FILESDIR}/extra-patch-hide-reallocarray +. endif +.elif ${OPSYS} == DragonFly +EXTRA_PATCHES= ${FILESDIR}/extra-patch-hide-reallocarray-dfly .endif post-install: Added: head/graphics/giflib/files/extra-patch-hide-reallocarray-dfly ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/giflib/files/extra-patch-hide-reallocarray-dfly Thu Mar 3 12:26:16 2016 (r410035) @@ -0,0 +1,24 @@ +--- lib/dgif_lib.c.orig 2016-01-07 10:44:44 UTC ++++ lib/dgif_lib.c +@@ -41,6 +41,9 @@ static int DGifDecompressInput(GifFileTy + static int DGifBufferedInput(GifFileType *GifFile, GifByteType *Buf, + GifByteType *NextByte); + ++extern void * ++reallocarray(void *optr, size_t nmemb, size_t size) __dso_hidden; ++ + /****************************************************************************** + Open a new GIF file for read, given by its name. + Returns dynamically allocated GifFileType pointer which serves as the GIF +--- lib/gifalloc.c.orig 2015-07-13 04:05:46 UTC ++++ lib/gifalloc.c +@@ -12,6 +12,9 @@ + + #define MAX(x, y) (((x) > (y)) ? (x) : (y)) + ++extern void * ++reallocarray(void *optr, size_t nmemb, size_t size) __dso_hidden; ++ + /****************************************************************************** + Miscellaneous utility functions + ******************************************************************************/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603031226.u23CQGAI032869>