diff options
| author | Calvin Morrison <[email protected]> | 2011-11-13 19:27:09 -0500 |
|---|---|---|
| committer | Calvin Morrison <[email protected]> | 2011-11-13 19:27:09 -0500 |
| commit | b04ad86203e19f0e89e971fefc3f40b380cbe7b2 (patch) | |
| tree | 639782b440de136501ae6ee50d8d54450765346f /redhat/kdenetwork/r1243951.diff | |
| parent | 7123ebd91f9851d8a0479d043508ec5885e24f91 (diff) | |
| parent | 70daaabb4fd5f3b559f5ef489377c9fe93a47f0d (diff) | |
| download | tde-packaging-b04ad86203e19f0e89e971fefc3f40b380cbe7b2.tar.gz tde-packaging-b04ad86203e19f0e89e971fefc3f40b380cbe7b2.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/kdenetwork/r1243951.diff')
| -rw-r--r-- | redhat/kdenetwork/r1243951.diff | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/redhat/kdenetwork/r1243951.diff b/redhat/kdenetwork/r1243951.diff new file mode 100644 index 000000000..1ee7d4e3b --- /dev/null +++ b/redhat/kdenetwork/r1243951.diff @@ -0,0 +1,42 @@ +Index: kdenetwork/kopete/libkopete/avdevice/configure.in.in +=================================================================== +--- kdenetwork/kopete/libkopete/avdevice/configure.in.in (revision 0) ++++ kdenetwork/kopete/libkopete/avdevice/configure.in.in (revision 1243951) +@@ -0,0 +1,21 @@ ++# -- Check for libv4l1-videodev.h presence -------------------- ++ ++AC_MSG_CHECKING([for libv4l1-videodev.h]) ++ ++AC_TRY_COMPILE([ ++#include <libv4l1-videodev.h> ++], ++[ ++], ++ ac_have_libv4l1_videodev_h=yes ++, ++ ac_have_libv4l1_videodev_h=no ++) ++ ++if test $ac_have_libv4l1_videodev_h = yes; then ++ AC_DEFINE(HAVE_LIBV4L1_VIDEODEV_H, 1, [Define if you have libv4l1-videodev.h installed]) ++fi ++ ++AC_MSG_RESULT($ac_have_libv4l1_videodev_h) ++ ++# -- End libv4l1-videodev.h ---------------------------------------------- +Index: kdenetwork/kopete/libkopete/avdevice/videodevice.h +=================================================================== +--- kdenetwork/kopete/libkopete/avdevice/videodevice.h (revision 1243950) ++++ kdenetwork/kopete/libkopete/avdevice/videodevice.h (revision 1243951) +@@ -52,7 +52,11 @@ + + #include <linux/fs.h> + #include <linux/kernel.h> ++#if defined(HAVE_LIBV4L1_VIDEODEV_H) ++#include <libv4l1-videodev.h> ++#else + #include <linux/videodev.h> ++#endif + #define VIDEO_MODE_PAL_Nc 3 + #define VIDEO_MODE_PAL_M 4 + #define VIDEO_MODE_PAL_N 5 |