Index: Makefile =================================================================== --- Makefile (revision 418309) +++ Makefile (working copy) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= libgd -PORTVERSION= 2.1.1 +PORTVERSION= 2.2.2 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES+= graphics -MASTER_SITES= https://bitbucket.org/libgd/gd-libgd/downloads/ \ - http://cdn.bitbucket.org/libgd/gd-libgd/downloads/ +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/gd-${PORTVERSION}/ MAINTAINER?= dinoex@FreeBSD.org COMMENT?= Graphics library for fast creation of images @@ -99,6 +98,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \ ${STAGEDIR}${PREFIX}/include/ - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.5 + ${MV} ${STAGEDIR}${PREFIX}/lib/libgd.so.3.0.20202 ${STAGEDIR}${PREFIX}/lib/libgd.so.6.0.20202 + ${LN} -sf libgd.so.6.0.20202 ${STAGEDIR}${PREFIX}/lib/libgd.so.6 + ${RM} ${STAGEDIR}${PREFIX}/lib/libgd.so.3 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6.0.20202 .include Index: distinfo =================================================================== --- distinfo (revision 418309) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1468105350 -SHA256 (libgd-2.1.1.tar.xz) = 9ada1ed45594abc998ebc942cef12b032fbad672e73efc22bc9ff54f5df2b285 -SIZE (libgd-2.1.1.tar.xz) = 2039132 +TIMESTAMP = 1468147279 +SHA256 (libgd-2.2.2.tar.xz) = 489f756ce07f0c034b1a794f4d34fdb4d829256112cb3c36feb40bb56b79218c +SIZE (libgd-2.2.2.tar.xz) = 2105628 Index: files/patch-webpimg.c =================================================================== --- files/patch-webpimg.c (revision 418309) +++ files/patch-webpimg.c (working copy) @@ -1,29 +0,0 @@ -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 - ---- src/webpimg.c.orig 2013-06-25 09:58:23 UTC -+++ 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); - Index: pkg-plist =================================================================== --- pkg-plist (revision 418309) +++ pkg-plist (working copy) @@ -28,6 +28,6 @@ lib/libgd.a lib/libgd.la lib/libgd.so -lib/libgd.so.5 -lib/libgd.so.5.0.0 +lib/libgd.so.6 +lib/libgd.so.6.0.20202 libdata/pkgconfig/gdlib.pc