svn commit: r431839 - in head: devel/efl graphics/entangle graphics/gegl3 graphics/gthumb graphics/libkdcraw-kde4 graphics/libraw graphics/libraw/files graphics/luminance graphics/luminance-qt5 gra...

Jason E. Hale jhale at FreeBSD.org
Thu Jan 19 04:39:40 UTC 2017


Author: jhale
Date: Thu Jan 19 04:39:37 2017
New Revision: 431839
URL: https://svnweb.freebsd.org/changeset/ports/431839

Log:
  - Update graphics/libraw to 0.18.0
  - Complete conversion to options helpers
  - Add options for JPEG and JASPER support
    - Side note: This had a dependency on jpeg before, so the JPEG
      option default is ON. However, the configure script wasn't
      detecting it previously.
  - Silence MKDIRs
  - Take maintainership
  - Chase shared library bump
  
  Changes:	http://www.libraw.org/download#changelog

Modified:
  head/devel/efl/Makefile
  head/graphics/entangle/Makefile
  head/graphics/gegl3/Makefile
  head/graphics/gthumb/Makefile
  head/graphics/libkdcraw-kde4/Makefile
  head/graphics/libraw/Makefile
  head/graphics/libraw/distinfo
  head/graphics/libraw/files/patch-Makefile.in
  head/graphics/libraw/files/patch-configure
  head/graphics/libraw/pkg-plist
  head/graphics/luminance-qt5/Makefile
  head/graphics/luminance/Makefile
  head/graphics/nomacs/Makefile
  head/graphics/openimageio/Makefile
  head/graphics/oyranos/Makefile
  head/graphics/shotwell/Makefile

Modified: head/devel/efl/Makefile
==============================================================================
--- head/devel/efl/Makefile	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/devel/efl/Makefile	Thu Jan 19 04:39:37 2017	(r431839)
@@ -3,6 +3,7 @@
 
 PORTNAME=	efl
 PORTVERSION=	1.18.4
+PORTREVISION=	1
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/
 

Modified: head/graphics/entangle/Makefile
==============================================================================
--- head/graphics/entangle/Makefile	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/graphics/entangle/Makefile	Thu Jan 19 04:39:37 2017	(r431839)
@@ -3,6 +3,7 @@
 
 PORTNAME=	entangle
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://entangle-photo.org/download/sources/
 

Modified: head/graphics/gegl3/Makefile
==============================================================================
--- head/graphics/gegl3/Makefile	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/graphics/gegl3/Makefile	Thu Jan 19 04:39:37 2017	(r431839)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gegl
 PORTVERSION=	0.3.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	GIMP
 PKGNAMESUFFIX=	3

Modified: head/graphics/gthumb/Makefile
==============================================================================
--- head/graphics/gthumb/Makefile	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/graphics/gthumb/Makefile	Thu Jan 19 04:39:37 2017	(r431839)
@@ -4,7 +4,7 @@
 
 PORTNAME=	gthumb
 PORTVERSION=	3.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Modified: head/graphics/libkdcraw-kde4/Makefile
==============================================================================
--- head/graphics/libkdcraw-kde4/Makefile	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/graphics/libkdcraw-kde4/Makefile	Thu Jan 19 04:39:37 2017	(r431839)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libkdcraw
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics kde kde-kde4
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/graphics/libraw/Makefile
==============================================================================
--- head/graphics/libraw/Makefile	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/graphics/libraw/Makefile	Thu Jan 19 04:39:37 2017	(r431839)
@@ -2,76 +2,70 @@
 # $FreeBSD$
 
 PORTNAME=	libraw
-PORTVERSION=	0.17.2
+PORTVERSION=	0.18.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libraw.org/data/
 DISTNAME=	LibRaw-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	jhale at FreeBSD.org
 COMMENT=	Library for manipulating raw images
 
 LICENSE=	LGPL21 CDDL
 LICENSE_COMB=	dual
 
 USE_LDCONFIG=	yes
-USES=		cpe libtool jpeg pathfix pkgconfig
+USES=		cpe libtool localbase pathfix pkgconfig
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-examples --disable-jasper
-CFLAGS+=	-fPIC
+CONFIGURE_ARGS=	--disable-examples
 INSTALL_TARGET=	install-strip
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DEMOSAIC_PACK_GPL2 DEMOSAIC_PACK_GPL3 DOCS EXAMPLES LCMS2 \
-		OPTIMIZED_CFLAGS OPENMP
-OPTIONS_DEFAULT=	LCMS2
-
-DEMOSAIC_PACK_GPL2_DESC=	Enable GPLv2 demosaic pack
-DEMOSAIC_PACK_GPL3_DESC=	Enable GPLv3 demosaic pack
-OPTIMIZED_CFLAGS_DESC=		Enable optimizations (on x86)
-OPENMP_DESC=			Enable OpenMP (implies GCC 4.6+)
+OPTIONS_DEFINE=		DEMOSAIC_PACK_GPL2 DEMOSAIC_PACK_GPL3 \
+			DOCS EXAMPLES JASPER JPEG LCMS2 OPENMP
+OPTIONS_DEFINE_i386=	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-${PORTVERSION}
 DEMOSAIC_PACK_GPL2_DISTFILES=		LibRaw-demosaic-pack-GPL2-${PORTVERSION}.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-${PORTVERSION}
 DEMOSAIC_PACK_GPL3_DISTFILES=		LibRaw-demosaic-pack-GPL3-${PORTVERSION}.tar.gz
