wok annotate amsn/stuff/amsn-v4l2.patch @ rev 14376

move from undigest python-apsw, python-llfuse, python-py, python-pycryptopp, python-pyliblzma, python-pytest, python-unittest2, s3ql
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Apr 22 18:19:33 2013 +0200 (2013-04-22)
parents 6bfee44096f0
children
rev   line source
slaxemulator@13122 1 --- configure.ac 2012-05-23 21:21:14.000000000 +0200
slaxemulator@13122 2 +++ configure.ac 2012-06-02 12:29:24.836921683 +0200
slaxemulator@13122 3 @@ -378,6 +378,10 @@
slaxemulator@13122 4 AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux)
slaxemulator@13122 5 fi
slaxemulator@11040 6
slaxemulator@11040 7 +if test "$FOUND_OS" = "linux"; then
slaxemulator@11040 8 + AC_CHECK_HEADERS(linux/videodev2.h)
slaxemulator@11040 9 +fi
slaxemulator@11040 10 +
slaxemulator@11040 11 #---------------------------------------------------------------------------------------------
slaxemulator@13122 12
slaxemulator@11040 13 dnl ---------------------------------------------------------------------
slaxemulator@13122 14 --- utils/linux/capture/capture.h 2011-04-12 02:20:59.000000000 +0200
slaxemulator@13122 15 +++ utils/linux/capture/capture.h 2012-06-02 12:29:24.836921683 +0200
slaxemulator@13122 16 @@ -34,7 +34,11 @@
slaxemulator@11040 17 #ifdef HAVE_SYS_VIDEODEV2_H
slaxemulator@11040 18 # include <sys/videodev2.h>
slaxemulator@11040 19 #else
slaxemulator@11040 20 -# include <linux/videodev.h>
slaxemulator@11040 21 + #ifdef HAVE_LINUX_VIDEODEV2_H
slaxemulator@11040 22 + #include <linux/videodev2.h>
slaxemulator@11040 23 + #else
slaxemulator@11040 24 + #include <linux/videodev.h>
slaxemulator@11040 25 + #endif
slaxemulator@11040 26 #endif
slaxemulator@13122 27 */
slaxemulator@13122 28
slaxemulator@13122 29 --- utils/linux/capture/libng/plugins/Rules.mk 2012-05-18 17:31:32.000000000 +0200
slaxemulator@13122 30 +++ utils/linux/capture/libng/plugins/Rules.mk 2012-06-02 12:51:59.523065502 +0200
slaxemulator@13122 31 @@ -2,6 +2,13 @@
slaxemulator@13122 32 TARGETS-plugins := $(capture_dir)/libng/plugins/conv-mjpeg.so
slaxemulator@13122 33 TARGETS-plugins += $(patsubst %,$(capture_dir)/libng/plugins/%.so,${LIBNG_PLUGINS})
slaxemulator@13122 34
slaxemulator@13122 35 +plugin_link_so = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(capture_dir)/capture.so $(SHARED) -o $@
slaxemulator@13122 36 +ifeq ($(verbose),no)
slaxemulator@13122 37 + echo_plugin_link_so = echo " LDP " $@
slaxemulator@13122 38 +else
slaxemulator@13122 39 + echo_plugin_link_so = echo $(plugin_link_so)
slaxemulator@13122 40 +endif
slaxemulator@13122 41 +
slaxemulator@13122 42 # global targets
slaxemulator@13122 43 all:: $(TARGETS-plugins)