Attachment #204543 for bug #237847





PORTNAME=	siril
DISTVERSION=	0.9.10
PORTREVISION=	2
CATEGORIES=	astro graphics
MASTER_SITES=	https://free-astro.org/download/


		libfftw3.so:math/fftw3 \
		libgsl.so:math/gsl \
		liblcms2.so:graphics/lcms2 \
		libopencv_core.so:graphics/opencv-core \
		libpng.so:graphics/png \
		libraw.so:graphics/libraw \
		libtiff.so:graphics/tiff
# LIB_DEPENDS+=	libopencv_photo.so:graphics/opencv # for some reason, configure fails without opencv, but executable only links to opencv-core
BUILD_DEPENDS+=	${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core \
		${LOCALBASE}/lib/opencv4/libopencv_calib3d.so:graphics/opencv
RUN_DEPENDS+=	${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core \
		${LOCALBASE}/lib/opencv4/libopencv_calib3d.so:graphics/opencv

USES=		autoreconf desktop-file-utils gettext gmake gnome localbase pkgconfig jpeg shared-mime-info tar:bz2
GNU_CONFIGURE=	yes




--- configure.ac.orig	2019-01-16 08:56:00 UTC
+++ configure.ac
@@ -102,7 +102,7 @@ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 	dnl AC_MSG_WARN(CXX is "$CXX")
 	dnl http://nerdland.net/2009/07/detecting-c-libraries-with-autotools/ solution 2
 	dnl we handle 2 opencv versions because of a debian bug with opencv2 and GTK3
-	PKG_CHECK_MODULES([OPENCV], [opencv >= 3.0],
+	PKG_CHECK_MODULES([OPENCV], [opencv4-core >= 3.0],
 			  [OPENCV_LIBS="-lopencv_core -lopencv_imgproc -lopencv_calib3d"],
 			  [PKG_CHECK_MODULES([OPENCV], [opencv >= 2.0],
 					     [OPENCV_LIBS="-lopencv_core -lopencv_imgproc"],
@@ -111,6 +111,10 @@ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 								AC_MSG_ERROR([opencv not found. Not using some image processing.]))]
 					     )]
 			  )
+	OPENCV_LIBS_ONLY_L=`$PKG_CONFIG opencv4-core --libs-only-L`
+	OPENCV_LIBS_ONLY_OTHER=`$PKG_CONFIG opencv4-core --libs-only-other`
+	AC_SUBST(OPENCV_LIBS_ONLY_L)
+	AC_SUBST(OPENCV_LIBS_ONLY_OTHER)
 else
 	AC_MSG_ERROR([no C++ compiler found])
 fi	

Line 0 Link Here

(-)astro/siril/files/patch-src_Makefile.am (+11 lines)
	1	--- src/Makefile.am.orig 2019-05-17 04:40:19 UTC
	2	+++ src/Makefile.am
	3	@@ -47,7 +47,7 @@ siril_SOURCES += io/avi_pipp/pipp_avi_write.cpp io/avi
	4
	5	siril_SOURCES += opencv/opencv.cpp opencv/opencv.h opencv/ecc/ecc.cpp opencv/ecc/ecc.h
	6	siril_SOURCES += opencv/findHomography/fundam.cpp opencv/findHomography/calibration.cpp opencv/findHomography/modelest.cpp opencv/findHomography/_modelest.h opencv/findHomography/calib3d.hpp opencv/findHomography/precomp.hpp
	7	-siril_LDADD += $(OPENCV_LIBS)
	8	+siril_LDADD += $(OPENCV_LIBS_ONLY_L) $(OPENCV_LIBS) $(OPENCV_LIBS_ONLY_OTHER)
	9
	10	if OS_WIN32
	11	AM_LDFLAGS += -Wl,--export-all-symbols

Return to bug 237847

Lines 2-8 Link Here

(-)astro/siril/Makefile (-3 / +6 lines)
2		2
3	PORTNAME= siril	3	PORTNAME= siril
4	DISTVERSION= 0.9.10	4	DISTVERSION= 0.9.10
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= astro graphics	6	CATEGORIES= astro graphics
7	MASTER_SITES= https://free-astro.org/download/	7	MASTER_SITES= https://free-astro.org/download/
8		8
Lines 22-32 Link Here
22	libfftw3.so:math/fftw3 \	22	libfftw3.so:math/fftw3 \
23	libgsl.so:math/gsl \	23	libgsl.so:math/gsl \
24	liblcms2.so:graphics/lcms2 \	24	liblcms2.so:graphics/lcms2 \
25	libopencv_core.so:graphics/opencv-core \
26	libpng.so:graphics/png \	25	libpng.so:graphics/png \
27	libraw.so:graphics/libraw \	26	libraw.so:graphics/libraw \
28	libtiff.so:graphics/tiff	27	libtiff.so:graphics/tiff
29	LIB_DEPENDS+= libopencv_photo.so:graphics/opencv # for some reason, configure fails without opencv, but executable only links to opencv-core	28	# LIB_DEPENDS+= libopencv_photo.so:graphics/opencv # for some reason, configure fails without opencv, but executable only links to opencv-core
		29	BUILD_DEPENDS+= ${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core \
		30	${LOCALBASE}/lib/opencv4/libopencv_calib3d.so:graphics/opencv
		31	RUN_DEPENDS+= ${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core \
		32	${LOCALBASE}/lib/opencv4/libopencv_calib3d.so:graphics/opencv
30		33
31	USES= autoreconf desktop-file-utils gettext gmake gnome localbase pkgconfig jpeg shared-mime-info tar:bz2	34	USES= autoreconf desktop-file-utils gettext gmake gnome localbase pkgconfig jpeg shared-mime-info tar:bz2
32	GNU_CONFIGURE= yes	35	GNU_CONFIGURE= yes

Line 0 Link Here

(-)astro/siril/files/patch-configure.ac (+22 lines)
	1	--- configure.ac.orig 2019-01-16 08:56:00 UTC
	2	+++ configure.ac
	3	@@ -102,7 +102,7 @@ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
	4	dnl AC_MSG_WARN(CXX is "$CXX")
	5	dnl http://nerdland.net/2009/07/detecting-c-libraries-with-autotools/ solution 2
	6	dnl we handle 2 opencv versions because of a debian bug with opencv2 and GTK3
	7	- PKG_CHECK_MODULES([OPENCV], [opencv >= 3.0],
	8	+ PKG_CHECK_MODULES([OPENCV], [opencv4-core >= 3.0],
	9	[OPENCV_LIBS="-lopencv_core -lopencv_imgproc -lopencv_calib3d"],
	10	[PKG_CHECK_MODULES([OPENCV], [opencv >= 2.0],
	11	[OPENCV_LIBS="-lopencv_core -lopencv_imgproc"],
	12	@@ -111,6 +111,10 @@ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
	13	AC_MSG_ERROR([opencv not found. Not using some image processing.]))]
	14	)]
	15	)
	16	+ OPENCV_LIBS_ONLY_L=`$PKG_CONFIG opencv4-core --libs-only-L`
	17	+ OPENCV_LIBS_ONLY_OTHER=`$PKG_CONFIG opencv4-core --libs-only-other`
	18	+ AC_SUBST(OPENCV_LIBS_ONLY_L)
	19	+ AC_SUBST(OPENCV_LIBS_ONLY_OTHER)
	20	else
	21	AC_MSG_ERROR([no C++ compiler found])
	22	fi