aboutsummaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorRainer Hurling <rhurlin@FreeBSD.org>2020-10-03 09:51:05 +0000
committerRainer Hurling <rhurlin@FreeBSD.org>2020-10-03 09:51:05 +0000
commite7d6d16c15e348db987f1b2bbab275b4a0b998c4 (patch)
treef7aa1e9cafe5257aab8a4f06354d8e7c3563f00a /math
parent0f427b1ffc3abbb440bb02505b263eab63401a50 (diff)
downloadports-e7d6d16c15e348db987f1b2bbab275b4a0b998c4.tar.gz
ports-e7d6d16c15e348db987f1b2bbab275b4a0b998c4.zip
math/saga: Configure not finding OpenCV headers
- Let pkg-config find the OpenCV 3.x headers after change in sources[1] - Convert sed replacement to proper patch file - While here, remove unneeded OpenMP post-patch [1] https://sourceforge.net/p/saga-gis/code/ci/1a4b6df792186480953f4fb20474f16b328a9a5c/ Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D26645
Notes
Notes: svn path=/head/; revision=551288
Diffstat (limited to 'math')
-rw-r--r--math/saga/Makefile5
-rw-r--r--math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am14
2 files changed, 15 insertions, 4 deletions
diff --git a/math/saga/Makefile b/math/saga/Makefile
index f11fc7a27f9b..716963374a0b 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -3,6 +3,7 @@
PORTNAME= saga
PORTVERSION= 7.7.1
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
@@ -89,8 +90,6 @@ post-extract:
${WRKSRC}/src/tools/pointcloud/pointcloud_viewer/Makefile.am \
${WRKSRC}/src/tools/statistics/statistics_kriging/Makefile.am \
${WRKSRC}/src/tools/tin/tin_viewer/Makefile.am
- @${REINPLACE_CMD} -e 's|/usr/include/opencv|${LOCALBASE}/include/opencv ${LOCALBASE}/include|g' \
- ${WRKSRC}/src/tools/imagery/imagery_opencv/Makefile.am
post-patch:
.if ${ARCH} == "powerpc"
@@ -102,8 +101,6 @@ post-patch:
post-patch-OPENMP-on:
@${REINPLACE_CMD} -e 's|-lgomp|-lomp|' \
- ${WRKSRC}/configure.ac \
- ${WRKSRC}/configure \
${WRKSRC}/src/accessories/templates/template4saga-tools/my_tool_library/Makefile
post-configure:
diff --git a/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am b/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am
new file mode 100644
index 000000000000..2a6c505a52e0
--- /dev/null
+++ b/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am
@@ -0,0 +1,14 @@
+--- src/tools/imagery/imagery_opencv/Makefile.am.orig 2020-09-28 15:32:31 UTC
++++ src/tools/imagery/imagery_opencv/Makefile.am
+@@ -7,9 +7,9 @@ endif
+
+ if HAVE_CV
+ DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+-CXX_INCS = -I$(top_srcdir)/src/saga_core `pkg-config opencv4 --cflags`
++CXX_INCS = -I$(top_srcdir)/src/saga_core `pkg-config opencv --cflags`
+ AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
+-AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv4 --libs`
++AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv --libs`
+ pkglib_LTLIBRARIES = libimagery_opencv.la
+ libimagery_opencv_la_SOURCES =\
+ MLB_Interface.cpp\