Attachment 204543 Details for Bug 237847 – patch to astro/siril to depend on opencv4

[patch] patch to astro/siril to depend on opencv4

siril-ver1.diff (text/plain), 4.08 KB, created by Hiroo Ono on 2019-05-22 15:37:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hiroo Ono

Created: 2019-05-22 15:37:11 UTC

Size: 4.08 KB

patch

obsolete

>Index: astro/siril/Makefile
>===================================================================
>--- astro/siril/Makefile	(revision 500577)
>+++ astro/siril/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	siril
> DISTVERSION=	0.9.10
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	astro graphics
> MASTER_SITES=	https://free-astro.org/download/
> 
>@@ -22,11 +22,14 @@
> 		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
>+# 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
>Index: astro/siril/files/patch-configure.ac
>===================================================================
>--- astro/siril/files/patch-configure.ac	(nonexistent)
>+++ astro/siril/files/patch-configure.ac	(working copy)
>@@ -0,0 +1,22 @@
>+--- 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	
>
>Property changes on: astro/siril/files/patch-configure.ac
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: astro/siril/files/patch-src_Makefile.am
>===================================================================
>--- astro/siril/files/patch-src_Makefile.am	(nonexistent)
>+++ astro/siril/files/patch-src_Makefile.am	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/Makefile.am.orig	2019-05-17 04:40:19 UTC
>++++ src/Makefile.am
>+@@ -47,7 +47,7 @@ siril_SOURCES += io/avi_pipp/pipp_avi_write.cpp io/avi
>+ 
>+ siril_SOURCES += opencv/opencv.cpp opencv/opencv.h opencv/ecc/ecc.cpp opencv/ecc/ecc.h
>+ 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
>+-siril_LDADD += $(OPENCV_LIBS)
>++siril_LDADD += $(OPENCV_LIBS_ONLY_L) $(OPENCV_LIBS) $(OPENCV_LIBS_ONLY_OTHER)
>+ 
>+ if OS_WIN32
>+ AM_LDFLAGS += -Wl,--export-all-symbols
>
>Property changes on: astro/siril/files/patch-src_Makefile.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 237847: 204333 | 204334 | 204542 | 204543 | 204544