wok-next diff amsn/stuff/amsn-v4l2.patch @ rev 15706
claws-mail: Fix receipt
author | Eric Joseph-Alexandre <erjo@slitaz.org> |
---|---|
date | Sun Dec 22 18:42:54 2013 +0100 (2013-12-22) |
parents | 6bfee44096f0 |
children |
line diff
1.1 --- a/amsn/stuff/amsn-v4l2.patch Sun Oct 16 07:42:24 2011 +0000 1.2 +++ b/amsn/stuff/amsn-v4l2.patch Sun Dec 22 18:42:54 2013 +0100 1.3 @@ -1,24 +1,19 @@ 1.4 -Add support for v4l2 on Linux so it can compile against modern 1.5 -kernel headers. #363201 1.6 +--- configure.ac 2012-05-23 21:21:14.000000000 +0200 1.7 ++++ configure.ac 2012-06-02 12:29:24.836921683 +0200 1.8 +@@ -378,6 +378,10 @@ 1.9 + AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux) 1.10 + fi 1.11 1.12 -Patch by Kevin McCarthy <signals@gentoo.org> 1.13 - 1.14 ---- configure.ac 1.15 -+++ configure.ac 1.16 -@@ -382,6 +382,10 @@ 1.17 - AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux) 1.18 - fi 1.19 - 1.20 +if test "$FOUND_OS" = "linux"; then 1.21 + AC_CHECK_HEADERS(linux/videodev2.h) 1.22 +fi 1.23 + 1.24 #--------------------------------------------------------------------------------------------- 1.25 - 1.26 + 1.27 dnl --------------------------------------------------------------------- 1.28 ---- utils/linux/capture/capture.h 1.29 -+++ utils/linux/capture/capture.h 1.30 -@@ -33,7 +33,11 @@ 1.31 +--- utils/linux/capture/capture.h 2011-04-12 02:20:59.000000000 +0200 1.32 ++++ utils/linux/capture/capture.h 2012-06-02 12:29:24.836921683 +0200 1.33 +@@ -34,7 +34,11 @@ 1.34 #ifdef HAVE_SYS_VIDEODEV2_H 1.35 # include <sys/videodev2.h> 1.36 #else 1.37 @@ -29,5 +24,20 @@ 1.38 + #include <linux/videodev.h> 1.39 + #endif 1.40 #endif 1.41 - 1.42 - #include "grab-ng.h" 1.43 + */ 1.44 + 1.45 +--- utils/linux/capture/libng/plugins/Rules.mk 2012-05-18 17:31:32.000000000 +0200 1.46 ++++ utils/linux/capture/libng/plugins/Rules.mk 2012-06-02 12:51:59.523065502 +0200 1.47 +@@ -2,6 +2,13 @@ 1.48 + TARGETS-plugins := $(capture_dir)/libng/plugins/conv-mjpeg.so 1.49 + TARGETS-plugins += $(patsubst %,$(capture_dir)/libng/plugins/%.so,${LIBNG_PLUGINS}) 1.50 + 1.51 ++plugin_link_so = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(capture_dir)/capture.so $(SHARED) -o $@ 1.52 ++ifeq ($(verbose),no) 1.53 ++ echo_plugin_link_so = echo " LDP " $@ 1.54 ++else 1.55 ++ echo_plugin_link_so = echo $(plugin_link_so) 1.56 ++endif 1.57 ++ 1.58 + # global targets 1.59 + all:: $(TARGETS-plugins)