From e807e07bfa22eefd5aebf13498c1df16c90afb0a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 24 May 2015 09:37:12 +0200 Subject: [PATCH 1/3] Fixed Bug #69479 GD fails to build with newer libvpx From upstream https://github.com/libgd/libgd/commit/d41eb72cd4545c394578332e5c102dee69e02ee8 Fix build with latest libvpx 1.4.0 These new constants exist at least since 1.0.0 Compatibility ones have been droped in 1.4.0 --- ext/gd/libgd/webpimg.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ext/gd/libgd/webpimg.c b/ext/gd/libgd/webpimg.c index 01bef93c48c..1ea349586df 100644 --- a/ext/gd/libgd/webpimg.c +++ b/ext/gd/libgd/webpimg.c @@ -706,14 +706,14 @@ static WebPResult VPXEncode(const uint8* Y, 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); From 4cab20bbb4e6ef7d9d26bbe992dab2509d106ac3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 24 May 2015 09:39:03 +0200 Subject: [PATCH 2/3] NEWS --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 0e0af2c3626..d7579e473d3 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,9 @@ PHP NEWS . Fixed bug #69628 (complex GLOB_BRACE fails on Windows). (Christoph M. Becker) +- GD: + . Fixed bug #69479 (GD fails to build with newer libvpx). (Remi) + - Iconv: . Fixed bug #48147 (iconv with //IGNORE cuts the string). (Stas) From c630779648a3fd34d684e230527059403b06464c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 24 May 2015 09:39:44 +0200 Subject: [PATCH 3/3] NEWS --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 5bbcfc2ea95..5ba7298a099 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,9 @@ PHP NEWS . Fixed POST data processing slowdown due to small input buffer size on Windows. (Jorge Oliveira, Anatol) +- GD: + . Fixed bug #69479 (GD fails to build with newer libvpx). (Remi) + - Iconv: . Fixed bug #48147 (iconv with //IGNORE cuts the string). (Stas)