[137007] trunk/dports/graphics/gd2

[ryandesign at macports.org]

Revision: 137007
          https://trac.macports.org/changeset/137007
Author:   ryandesign at macports.org
Date:     2015-06-02 06:55:10 -0700 (Tue, 02 Jun 2015)
Log Message:
-----------
gd2: fix build with upcoming libvpx 1.4+ (#47920)

Modified Paths:
--------------
    trunk/dports/graphics/gd2/Portfile

Added Paths:
-----------
    trunk/dports/graphics/gd2/files/patch-src-webpimg.c.diff

Modified: trunk/dports/graphics/gd2/Portfile
===================================================================
--- trunk/dports/graphics/gd2/Portfile	2015-06-02 13:53:33 UTC (rev 137006)
+++ trunk/dports/graphics/gd2/Portfile	2015-06-02 13:55:10 UTC (rev 137007)
@@ -46,7 +46,8 @@
                             port:libvpx \
                             port:zlib
 
-patchfiles                  patch-src-gdft.c.diff
+patchfiles                  patch-src-gdft.c.diff \
+                            patch-src-webpimg.c.diff
 
 configure.args-append       --with-freetype=${prefix} \
                             --with-fontconfig=${prefix} \

Added: trunk/dports/graphics/gd2/files/patch-src-webpimg.c.diff
===================================================================
--- trunk/dports/graphics/gd2/files/patch-src-webpimg.c.diff	                        (rev 0)
+++ trunk/dports/graphics/gd2/files/patch-src-webpimg.c.diff	2015-06-02 13:55:10 UTC (rev 137007)
@@ -0,0 +1,26 @@
+Fix build with libvpx 1.4+
+https://github.com/libgd/libgd/commit/d41eb72cd4545c394578332e5c102dee69e02ee8
+--- src/webpimg.c.orig	2015-01-06 01:16:03.000000000 -0800
++++ src/webpimg.c	2015-05-31 19:11:49.000000000 -0700
+@@ -711,14 +711,14 @@
+     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);
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150602/6dd358e8/attachment.html>