[CinCV-commits] CinelerraCV.git (#1218) - master (branch) updated: v2.1.5-175-g9037c2d

git version control git at cinelerra-cv.org
Mon Jun 23 22:39:06 CEST 2014


The branch, master has been updated
       via  9037c2d90bf1a446ee67ff314d32bd1a066a9cab (commit)
      from  fd81d5591620809db3a4f079a47c5bdd182f92cc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9037c2d90bf1a446ee67ff314d32bd1a066a9cab
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Jun 21 20:27:16 2014 +0200

    Only build new plugin findobject if opencv is available.
    
    Use the configure check for OpenCV to decide if the plugin
    should be built or not, to allow the code to build
    on old systems without the OpenCV library available.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac        |   10 ++++++++--
 plugins/Makefile.am |    7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/configure.ac b/configure.ac
index b3eebd2..0280130 100644
--- a/configure.ac
+++ b/configure.ac
@@ -284,6 +284,10 @@ else
 fi
 AC_DEFINE_UNQUOTED(HAVE_OPENCV_SURF, $HAVE_OPENCV_SURF,
 	[define if SURF support is compiled into opencv])
+if test "x$opencv" = "xyes" && test "x$opencvh" = "xyes" ; then
+	enable_findobject=ok
+fi
+AM_CONDITIONAL(ENABLE_FINDOBJECT,test "x$enable_findobject" = "xok")
 ############## END OF MISC LIBRARIES
 
 LARGEFILE_CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -789,8 +793,6 @@ RPT(libfaac,libfaac libraries)
 RPT(libfaach,libfaac headers)
 RPT(libfaad,libfaad libraries)
 RPT(libfaadh,libfaad headers)
-RPT(opencv,opencv libraries)
-RPT(opencvh,opencv headers)
 mandatory="$succeeded"
 
 echo
@@ -815,6 +817,10 @@ ORPT(enable_firewire,Firewire,--disable-firewire,
 ORPT(enable_opengl,Hardware acceleration using OpenGL 2.0,--disable-opengl,
 	RPT(libGL,OpenGL 2.0 libraries)
 )
+ORPT(enable_findobject,findobject plugin using OpenCV 2.0,--disable-findobject,
+	RPT(opencv,opencv libraries)
+	RPT(opencvh,opencv headers)
+)
 
 if test "x$mandatory" = "xno"; then
 	echo
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index e8f9ca6..331020f 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -3,6 +3,11 @@ THEMES= \
 	bluedottheme \
 	defaulttheme
 
+if ENABLE_FINDOBJECT
+MAYBE_FINDOBJECT = \
+	findobject 
+endif
+
 SUBDIRS= \
 	$(THEMES) \
 	libfourier \
@@ -39,7 +44,6 @@ SUBDIRS= \
 	dot \
 	downsample \
 	fieldframe \
-	findobject \
 	flash \
 	flip \
 	framefield \
@@ -106,6 +110,7 @@ SUBDIRS= \
 	wipe \
 	yuv \
 	zoomblur \
+	$(MAYBE_FINDOBJECT) \
 	fonts
 
 AUTOMAKE_OPTIONS=foreign


hooks/post-receive
-- 
CinelerraCV.git (CinelerraCV)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CinelerraCV.git" (CinelerraCV).



More information about the cinelerra-commits mailing list