diff options
Diffstat (limited to 'graphics')
33 files changed, 142 insertions, 61 deletions
diff --git a/graphics/a2png/Makefile b/graphics/a2png/Makefile index 7239019..982118e 100644 --- a/graphics/a2png/Makefile +++ b/graphics/a2png/Makefile @@ -3,7 +3,7 @@ PORTNAME= a2png PORTVERSION= 0.1.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile index 6d6b20c..5917a92 100644 --- a/graphics/dataplot/Makefile +++ b/graphics/dataplot/Makefile @@ -3,7 +3,7 @@ PORTNAME= dataplot PORTVERSION= 20132012 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.nist.gov/pub/dataplot/unix/:source \ LOCAL/beech:source \ diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile index d9047ed..0548df5 100644 --- a/graphics/fly/Makefile +++ b/graphics/fly/Makefile @@ -3,7 +3,7 @@ PORTNAME= fly PORTVERSION= 2.0.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://fossies.org/unix/www/ \ http://martin.gleeson.com/fly/dist/ diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile index 6fd1fdb..ec41706 100644 --- a/graphics/g2/Makefile +++ b/graphics/g2/Makefile @@ -3,7 +3,7 @@ PORTNAME= g2 PORTVERSION= 0.40 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= SUNSITE/libs/graphics diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 0ca0490..6322a70 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -2,28 +2,29 @@ # $FreeBSD$ PORTNAME= libgd -PORTVERSION= 2.1.0 -PORTREVISION?= 7 +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 +LICENSE= MIT + LIB_DEPENDS= libtiff.so:graphics/tiff \ libpng.so:graphics/png \ libfreetype.so:print/freetype2 CONFLICTS= bazaar-1.* -USES= jpeg libtool:keepla pathfix pkgconfig shebangfix tar:xz +USES= tar:xz pkgconfig pathfix libtool:keepla shebangfix jpeg SHEBANG_FILES= ${WRKSRC}/src/bdftogd GNU_CONFIGURE= yes USE_LDCONFIG= yes -OPTIONS_DEFINE= FONTCONFIG ICONV VPX XPM +OPTIONS_DEFINE= FONTCONFIG ICONV VPX XPM WEBP OPTIONS_DEFAULT=FONTCONFIG NO_OPTIONS_SORT=yes FONTCONFIG_LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig @@ -35,6 +36,9 @@ VPX_CONFIGURE_OFF= --without-vpx XPM_USE= xorg=xpm,x11 XPM_CONFIGURE_ON= --with-x XPM_CONFIGURE_OFF= --with-xpm=no +WEBP_LIB_DEPENDS= libwebp.so:graphics/webp +WEBP_CONFIGURE_OFF= --without-webp +WEBP_BROKEN= circular dependencies .include <bsd.port.options.mk> @@ -99,6 +103,6 @@ pre-build: post-install: ${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \ ${STAGEDIR}${PREFIX}/include/ - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.5 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6.0.20202 .include <bsd.port.mk> diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo index 5a470af..d8f3527 100644 --- a/graphics/gd/distinfo +++ b/graphics/gd/distinfo @@ -1,2 +1,3 @@ -SHA256 (libgd-2.1.0.tar.xz) = fa6665dfe3d898019671293c84d77067a3d2ede50884dbcb6df899d508370e5a -SIZE (libgd-2.1.0.tar.xz) = 2004304 +TIMESTAMP = 1468106153 +SHA256 (libgd-2.2.2.tar.xz) = 489f756ce07f0c034b1a794f4d34fdb4d829256112cb3c36feb40bb56b79218c +SIZE (libgd-2.2.2.tar.xz) = 2105628 diff --git a/graphics/gd/files/patch-configure b/graphics/gd/files/patch-configure new file mode 100644 index 0000000..2136100 --- /dev/null +++ b/graphics/gd/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.bak 2016-06-24 07:52:14.000000000 +0200 ++++ configure 2016-07-10 01:24:57.924934000 +0200 +@@ -2463,7 +2463,7 @@ + # Dynamic library version information + # See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info + +-GDLIB_LT_CURRENT=3 ++GDLIB_LT_CURRENT=6 + GDLIB_LT_REVISION=$(printf '%i%02i%02i' $GDLIB_MAJOR $GDLIB_MINOR $GDLIB_REVISION) + GDLIB_LT_AGE=0 + diff --git a/graphics/gd/files/patch-gd_tga.c b/graphics/gd/files/patch-gd_tga.c new file mode 100644 index 0000000..aacc04d --- /dev/null +++ b/graphics/gd/files/patch-gd_tga.c @@ -0,0 +1,88 @@ +--- src/gd_tga.c.orig 2016-07-18 19:23:11 UTC ++++ src/gd_tga.c +@@ -99,7 +99,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFro + if (tga->bits == TGA_BPP_24) { + *tpix = gdTrueColor(tga->bitmap[bitmap_caret + 2], tga->bitmap[bitmap_caret + 1], tga->bitmap[bitmap_caret]); + bitmap_caret += 3; +- } else if (tga->bits == TGA_BPP_32 || tga->alphabits) { ++ } else if (tga->bits == TGA_BPP_32 && tga->alphabits) { + register int a = tga->bitmap[bitmap_caret + 3]; + + *tpix = gdTrueColorAlpha(tga->bitmap[bitmap_caret + 2], tga->bitmap[bitmap_caret + 1], tga->bitmap[bitmap_caret], gdAlphaMax - (a >> 1)); +@@ -159,16 +159,13 @@ int read_header_tga(gdIOCtx *ctx, oTga * + printf("wxh: %i %i\n", tga->width, tga->height); + #endif + +- switch(tga->bits) { +- case 8: +- case 16: +- case 24: +- case 32: +- break; +- default: +- gd_error("bps %i not supported", tga->bits); ++ if (!((tga->bits == TGA_BPP_24 && tga->alphabits == 0) ++ || (tga->bits == TGA_BPP_32 && tga->alphabits == 8))) ++ { ++ gd_error_ex(GD_WARNING, "gd-tga: %u bits per pixel with %u alpha bits not supported\n", ++ tga->bits, tga->alphabits); ++ + return -1; +- break; + } + + tga->ident = NULL; +@@ -285,14 +285,23 @@ int read_image_tga( gdIOCtx *ctx, oTga * + buffer_caret = 0; + + while( bitmap_caret < image_block_size ) { +- ++ + if ((decompression_buffer[buffer_caret] & TGA_RLE_FLAG) == TGA_RLE_FLAG) { + encoded_pixels = ( ( decompression_buffer[ buffer_caret ] & 127 ) + 1 ); + buffer_caret++; + +- for (i = 0; i < encoded_pixels; i++) { +- for (j = 0; j < pixel_block_size; j++, bitmap_caret++) { +- tga->bitmap[ bitmap_caret ] = decompression_buffer[ buffer_caret + j ]; ++ if (encoded_pixels != 0) { ++ ++ if (!((buffer_caret + (encoded_pixels * pixel_block_size)) < image_block_size)) { ++ gdFree( decompression_buffer ); ++ gdFree( conversion_buffer ); ++ return -1; ++ } ++ ++ for (i = 0; i < encoded_pixels; i++) { ++ for (j = 0; j < pixel_block_size; j++, bitmap_caret++) { ++ tga->bitmap[ bitmap_caret ] = decompression_buffer[ buffer_caret + j ]; ++ } + } + } + buffer_caret += pixel_block_size; +@@ -300,11 +309,20 @@ int read_image_tga( gdIOCtx *ctx, oTga * + encoded_pixels = decompression_buffer[ buffer_caret ] + 1; + buffer_caret++; + +- for (i = 0; i < encoded_pixels; i++) { +- for( j = 0; j < pixel_block_size; j++, bitmap_caret++ ) { +- tga->bitmap[ bitmap_caret ] = decompression_buffer[ buffer_caret + j ]; ++ if (encoded_pixels != 0) { ++ ++ if (!((buffer_caret + (encoded_pixels * pixel_block_size)) < image_block_size)) { ++ gdFree( decompression_buffer ); ++ gdFree( conversion_buffer ); ++ return -1; ++ } ++ ++ for (i = 0; i < encoded_pixels; i++) { ++ for( j = 0; j < pixel_block_size; j++, bitmap_caret++ ) { ++ tga->bitmap[ bitmap_caret ] = decompression_buffer[ buffer_caret + j ]; ++ } ++ buffer_caret += pixel_block_size; + } +- buffer_caret += pixel_block_size; + } + } + } + diff --git a/graphics/gd/files/patch-webpimg.c b/graphics/gd/files/patch-webpimg.c deleted file mode 100644 index 2b62d09..0000000 --- a/graphics/gd/files/patch-webpimg.c +++ /dev/null @@ -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); - diff --git a/graphics/gd/pkg-plist b/graphics/gd/pkg-plist index 6018d10..3481a12 100644 --- a/graphics/gd/pkg-plist +++ b/graphics/gd/pkg-plist @@ -28,6 +28,6 @@ include/gdpp.h 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 diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile index 04ecfce..0aa4bb9 100644 --- a/graphics/gdchart/Makefile +++ b/graphics/gdchart/Makefile @@ -3,7 +3,7 @@ PORTNAME= gdchart PORTVERSION= 0.11.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= http://www.fred.net/brv/chart/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ diff --git a/graphics/gdtclft/Makefile b/graphics/gdtclft/Makefile index 20e29be..b1ac604 100644 --- a/graphics/gdtclft/Makefile +++ b/graphics/gdtclft/Makefile @@ -3,7 +3,7 @@ PORTNAME= Gdtclft PORTVERSION= 2.2.5 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics tcl MASTER_SITES= http://BSDforge.com/projects/source/graphics/gdtclft/ DISTNAME= ${PORTNAME}${PORTVERSION} diff --git a/graphics/grads/Makefile b/graphics/grads/Makefile index 66ab482..24d92f6 100644 --- a/graphics/grads/Makefile +++ b/graphics/grads/Makefile @@ -3,7 +3,7 @@ PORTNAME= grads PORTVERSION= 1.9b4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics science math MASTER_SITES= ftp://grads.iges.org/grads/1.9/:src \ ftp://cola.gmu.edu/grads/1.9/:src \ diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index e7cea29..69aabb69 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -3,7 +3,7 @@ PORTNAME= graphviz PORTVERSION= 2.38.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics tk MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index 1909c2c..d02ff0b 100644 --- a/graphics/libgphoto2/Makefile +++ b/graphics/libgphoto2/Makefile @@ -3,6 +3,7 @@ PORTNAME= libgphoto2 PORTVERSION= 2.5.10 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/gphoto/libgphoto/${PORTVERSION} diff --git a/graphics/libpuzzle/Makefile b/graphics/libpuzzle/Makefile index 0bfc5d5..8631d08 100644 --- a/graphics/libpuzzle/Makefile +++ b/graphics/libpuzzle/Makefile @@ -2,7 +2,7 @@ PORTNAME= libpuzzle PORTVERSION= 0.11 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/releases/ diff --git a/graphics/libsixel/Makefile b/graphics/libsixel/Makefile index f4c24b7..08a1560 100644 --- a/graphics/libsixel/Makefile +++ b/graphics/libsixel/Makefile @@ -2,6 +2,7 @@ PORTNAME= libsixel PORTVERSION= 1.6.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= graphics diff --git a/graphics/lua-gd/Makefile b/graphics/lua-gd/Makefile index fa00e35..983550b 100644 --- a/graphics/lua-gd/Makefile +++ b/graphics/lua-gd/Makefile @@ -3,7 +3,7 @@ PORTNAME= lua-gd PORTVERSION= 2.0.33r2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://files.luaforge.net/releases/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}forLua5.1/ diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile index 02cbe9d..59f2273 100644 --- a/graphics/mapserver/Makefile +++ b/graphics/mapserver/Makefile @@ -3,7 +3,7 @@ PORTNAME= mapserver PORTVERSION= 7.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics www geography MASTER_SITES= http://download.osgeo.org/mapserver/ diff --git a/graphics/mscgen/Makefile b/graphics/mscgen/Makefile index d1b96cb..3481dc6 100644 --- a/graphics/mscgen/Makefile +++ b/graphics/mscgen/Makefile @@ -3,7 +3,7 @@ PORTNAME= mscgen PORTVERSION= 0.20 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://www.mcternan.me.uk/mscgen/software/ \ http://romain.blogreen.org/distfiles/ diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile index a3684ca..2b44df0 100644 --- a/graphics/p5-GD/Makefile +++ b/graphics/p5-GD/Makefile @@ -2,7 +2,7 @@ PORTNAME= GD PORTVERSION= 2.56 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/php-libpuzzle/Makefile b/graphics/php-libpuzzle/Makefile index f5c1c3c..2f0539e 100644 --- a/graphics/php-libpuzzle/Makefile +++ b/graphics/php-libpuzzle/Makefile @@ -3,7 +3,7 @@ PORTNAME= libpuzzle PORTVERSION= 0.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://download.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/release/ \ ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/releases/ diff --git a/graphics/php5-ffmpeg/Makefile b/graphics/php5-ffmpeg/Makefile index a5513b7..84572d0 100644 --- a/graphics/php5-ffmpeg/Makefile +++ b/graphics/php5-ffmpeg/Makefile @@ -3,6 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.6.0.20120114 +PORTREVISION= 1 DISTVERSIONPREFIX= php- CATEGORIES= graphics MASTER_SITES= LOCAL/sunpoet diff --git a/graphics/phplot/Makefile b/graphics/phplot/Makefile index 8f7f3fd..e377a41 100644 --- a/graphics/phplot/Makefile +++ b/graphics/phplot/Makefile @@ -3,6 +3,7 @@ PORTNAME= phplot PORTVERSION= 6.2.0 +PORTREVISION= 1 CATEGORIES= graphics www MASTER_SITES= SF \ SF/${PORTNAME}/Manual/20130511:source2 diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile index 62c630a..f2eb7f6 100644 --- a/graphics/png2html/Makefile +++ b/graphics/png2html/Makefile @@ -3,7 +3,7 @@ PORTNAME= png2html PORTVERSION= 1.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= http://www.engr.mun.ca/~holden/ diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index 4261845..1bbb67c 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -3,7 +3,7 @@ PORTNAME= pstoedit PORTVERSION= 3.70 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics print MASTER_SITES= SF diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile index 8cdc877..e3dba8c 100644 --- a/graphics/py-gd/Makefile +++ b/graphics/py-gd/Makefile @@ -3,6 +3,7 @@ PORTNAME= gd PORTVERSION= 0.59 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile index 892e66d..9127731 100644 --- a/graphics/raster3d/Makefile +++ b/graphics/raster3d/Makefile @@ -3,7 +3,7 @@ PORTNAME= raster3d PORTVERSION= 3.0.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics biology MASTER_SITES= http://skuld.bmsc.washington.edu/${PORTNAME}/ DISTNAME= Raster3D_${PORTVERSION:R}-${PORTVERSION:E} diff --git a/graphics/repng2jpeg/Makefile b/graphics/repng2jpeg/Makefile index 3f03bb8..d2a2fd1 100644 --- a/graphics/repng2jpeg/Makefile +++ b/graphics/repng2jpeg/Makefile @@ -3,6 +3,7 @@ PORTNAME= repng2jpeg PORTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://bsdforge.com/projects/source/graphics/repng2jpeg/ diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile index 0ec133b..3910ab0 100644 --- a/graphics/ruby-gd/Makefile +++ b/graphics/ruby-gd/Makefile @@ -3,7 +3,7 @@ PORTNAME= gd PORTVERSION= 0.8.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics ruby MASTER_SITES= ftp://ftp.jp.vim.org/pub/distfiles/ruby/ \ http://www.mmnt.net/db/0/8/ftp.jp.vim.org/pub/distfiles/ruby/ diff --git a/graphics/rubygem-gd2/Makefile b/graphics/rubygem-gd2/Makefile index 3c0b204..469aa9a 100644 --- a/graphics/rubygem-gd2/Makefile +++ b/graphics/rubygem-gd2/Makefile @@ -3,7 +3,7 @@ PORTNAME= gd2 PORTVERSION= 1.1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics rubygems MASTER_SITES= RG diff --git a/graphics/scr2png/Makefile b/graphics/scr2png/Makefile index ae0ab33..b89d515 100644 --- a/graphics/scr2png/Makefile +++ b/graphics/scr2png/Makefile @@ -3,7 +3,7 @@ PORTNAME= scr2png PORTVERSION= 1.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= LOCAL/nik diff --git a/graphics/zimg/Makefile b/graphics/zimg/Makefile index 7cb7865..bdd87db 100644 --- a/graphics/zimg/Makefile +++ b/graphics/zimg/Makefile @@ -3,7 +3,7 @@ PORTNAME= zimg PORTVERSION= 5.0.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} |
