[libcvd-members] libcvd configure configure.in cvd/videosource.h...

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        08/05/20 04:14:31

Modified files:
        .              : configure configure.in 
        cvd            : videosource.h 
        cvd_src        : videosource.cpp 

Log message:
        Fixed dependency on V4LBuffer
        
        Currently, the setting of feature macros is done in the old style way
        using shell logic. Internal macros are set using the new dependency 
mechanism.
        All macros should be set using the dependency mechanism, really.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.119&r2=1.120
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.120&r2=1.121
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/videosource.h?cvsroot=libcvd&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/videosource.cpp?cvsroot=libcvd&r1=1.5&r2=1.6

Patches:
Index: configure
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- configure   13 May 2008 12:45:32 -0000      1.119
+++ configure   20 May 2008 04:14:29 -0000      1.120
@@ -10948,7 +10948,7 @@
 #General OS specific bits
 cvd_src/Linux/dvbuffer                                                 
dvbuffer END
 cvd_src/Linux/v4l1buffer                                               
v4l1buffer END
-cvd_src/Linux/v4lbuffer                                                        
v4l2buffer linux_2_6 END
+cvd_src/Linux/v4lbuffer,V4LBUFFER                              v4l2buffer 
linux_2_6 END
 cvd_src/Linux/v4l2buffer                               v4l2buffer END
 cvd_src/IRIX/O2buffer,cvd_src/IRIX/sgi-video   o2buffer END
 cvd_src/OSX/qtbuffer                                                   
qtbuffer END

Index: configure.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure.in,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- configure.in        13 May 2008 12:45:33 -0000      1.120
+++ configure.in        20 May 2008 04:14:30 -0000      1.121
@@ -888,7 +888,7 @@
 #General OS specific bits
 cvd_src/Linux/dvbuffer                                                 
dvbuffer END
 cvd_src/Linux/v4l1buffer                                               
v4l1buffer END
-cvd_src/Linux/v4lbuffer                                                        
v4l2buffer linux_2_6 END
+cvd_src/Linux/v4lbuffer,V4LBUFFER                              v4l2buffer 
linux_2_6 END
 cvd_src/Linux/v4l2buffer                               v4l2buffer END
 cvd_src/IRIX/O2buffer,cvd_src/IRIX/sgi-video   o2buffer END
 cvd_src/OSX/qtbuffer                                                   
qtbuffer END

Index: cvd/videosource.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/videosource.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- cvd/videosource.h   6 May 2008 23:06:42 -0000       1.9
+++ cvd/videosource.h   20 May 2008 04:14:30 -0000      1.10
@@ -18,7 +18,7 @@
 #include <cvd/videofilebuffer.h>
 #endif
 
-#if CVD_HAVE_V4L2BUFFER
+#if CVD_INTERNAL_HAVE_V4LBUFFER
 #include <cvd/Linux/v4lbuffer.h>
 #endif
 
@@ -70,7 +70,7 @@
 
     void get_files_options(const VideoSource& vs, int& fps, int& ra_frames, 
VideoBufferFlags::OnEndOfBuffer& eob);
     
-#if CVD_HAVE_V4L2BUFFER
+#if CVD_INTERNAL_HAVE_V4LBUFFER
     template <class T> VideoBuffer<T>* makeV4LBuffer(const std::string& dev, 
const ImageRef& size, int input, bool interlaced)
     {
        throw VideoSourceException("V4LBuffer cannot handle types other than 
byte, bayer, yuv422, Rgb<byte>");
@@ -140,7 +140,7 @@
        }
 #endif
 
-#if CVD_HAVE_V4L2BUFFER
+#if CVD_INTERNAL_HAVE_V4LBUFFER
        else if (vs.protocol == "v4l2") {
            ImageRef size;
            int input;
@@ -182,7 +182,7 @@
 #if CVD_HAVE_FFMPEG
                                       "file, "
 #endif
-#if CVD_HAVE_V4L2BUFFER
+#if CVD_INTERNAL_HAVE_V4LBUFFER
                                       "v4l2, "
 #endif
 #if CVD_HAVE_DVBUFFER

Index: cvd_src/videosource.cpp
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/videosource.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cvd_src/videosource.cpp     6 May 2008 23:06:42 -0000       1.5
+++ cvd_src/videosource.cpp     20 May 2008 04:14:30 -0000      1.6
@@ -226,7 +226,7 @@
     }
 
 
-#if CVD_HAVE_V4L2BUFFER
+#if CVD_INTERNAL_HAVE_V4LBUFFER
     template <> CVD::VideoBuffer<CVD::byte>* makeV4LBuffer(const std::string& 
dev, const CVD::ImageRef& size, int input, bool interlaced)
     {
        return new CVD::V4LBuffer<CVD::byte>(dev, size, input, interlaced);