From f2fc9d6de460a59d2ca4633a80086dc32e24c086 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Tue, 9 Jun 2015 14:25:41 +0000 Subject: multimedia/libvpx: update to 1.4.0 ABI isn't compatible, so bump PORTREVISION in consumers. Changes: https://chromium.googlesource.com/webm/libvpx/+/v1.4.0 Differential Revision: https://reviews.freebsd.org/D2570 Exp-run by: antoine Approved by: ashish, multimedia (kwm) Approved by: maintainer timeout (ale, dinoex; 2 weeks) --- graphics/php56-gd/Makefile | 1 + graphics/php56-gd/files/patch-libgd_webpimg.c | 29 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 graphics/php56-gd/files/patch-libgd_webpimg.c (limited to 'graphics/php56-gd') diff --git a/graphics/php56-gd/Makefile b/graphics/php56-gd/Makefile index 4746215748f7..4979a92bb137 100644 --- a/graphics/php56-gd/Makefile +++ b/graphics/php56-gd/Makefile @@ -1,6 +1,7 @@ # Created by: Alex Dupre # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= graphics MASTERDIR= ${.CURDIR}/../../lang/php56 diff --git a/graphics/php56-gd/files/patch-libgd_webpimg.c b/graphics/php56-gd/files/patch-libgd_webpimg.c new file mode 100644 index 000000000000..d1d74cd0e7a6 --- /dev/null +++ b/graphics/php56-gd/files/patch-libgd_webpimg.c @@ -0,0 +1,29 @@ +Adjust to libvpx 1.4.0 until the code is removed. + +https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d%5E!/ +https://bitbucket.org/libgd/gd-libgd/commits/824a3aa + +--- libgd/webpimg.c.orig 2013-06-25 09:58:23 UTC ++++ libgd/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