Changeset 39460


Ignore:
Timestamp:
2014-02-04T16:32:37+01:00 (4 years ago)
Author:
jow
Message:

sane-backends: update to 1.0.24 and fix configure

  • bump to 1.0.24
  • get rid of shipped libtool
  • remove host include paths from configure macros
  • do not patch generated configure
  • refresh patches

Signed-off-by: Jo-Philipp Wich <jow@…>

Location:
packages/utils/sane-backends
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • packages/utils/sane-backends/Makefile

    r35388 r39460  
    11# 
    2 # Copyright (C) 2006-2012 OpenWrt.org 
     2# Copyright (C) 2006-2014 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.23 
     11PKG_VERSION:=1.0.24 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=http://fossies.org/linux/misc \ 
    16         ftp://ftp.sane-project.org/pub/sane/$(PKG_NAME)-$(PKG_VERSION) \ 
    17         https://alioth.debian.org/frs/download.php/3503 
    18 PKG_MD5SUM:=e226a89c54173efea80e91e9a5eb6573 
     16        https://alioth.debian.org/frs/download.php/3958 
     17PKG_MD5SUM:=1ca68e536cd7c1852322822f5f6ac3a4 
    1918 
    2019PKG_FIXUP:=autoreconf 
     20PKG_REMOVE_FILES:=aclocal.m4 
     21 
    2122PKG_INSTALL:=1 
    2223 
  • packages/utils/sane-backends/patches/002-remove-uneeded.patch

    r32036 r39460  
    11--- a/Makefile.in 
    22+++ b/Makefile.in 
    3 @@ -293,7 +293,7 @@ target_alias = @target_alias@ 
     3@@ -396,7 +396,7 @@ target_alias = @target_alias@ 
    44 top_build_prefix = @top_build_prefix@ 
    55 top_builddir = @top_builddir@ 
    66 top_srcdir = @top_srcdir@ 
    7 -SUBDIRS = include lib sanei backend frontend tools doc po 
     7-SUBDIRS = include lib sanei backend frontend tools doc po testsuite 
    88+SUBDIRS = include lib sanei backend frontend 
    99 DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite 
  • packages/utils/sane-backends/patches/010-dont-add-host-include-path.patch

    r27634 r39460  
    1 --- a/configure 
    2 +++ b/configure 
    3 @@ -5070,9 +5070,6 @@ else 
     1--- a/configure.in 
     2+++ b/configure.in 
     3@@ -82,8 +82,6 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$c 
     4 dnl *********************************************************************** 
     5 dnl set compiler/linker flags 
     6 dnl *********************************************************************** 
     7-INCLUDES="${INCLUDES} -I/usr/local/include" 
     8-AC_SUBST(INCLUDES) 
     9 SANE_SET_CFLAGS([$is_release]) 
     10 SANE_SET_LDFLAGS 
     11 SANE_LINKER_RPATH 
     12@@ -332,30 +330,22 @@ if test -c /dev/urandom ; then 
     13     AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?]) 
    414 fi 
    515  
     16-dnl added by PN 3/2/12 to detect cups 
     17-$as_echo "checking for cups" 
     18-if test -e /usr/include/cups/cups.h ; then 
     19-    AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?]) 
     20-       with_cups="yes" 
     21-       LIBS="-lcups  $LIBS" 
     22-else 
     23-       $as_echo "cups.h not found, you may want to install a cups development package" 
     24-       $as_echo "in order to autodetect network scanners in kodakaio." 
     25-       with_cups="no" 
     26+AC_CHECK_HEADERS([cups/cups.h], [with_cups=yes], [with_cups=no]) 
     27+if test "x${with_cups}" = "xyes"; then 
     28+  AC_DEFINE(HAVE_CUPS,[1],[Is cups/cups.h available?]) 
     29+  AC_PATH_PROG(CUPS_CONFIG, cups-config) 
     30+  if test "x${CUPS_CONFIG}" != "x"; then 
     31+    LIBS="$LIBS `$CUPS_CONFIG --libs`" 
     32+  fi 
     33 fi 
    634  
    7 -INCLUDES="${INCLUDES} -I/usr/local/include" 
    8 - 
    9 - 
    10  if test "${ac_cv_c_compiler_gnu}" = "yes"; then 
    11    NORMAL_CFLAGS="\ 
    12        -W \ 
     35-dnl added by llagendijk 12/7/2012 to detect systemd for saned 
     36-$as_echo_n "Checking for systemd..." 
     37-if test -e /usr/include/systemd/sd-daemon.h ; then 
     38-    AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?]) 
     39-    with_systemd="yes" 
     40-    SYSTEMD_LIBS=" -lsystemd-daemon" 
     41-    AC_SUBST(SYSTEMD_LIBS) 
     42-    $as_echo "yes" 
     43-else 
     44-    with_systemd="no" 
     45-    $as_echo "no" 
     46+AC_CHECK_HEADERS([systemd/sd-daemon.h]) 
     47+PKG_CHECK_MODULES([HAVE_SYSTEMD], [libsystemd-daemon], [with_systemd=yes], [with_systemd=no]) 
     48+if test "x${with_systemd}" = "xyes"; then 
     49+    AC_DEFINE(HAVE_SYSTEMD,[1],[Is systemd/sd-daemon.h available?]) 
     50+    SYSTEMD_LIBS="-lsystemd-daemon" 
     51 fi 
     52+AC_SUBST(SYSTEMD_LIBS) 
     53  
     54 dnl *********** 
     55 dnl USB Support 
Note: See TracChangeset for help on using the changeset viewer.