Builds opencv video filters elsewhere than win32

diff --git a/configure.ac b/configure.ac
index b69c5b3293114bc5042562a2da033325ff7f7d99..0dfc6891be2e317e2b9b2cc1b781b10cc3c970df 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2234,10 +2234,9 @@ if test "${enable_opencv}" = "yes" -a "${CXX}" != "";
 then
   AC_ARG_WITH(opencv-tree,
   [    --with-opencv-tree=PATH opencv tree for linking])
-  if test -n "${with_opencv_tree}"
-  then
     if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
     then
+      test -z "${with_opencv_tree}" && AC_MSG_ERROR([You have to specify --with-opencv-tree])
          AC_MSG_CHECKING(for opencv in ${with_opencv_tree})
          if test -f ${with_opencv_tree}/cv/include/cv.h -a -f ${with_opencv_tree}/cxcore/include/cxcore.h \
            -a -f ${with_opencv_tree}/cvaux/include/cvaux.h -a -f ${with_opencv_tree}/otherlibs/highgui/highgui.h
@@ -2257,9 +2256,17 @@ then
         AC_MSG_ERROR([cannot find opencv in ${with_opencv_tree}])
          fi
     else
-         AC_MSG_WARN([--enable-opencv currently only works on windows])
+      PKG_CHECK_MODULES(OPENCV, opencv,
+        [
+          VLC_ADD_PLUGIN([opencv_example])
+          VLC_ADD_PLUGIN([opencv_wrapper])
+          VLC_ADD_LIBS([opencv_example opencv_wrapper],[${OPENCV_LIBS}])
+          VLC_ADD_CFLAGS([opencv_wrapper],[${OPENCV_CFLAGS}])
+          VLC_ADD_CXXFLAGS([opencv_example],[${OPENCV_CFLAGS}])
+        ],
+        [AC_MSG_ERROR([libopencv not found!])]
+      )
     fi
-  fi  
 fi
 
 

diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
index ee3181aaf332dfd5087993d72b6e2fb52c31c0d9..54a3f4d31a52763aaca3fd82ddd640a245826f28 100644 (file)
--- a/modules/video_filter/opencv_example.cpp
+++ b/modules/video_filter/opencv_example.cpp
@@ -36,7 +36,6 @@
 
 #include <vlc/vlc.h>
 #include <vlc_plugin.h>
-#include <vlc_decoder.h>
 #include <vlc_filter.h>
 #include "filter_common.h"
 #include <vlc_image.h>