From 583ea2f64c0093f2fc4e4dc242b452849e3909e2 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 2 Aug 2016 18:29:21 +0000 Subject: We welcome the 2.2.3 release around a month after 2.2.2 (we are getting consistent). Another important milestone in the GD 2.2 series. Security related fixes: This flaw is caused by loading data from external sources (file, custom ctx, etc) and are hard to validate before calling libgd APIs: * fix php bug 72339, Integer Overflow in _gd2GetHeader (CVE-2016-5766) * bug 247, A read out-of-bands was found in the parsing of TGA files (CVE-2016-6132) * also bug 247, Buffer over-read issue when parsing crafted TGA file (CVE-2016-6214) * bug 248, fix Out-Of-Bounds Read in read_image_tga Using application provided parameters, in these cases invalid data causes the issues: * Integer overflow error within _gdContributionsAlloc() (CVE-2016-6207) * fix php bug 72494, invalid color index not handled, can lead to crash ( CVE-2016-6128) * improve color check for CropThreshold Important update: * gdImageCopyResampled has been improved. Better handling of images with alpha channel, also brings libgd in sync with php's bundled gd. --- graphics/gd/Makefile | 13 +- graphics/gd/buildlink3.mk | 15 +- graphics/gd/distinfo | 17 +- graphics/gd/options.mk | 12 +- graphics/gd/patches/patch-aa | 25 --- graphics/gd/patches/patch-ab | 266 ------------------------------- graphics/gd/patches/patch-configure | 21 --- graphics/gd/patches/patch-configure.ac | 15 -- graphics/gd/patches/patch-src_gd__bmp.c | 20 --- graphics/gd/patches/patch-src_gd__crop.c | 18 --- graphics/gd/patches/patch-src_webpimg.c | 30 ---- 11 files changed, 18 insertions(+), 434 deletions(-) delete mode 100644 graphics/gd/patches/patch-aa delete mode 100644 graphics/gd/patches/patch-ab delete mode 100644 graphics/gd/patches/patch-configure delete mode 100644 graphics/gd/patches/patch-configure.ac delete mode 100644 graphics/gd/patches/patch-src_gd__bmp.c delete mode 100644 graphics/gd/patches/patch-src_gd__crop.c delete mode 100644 graphics/gd/patches/patch-src_webpimg.c (limited to 'graphics/gd') diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index e5afec11f20..aa6b8d5ded6 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,28 +1,30 @@ -# $NetBSD: Makefile,v 1.110 2016/07/09 06:38:20 wiz Exp $ +# $NetBSD: Makefile,v 1.111 2016/08/02 18:29:21 adam Exp $ -DISTNAME= libgd-2.1.1 +DISTNAME= libgd-2.2.3 PKGNAME= ${DISTNAME:S/libgd/gd/} -PKGREVISION= 4 CATEGORIES= graphics -MASTER_SITES= https://bitbucket.org/libgd/gd-libgd/downloads/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=libgd/} EXTRACT_SUFX= .tar.xz MAINTAINER= adam@NetBSD.org HOMEPAGE= http://libgd.bitbucket.org/ COMMENT= Graphics library for the dynamic creation of images -#WRKSRC= ${WRKDIR}/${DISTNAME:S/libgd-/libgd-gd-/} +GITHUB_PROJECT= libgd +GITHUB_RELEASE= gd-${PKGVERSION_NOREV} .include "options.mk" USE_LIBTOOL= yes USE_TOOLS+= perl:run GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --disable-werror CONFIGURE_ARGS+= --with-fontconfig=${BUILDLINK_PREFIX.fontconfig} CONFIGURE_ARGS+= --with-freetype=${BUILDLINK_PREFIX.freetype2} CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg} CONFIGURE_ARGS+= --with-png=${BUILDLINK_PREFIX.png} CONFIGURE_ARGS+= --with-tiff=${BUILDLINK_PREFIX.tiff} +CONFIGURE_ARGS+= --with-webp=${BUILDLINK_PREFIX.libwebp} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} REPLACE_PERL+= src/bdftogd PTHREAD_AUTO_VARS= yes @@ -31,6 +33,7 @@ PTHREAD_AUTO_VARS= yes .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/libwebp/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk index a8f837154c3..880015a8e9d 100644 --- a/graphics/gd/buildlink3.mk +++ b/graphics/gd/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.36 2015/11/18 14:19:46 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.37 2016/08/02 18:29:21 adam Exp $ BUILDLINK_TREE+= gd @@ -6,18 +6,11 @@ BUILDLINK_TREE+= gd GD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gd+= gd>=2.0.15nb1 -BUILDLINK_ABI_DEPENDS.gd+= gd>=2.1.1nb2 +BUILDLINK_ABI_DEPENDS.gd+= gd>=2.2.3 BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd .include "../../mk/bsd.fast.prefs.mk" -_GD_PRE_LIBVPX_OPTION!= \ - if ${PKG_INFO} -qe 'gd<2.1.0nb1'; then \ - ${ECHO} yes; \ - else \ - ${ECHO} no; \ - fi - pkgbase := gd .include "../../mk/pkg-build-options.mk" @@ -28,11 +21,9 @@ pkgbase := gd .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/libwebp/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" -.if ${_GD_PRE_LIBVPX_OPTION} == "yes" || !empty(PKG_BUILD_OPTIONS.gd:Mlibvpx) -.include "../../multimedia/libvpx/buildlink3.mk" -.endif .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .endif # GD_BUILDLINK3_MK diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo index 2c107afa82d..43590cff930 100644 --- a/graphics/gd/distinfo +++ b/graphics/gd/distinfo @@ -1,13 +1,6 @@ -$NetBSD: distinfo,v 1.40 2016/06/30 09:00:18 taca Exp $ +$NetBSD: distinfo,v 1.41 2016/08/02 18:29:21 adam Exp $ -SHA1 (libgd-2.1.1.tar.xz) = 9038ed488b577d16aa8c32b6c10b4a70b10f7fa1 -RMD160 (libgd-2.1.1.tar.xz) = 8d564caf9a953d344fb9a5e169d241510a2c71f1 -SHA512 (libgd-2.1.1.tar.xz) = 48f444402a4b89e412870f9091b92eb26136c5c0d795722262ad973c7d4103476204a2de36133a2634b8f410d6bccdcf60afb829a74ac2fddfb96aff2cd2567b -Size (libgd-2.1.1.tar.xz) = 2039132 bytes -SHA1 (patch-aa) = 00198349dd9cff60f1f5738524096a251057eb16 -SHA1 (patch-ab) = 300ffacf47d7421fc9efb7b3fd9e93f011de1b4b -SHA1 (patch-configure) = 53769c3daffa38c88d82093f59cb97b4bd38008f -SHA1 (patch-configure.ac) = 72092d5a0ee7944249286edc0d3505176f15303f -SHA1 (patch-src_gd__bmp.c) = 4db300a26cebae6fb6f14564c5648608d7ed6cc5 -SHA1 (patch-src_gd__crop.c) = 34c9716fe40e8f80cc126893dbafa0151bbf3b5a -SHA1 (patch-src_webpimg.c) = 2717cbcfdbbddfc8cd96de2d4f6a07a0485ba086 +SHA1 (libgd-2.2.3.tar.xz) = 2f8cebec5afd6c83a3d5cb92f40ea4926b4daa98 +RMD160 (libgd-2.2.3.tar.xz) = e6c29133c2ea33c8ba16571892d2798ef0f5afea +SHA512 (libgd-2.2.3.tar.xz) = bdc6d086bc054beda6574ec46baa4cd94048a5f2f357f875ba05983e92d247f1b731434b9e438c6aef09d46fa96f1a7e1f330a25a77ffd2dd78aa8a32d652557 +Size (libgd-2.2.3.tar.xz) = 2164152 bytes diff --git a/graphics/gd/options.mk b/graphics/gd/options.mk index 063b162b2b8..df703e21f23 100644 --- a/graphics/gd/options.mk +++ b/graphics/gd/options.mk @@ -1,8 +1,7 @@ -# $NetBSD: options.mk,v 1.4 2015/07/04 16:18:35 joerg Exp $ +# $NetBSD: options.mk,v 1.5 2016/08/02 18:29:21 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gd -PKG_SUPPORTED_OPTIONS= libvpx x11 -PKG_SUGGESTED_OPTIONS= libvpx +PKG_SUPPORTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" @@ -13,10 +12,3 @@ CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.libXpm} .else CONFIGURE_ARGS+= --without-xpm .endif - -.if !empty(PKG_OPTIONS:Mlibvpx) -.include "../../multimedia/libvpx/buildlink3.mk" -CONFIGURE_ARGS+= --with-vpx=${BUILDLINK_PREFIX.libvpx} -.else -CONFIGURE_ARGS+= --without-vpx -.endif diff --git a/graphics/gd/patches/patch-aa b/graphics/gd/patches/patch-aa deleted file mode 100644 index 6f6aa21b2b8..00000000000 --- a/graphics/gd/patches/patch-aa +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-aa,v 1.19 2013/09/02 21:17:42 adam Exp $ - ---- src/entities.h.orig 2013-06-25 09:58:23.000000000 +0000 -+++ src/entities.h -@@ -14,7 +14,11 @@ extern "C" { - static struct entities_s { - char *name; - int value; -- } entities[] = { -+ }; -+ extern struct entities_s entities[]; -+ -+#if 0 -+struct entities_s entities[] = { - {"AElig", 198}, - {"Aacute", 193}, - {"Acirc", 194}, -@@ -268,6 +272,7 @@ extern "C" { - {"zwj", 8205}, - {"zwnj", 8204}, - }; -+#endif - - #define ENTITY_NAME_LENGTH_MAX 8 - #define NR_OF_ENTITIES 252 diff --git a/graphics/gd/patches/patch-ab b/graphics/gd/patches/patch-ab deleted file mode 100644 index 5ce9e8d78e5..00000000000 --- a/graphics/gd/patches/patch-ab +++ /dev/null @@ -1,266 +0,0 @@ -$NetBSD: patch-ab,v 1.10 2013/09/02 21:17:42 adam Exp $ - ---- src/gdft.c.orig 2013-06-25 09:58:23.000000000 +0000 -+++ src/gdft.c -@@ -35,6 +35,261 @@ - #endif - #endif - -+struct entities_s entities[] = { -+ {"AElig", 198}, -+ {"Aacute", 193}, -+ {"Acirc", 194}, -+ {"Agrave", 192}, -+ {"Alpha", 913}, -+ {"Aring", 197}, -+ {"Atilde", 195}, -+ {"Auml", 196}, -+ {"Beta", 914}, -+ {"Ccedil", 199}, -+ {"Chi", 935}, -+ {"Dagger", 8225}, -+ {"Delta", 916}, -+ {"ETH", 208}, -+ {"Eacute", 201}, -+ {"Ecirc", 202}, -+ {"Egrave", 200}, -+ {"Epsilon", 917}, -+ {"Eta", 919}, -+ {"Euml", 203}, -+ {"Gamma", 915}, -+ {"Iacute", 205}, -+ {"Icirc", 206}, -+ {"Igrave", 204}, -+ {"Iota", 921}, -+ {"Iuml", 207}, -+ {"Kappa", 922}, -+ {"Lambda", 923}, -+ {"Mu", 924}, -+ {"Ntilde", 209}, -+ {"Nu", 925}, -+ {"OElig", 338}, -+ {"Oacute", 211}, -+ {"Ocirc", 212}, -+ {"Ograve", 210}, -+ {"Omega", 937}, -+ {"Omicron", 927}, -+ {"Oslash", 216}, -+ {"Otilde", 213}, -+ {"Ouml", 214}, -+ {"Phi", 934}, -+ {"Pi", 928}, -+ {"Prime", 8243}, -+ {"Psi", 936}, -+ {"Rho", 929}, -+ {"Scaron", 352}, -+ {"Sigma", 931}, -+ {"THORN", 222}, -+ {"Tau", 932}, -+ {"Theta", 920}, -+ {"Uacute", 218}, -+ {"Ucirc", 219}, -+ {"Ugrave", 217}, -+ {"Upsilon", 933}, -+ {"Uuml", 220}, -+ {"Xi", 926}, -+ {"Yacute", 221}, -+ {"Yuml", 376}, -+ {"Zeta", 918}, -+ {"aacute", 225}, -+ {"acirc", 226}, -+ {"acute", 180}, -+ {"aelig", 230}, -+ {"agrave", 224}, -+ {"alefsym", 8501}, -+ {"alpha", 945}, -+ {"amp", 38}, -+ {"and", 8743}, -+ {"ang", 8736}, -+ {"aring", 229}, -+ {"asymp", 8776}, -+ {"atilde", 227}, -+ {"auml", 228}, -+ {"bdquo", 8222}, -+ {"beta", 946}, -+ {"brvbar", 166}, -+ {"bull", 8226}, -+ {"cap", 8745}, -+ {"ccedil", 231}, -+ {"cedil", 184}, -+ {"cent", 162}, -+ {"chi", 967}, -+ {"circ", 710}, -+ {"clubs", 9827}, -+ {"cong", 8773}, -+ {"copy", 169}, -+ {"crarr", 8629}, -+ {"cup", 8746}, -+ {"curren", 164}, -+ {"dArr", 8659}, -+ {"dagger", 8224}, -+ {"darr", 8595}, -+ {"deg", 176}, -+ {"delta", 948}, -+ {"diams", 9830}, -+ {"divide", 247}, -+ {"eacute", 233}, -+ {"ecirc", 234}, -+ {"egrave", 232}, -+ {"empty", 8709}, -+ {"emsp", 8195}, -+ {"ensp", 8194}, -+ {"epsilon", 949}, -+ {"equiv", 8801}, -+ {"eta", 951}, -+ {"eth", 240}, -+ {"euml", 235}, -+ {"euro", 8364}, -+ {"exist", 8707}, -+ {"fnof", 402}, -+ {"forall", 8704}, -+ {"frac12", 189}, -+ {"frac14", 188}, -+ {"frac34", 190}, -+ {"frasl", 8260}, -+ {"gamma", 947}, -+ {"ge", 8805}, -+ {"gt", 62}, -+ {"hArr", 8660}, -+ {"harr", 8596}, -+ {"hearts", 9829}, -+ {"hellip", 8230}, -+ {"iacute", 237}, -+ {"icirc", 238}, -+ {"iexcl", 161}, -+ {"igrave", 236}, -+ {"image", 8465}, -+ {"infin", 8734}, -+ {"int", 8747}, -+ {"iota", 953}, -+ {"iquest", 191}, -+ {"isin", 8712}, -+ {"iuml", 239}, -+ {"kappa", 954}, -+ {"lArr", 8656}, -+ {"lambda", 955}, -+ {"lang", 9001}, -+ {"laquo", 171}, -+ {"larr", 8592}, -+ {"lceil", 8968}, -+ {"ldquo", 8220}, -+ {"le", 8804}, -+ {"lfloor", 8970}, -+ {"lowast", 8727}, -+ {"loz", 9674}, -+ {"lrm", 8206}, -+ {"lsaquo", 8249}, -+ {"lsquo", 8216}, -+ {"lt", 60}, -+ {"macr", 175}, -+ {"mdash", 8212}, -+ {"micro", 181}, -+ {"middot", 183}, -+ {"minus", 8722}, -+ {"mu", 956}, -+ {"nabla", 8711}, -+ {"nbsp", 160}, -+ {"ndash", 8211}, -+ {"ne", 8800}, -+ {"ni", 8715}, -+ {"not", 172}, -+ {"notin", 8713}, -+ {"nsub", 8836}, -+ {"ntilde", 241}, -+ {"nu", 957}, -+ {"oacute", 243}, -+ {"ocirc", 244}, -+ {"oelig", 339}, -+ {"ograve", 242}, -+ {"oline", 8254}, -+ {"omega", 969}, -+ {"omicron", 959}, -+ {"oplus", 8853}, -+ {"or", 8744}, -+ {"ordf", 170}, -+ {"ordm", 186}, -+ {"oslash", 248}, -+ {"otilde", 245}, -+ {"otimes", 8855}, -+ {"ouml", 246}, -+ {"para", 182}, -+ {"part", 8706}, -+ {"permil", 8240}, -+ {"perp", 8869}, -+ {"phi", 966}, -+ {"pi", 960}, -+ {"piv", 982}, -+ {"plusmn", 177}, -+ {"pound", 163}, -+ {"prime", 8242}, -+ {"prod", 8719}, -+ {"prop", 8733}, -+ {"psi", 968}, -+ {"quot", 34}, -+ {"rArr", 8658}, -+ {"radic", 8730}, -+ {"rang", 9002}, -+ {"raquo", 187}, -+ {"rarr", 8594}, -+ {"rceil", 8969}, -+ {"rdquo", 8221}, -+ {"real", 8476}, -+ {"reg", 174}, -+ {"rfloor", 8971}, -+ {"rho", 961}, -+ {"rlm", 8207}, -+ {"rsaquo", 8250}, -+ {"rsquo", 8217}, -+ {"sbquo", 8218}, -+ {"scaron", 353}, -+ {"sdot", 8901}, -+ {"sect", 167}, -+ {"shy", 173}, -+ {"sigma", 963}, -+ {"sigmaf", 962}, -+ {"sim", 8764}, -+ {"spades", 9824}, -+ {"sub", 8834}, -+ {"sube", 8838}, -+ {"sum", 8721}, -+ {"sup", 8835}, -+ {"sup1", 185}, -+ {"sup2", 178}, -+ {"sup3", 179}, -+ {"supe", 8839}, -+ {"szlig", 223}, -+ {"tau", 964}, -+ {"there4", 8756}, -+ {"theta", 952}, -+ {"thetasym", 977}, -+ {"thinsp", 8201}, -+ {"thorn", 254}, -+ {"tilde", 732}, -+ {"times", 215}, -+ {"trade", 8482}, -+ {"uArr", 8657}, -+ {"uacute", 250}, -+ {"uarr", 8593}, -+ {"ucirc", 251}, -+ {"ugrave", 249}, -+ {"uml", 168}, -+ {"upsih", 978}, -+ {"upsilon", 965}, -+ {"uuml", 252}, -+ {"weierp", 8472}, -+ {"xi", 958}, -+ {"yacute", 253}, -+ {"yen", 165}, -+ {"yuml", 255}, -+ {"zeta", 950}, -+ {"zwj", 8205}, -+ {"zwnj", 8204}, -+}; -+ - /* number of antialised colors for indexed bitmaps */ - #define GD_NUMCOLORS 8 - diff --git a/graphics/gd/patches/patch-configure b/graphics/gd/patches/patch-configure deleted file mode 100644 index efe55c33d88..00000000000 --- a/graphics/gd/patches/patch-configure +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-configure,v 1.1 2015/09/25 05:19:25 richard Exp $ -update gdlib-config version info ---- configure.orig 2015-01-08 05:12:18.000000000 +0000 -+++ configure -@@ -740,6 +740,8 @@ INSTALL_SCRIPT - INSTALL_PROGRAM - FEATURES - GDLIB_AGE -+GDLIB_MAJOR -+GDLIB_MINOR - GDLIB_REVISION - GDLIB_CURRENT - host_os -@@ -2426,7 +2428,6 @@ GDLIB_VERSION=2.1.1 - # See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info - - GDLIB_CURRENT=3 --GDLIB_REVISION=0 - GDLIB_AGE=0 - - diff --git a/graphics/gd/patches/patch-configure.ac b/graphics/gd/patches/patch-configure.ac deleted file mode 100644 index f14693dcb45..00000000000 --- a/graphics/gd/patches/patch-configure.ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-configure.ac,v 1.1 2015/09/25 05:19:25 richard Exp $ -update gdlib-config version info ---- configure.ac.orig 2015-01-06 09:16:03.000000000 +0000 -+++ configure.ac -@@ -32,8 +32,9 @@ GDLIB_VERSION=gd_PKG_VERSION - # See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info - - GDLIB_CURRENT=3 --GDLIB_REVISION=0 - GDLIB_AGE=0 -+AC_SUBST(GDLIB_MAJOR) -+AC_SUBST(GDLIB_MINOR) - AC_SUBST(GDLIB_CURRENT) - AC_SUBST(GDLIB_REVISION) - AC_SUBST(GDLIB_AGE) diff --git a/graphics/gd/patches/patch-src_gd__bmp.c b/graphics/gd/patches/patch-src_gd__bmp.c deleted file mode 100644 index d0576162014..00000000000 --- a/graphics/gd/patches/patch-src_gd__bmp.c +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-src_gd__bmp.c,v 1.2 2013/11/11 21:34:40 dholland Exp $ - -Don't use ceill(); it isn't remotely needed here (it is probably a -typo) and causes build failure on platforms where it isn't available. -See PR 48334. - -upstream report: -https://bitbucket.org/libgd/gd-libgd/issue/98/gd_bmpc-use-of-both-ceil-and-ceill - ---- src/gd_bmp.c~ 2013-06-25 09:58:23.000000000 +0000 -+++ src/gd_bmp.c -@@ -792,7 +792,7 @@ static int bmp_read_1bit(gdImagePtr im, - } - - /* The line must be divisible by 4, else its padded with NULLs */ -- padding = ((int)ceill(0.1 * info->width)) % 4; -+ padding = ((int)ceil(0.1 * info->width)) % 4; - if (padding) { - padding = 4 - padding; - } diff --git a/graphics/gd/patches/patch-src_gd__crop.c b/graphics/gd/patches/patch-src_gd__crop.c deleted file mode 100644 index 254b9272558..00000000000 --- a/graphics/gd/patches/patch-src_gd__crop.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-src_gd__crop.c,v 1.1 2016/06/30 09:00:18 taca Exp $ - -Fix for CVE-2016-6128 from -https://github.com/libgd/libgd/commit/1ccfe21e14c4d18336f9da8515cd17db88c3de61. - ---- src/gd_crop.c.orig 2015-01-06 09:16:03.000000000 +0000 -+++ src/gd_crop.c -@@ -136,6 +136,10 @@ BGD_DECLARE(gdImagePtr) gdImageCropThres - return NULL; - } - -+ if (color < 0 || (!gdImageTrueColor(im) && color >= gdImageColorsTotal(im))) { -+ return NULL; -+ } -+ - /* TODO: Add gdImageGetRowPtr and works with ptr at the row level - * for the true color and palette images - * new formats will simply work with ptr diff --git a/graphics/gd/patches/patch-src_webpimg.c b/graphics/gd/patches/patch-src_webpimg.c deleted file mode 100644 index 2d0b00dec61..00000000000 --- a/graphics/gd/patches/patch-src_webpimg.c +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-src_webpimg.c,v 1.1 2015/06/30 10:20:11 ryoon Exp $ - -Fix build with libvpx-1.4.0. - -https://github.com/libgd/libgd/commit/d41eb72cd4545c394578332e5c102dee69e02ee8#diff-6df10f67563acb6f093f2d9fe3549f08 - ---- src/webpimg.c.orig 2015-01-14 03:09:04.000000000 +0000 -+++ src/webpimg.c -@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8* - codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0); - codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2); - -- vpx_img_wrap(&img, IMG_FMT_I420, -+ vpx_img_wrap(&img, VPX_IMG_FMT_I420, - y_width, y_height, 16, (uint8*)(Y)); -- img.planes[PLANE_Y] = (uint8*)(Y); -- img.planes[PLANE_U] = (uint8*)(U); -- img.planes[PLANE_V] = (uint8*)(V); -- img.stride[PLANE_Y] = y_stride; -- img.stride[PLANE_U] = uv_stride; -- img.stride[PLANE_V] = uv_stride; -+ img.planes[VPX_PLANE_Y] = (uint8*)(Y); -+ img.planes[VPX_PLANE_U] = (uint8*)(U); -+ img.planes[VPX_PLANE_V] = (uint8*)(V); -+ img.stride[VPX_PLANE_Y] = y_stride; -+ img.stride[VPX_PLANE_U] = uv_stride; -+ img.stride[VPX_PLANE_V] = uv_stride; - - res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY); - -- cgit v1.2.3