summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/blender/Makefile2
-rw-r--r--graphics/darktable/Makefile14
-rw-r--r--graphics/ebsynth/Makefile5
-rw-r--r--graphics/gmic/Makefile12
-rw-r--r--graphics/gthumb/Makefile3
-rw-r--r--graphics/lightzone/Makefile3
-rw-r--r--graphics/mandelbulber/Makefile3
-rw-r--r--graphics/pcl-pointclouds/Makefile14
-rw-r--r--graphics/photoflare/Makefile6
-rw-r--r--graphics/rawtherapee/Makefile3
-rw-r--r--graphics/tesseract/Makefile8
11 files changed, 15 insertions, 58 deletions
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 83573531c22d..7188290923c8 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -3,6 +3,7 @@
PORTNAME= blender
DISTVERSION= 2.82
+PORTREVISION= 1
CATEGORIES= graphics multimedia
MASTER_SITES= http://download.blender.org/source/ \
http://mirror.cs.umn.edu/blender.org/source/ \
@@ -135,7 +136,6 @@ OPENIMAGEDN_ONLY_FOR_ARCHS= amd64
OPENIMAGEDN_ONLY_FOR_ARCHS_REASON= oidn only supports amd64
# openmp usually works on amd64
OPENMP_CMAKE_BOOL= WITH_OPENMP
-OPENMP_LIB_DEPENDS= libomp.so:devel/openmp
OPENSUBDIV_CMAKE_BOOL= WITH_OPENSUBDIV
OPENSUBDIV_LIB_DEPENDS= libosdCPU.so:graphics/opensubdiv
OPENVDB_CMAKE_BOOL= WITH_OPENVDB WITH_OPENVDB_BLOSC
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index c4ed03deb63e..c0514c33a119 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -3,7 +3,7 @@
PORTNAME= darktable
PORTVERSION= 3.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
@@ -104,18 +104,6 @@ CMAKE_ARGS+= -DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_BIN} \
-DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_BIN}
.endif
-# Base clang may not support OpenMP, use ports clang:
-.if ${ARCH} == amd64 && ${CHOSEN_COMPILER_TYPE} == clang
-LLVM_VER= ${LLVM_DEFAULT}
-BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
-
-CPP= clang-cpp${LLVM_VER}
-CC= clang${LLVM_VER}
-CXX= clang++${LLVM_VER}
-
-LIB_DEPENDS+= libomp.so:devel/llvm${LLVM_VER}
-.endif
-
.if defined(WITH_DEBUG)
CMAKE_BUILD_TYPE= RelWithDebInfo
STRIP=
diff --git a/graphics/ebsynth/Makefile b/graphics/ebsynth/Makefile
index ba624e954171..d46d9c682899 100644
--- a/graphics/ebsynth/Makefile
+++ b/graphics/ebsynth/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ebsynth
PORTVERSION= 0.0.0.20190510
+PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= FreeBSD@ShaneWare.biz
@@ -9,9 +10,7 @@ COMMENT= Example-based Image Synthesis and Style Transfer
LICENSE= PD
-LIB_DEPENDS= libomp.so:devel/openmp
-
-USES= compiler:c++11-lang localbase
+USES= compiler:c++11-lang
USE_GITHUB= yes
GH_ACCOUNT= jamriska
GH_TAGNAME= 2f5c97c0c21a
diff --git a/graphics/gmic/Makefile b/graphics/gmic/Makefile
index d5c44e1d1cf4..0dd7e9806257 100644
--- a/graphics/gmic/Makefile
+++ b/graphics/gmic/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gmic
DISTVERSION= 2.8.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= https://gmic.eu/files/source/
DISTNAME= ${PORTNAME}_${DISTVERSION}
@@ -41,17 +41,9 @@ OPTIONS_DEFAULT= OPENMP X11
OPTIONS_SUB= yes
OPENMP_CMAKE_BOOL= ENABLE_OPENMP
-OPENMP_LIB_DEPENDS= libgomp.so:devel/openmp
X11_CMAKE_BOOL= ENABLE_X
X11_USES= xorg
X11_USE= XORG=ice,sm,x11,xext
-.include <bsd.port.pre.mk>
-
-# XXX Drop after FreeBSD 12.0 EOL
-.if ${CHOSEN_COMPILER_TYPE} == clang && !exists(/usr/include/omp.h)
-LIB_DEPENDS+= libomp.so:devel/openmp
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 13ce5935cccc..4df093fe28a6 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gthumb
PORTVERSION= 3.6.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -22,7 +22,6 @@ LIB_DEPENDS= libclutter-1.0.so:graphics/clutter \
libjson-glib-1.0.so:devel/json-glib \
liblcms2.so:graphics/lcms2 \
liboauth.so:net/liboauth \
- libomp.so:devel/openmp \
libpng.so:graphics/png \
libsoup-2.4.so:devel/libsoup \
libtiff.so:graphics/tiff
diff --git a/graphics/lightzone/Makefile b/graphics/lightzone/Makefile
index e7099d125097..6085c8b6ad4b 100644
--- a/graphics/lightzone/Makefile
+++ b/graphics/lightzone/Makefile
@@ -4,7 +4,7 @@
PORTNAME= lightzone
DISTVERSION= 4.1.8-3
DISTVERSIONSUFFIX= -g36e87773
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics java
DIST_SUBDIR= ${PORTNAME}
@@ -23,7 +23,6 @@ BUILD_DEPENDS= jhindexer:java/javahelp \
tidy:www/tidy-lib \
autoconf:devel/autoconf
LIB_DEPENDS= liblcms2.so:graphics/lcms2 \
- libomp.so:devel/openmp \
libtiff.so:graphics/tiff
RUN_DEPENDS= jhindexer:java/javahelp
diff --git a/graphics/mandelbulber/Makefile b/graphics/mandelbulber/Makefile
index 312f99219fb1..ebbbefe91a84 100644
--- a/graphics/mandelbulber/Makefile
+++ b/graphics/mandelbulber/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mandelbulber
DISTVERSION= 2.20
+PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= amdmi3@FreeBSD.org
@@ -37,8 +38,6 @@ OPTIONS_EXCLUDE= OPENMP # not properly supported yet
OPENCL_BUILD_DEPENDS= opencl>=0:devel/opencl
-OPENMP_LIB_DEPENDS= libomp.so:devel/openmp
-
post-patch-OPENMP-off:
@${REINPLACE_CMD} -e 's|-fopenmp||' \
${CMAKE_SOURCE_PATH}/CMakeLists.txt
diff --git a/graphics/pcl-pointclouds/Makefile b/graphics/pcl-pointclouds/Makefile
index 34b9381254a2..28eb894efa7a 100644
--- a/graphics/pcl-pointclouds/Makefile
+++ b/graphics/pcl-pointclouds/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pcl
DISTVERSIONPREFIX= ${PORTNAME}-
DISTVERSION= 1.10.0
+PORTREVISION= 1
CATEGORIES= graphics math
PKGNAMESUFFIX= -pointclouds
@@ -23,7 +24,7 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libpcap.so:net/libpcap \
libtiff.so:graphics/tiff
-USES= cmake compiler eigen:3 jpeg python xorg
+USES= cmake compiler:c++14-lang eigen:3 jpeg python xorg
LLD_UNSAFE= yes
USE_GITHUB= yes
GH_ACCOUNT= PointCloudLibrary
@@ -59,17 +60,6 @@ VTK_BROKEN= VTK has missing ompxx symbols: https://gitlab.kitware.com/vtk/vtk/i
.include <bsd.port.pre.mk>
-.if ${CHOSEN_COMPILER_TYPE} == clang
-# use clang from ports because cmake can't find OpenMP with base clang, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678
-# This should also be an port option, but PCL fails to build w/out OpenMP: https://github.com/PointCloudLibrary/pcl/issues/2638
-BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-CPP= clang-cpp${LLVM_DEFAULT}
-CC= clang${LLVM_DEFAULT}
-CXX= clang++${LLVM_DEFAULT}
-.else
-USE_GCC= yes
-.endif
-
post-patch: # 10 doesn't have std::sqrt, switching to ::sqrt from math.h
@${GREP} -rl std::sqrt ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's|::std::sqrt|::sqrt|g ; s|std::sqrt|::sqrt|g'
diff --git a/graphics/photoflare/Makefile b/graphics/photoflare/Makefile
index de5196f7db26..b6826b1bb3b1 100644
--- a/graphics/photoflare/Makefile
+++ b/graphics/photoflare/Makefile
@@ -3,6 +3,7 @@
PORTNAME= photoflare
DISTVERSIONPREFIX= v
DISTVERSION= 1.6.1
+PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= yuri@FreeBSD.org
@@ -11,8 +12,7 @@ COMMENT= Quick, simple but powerful cross-platform image editor
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-LIB_DEPENDS= libGraphicsMagick++.so:graphics/GraphicsMagick \
- libomp.so:devel/openmp
+LIB_DEPENDS= libGraphicsMagick++.so:graphics/GraphicsMagick
USES= compiler:c++17-lang desktop-file-utils gl qmake qt:5 localbase pkgconfig
USE_GITHUB= yes
@@ -20,6 +20,6 @@ USE_QT= core gui network printsupport widgets buildtools_build linguisttools_bu
USE_GL= gl
CXXFLAGS+= `pkg-config --cflags GraphicsMagick++`
-LDFLAGS+= `pkg-config --libs GraphicsMagick++` ${LOCALBASE}/lib/libomp.so
+LDFLAGS+= `pkg-config --libs GraphicsMagick++` -lomp
.include <bsd.port.mk>
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 62fb40baa0e8..a325bd1e9391 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -126,9 +126,6 @@ CMAKE_ARGS+= -DPROC_TARGET_NUMBER="2"
.endif
.if !empty(PORT_OPTIONS:MOPENMP) && !empty(OPTIONS_DEFINE:MOPENMP)
-. if ${OSVERSION} < 1102507 || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200506) || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300050)
-LIB_DEPENDS+= libomp.so:devel/openmp
-. endif
OPENMP_FLAGS= -lm -lomp
LDFLAGS+= ${OPENMP_FLAGS}
.endif
diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index ff9570c43aac..f8a73cc57bf0 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -49,12 +49,6 @@ TOOLS_LIB_DEPENDS=libicui18n.so:devel/icu \
libfontconfig.so:x11-fonts/fontconfig
TOOLS_USE= GNOME=cairo,glib20,pango
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == clang && !exists(/usr/include/omp.h) && ${PORT_OPTIONS:MOPENMP}
-LIB_DEPENDS+= libomp.so:devel/openmp
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|-O3 -DNDEBUG||' ${WRKSRC}/configure.ac
@@ -68,4 +62,4 @@ post-install-DOCS-on:
post-install-TOOLS-on:
@cd ${WRKSRC} && ${MAKE} DESTDIR=${STAGEDIR} training-install
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>