SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/sane-backends/stuff/libv4l-0.8.3.patch	Tue Aug 14 13:39:12 2012 +0200
     1.3 @@ -0,0 +1,64 @@
     1.4 +From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
     1.5 +From: Nils Philippsen <nils@redhat.com>
     1.6 +Date: Mon, 14 Mar 2011 13:35:05 +0100
     1.7 +Subject: [PATCH] patch: v4l
     1.8 +
     1.9 +Squashed commit of the following:
    1.10 +
    1.11 +commit 23381932c76846191b42a48e505b37cd74711265
    1.12 +Author: Julien BLACHE <jb@jblache.org>
    1.13 +Date:   Wed Feb 16 19:37:43 2011 +0100
    1.14 +
    1.15 +    Fix v4l build with libv4l 0.8.3+
    1.16 +
    1.17 +    (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
    1.18 +
    1.19 +    Conflicts:
    1.20 +
    1.21 +    	ChangeLog
    1.22 +
    1.23 +    Signed-off-by: Nils Philippsen <nils@redhat.com>
    1.24 +---
    1.25 + backend/v4l.c |    3 +--
    1.26 + backend/v4l.h |    3 ++-
    1.27 + 2 files changed, 3 insertions(+), 3 deletions(-)
    1.28 +
    1.29 +diff --git a/backend/v4l.c b/backend/v4l.c
    1.30 +index 6510ef0..38595ed 100644
    1.31 +--- a/backend/v4l.c
    1.32 ++++ b/backend/v4l.c
    1.33 +@@ -84,9 +84,8 @@
    1.34 + #include "../include/sane/sanei_config.h"
    1.35 + #define V4L_CONFIG_FILE "v4l.conf"
    1.36 + 
    1.37 +-#include "v4l.h"
    1.38 +-
    1.39 + #include <libv4l1.h>
    1.40 ++#include "v4l.h"
    1.41 + 
    1.42 + static const SANE_Device **devlist = NULL;
    1.43 + static int num_devices;
    1.44 +diff --git a/backend/v4l.h b/backend/v4l.h
    1.45 +index 588b96e..6aee586 100644
    1.46 +--- a/backend/v4l.h
    1.47 ++++ b/backend/v4l.h
    1.48 +@@ -29,6 +29,7 @@
    1.49 + #ifndef v4l_h
    1.50 + #define v4l_h
    1.51 + 
    1.52 ++#ifndef __LINUX_VIDEODEV_H
    1.53 + /* Kernel interface */
    1.54 + /* Only the stuff we need. For more features, more defines are needed */
    1.55 + 
    1.56 +@@ -165,7 +166,7 @@ struct video_channel
    1.57 + 
    1.58 + 
    1.59 + /* end of kernel interface */
    1.60 +-
    1.61 ++#endif /* !__LINUX_VIDEODEV_H */
    1.62 + 
    1.63 + #include <../include/sane/sane.h>
    1.64 + 
    1.65 +-- 
    1.66 +1.7.4
    1.67 +