wok diff amsn/stuff/amsn-v4l2.patch @ rev 12692

xorg-server: fix font path
author Christophe Lincoln <pankso@slitaz.org>
date Wed May 02 16:15:55 2012 +0200 (2012-05-02)
parents
children 8eb478641728
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/amsn/stuff/amsn-v4l2.patch	Wed May 02 16:15:55 2012 +0200
     1.3 @@ -0,0 +1,33 @@
     1.4 +Add support for v4l2 on Linux so it can compile against modern
     1.5 +kernel headers. #363201
     1.6 +
     1.7 +Patch by Kevin McCarthy <signals@gentoo.org>
     1.8 +
     1.9 +--- configure.ac
    1.10 ++++ configure.ac
    1.11 +@@ -382,6 +382,10 @@
    1.12 + 	AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux)
    1.13 + fi
    1.14 + 
    1.15 ++if test "$FOUND_OS" = "linux"; then
    1.16 ++    AC_CHECK_HEADERS(linux/videodev2.h)
    1.17 ++fi
    1.18 ++
    1.19 + #---------------------------------------------------------------------------------------------
    1.20 + 
    1.21 + dnl ---------------------------------------------------------------------
    1.22 +--- utils/linux/capture/capture.h
    1.23 ++++ utils/linux/capture/capture.h
    1.24 +@@ -33,7 +33,11 @@
    1.25 + #ifdef HAVE_SYS_VIDEODEV2_H
    1.26 + #   include <sys/videodev2.h>
    1.27 + #else
    1.28 +-#   include <linux/videodev.h>
    1.29 ++	#ifdef HAVE_LINUX_VIDEODEV2_H
    1.30 ++		#include <linux/videodev2.h>
    1.31 ++	#else
    1.32 ++		#include <linux/videodev.h>
    1.33 ++	#endif
    1.34 + #endif
    1.35 + 
    1.36 + #include "grab-ng.h"