[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete
From:       Lamarque Souza <lamarque () gmail ! com>
Date:       2011-03-27 19:29:03
Message-ID: 20110327192903.11F08AC8CA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1226213 by lvsouza:

Make V4L support optional as it has been removed from kernel 2.6.38
http://svn.reviewboard.kde.org/r/6643
Thanks Carlos Federico Aguirre for this patch.

BUG: 269296
REVIEW: 6643
FIXED-IN: 4.6.2


 M  +1 -0      CMakeLists.txt  
 M  +2 -0      config-kopete.h.cmake  
 M  +24 -1     libkopete/avdevice/videodevice.cpp  
 M  +10 -0     libkopete/avdevice/videodevice.h  


--- trunk/KDE/kdenetwork/kopete/CMakeLists.txt #1226212:1226213
@@ -122,6 +122,7 @@
 check_include_files(valgrind/valgrind.h HAVE_VALGRIND_H)
 check_include_files(stdint.h HAVE_STDINT_H)
 check_include_files(inttypes.h HAVE_INTTYPES_H)
+check_include_files(linux/videodev.h HAVE_V4L)
 macro_bool_to_01(X11_Xss_FOUND HAVE_XSCREENSAVER)
 
 macro_optional_find_package(Expat)
--- trunk/KDE/kdenetwork/kopete/config-kopete.h.cmake #1226212:1226213
@@ -62,3 +62,5 @@
 
 /* Define to 1 if you want libv4l support */
 #cmakedefine HAVE_LIBV4L2 1
+
+#cmakedefine HAVE_V4L 1
--- trunk/KDE/kdenetwork/kopete/libkopete/avdevice/videodevice.cpp #1226212:1226213
@@ -485,7 +485,7 @@
 		}
 
 #endif
-
+#ifdef HAVE_V4L
 		CLEAR(V4L_capabilities);
 
 		if(m_driver==VIDEODEV_DRIVER_NONE)
@@ -550,6 +550,7 @@
 			}
 		}
 #endif
+#endif
 		m_name=m_model; // Take care about changing the name to be different from the model itself...
 
 		detectPixelFormats();
@@ -678,6 +679,7 @@
 			}
 			break;
 #endif
+#ifdef HAVE_V4L
 		case VIDEODEV_DRIVER_V4L:
 			m_videoread=true;
 			m_io_method=IO_METHOD_READ;
@@ -689,6 +691,7 @@
 			}
 			break;
 #endif
+#endif
 		case VIDEODEV_DRIVER_NONE:
 		default:
 
@@ -863,6 +866,7 @@
 				}
 				break;
 #endif
+#ifdef HAVE_V4L
 			case VIDEODEV_DRIVER_V4L:
 				{
 					struct video_window V4L_videowindow;
@@ -893,6 +897,7 @@
 				}
 				break;
 #endif
+#endif
 			case VIDEODEV_DRIVER_NONE:
 			default:
 				return EXIT_FAILURE;
@@ -966,6 +971,7 @@
 			}
 			break;
 #endif
+#ifdef HAVE_V4L
 		case VIDEODEV_DRIVER_V4L:
 			{
 			struct video_picture V4L_picture;
@@ -994,6 +1000,7 @@
 			}
 			break;
 #endif
+#endif
 		case VIDEODEV_DRIVER_NONE:
 		default:
 			break;
@@ -1043,6 +1050,7 @@
 				setupControls();
 				break;
 #endif
+#ifdef HAVE_V4L
 			case VIDEODEV_DRIVER_V4L:
 				struct video_channel V4L_input;
 				V4L_input.channel=newinput;
@@ -1055,6 +1063,7 @@
 				setupControls();
 				break;
 #endif
+#endif
 			case VIDEODEV_DRIVER_NONE:
 			default:
 				break;
@@ -1817,6 +1826,7 @@
 			}
 			break;
 #endif
+#ifdef HAVE_V4L
 		case VIDEODEV_DRIVER_V4L:
 			struct video_picture V4L_picture;
 			if(-1 == xioctl(VIDIOCGPICT, &V4L_picture))
