diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile index 034af99977c5..633c0bf1917b 100644 --- a/astro/kstars/Makefile +++ b/astro/kstars/Makefile @@ -2,7 +2,7 @@ PORTNAME= kstars DISTVERSION= 3.1.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= astro kde MASTER_SITES= KDE/stable/${PORTNAME} diff --git a/astro/siril/Makefile b/astro/siril/Makefile index 6e64b481544b..f57b302d016c 100644 --- a/astro/siril/Makefile +++ b/astro/siril/Makefile @@ -2,6 +2,7 @@ PORTNAME= siril DISTVERSION= 0.9.10 +PORTREVISION= 1 CATEGORIES= astro graphics MASTER_SITES= https://free-astro.org/download/ diff --git a/devel/efl/Makefile b/devel/efl/Makefile index 35ef018e8028..d8c81e4297d8 100644 --- a/devel/efl/Makefile +++ b/devel/efl/Makefile @@ -3,7 +3,7 @@ PORTNAME= efl DISTVERSION= 1.20.7 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel enlightenment MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/ DIST_SUBDIR= enlightenment diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile index c0a2d49f4529..f749daa4ce32 100644 --- a/graphics/ImageMagick6/Makefile +++ b/graphics/ImageMagick6/Makefile @@ -2,6 +2,7 @@ PORTNAME= ImageMagick DISTVERSION= 6.9.10-22 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index d86ccdfccb00..af5c435e2185 100644 --- a/graphics/ImageMagick7/Makefile +++ b/graphics/ImageMagick7/Makefile @@ -2,6 +2,7 @@ PORTNAME= ImageMagick DISTVERSION= 7.0.8-22 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ http://www.imagemagick.org/download/legacy/ \ diff --git a/graphics/entangle/Makefile b/graphics/entangle/Makefile index b82f3a6f03bf..8c1c1291e4d9 100644 --- a/graphics/entangle/Makefile +++ b/graphics/entangle/Makefile @@ -3,7 +3,7 @@ PORTNAME= entangle PORTVERSION= 0.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://entangle-photo.org/download/sources/ diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile index 06432eb2eb23..d259d6f41797 100644 --- a/graphics/gegl/Makefile +++ b/graphics/gegl/Makefile @@ -3,7 +3,7 @@ PORTNAME= gegl PORTVERSION= 0.4.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= GIMP diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile index c1629afd4e05..2009e5a5a713 100644 --- a/graphics/gthumb/Makefile +++ b/graphics/gthumb/Makefile @@ -4,7 +4,7 @@ PORTNAME= gthumb PORTVERSION= 3.6.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile index d87185a3cb2c..06718a58f237 100644 --- a/graphics/krita/Makefile +++ b/graphics/krita/Makefile @@ -2,7 +2,7 @@ PORTNAME= krita DISTVERSION= 4.1.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION} DIST_SUBDIR= KDE/${PORTNAME} diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile index b5c617d89dc2..6026de845764 100644 --- a/graphics/libkdcraw/Makefile +++ b/graphics/libkdcraw/Makefile @@ -2,6 +2,7 @@ PORTNAME= libkdcraw DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/graphics/libraw/Makefile b/graphics/libraw/Makefile index 8015e53d2bdc..8b5e8df7f79a 100644 --- a/graphics/libraw/Makefile +++ b/graphics/libraw/Makefile @@ -2,12 +2,10 @@ # $FreeBSD$ PORTNAME= libraw -PORTVERSION= 0.18.13 -PORTREVISION= 2 +PORTVERSION= 0.19.2 CATEGORIES= graphics MASTER_SITES= http://www.libraw.org/data/ DISTNAME= LibRaw-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= jhale@FreeBSD.org COMMENT= Library for manipulating raw images @@ -15,8 +13,9 @@ COMMENT= Library for manipulating raw images LICENSE= LGPL21 CDDL LICENSE_COMB= dual -USE_LDCONFIG= yes USES= cpe libtool localbase pathfix pkgconfig +USE_LDCONFIG= yes + GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-examples INSTALL_TARGET= install-strip @@ -24,26 +23,9 @@ INSTALL_TARGET= install-strip PORTDOCS= * PORTEXAMPLES= * -DEMOSAIC_PACK_VERSION= 0.18.8 - -OPTIONS_DEFINE= DEMOSAIC_PACK_GPL2 DEMOSAIC_PACK_GPL3 \ - DOCS EXAMPLES JASPER JPEG LCMS2 OPENMP OPTIMIZED_CFLAGS +OPTIONS_DEFINE= DOCS EXAMPLES JASPER JPEG LCMS2 OPENMP OPTIMIZED_CFLAGS OPTIONS_DEFAULT= JPEG LCMS2 -DEMOSAIC_PACK_GPL2_DESC= GPLv2 demosaic pack -DEMOSAIC_PACK_GPL2_CONFIGURE_OFF= --disable-demosaic-pack-gpl2 -DEMOSAIC_PACK_GPL2_CONFIGURE_ON= --enable-demosaic-pack-gpl2=../LibRaw-demosaic-pack-GPL2-${DEMOSAIC_PACK_VERSION} -DEMOSAIC_PACK_GPL2_DISTFILES= LibRaw-demosaic-pack-GPL2-${DEMOSAIC_PACK_VERSION}.tar.gz -DEMOSAIC_PACK_GPL2_VARS= LICENSE=GPLv2+ \ - LICENSE_COMB=single - -DEMOSAIC_PACK_GPL3_DESC= GPLv3 demosaic pack -DEMOSAIC_PACK_GPL3_CONFIGURE_OFF= --disable-demosaic-pack-gpl3 -DEMOSAIC_PACK_GPL3_CONFIGURE_ON= --enable-demosaic-pack-gpl3=../LibRaw-demosaic-pack-GPL3-${DEMOSAIC_PACK_VERSION} -DEMOSAIC_PACK_GPL3_DISTFILES= LibRaw-demosaic-pack-GPL3-${DEMOSAIC_PACK_VERSION}.tar.gz -DEMOSAIC_PACK_GPL3_VARS= LICENSE=GPLv3+ \ - LICENSE_COMB=single - JASPER_CONFIGURE_ENABLE= jasper JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper diff --git a/graphics/libraw/distinfo b/graphics/libraw/distinfo index c64e4c05803f..add446f42e18 100644 --- a/graphics/libraw/distinfo +++ b/graphics/libraw/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1530409608 -SHA256 (LibRaw-0.18.13.tar.gz) = cb1f9d0d1fabc8967d501d95c05d2b53d97a2b917345c66553b1abbea06757ca -SIZE (LibRaw-0.18.13.tar.gz) = 1287631 -SHA256 (LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz) = 0b24bcf7bbb5d13fde58bb071f94dc9354be09bc44b2bba0698493065e99f8da -SIZE (LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz) = 30868 -SHA256 (LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz) = ffd6916cd66c8101e4e6b589799f256c897748d2fd2486aa34c3705146dbc701 -SIZE (LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz) = 39002 +TIMESTAMP = 1553861200 +SHA256 (LibRaw-0.19.2.tar.gz) = 400d47969292291d297873a06fb0535ccce70728117463927ddd9452aa849644 +SIZE (LibRaw-0.19.2.tar.gz) = 1302092 diff --git a/graphics/libraw/files/patch-internal_dcraw__common.cpp b/graphics/libraw/files/patch-internal_dcraw__common.cpp deleted file mode 100644 index e83775e970e9..000000000000 --- a/graphics/libraw/files/patch-internal_dcraw__common.cpp +++ /dev/null @@ -1,32 +0,0 @@ -Use strnlen(3) and strcasestr(3) from FreeBSD's libc instead of the bundled -versions. Patch has been applied upstream in master branch: -https://github.com/LibRaw/LibRaw/commit/b1a2984 - ---- internal/dcraw_common.cpp.orig 2017-09-22 06:35:16 UTC -+++ internal/dcraw_common.cpp -@@ -51,6 +51,8 @@ int CLASS fcol (int row, int col) - if (filters == 9) return xtrans[(row+6) % 6][(col+6) % 6]; - return FC(row,col); - } -+ -+#if !defined(__FreeBSD__) - static size_t local_strnlen(const char *s, size_t n) - { - const char *p = (const char *)memchr(s, 0, n); -@@ -58,6 +60,7 @@ static size_t local_strnlen(const char * - } - /* add OS X version check here ?? */ - #define strnlen(a,b) local_strnlen(a,b) -+#endif - - #ifdef LIBRAW_LIBRARY_BUILD - static int stread(char *buf, size_t len, LibRaw_abstract_datastream *fp) -@@ -69,7 +72,7 @@ static int stread(char *buf, size_t len, - #define stmread(buf,maxlen,fp) stread(buf,MIN(maxlen,sizeof(buf)),fp) - #endif - --#ifndef __GLIBC__ -+#if !defined(__GLIBC__) && !defined(__FreeBSD__) - char *my_memmem (char *haystack, size_t haystacklen, - char *needle, size_t needlelen) - { diff --git a/graphics/libraw/files/patch-internal_libraw__x3f.cpp b/graphics/libraw/files/patch-internal_libraw__x3f.cpp deleted file mode 100644 index 0eaeeed07b8a..000000000000 --- a/graphics/libraw/files/patch-internal_libraw__x3f.cpp +++ /dev/null @@ -1,39 +0,0 @@ -In file included from src/libraw_cxx.cpp:5472: -src/../internal/libraw_x3f.cpp:1404:19: error: non-constant-expression cannot be narrowed from type - 'int' to 'int16_t' (aka 'short') in initializer list [-Wc++11-narrowing] - int16_t c[3] = {offset,offset,offset}; - ^~~~~~ -src/../internal/libraw_x3f.cpp:1404:19: note: insert an explicit cast to silence this issue - int16_t c[3] = {offset,offset,offset}; - ^~~~~~ - static_cast( ) -src/../internal/libraw_x3f.cpp:1404:26: error: non-constant-expression cannot be narrowed from type - 'int' to 'int16_t' (aka 'short') in initializer list [-Wc++11-narrowing] - int16_t c[3] = {offset,offset,offset}; - ^~~~~~ -src/../internal/libraw_x3f.cpp:1404:26: note: insert an explicit cast to silence this issue - int16_t c[3] = {offset,offset,offset}; - ^~~~~~ - static_cast( ) -src/../internal/libraw_x3f.cpp:1404:33: error: non-constant-expression cannot be narrowed from type - 'int' to 'int16_t' (aka 'short') in initializer list [-Wc++11-narrowing] - int16_t c[3] = {offset,offset,offset}; - ^~~~~~ -src/../internal/libraw_x3f.cpp:1404:33: note: insert an explicit cast to silence this issue - int16_t c[3] = {offset,offset,offset}; - ^~~~~~ - static_cast( ) - -https://github.com/LibRaw/LibRaw/commit/6d4b3ea - ---- internal/libraw_x3f.cpp.orig 2017-09-22 06:23:54 UTC -+++ internal/libraw_x3f.cpp -@@ -1401,7 +1401,7 @@ static void huffman_decode_row(x3f_info_t *I, - x3f_image_data_t *ID = &DEH->data_subsection.image_data; - x3f_huffman_t *HUF = ID->huffman; - -- int16_t c[3] = {offset,offset,offset}; -+ int16_t c[3] = {(int16_t)offset,(int16_t)offset,(int16_t)offset}; - int col; - bit_state_t BS; - diff --git a/graphics/libraw/pkg-plist b/graphics/libraw/pkg-plist index 976e62955fa1..cb6207265214 100644 --- a/graphics/libraw/pkg-plist +++ b/graphics/libraw/pkg-plist @@ -7,11 +7,11 @@ include/libraw/libraw_types.h include/libraw/libraw_version.h lib/libraw.a lib/libraw.so -lib/libraw.so.16 -lib/libraw.so.16.0.0 +lib/libraw.so.19 +lib/libraw.so.19.0.0 lib/libraw_r.a lib/libraw_r.so -lib/libraw_r.so.16 -lib/libraw_r.so.16.0.0 +lib/libraw_r.so.19 +lib/libraw_r.so.19.0.0 libdata/pkgconfig/libraw.pc libdata/pkgconfig/libraw_r.pc diff --git a/graphics/luminance-qt5/Makefile b/graphics/luminance-qt5/Makefile index 89a8e834de16..91dced1d77c0 100644 --- a/graphics/luminance-qt5/Makefile +++ b/graphics/luminance-qt5/Makefile @@ -3,7 +3,7 @@ PORTNAME= luminance-hdr DISTVERSION= 2.4.0 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION} PKGNAMESUFFIX= -qt5 diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile index a91d5711323b..a4aba7d2e56a 100644 --- a/graphics/nomacs/Makefile +++ b/graphics/nomacs/Makefile @@ -2,7 +2,7 @@ PORTNAME= nomacs PORTVERSION= 3.6.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MAINTAINER= bsd@tuxproject.de diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index 57414ade4b91..dc80045c684f 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -4,7 +4,7 @@ PORTNAME= openimageio PORTVERSION= 1.8.17 DISTVERSIONPREFIX= Release- -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz diff --git a/graphics/oyranos/Makefile b/graphics/oyranos/Makefile index 01a1a26f9dfd..472ce5056029 100644 --- a/graphics/oyranos/Makefile +++ b/graphics/oyranos/Makefile @@ -2,7 +2,7 @@ PORTNAME= oyranos PORTVERSION= 0.9.6 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MAINTAINER= bsam@FreeBSD.org diff --git a/graphics/photoqt/Makefile b/graphics/photoqt/Makefile index e292ddea6493..9b11bf86e907 100644 --- a/graphics/photoqt/Makefile +++ b/graphics/photoqt/Makefile @@ -3,7 +3,7 @@ PORTNAME= photoqt DISTVERSIONPREFIX= v DISTVERSION= 1.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MAINTAINER= melanhit@gmail.com diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index 4e749ab61c77..0e47533ce125 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -3,7 +3,7 @@ PORTNAME= shotwell PORTVERSION= 0.30.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics gnome MASTER_SITES= GNOME