diff options
| author | Timothy Pearson <[email protected]> | 2012-08-08 01:26:02 -0500 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-08-20 18:28:14 +0200 |
| commit | 735cab429b6ca7f1fe217c17f33cfbec52aade65 (patch) | |
| tree | 45821dfac7e06e2c0fcd09166a5c79f8e8f451f0 | |
| parent | 7fa699a3c330921d98fc274dd8e88f09a2ec98a8 (diff) | |
| download | tdenetwork-735cab429b6ca7f1fe217c17f33cfbec52aade65.tar.gz tdenetwork-735cab429b6ca7f1fe217c17f33cfbec52aade65.zip | |
Fix FTBFS
(cherry picked from commit d573a253c1ba45b5e56f7bc25c8242f797a204e4)
| -rw-r--r-- | kopete/libkopete/avdevice/configure.in.in | 22 | ||||
| -rw-r--r-- | kopete/libkopete/avdevice/videodevice.cpp | 4 | ||||
| -rw-r--r-- | kopete/libkopete/avdevice/videodevice.h | 4 |
3 files changed, 28 insertions, 2 deletions
diff --git a/kopete/libkopete/avdevice/configure.in.in b/kopete/libkopete/avdevice/configure.in.in index 34dd7523..4a446c03 100644 --- a/kopete/libkopete/avdevice/configure.in.in +++ b/kopete/libkopete/avdevice/configure.in.in @@ -19,3 +19,25 @@ fi AC_MSG_RESULT($ac_have_libv4l1_videodev_h) # -- End libv4l1-videodev.h ---------------------------------------------- + +# -- Check for installed videodev headers -------------------- + +AC_MSG_CHECKING([for videodev.h]) + +AC_TRY_COMPILE([ +#include <linux/videodev.h> +], +[ +], + ac_have_videodev_h=yes +, + ac_have_videodev_h=no +) + +if test $ac_have_videodev_h = yes; then + AC_DEFINE(HAVE_LINUX_VIDEODEV_H, 1, [Define if you have videodev.h installed]) +fi + +AC_MSG_RESULT($ac_have_videodev_h) + +# -- End videodev ---------------------------------------------- diff --git a/kopete/libkopete/avdevice/videodevice.cpp b/kopete/libkopete/avdevice/videodevice.cpp index e12fb02f..1df1220f 100644 --- a/kopete/libkopete/avdevice/videodevice.cpp +++ b/kopete/libkopete/avdevice/videodevice.cpp @@ -2237,7 +2237,11 @@ TQString VideoDevice::pixelFormatName(int pixelformat) int VideoDevice::detectPixelFormats() { +#if defined(__linux__) && defined(ENABLE_AV) +#ifdef V4L2_CAP_VIDEO_CAPTURE int err = 0; +#endif +#endif switch(m_driver) { #if defined(__linux__) && defined(ENABLE_AV) diff --git a/kopete/libkopete/avdevice/videodevice.h b/kopete/libkopete/avdevice/videodevice.h index 7e575138..61bd8844 100644 --- a/kopete/libkopete/avdevice/videodevice.h +++ b/kopete/libkopete/avdevice/videodevice.h @@ -295,11 +295,11 @@ public: void enumerateMenu (void); #endif -#ifndef ENABLE_AV +#ifdef ENABLE_AV struct video_capability V4L_capabilities; struct video_buffer V4L_videobuffer; #endif -#endif +#endif TQValueVector<Kopete::AV::VideoInput> m_input; TQValueVector<Kopete::AV::VideoControl> m_control; // TQFile file; |