Attachment 217129 Details for Bug 248541 – Use textproc/p5-Pod-Parser during build; update to version 3.2.1

[patch] Use textproc/p5-Pod-Parser during build; update to version 3.2.1

darktable-3.2.1.diff (text/plain), 6.54 KB, created by Martin Neubauer on 2020-08-10 13:57:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Neubauer

Created: 2020-08-10 13:57:28 UTC

Size: 6.54 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 544619)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	darktable
>-PORTVERSION=	3.0.2
>-PORTREVISION=	1
>+PORTVERSION=	3.2.1
> CATEGORIES=	graphics
> MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
> 
>@@ -12,15 +11,15 @@
> 
> LICENSE=	GPLv3
> 
>-ONLY_FOR_ARCHS=		amd64
>+ONLY_FOR_ARCHS=	amd64
> ONLY_FOR_ARCHS_REASON=	uses SSE instructions and 64-bit address space
> 
> BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
>-		xsltproc:textproc/libxslt \
> 		p5-Pod-Parser>=0:textproc/p5-Pod-Parser \
>-		po4a-translate:textproc/po4a
>-LIB_DEPENDS=	libcolord.so:graphics/colord \
>-		libcolord-gtk.so:graphics/colord-gtk \
>+		po4a-translate:textproc/po4a \
>+		xsltproc:textproc/libxslt
>+LIB_DEPENDS=	libcolord-gtk.so:graphics/colord-gtk \
>+		libcolord.so:graphics/colord \
> 		libcurl.so:ftp/curl \
> 		libexiv2.so:graphics/exiv2 \
> 		libjson-glib-1.0.so:devel/json-glib \
>@@ -31,8 +30,8 @@
> 		libsoup-2.4.so:devel/libsoup \
> 		libtiff.so:graphics/tiff
> 
>-USES=		cmake compiler:c++11-lib desktop-file-utils	\
>-		gl gnome jpeg pkgconfig sqlite tar:xz xorg
>+USES=		cmake compiler:c++11-lib desktop-file-utils gl gnome jpeg \
>+		pkgconfig shebangfix sqlite tar:xz xorg
> USE_GL=		glu
> USE_GNOME=	cairo gtk30 intltool librsvg2 libxml2
> INSTALLS_ICONS=	yes
>@@ -39,20 +38,21 @@
> USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
> USE_XORG=	ice sm x11 xext xrandr
> 
>-CMAKE_ARGS+=	-DBINARY_PACKAGE_BUILD=1
>-CMAKE_ARGS+=	-DBUILD_CMSTEST:BOOL=ON
>-CMAKE_ARGS+=	-DUSE_KWALLET:BOOL=ON
>+SHEBANG_FILES=	tools/*.sh
> 
>+CMAKE_ARGS+=	-DBINARY_PACKAGE_BUILD=1 \
>+		-DBUILD_CMSTEST:BOOL=ON \
>+		-DUSE_KWALLET:BOOL=ON
>+
> CFLAGS+=	-fopenmp
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.rc/~rc/}
> 
>-OPTIONS_DEFINE=	DOCS GEO GPHOTO GRAPHMAGICK	\
>-		LIBSECRET LUA NLS OPENEXR OPENJPEG PRINT WEBP
>-OPTIONS_DEFAULT=GEO GPHOTO LUA OPENEXR OPENJPEG	\
>-		PRINT WEBP
>-OPTIONS_SUB=	yes
>+OPTIONS_DEFINE=		DOCS GEO GPHOTO GRAPHMAGICK LIBSECRET LUA NLS OPENEXR \
>+			OPENJPEG PRINT WEBP
>+OPTIONS_DEFAULT=	GEO GPHOTO LUA OPENEXR OPENJPEG PRINT WEBP
>+OPTIONS_SUB=		yes
> 
> GEO_DESC=	Support geotagging
> LIBSECRET_DESC=	Support libsecret as password backend
>@@ -63,21 +63,21 @@
> GPHOTO_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
> GPHOTO_CMAKE_OFF=	-DUSE_CAMERA_SUPPORT:BOOL=OFF
> 
>-GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick
>-GRAPHMAGICK_CMAKE_OFF=	-DUSE_GRAPHICSMAGICK:BOOL=OFF
>+GRAPHMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
>+GRAPHMAGICK_CMAKE_OFF=		-DUSE_GRAPHICSMAGICK:BOOL=OFF
> 
> LIBSECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
> LIBSECRET_CMAKE_OFF=	-DUSE_LIBSECRET:BOOL=OFF
> 
>-LUA_USES=		lua:53
>-LUA_CMAKE_OFF=		-DUSE_LUA:BOOL=OFF
>+LUA_USES=	lua:53
>+LUA_CMAKE_OFF=	-DUSE_LUA:BOOL=OFF
> 
> # FIXME: Even with NLS turned off, darktable(1) is still linked to
> # libintl.so.
>-NLS_USES=		gettext
>-NLS_USES_OFF=		gettext-runtime
>-NLS_CMAKE_OFF=		-DUSE_NLS:BOOL=OFF
>-NLS_LDFLAGS=		-L${LOCALBASE}/lib -lintl
>+NLS_USES=	gettext
>+NLS_USES_OFF=	gettext-runtime
>+NLS_CMAKE_OFF=	-DUSE_NLS:BOOL=OFF
>+NLS_LDFLAGS=	-L${LOCALBASE}/lib -lintl
> 
> OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/openexr \
> 			libIlmThread.so:graphics/ilmbase
>Index: distinfo
>===================================================================
>--- distinfo	(revision 544619)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1588248963
>-SHA256 (darktable-3.0.2.tar.xz) = 6abaf661fe9414e92bdb33b58b98ef024ccf6132b7876abaf0751ec2109f36fb
>-SIZE (darktable-3.0.2.tar.xz) = 3931240
>+TIMESTAMP = 1597066185
>+SHA256 (darktable-3.2.1.tar.xz) = 6e3683ea88dc0a0271be7eca4fd594b9e46b1b7194847825a8d0a0c12bdeb90c
>+SIZE (darktable-3.2.1.tar.xz) = 3920728
>Index: files/patch-data_kernels_CMakeLists.txt
>===================================================================
>--- files/patch-data_kernels_CMakeLists.txt	(revision 544619)
>+++ files/patch-data_kernels_CMakeLists.txt	(nonexistent)
>@@ -1,13 +0,0 @@
>---- data/kernels/CMakeLists.txt.orig	2020-04-15 07:10:53 UTC
>-+++ data/kernels/CMakeLists.txt
>-@@ -31,8 +31,8 @@ macro (testcompile_opencl_kernel IN)
>- endmacro (testcompile_opencl_kernel)
>- 
>- if (TESTBUILD_OPENCL_PROGRAMS)
>--  foreach(IN ${DT_OPENCL_KERNELS})
>--    testcompile_opencl_kernel(${IN})
>-+  foreach(i ${DT_OPENCL_KERNELS})
>-+    testcompile_opencl_kernel(${i})
>-   endforeach()
>- endif()
>- 
>
>Property changes on: files/patch-data_kernels_CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 544619)
>+++ pkg-plist	(working copy)
>@@ -198,6 +198,7 @@
> %%DATADIR%%/kernels/liquify.cl
> %%DATADIR%%/kernels/locallaplacian.cl
> %%DATADIR%%/kernels/lut3d.cl
>+%%DATADIR%%/kernels/negadoctor.cl
> %%DATADIR%%/kernels/nlmeans.cl
> %%DATADIR%%/kernels/programs.conf
> %%DATADIR%%/kernels/retouch.cl
>@@ -209,6 +210,9 @@
> %%DATADIR%%/latex/photobook.cls
> %%LUA%%%%DATADIR%%/lua/darktable/debug.lua
> %%LUA%%%%DATADIR%%/luarc
>+%%LUA_LIBDIR%%/darktable/plugins/imageio/format/%%LUA_LIBDIR%%xcf.so
>+%%LUA_LIBDIR%%/darktable/plugins/%%LUA_LIBDIR%%negadoctor.so
>+%%LUA_LIBDIR%%/darktable/plugins/lighttable/%%LUA_LIBDIR%%ioporder.so
> %%DATADIR%%/noiseprofiles.json
> %%DATADIR%%/pixmaps/dt_logo_128x128.png
> %%DATADIR%%/pixmaps/idbutton-1.png
>@@ -383,19 +387,13 @@
> share/icons/hicolor/scalable/apps/darktable-2.svg
> share/icons/hicolor/scalable/apps/darktable-3.svg
> share/icons/hicolor/scalable/apps/darktable.svg
>-%%NLS%%share/locale/ca/LC_MESSAGES/darktable.mo
>-%%NLS%%share/locale/cs/LC_MESSAGES/darktable.mo
>-%%NLS%%share/locale/da/LC_MESSAGES/darktable.mo
> %%NLS%%share/locale/de/LC_MESSAGES/darktable.mo
> %%NLS%%share/locale/es/LC_MESSAGES/darktable.mo
> %%NLS%%share/locale/fr/LC_MESSAGES/darktable.mo
> %%NLS%%share/locale/he/LC_MESSAGES/darktable.mo
>-%%NLS%%share/locale/hu/LC_MESSAGES/darktable.mo
> %%NLS%%share/locale/it/LC_MESSAGES/darktable.mo
>-%%NLS%%share/locale/ja/LC_MESSAGES/darktable.mo
>-%%NLS%%share/locale/nb/LC_MESSAGES/darktable.mo
>-%%NLS%%share/locale/nl/LC_MESSAGES/darktable.mo
> %%NLS%%share/locale/pl/LC_MESSAGES/darktable.mo
>+%%NLS%%share/locale/pt_BR/LC_MESSAGES/darktable.mo
> %%NLS%%share/locale/ru/LC_MESSAGES/darktable.mo
> %%NLS%%share/locale/sl/LC_MESSAGES/darktable.mo
> %%DATADIR%%/tools/common.sh

Flags:

m.ne: maintainer-approval?

Actions: View | Diff

Attachments on bug 248541: 217115 | 217129