@@ -1847,6 +1857,7 @@
 			kDebug() << "Reported current value is" << *value << ".";
 			return EXIT_SUCCESS;
 #endif
+#endif
 		case VIDEODEV_DRIVER_NONE:
 		default:
 			break;
@@ -1963,6 +1974,7 @@
 			}
 			break;
 #endif
+#ifdef HAVE_V4L
 		case VIDEODEV_DRIVER_V4L:
 			struct video_picture V4L_picture;
 			if(-1 == xioctl(VIDIOCGPICT, &V4L_picture))
@@ -2008,6 +2020,7 @@
 			}
 			return EXIT_SUCCESS;
 #endif
+#endif
 		case VIDEODEV_DRIVER_NONE:
 		default:
 			break;
@@ -2070,6 +2083,7 @@
 			}
 			break;
 #endif
+#ifdef HAVE_V4L
 		case VIDEODEV_DRIVER_V4L:
 			switch(palette)
 			{
@@ -2088,6 +2102,7 @@
 			}
 			break;
 #endif
+#endif
 		case VIDEODEV_DRIVER_NONE:
 		default:
 			return PIXELFORMAT_NONE;	break;
@@ -2150,6 +2165,7 @@
 			}
 			break;
 #endif
+#ifdef HAVE_V4L
 		case VIDEODEV_DRIVER_V4L:
 			switch(pixelformat)
 			{
@@ -2195,6 +2211,7 @@
 			}
 			break;
 #endif
+#endif
 		case VIDEODEV_DRIVER_NONE:
 		default:
 			return PIXELFORMAT_NONE;	break;
@@ -2356,6 +2373,7 @@
 			}
 			break;
 #endif
+#ifdef HAVE_V4L
 		case VIDEODEV_DRIVER_V4L:
 			switch(pixelformat)
 			{
@@ -2373,6 +2391,7 @@
 			}
 			break;
 #endif
+#endif
 		case VIDEODEV_DRIVER_NONE:
 		default:
 			break;
@@ -2520,6 +2539,7 @@
 			}
 			break;
 #endif
+#ifdef HAVE_V4L
 		case VIDEODEV_DRIVER_V4L:
 			switch(standard)
 			{
@@ -2575,6 +2595,7 @@
 			}
 			break;
 #endif
+#endif
 		case VIDEODEV_DRIVER_NONE:
 		default:
 			return STANDARD_UNKNOWN;	break;
@@ -2701,6 +2722,7 @@
 			}
 			break;
 #endif
+#ifdef HAVE_V4L
 		case VIDEODEV_DRIVER_V4L:
 			switch(standard)
 			{
@@ -2715,6 +2737,7 @@
 			}
 			break;
 #endif
+#endif
 		case VIDEODEV_DRIVER_NONE:
 		default:
 			break;
--- trunk/KDE/kdenetwork/kopete/libkopete/avdevice/videodevice.h #1226212:1226213
@@ -55,13 +55,21 @@
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #endif
+
+#ifdef HAVE_V4L
 #include <linux/videodev.h>
+#endif // have_v4l
+
 #define VIDEO_MODE_PAL_Nc  3
 #define VIDEO_MODE_PAL_M   4
 #define VIDEO_MODE_PAL_N   5
 #define VIDEO_MODE_NTSC_JP 6
 #define __STRICT_ANSI__
 
+#if defined(HAVE_LIBV4L2) && ! defined(HAVE_V4L)
+#include <linux/videodev2.h>
+#endif
+
 #ifdef HAVE_LIBV4L2
 #include <libv4l2.h>
 #endif // HAVE_V4L2
@@ -367,9 +375,11 @@
 	struct v4l2_format fmt;
 //	struct v4l2_input m_input;
 #endif
+#ifdef HAVE_V4L
 	struct video_capability V4L_capabilities;
 	struct video_buffer V4L_videobuffer;
 #endif	
+#endif
 	int currentwidth, minwidth, maxwidth, currentheight, minheight, maxheight;
 
 	QVector<rawbuffer> m_rawbuffers;
[prev in list] [next in list] [prev in thread] [next in thread]