+DEMOSAIC_PACK_GPL3_VARS=		LICENSE=GPLv3+ \
+					LICENSE_COMB=single
+
+JASPER_CONFIGURE_ENABLE=		jasper
+JASPER_LIB_DEPENDS=			libjasper.so:graphics/jasper
+
+JPEG_CONFIGURE_ENABLE=			jpeg
+JPEG_USES=				jpeg
+
 LCMS2_CONFIGURE_ENABLE=			lcms
 LCMS2_LIB_DEPENDS=			liblcms2.so:graphics/lcms2
-OPENMP_CONFIGURE_ENABLE=		openmp
-OPENMP_USE=				GCC=yes
-
-.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-.if ${ARCH} == "i386"
-CFLAGS+=	-O3
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MDEMOSAIC_PACK_GPL2}
-LICENSE=	GPLv2
-LICENSE_COMB=	single
-.endif
-
-.if ${PORT_OPTIONS:MDEMOSAIC_PACK_GPL3}
-LICENSE=	GPLv3
-LICENSE_COMB=	single
-.endif
+OPENMP_DESC=				OpenMP support (implies GCC)
+OPENMP_CONFIGURE_ENABLE=		openmp
+OPENMP_USES=				compiler:openmp
 
-post-patch:
-	@${REINPLACE_CMD} -e "s/-lstdc++//g" ${WRKSRC}/configure
+OPTIMIZED_CFLAGS_CFLAGS=		-O3
 
+# Use "\*" instead of "." in COPYTREE_SHARE commands as "." has
+# the undesired effect of copying ".deps" directory
 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/samples && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
 

Modified: head/graphics/libraw/distinfo
==============================================================================
--- head/graphics/libraw/distinfo	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/graphics/libraw/distinfo	Thu Jan 19 04:39:37 2017	(r431839)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1465820275
-SHA256 (LibRaw-0.17.2.tar.gz) = 92b0c42c7666eca9307e5e1f97d6fefc196cf0b7ee089e22880259a76fafd15c
-SIZE (LibRaw-0.17.2.tar.gz) = 1472714
-SHA256 (LibRaw-demosaic-pack-GPL2-0.17.2.tar.gz) = a2e5e9cc04fa8f3e94070110dce8a06aa3b0b2f573ed99c5fc3e327d15f014b7
-SIZE (LibRaw-demosaic-pack-GPL2-0.17.2.tar.gz) = 31190
-SHA256 (LibRaw-demosaic-pack-GPL3-0.17.2.tar.gz) = b00cd0f54851bd3c8a66be4cacbf049e4508f1bac8ff85cb4528d8979739ed36
-SIZE (LibRaw-demosaic-pack-GPL3-0.17.2.tar.gz) = 38908
+TIMESTAMP = 1484692033
+SHA256 (LibRaw-0.18.0.tar.gz) = d56a0c9a0e6d1b8c8c5585346acf2cfb0554eee0f0948da66f580cd65c8c5c9b
+SIZE (LibRaw-0.18.0.tar.gz) = 1278737
+SHA256 (LibRaw-demosaic-pack-GPL2-0.18.0.tar.gz) = 905eff0be2ce43c99527000c81e3b4f4a563ef9bc26581166742459f6358df90
+SIZE (LibRaw-demosaic-pack-GPL2-0.18.0.tar.gz) = 31149
+SHA256 (LibRaw-demosaic-pack-GPL3-0.18.0.tar.gz) = c79cbb4a7fa452a860ad0fa92e4feb4c250af4b5db297ea077b9472aa5be3905
+SIZE (LibRaw-demosaic-pack-GPL3-0.18.0.tar.gz) = 39585

Modified: head/graphics/libraw/files/patch-Makefile.in
==============================================================================
--- head/graphics/libraw/files/patch-Makefile.in	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/graphics/libraw/files/patch-Makefile.in	Thu Jan 19 04:39:37 2017	(r431839)
@@ -1,16 +1,14 @@
---- Makefile.in.orig	2013-12-23 02:36:04.000000000 +0200
-+++ Makefile.in	2013-12-23 02:36:23.000000000 +0200
-@@ -462,12 +462,7 @@
+--- Makefile.in.orig	2016-12-27 15:20:16 UTC
++++ Makefile.in
+@@ -474,10 +474,7 @@ nobase_include_HEADERS = libraw/libraw.h
  
  
  # Docs
 -doc_DATA = COPYRIGHT \
 -			LICENSE.CDDL \
 -			LICENSE.LGPL \
