Attachment #172309 for bug #210913




# $FreeBSD$

PORTNAME=	libgd
PORTVERSION=	2.2.2
PORTREVISION?=	0
PORTEPOCH=	1
CATEGORIES+=	graphics
MASTER_SITES=   https://github.com/${PORTNAME}/${PORTNAME}/releases/download/gd-${PORTVERSION}/
		http://cdn.bitbucket.org/libgd/gd-libgd/downloads/

MAINTAINER?=	dinoex@FreeBSD.org
COMMENT?=	Graphics library for fast creation of images

post-install:
	${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \
		${STAGEDIR}${PREFIX}/include/
	${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 <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1468105350	1	TIMESTAMP = 1468147279
2	SHA256 (libgd-2.1.1.tar.xz) = 9ada1ed45594abc998ebc942cef12b032fbad672e73efc22bc9ff54f5df2b285	2	SHA256 (libgd-2.2.2.tar.xz) = 489f756ce07f0c034b1a794f4d34fdb4d829256112cb3c36feb40bb56b79218c
3	SIZE (libgd-2.1.1.tar.xz) = 2039132	3	SIZE (libgd-2.2.2.tar.xz) = 2105628




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);
 

Lines 28-33 Link Here

(-)pkg-plist (-2 / +2 lines)
28	lib/libgd.a	28	lib/libgd.a
29	lib/libgd.la	29	lib/libgd.la
30	lib/libgd.so	30	lib/libgd.so
31	lib/libgd.so.5	31	lib/libgd.so.6
32	lib/libgd.so.5.0.0	32	lib/libgd.so.6.0.20202
33	libdata/pkgconfig/gdlib.pc	33	libdata/pkgconfig/gdlib.pc

Return to bug 210913

Lines 2-13 Link Here

(-)Makefile (-4 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libgd	4	PORTNAME= libgd
5	PORTVERSION= 2.1.1	5	PORTVERSION= 2.2.2
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES+= graphics	8	CATEGORIES+= graphics
9	MASTER_SITES= https://bitbucket.org/libgd/gd-libgd/downloads/ \	9	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/gd-${PORTVERSION}/
10	http://cdn.bitbucket.org/libgd/gd-libgd/downloads/
11		10
12	MAINTAINER?= dinoex@FreeBSD.org	11	MAINTAINER?= dinoex@FreeBSD.org
13	COMMENT?= Graphics library for fast creation of images	12	COMMENT?= Graphics library for fast creation of images
Lines 99-104 Link Here
99	post-install:	98	post-install:
100	${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \	99	${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \
101	${STAGEDIR}${PREFIX}/include/	100	${STAGEDIR}${PREFIX}/include/
102	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.5	101	${MV} ${STAGEDIR}${PREFIX}/lib/libgd.so.3.0.20202 ${STAGEDIR}${PREFIX}/lib/libgd.so.6.0.20202
		102	${LN} -sf libgd.so.6.0.20202 ${STAGEDIR}${PREFIX}/lib/libgd.so.6
		103	${RM} ${STAGEDIR}${PREFIX}/lib/libgd.so.3
		104	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6.0.20202
103		105
104	.include <bsd.port.mk>	106	.include <bsd.port.mk>

Lines 1-29 Link Here

(-)files/patch-webpimg.c (-29 lines)
1	Adjust to libvpx 1.4.0 until the code is removed.
2
3	https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d%5E!/
4	https://bitbucket.org/libgd/gd-libgd/commits/824a3aa
5
6	--- src/webpimg.c.orig 2013-06-25 09:58:23 UTC
7	+++ src/webpimg.c
8	@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8*
9	codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
10	codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
11
12	- vpx_img_wrap(&img, IMG_FMT_I420,
13	+ vpx_img_wrap(&img, VPX_IMG_FMT_I420,
14	y_width, y_height, 16, (uint8*)(Y));
15	- img.planes[PLANE_Y] = (uint8*)(Y);
16	- img.planes[PLANE_U] = (uint8*)(U);
17	- img.planes[PLANE_V] = (uint8*)(V);
18	- img.stride[PLANE_Y] = y_stride;
19	- img.stride[PLANE_U] = uv_stride;
20	- img.stride[PLANE_V] = uv_stride;
21	+ img.planes[VPX_PLANE_Y] = (uint8*)(Y);
22	+ img.planes[VPX_PLANE_U] = (uint8*)(U);
23	+ img.planes[VPX_PLANE_V] = (uint8*)(V);
24	+ img.stride[VPX_PLANE_Y] = y_stride;
25	+ img.stride[VPX_PLANE_U] = uv_stride;
26	+ img.stride[VPX_PLANE_V] = uv_stride;
27
28	res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);
29