diff options
| -rw-r--r-- | extra/sane/.footprint.i686 | 6 | ||||
| -rw-r--r-- | extra/sane/.footprint.x86_64 | 6 | ||||
| -rw-r--r-- | extra/sane/.md5sum.i686 | 1 | ||||
| -rw-r--r-- | extra/sane/.md5sum.x86_64 | 1 | ||||
| -rwxr-xr-x | extra/sane/Pkgfile | 14 | ||||
| -rw-r--r-- | extra/sane/sane-libv4l-0.8.3.patch | 65 |
6 files changed, 88 insertions, 5 deletions
diff --git a/extra/sane/.footprint.i686 b/extra/sane/.footprint.i686 index 903f93623..420ada2a6 100644 --- a/extra/sane/.footprint.i686 +++ b/extra/sane/.footprint.i686 @@ -75,6 +75,7 @@ drwxr-xr-x root/root etc/sane.d/dll.d/ -rw-r--r-- root/root etc/sane.d/umax.conf -rw-r--r-- root/root etc/sane.d/umax1220u.conf -rw-r--r-- root/root etc/sane.d/umax_pp.conf +-rw-r--r-- root/root etc/sane.d/v4l.conf -rw-r--r-- root/root etc/sane.d/xerox_mfp.conf drwxr-xr-x root/root etc/udev/ drwxr-xr-x root/root etc/udev/rules.d/ @@ -419,6 +420,10 @@ lrwxrwxrwx root/root usr/lib/sane/libsane-umax1220u.so.1 -> libsane-umax1220u.so lrwxrwxrwx root/root usr/lib/sane/libsane-umax_pp.so -> libsane-umax_pp.so.1.0.22 lrwxrwxrwx root/root usr/lib/sane/libsane-umax_pp.so.1 -> libsane-umax_pp.so.1.0.22 -rwxr-xr-x root/root usr/lib/sane/libsane-umax_pp.so.1.0.22 +-rwxr-xr-x root/root usr/lib/sane/libsane-v4l.la +lrwxrwxrwx root/root usr/lib/sane/libsane-v4l.so -> libsane-v4l.so.1.0.22 +lrwxrwxrwx root/root usr/lib/sane/libsane-v4l.so.1 -> libsane-v4l.so.1.0.22 +-rwxr-xr-x root/root usr/lib/sane/libsane-v4l.so.1.0.22 -rwxr-xr-x root/root usr/lib/sane/libsane-xerox_mfp.la lrwxrwxrwx root/root usr/lib/sane/libsane-xerox_mfp.so -> libsane-xerox_mfp.so.1.0.22 lrwxrwxrwx root/root usr/lib/sane/libsane-xerox_mfp.so.1 -> libsane-xerox_mfp.so.1.0.22 @@ -519,6 +524,7 @@ drwxr-xr-x root/root usr/share/man/man5/ -rw-r--r-- root/root usr/share/man/man5/sane-umax1220u.5.gz -rw-r--r-- root/root usr/share/man/man5/sane-umax_pp.5.gz -rw-r--r-- root/root usr/share/man/man5/sane-usb.5.gz +-rw-r--r-- root/root usr/share/man/man5/sane-v4l.5.gz -rw-r--r-- root/root usr/share/man/man5/sane-xerox_mfp.5.gz drwxr-xr-x root/root usr/share/man/man7/ -rw-r--r-- root/root usr/share/man/man7/sane.7.gz diff --git a/extra/sane/.footprint.x86_64 b/extra/sane/.footprint.x86_64 index 903f93623..420ada2a6 100644 --- a/extra/sane/.footprint.x86_64 +++ b/extra/sane/.footprint.x86_64 @@ -75,6 +75,7 @@ drwxr-xr-x root/root etc/sane.d/dll.d/ -rw-r--r-- root/root etc/sane.d/umax.conf -rw-r--r-- root/root etc/sane.d/umax1220u.conf -rw-r--r-- root/root etc/sane.d/umax_pp.conf +-rw-r--r-- root/root etc/sane.d/v4l.conf -rw-r--r-- root/root etc/sane.d/xerox_mfp.conf drwxr-xr-x root/root etc/udev/ drwxr-xr-x root/root etc/udev/rules.d/ @@ -419,6 +420,10 @@ lrwxrwxrwx root/root usr/lib/sane/libsane-umax1220u.so.1 -> libsane-umax1220u.so lrwxrwxrwx root/root usr/lib/sane/libsane-umax_pp.so -> libsane-umax_pp.so.1.0.22 lrwxrwxrwx root/root usr/lib/sane/libsane-umax_pp.so.1 -> libsane-umax_pp.so.1.0.22 -rwxr-xr-x root/root usr/lib/sane/libsane-umax_pp.so.1.0.22 +-rwxr-xr-x root/root usr/lib/sane/libsane-v4l.la +lrwxrwxrwx root/root usr/lib/sane/libsane-v4l.so -> libsane-v4l.so.1.0.22 +lrwxrwxrwx root/root usr/lib/sane/libsane-v4l.so.1 -> libsane-v4l.so.1.0.22 +-rwxr-xr-x root/root usr/lib/sane/libsane-v4l.so.1.0.22 -rwxr-xr-x root/root usr/lib/sane/libsane-xerox_mfp.la lrwxrwxrwx root/root usr/lib/sane/libsane-xerox_mfp.so -> libsane-xerox_mfp.so.1.0.22 lrwxrwxrwx root/root usr/lib/sane/libsane-xerox_mfp.so.1 -> libsane-xerox_mfp.so.1.0.22 @@ -519,6 +524,7 @@ drwxr-xr-x root/root usr/share/man/man5/ -rw-r--r-- root/root usr/share/man/man5/sane-umax1220u.5.gz -rw-r--r-- root/root usr/share/man/man5/sane-umax_pp.5.gz -rw-r--r-- root/root usr/share/man/man5/sane-usb.5.gz +-rw-r--r-- root/root usr/share/man/man5/sane-v4l.5.gz -rw-r--r-- root/root usr/share/man/man5/sane-xerox_mfp.5.gz drwxr-xr-x root/root usr/share/man/man7/ -rw-r--r-- root/root usr/share/man/man7/sane.7.gz diff --git a/extra/sane/.md5sum.i686 b/extra/sane/.md5sum.i686 index 1a4929777..35a1467f7 100644 --- a/extra/sane/.md5sum.i686 +++ b/extra/sane/.md5sum.i686 @@ -1 +1,2 @@ fadf56a60f4776bfb24491f66b617cf5 sane-backends-1.0.22.tar.gz +86c51f7a8f46f67d7e942230660d0eb5 sane-libv4l-0.8.3.patch diff --git a/extra/sane/.md5sum.x86_64 b/extra/sane/.md5sum.x86_64 index 1a4929777..35a1467f7 100644 --- a/extra/sane/.md5sum.x86_64 +++ b/extra/sane/.md5sum.x86_64 @@ -1 +1,2 @@ fadf56a60f4776bfb24491f66b617cf5 sane-backends-1.0.22.tar.gz +86c51f7a8f46f67d7e942230660d0eb5 sane-libv4l-0.8.3.patch diff --git a/extra/sane/Pkgfile b/extra/sane/Pkgfile index c2e12b523..4650e928d 100755 --- a/extra/sane/Pkgfile +++ b/extra/sane/Pkgfile @@ -2,20 +2,24 @@ # URL: http://www.sane-project.org/ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: libusb, libjpeg, libtiff, libgphoto2, libieee1284, gtk, libexif -# Run on: libusb,libjpeg,libtiff,libgphoto2,libieee1284,gtk,libexif +# Depends on: libusb-compat, v4l-utils, avahi, libjpeg, libtiff, libgphoto2, libieee1284, gtk, libexif +# Run on: libusb-compat,v4l-utils,avahi,libjpeg,libtiff,libgphoto2,libieee1284,gtk,libexif name=sane version=1.0.22 -release=1 -source=( ftp://ftp2.sane-project.org/pub/sane/$name-backends-$version/$name-backends-$version.tar.gz) - +release=2 +source=( ftp://ftp2.sane-project.org/pub/sane/$name-backends-$version/$name-backends-$version.tar.gz + sane-libv4l-0.8.3.patch) build() { cd $name-backends-$version + + patch -p1 -i ../sane-libv4l-0.8.3.patch + ./configure --prefix=/usr \ --localstatedir=/var \ --sysconfdir=/etc \ + --enable-avahi \ --mandir=/usr/share/man \ --infodir=/usr/share/info make diff --git a/extra/sane/sane-libv4l-0.8.3.patch b/extra/sane/sane-libv4l-0.8.3.patch new file mode 100644 index 000000000..241752160 --- /dev/null +++ b/extra/sane/sane-libv4l-0.8.3.patch @@ -0,0 +1,65 @@ +From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen <nils@redhat.com> +Date: Mon, 14 Mar 2011 13:35:05 +0100 +Subject: [PATCH] patch: v4l + +Squashed commit of the following: + +commit 23381932c76846191b42a48e505b37cd74711265 +Author: Julien BLACHE <jb@jblache.org> +Date: Wed Feb 16 19:37:43 2011 +0100 + + Fix v4l build with libv4l 0.8.3+ + + (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953) + + Conflicts: + + ChangeLog + + Signed-off-by: Nils Philippsen <nils@redhat.com> +--- + backend/v4l.c | 3 +-- + backend/v4l.h | 3 ++- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/backend/v4l.c b/backend/v4l.c +index 6510ef0..38595ed 100644 +--- a/backend/v4l.c ++++ b/backend/v4l.c +@@ -84,9 +84,8 @@ + #include "../include/sane/sanei_config.h" + #define V4L_CONFIG_FILE "v4l.conf" + +-#include "v4l.h" +- + #include <libv4l1.h> ++#include "v4l.h" + + static const SANE_Device **devlist = NULL; + static int num_devices; +diff --git a/backend/v4l.h b/backend/v4l.h +index 588b96e..6aee586 100644 +--- a/backend/v4l.h ++++ b/backend/v4l.h +@@ -29,6 +29,7 @@ + #ifndef v4l_h + #define v4l_h + ++#ifndef __LINUX_VIDEODEV_H + /* Kernel interface */ + /* Only the stuff we need. For more features, more defines are needed */ + +@@ -165,7 +166,7 @@ struct video_channel + + + /* end of kernel interface */ +- ++#endif /* !__LINUX_VIDEODEV_H */ + + #include <../include/sane/sane.h> + +-- +1.7.4 + + |