--			LICENSE.LibRaw.pdf \
 -			Changelog.txt
--
-+doc_DATA =
++doc_DATA = 
+ 
  
  # pkg-config .pc files
- pkgconfigdir = $(libdir)/pkgconfig

Modified: head/graphics/libraw/files/patch-configure
==============================================================================
--- head/graphics/libraw/files/patch-configure	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/graphics/libraw/files/patch-configure	Thu Jan 19 04:39:37 2017	(r431839)
@@ -1,8 +1,8 @@
---- configure.orig	2010-12-29 18:51:59.000000000 +0300
-+++ configure	2010-12-29 18:52:22.000000000 +0300
-@@ -2256,7 +2256,7 @@
-   */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
- esac
+--- configure.orig	2016-12-27 15:20:15 UTC
++++ configure
+@@ -2763,7 +2763,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+ $as_echo "$MKDIR_P" >&6; }
  
 -for ac_prog in gawk mawk nawk awk
 +for ac_prog in awk

Modified: head/graphics/libraw/pkg-plist
==============================================================================
--- head/graphics/libraw/pkg-plist	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/graphics/libraw/pkg-plist	Thu Jan 19 04:39:37 2017	(r431839)
@@ -7,11 +7,11 @@ include/libraw/libraw_types.h
 include/libraw/libraw_version.h
 lib/libraw.a
 lib/libraw.so
-lib/libraw.so.15
-lib/libraw.so.15.0.0
+lib/libraw.so.16
+lib/libraw.so.16.0.0
 lib/libraw_r.a
 lib/libraw_r.so
-lib/libraw_r.so.15
-lib/libraw_r.so.15.0.0
+lib/libraw_r.so.16
+lib/libraw_r.so.16.0.0
 libdata/pkgconfig/libraw.pc
 libdata/pkgconfig/libraw_r.pc

Modified: head/graphics/luminance-qt5/Makefile
==============================================================================
--- head/graphics/luminance-qt5/Makefile	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/graphics/luminance-qt5/Makefile	Thu Jan 19 04:39:37 2017	(r431839)
@@ -3,7 +3,7 @@
 
 PORTNAME=	luminance-hdr
 DISTVERSION=	2.4.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics
 MASTER_SITES=	SF/qtpfsgui/luminance/${DISTVERSION}
 PKGNAMESUFFIX=	-qt5

Modified: head/graphics/luminance/Makefile
==============================================================================
--- head/graphics/luminance/Makefile	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/graphics/luminance/Makefile	Thu Jan 19 04:39:37 2017	(r431839)
@@ -3,7 +3,7 @@
 
 PORTNAME=	luminance-hdr
 DISTVERSION=	2.3.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	SF/qtpfsgui/luminance/${DISTVERSION}
 

Modified: head/graphics/nomacs/Makefile
==============================================================================
--- head/graphics/nomacs/Makefile	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/graphics/nomacs/Makefile	Thu Jan 19 04:39:37 2017	(r431839)
@@ -2,7 +2,7 @@
 
 PORTNAME=	nomacs
 PORTVERSION=	2.2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	SF/nomacs/nomacs-${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source

Modified: head/graphics/openimageio/Makefile
==============================================================================
--- head/graphics/openimageio/Makefile	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/graphics/openimageio/Makefile	Thu Jan 19 04:39:37 2017	(r431839)
@@ -4,7 +4,7 @@
 PORTNAME=	openimageio
 PORTVERSION=	1.6.12
 DISTVERSIONPREFIX=	Release-
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD at Shaneware.biz

Modified: head/graphics/oyranos/Makefile
==============================================================================
--- head/graphics/oyranos/Makefile	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/graphics/oyranos/Makefile	Thu Jan 19 04:39:37 2017	(r431839)
@@ -2,7 +2,7 @@
 
 PORTNAME=	oyranos
 PORTVERSION=	0.9.5
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Oyranos/Oyranos%20${PORTVERSION:C|(.*)\.[0-9]*$|\1|}
 

Modified: head/graphics/shotwell/Makefile
==============================================================================
--- head/graphics/shotwell/Makefile	Thu Jan 19 04:12:36 2017	(r431838)
+++ head/graphics/shotwell/Makefile	Thu Jan 19 04:39:37 2017	(r431839)
@@ -3,7 +3,7 @@
 
 PORTNAME=	shotwell
 PORTVERSION=	0.24.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME/sources/shotwell/${PORTVERSION:R}
 


More information about the svn-ports-head mailing list