Date: Sat, 3 Oct 2020 09:51:05 +0000 (UTC) From: Rainer Hurling <rhurlin@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551288 - in head/math/saga: . files Message-ID: <202010030951.0939p5vE096687@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rhurlin Date: Sat Oct 3 09:51:05 2020 New Revision: 551288 URL: https://svnweb.freebsd.org/changeset/ports/551288 Log: 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 Added: head/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am (contents, props changed) Modified: head/math/saga/Makefile Modified: head/math/saga/Makefile ============================================================================== --- head/math/saga/Makefile Sat Oct 3 09:51:03 2020 (r551287) +++ head/math/saga/Makefile Sat Oct 3 09:51:05 2020 (r551288) @@ -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: Added: head/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/saga/files/patch-src_tools_imagery_imagery__opencv_Makefile.am Sat Oct 3 09:51:05 2020 (r551288) @@ -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\
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010030951.0939p5vE096687>