Date: Sun, 28 Feb 2021 09:45:38 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566753 - head/graphics/darktable Message-ID: <202102280945.11S9jcKP093165@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Sun Feb 28 09:45:38 2021 New Revision: 566753 URL: https://svnweb.freebsd.org/changeset/ports/566753 Log: graphics/darktable: fix build on powerpc64le Disable including gdkcolor.h because pixel is a type on POWER: /usr/local/include/gtk-3.0/gdk/deprecated/gdkcolor.h:56:11: error: two or more data types in declaration specifiers 56 | guint32 pixel; Disable OpenCL: /wrkdirs/usr/ports/graphics/darktable/work/darktable-3.4.1/data/kernels/bilateral.cl:67:17: error: implicit declaration of function 'atom_add' is invalid in OpenCL old_val.i = atom_add(ival, 0); Approved by: tier 2 blanket Modified: head/graphics/darktable/Makefile head/graphics/darktable/pkg-plist Modified: head/graphics/darktable/Makefile ============================================================================== --- head/graphics/darktable/Makefile Sun Feb 28 09:34:36 2021 (r566752) +++ head/graphics/darktable/Makefile Sun Feb 28 09:45:38 2021 (r566753) @@ -101,6 +101,16 @@ TOOLS_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_CMAKE_OFF= -DUSE_WEBP:BOOL=OFF +.include <bsd.port.options.mk> + +.if ${ARCH} == powerpc64le +CMAKE_ARGS+= -DUSE_OPENCL:BOOL=OFF +CXXFLAGS+= -DGDK_DISABLE_DEPRECATED +PLIST_SUB+= NO_OPENCL="@comment " +.else +PLIST_SUB+= NO_OPENCL="" +.endif + .include <bsd.port.pre.mk> .if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD || ${ARCH} == "i386" Modified: head/graphics/darktable/pkg-plist ============================================================================== --- head/graphics/darktable/pkg-plist Sun Feb 28 09:34:36 2021 (r566752) +++ head/graphics/darktable/pkg-plist Sun Feb 28 09:45:38 2021 (r566753) @@ -1,7 +1,7 @@ bin/darktable bin/darktable-chart bin/darktable-cli -bin/darktable-cltest +%%NO_OPENCL%%bin/darktable-cltest bin/darktable-cmstest bin/darktable-generate-cache bin/darktable-rs-identify @@ -176,43 +176,43 @@ share/applications/darktable.desktop %%DATADIR%%/darktable.bash %%DATADIR%%/darktablerc %%DATADIR%%/gdb_commands -%%DATADIR%%/kernels/atrous.cl -%%DATADIR%%/kernels/basecurve.cl -%%DATADIR%%/kernels/basic.cl -%%DATADIR%%/kernels/basicadj.cl -%%DATADIR%%/kernels/bilateral.cl -%%DATADIR%%/kernels/blendop.cl -%%DATADIR%%/kernels/bloom.cl -%%DATADIR%%/kernels/color_conversion.cl -%%DATADIR%%/kernels/colorreconstruction.cl -%%DATADIR%%/kernels/colorspace.cl -%%DATADIR%%/kernels/colorspaces.cl -%%DATADIR%%/kernels/common.h -%%DATADIR%%/kernels/demosaic_markesteijn.cl -%%DATADIR%%/kernels/demosaic_other.cl -%%DATADIR%%/kernels/demosaic_ppg.cl -%%DATADIR%%/kernels/demosaic_vng.cl -%%DATADIR%%/kernels/denoiseprofile.cl -%%DATADIR%%/kernels/dwt.cl -%%DATADIR%%/kernels/extended.cl -%%DATADIR%%/kernels/filmic.cl -%%DATADIR%%/kernels/gaussian.cl -%%DATADIR%%/kernels/guided_filter.cl -%%DATADIR%%/kernels/hazeremoval.cl -%%DATADIR%%/kernels/highpass.cl -%%DATADIR%%/kernels/liquify.cl -%%DATADIR%%/kernels/locallaplacian.cl -%%DATADIR%%/kernels/lut3d.cl -%%DATADIR%%/kernels/negadoctor.cl -%%DATADIR%%/kernels/nlmeans.cl -%%DATADIR%%/kernels/noise_generator.h -%%DATADIR%%/kernels/programs.conf -%%DATADIR%%/kernels/retouch.cl -%%DATADIR%%/kernels/rgb_norms.h -%%DATADIR%%/kernels/rgbcurve.cl -%%DATADIR%%/kernels/rgblevels.cl -%%DATADIR%%/kernels/sharpen.cl -%%DATADIR%%/kernels/soften.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/atrous.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/basecurve.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/basic.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/basicadj.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/bilateral.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/blendop.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/bloom.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/color_conversion.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/colorreconstruction.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/colorspace.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/colorspaces.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/common.h +%%NO_OPENCL%%%%DATADIR%%/kernels/demosaic_markesteijn.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/demosaic_other.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/demosaic_ppg.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/demosaic_vng.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/denoiseprofile.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/dwt.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/extended.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/filmic.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/gaussian.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/guided_filter.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/hazeremoval.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/highpass.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/liquify.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/locallaplacian.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/lut3d.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/negadoctor.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/nlmeans.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/noise_generator.h +%%NO_OPENCL%%%%DATADIR%%/kernels/programs.conf +%%NO_OPENCL%%%%DATADIR%%/kernels/retouch.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/rgb_norms.h +%%NO_OPENCL%%%%DATADIR%%/kernels/rgbcurve.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/rgblevels.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/sharpen.cl +%%NO_OPENCL%%%%DATADIR%%/kernels/soften.cl %%DATADIR%%/latex/photobook.cls %%LUA%%%%DATADIR%%/lua/darktable/debug.lua %%LUA%%%%DATADIR%%/luarc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102280945.11S9jcKP093165>