wok view amsn/stuff/amsn-v4l2.patch @ rev 19255

Up cookutils (804)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sun Jul 03 11:20:09 2016 +0300 (2016-07-03)
parents 6bfee44096f0
children
line source
1 --- configure.ac 2012-05-23 21:21:14.000000000 +0200
2 +++ configure.ac 2012-06-02 12:29:24.836921683 +0200
3 @@ -378,6 +378,10 @@
4 AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux)
5 fi
6
7 +if test "$FOUND_OS" = "linux"; then
8 + AC_CHECK_HEADERS(linux/videodev2.h)
9 +fi
10 +
11 #---------------------------------------------------------------------------------------------
12
13 dnl ---------------------------------------------------------------------
14 --- utils/linux/capture/capture.h 2011-04-12 02:20:59.000000000 +0200
15 +++ utils/linux/capture/capture.h 2012-06-02 12:29:24.836921683 +0200
16 @@ -34,7 +34,11 @@
17 #ifdef HAVE_SYS_VIDEODEV2_H
18 # include <sys/videodev2.h>
19 #else
20 -# include <linux/videodev.h>
21 + #ifdef HAVE_LINUX_VIDEODEV2_H
22 + #include <linux/videodev2.h>
23 + #else
24 + #include <linux/videodev.h>
25 + #endif
26 #endif
27 */
28
29 --- utils/linux/capture/libng/plugins/Rules.mk 2012-05-18 17:31:32.000000000 +0200
30 +++ utils/linux/capture/libng/plugins/Rules.mk 2012-06-02 12:51:59.523065502 +0200
31 @@ -2,6 +2,13 @@
32 TARGETS-plugins := $(capture_dir)/libng/plugins/conv-mjpeg.so
33 TARGETS-plugins += $(patsubst %,$(capture_dir)/libng/plugins/%.so,${LIBNG_PLUGINS})
34
35 +plugin_link_so = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(capture_dir)/capture.so $(SHARED) -o $@
36 +ifeq ($(verbose),no)
37 + echo_plugin_link_so = echo " LDP " $@
38 +else
39 + echo_plugin_link_so = echo $(plugin_link_so)
40 +endif
41 +
42 # global targets
43 all:: $(TARGETS-plugins)