wok-next annotate amsn/stuff/amsn-v4l2.patch @ rev 11798
ppp: build rp-pppoe.so (again)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sat Feb 25 10:55:20 2012 +0100 (2012-02-25) |
| parents | |
| children | 8eb478641728 |
| rev | line source |
|---|---|
| slaxemulator@11040 | 1 Add support for v4l2 on Linux so it can compile against modern |
| slaxemulator@11040 | 2 kernel headers. #363201 |
| slaxemulator@11040 | 3 |
| slaxemulator@11040 | 4 Patch by Kevin McCarthy <signals@gentoo.org> |
| slaxemulator@11040 | 5 |
| slaxemulator@11040 | 6 --- configure.ac |
| slaxemulator@11040 | 7 +++ configure.ac |
| slaxemulator@11040 | 8 @@ -382,6 +382,10 @@ |
| slaxemulator@11040 | 9 AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux) |
| slaxemulator@11040 | 10 fi |
| slaxemulator@11040 | 11 |
| slaxemulator@11040 | 12 +if test "$FOUND_OS" = "linux"; then |
| slaxemulator@11040 | 13 + AC_CHECK_HEADERS(linux/videodev2.h) |
| slaxemulator@11040 | 14 +fi |
| slaxemulator@11040 | 15 + |
| slaxemulator@11040 | 16 #--------------------------------------------------------------------------------------------- |
| slaxemulator@11040 | 17 |
| slaxemulator@11040 | 18 dnl --------------------------------------------------------------------- |
| slaxemulator@11040 | 19 --- utils/linux/capture/capture.h |
| slaxemulator@11040 | 20 +++ utils/linux/capture/capture.h |
| slaxemulator@11040 | 21 @@ -33,7 +33,11 @@ |
| slaxemulator@11040 | 22 #ifdef HAVE_SYS_VIDEODEV2_H |
| slaxemulator@11040 | 23 # include <sys/videodev2.h> |
| slaxemulator@11040 | 24 #else |
| slaxemulator@11040 | 25 -# include <linux/videodev.h> |
| slaxemulator@11040 | 26 + #ifdef HAVE_LINUX_VIDEODEV2_H |
| slaxemulator@11040 | 27 + #include <linux/videodev2.h> |
| slaxemulator@11040 | 28 + #else |
| slaxemulator@11040 | 29 + #include <linux/videodev.h> |
| slaxemulator@11040 | 30 + #endif |
| slaxemulator@11040 | 31 #endif |
| slaxemulator@11040 | 32 |
| slaxemulator@11040 | 33 #include "grab-ng.h" |