Changeset 30153


Ignore:
Timestamp:
2012-02-04T22:02:57+01:00 (6 years ago)
Author:
jow
Message:

[packages_10.03.2] sane-backends: merge r27239, r27634, r29278

Location:
branches/packages_10.03.2/utils/sane-backends
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/utils/sane-backends/Makefile

    r27239 r30153  
    11# 
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=sane-backends 
    11 PKG_VERSION:=1.0.20 
    12 PKG_RELEASE:=3 
     11PKG_VERSION:=1.0.22 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    15 PKG_SOURCE_URL:=ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION)/ 
    16 PKG_MD5SUM:=a0cfdfdebca2feb4f2ba5d3418b15a42 
     15PKG_SOURCE_URL:=ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION) \ 
     16        https://alioth.debian.org/frs/download.php/3503 
     17PKG_MD5SUM:=fadf56a60f4776bfb24491f66b617cf5 
    1718 
    1819PKG_FIXUP:=libtool 
     
    3435  SECTION:=utils 
    3536  CATEGORY:=Utilities 
    36   DEPENDS:=+sane-libs +libtiff 
     37  DEPENDS:=+sane-libs 
    3738  TITLE+= (backends) 
    3839endef 
     
    4748  SECTION:=libs 
    4849  CATEGORY:=Libraries 
    49   DEPENDS:=+libjpeg +libpthread +libusb 
     50  DEPENDS:=+libjpeg +libtiff +libusb 
    5051  TITLE+= (libraries) 
    5152endef 
     
    8081        --without-gphoto2 \ 
    8182        --disable-debug \ 
     83        --without-snmp 
    8284 
    8385define Build/Configure 
  • branches/packages_10.03.2/utils/sane-backends/patches/001-remove-unneeded.patch

    r17213 r30153  
    11--- a/Makefile.in 
    22+++ b/Makefile.in 
    3 @@ -244,7 +244,7 @@ target_alias = @target_alias@ 
     3@@ -293,7 +293,7 @@ target_alias = @target_alias@ 
    44 top_build_prefix = @top_build_prefix@ 
    55 top_builddir = @top_builddir@ 
  • branches/packages_10.03.2/utils/sane-backends/patches/010-dont-add-host-include-path.patch

    r19679 r30153  
    1 diff --git a/configure b/configure 
    2 index cc79209..5f22d58 100755 
    31--- a/configure 
    42+++ b/configure 
    5 @@ -5019,9 +5019,6 @@ else 
     3@@ -5070,9 +5070,6 @@ else 
    64 fi 
    75  
  • branches/packages_10.03.2/utils/sane-backends/patches/020-non-i386-qcam.patch

    r20305 r30153  
    1 --- ./backend/qcam.c.orig       2009-12-01 06:11:04.000000000 +0000 
    2 +++ ./backend/qcam.c    2009-12-01 15:12:40.000000000 +0000 
     1--- a/backend/qcam.c 
     2+++ b/backend/qcam.c 
    33@@ -105,6 +105,17 @@ 
    44  
Note: See TracChangeset for help on using the changeset viewer.