diff options
Diffstat (limited to 'graphics/sane-backends/patches')
| -rw-r--r-- | graphics/sane-backends/patches/patch-ab | 28 | ||||
| -rw-r--r-- | graphics/sane-backends/patches/patch-ai | 10 |
2 files changed, 19 insertions, 19 deletions
diff --git a/graphics/sane-backends/patches/patch-ab b/graphics/sane-backends/patches/patch-ab index cd48819e13b..a7cd0fd161d 100644 --- a/graphics/sane-backends/patches/patch-ab +++ b/graphics/sane-backends/patches/patch-ab @@ -1,34 +1,34 @@ -$NetBSD: patch-ab,v 1.11 2010/09/19 15:06:18 wiz Exp $ +$NetBSD: patch-ab,v 1.12 2011/07/12 12:19:41 wiz Exp $ ---- configure.orig 2010-04-26 00:57:49.000000000 +0000 +--- configure.orig 2011-02-14 01:27:52.000000000 +0000 +++ configure -@@ -11687,13 +11687,13 @@ as_val=`eval 'as_val=${'$as_ac_Header'} - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +@@ -7202,13 +7202,13 @@ if test "x$ac_cv_header_pthread_h" = x"" + #define HAVE_PTHREAD_H 1 _ACEOF -- { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 -$as_echo_n "checking for pthread_create in -lpthread... " >&6; } -+ { $as_echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 +$as_echo_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; } - if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then + if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" +LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -11753,7 +11753,7 @@ fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -7239,7 +7239,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } - if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then + if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : - PTHREAD_LIBS="-lpthread" + PTHREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" fi have_pthread=yes -@@ -34541,14 +34541,14 @@ for be in ${BACKENDS}; do +@@ -17092,14 +17092,14 @@ for be in ${BACKENDS}; do ;; mustek_pp) diff --git a/graphics/sane-backends/patches/patch-ai b/graphics/sane-backends/patches/patch-ai index 8efcc36ade4..96860fa92e1 100644 --- a/graphics/sane-backends/patches/patch-ai +++ b/graphics/sane-backends/patches/patch-ai @@ -1,19 +1,19 @@ -$NetBSD: patch-ai,v 1.1 2010/12/27 15:07:52 adam Exp $ +$NetBSD: patch-ai,v 1.2 2011/07/12 12:19:41 wiz Exp $ Avoid duplicate symbols in libepson and libepson2. ---- backend/epson_usb.c.orig 2010-12-27 14:37:39.000000000 +0000 +--- backend/epson_usb.c.orig 2011-01-16 01:01:28.000000000 +0000 +++ backend/epson_usb.c -@@ -3,7 +3,7 @@ - #include "epson_usb.h" +@@ -4,7 +4,7 @@ + /* generated with epson2usb.pl doc/descriptions/epson2.desc */ -SANE_Word sanei_epson_usb_product_ids[] = { +static SANE_Word sanei_epson_usb_product_ids[] = { 0x101, /* GT-7000U, Perfection 636U */ 0x103, /* GT-6600U, Perfection 610 */ 0x104, /* GT-7600U, GT-7600UF, Perfection 1200U, Perfection 1200U PHOTO */ -@@ -79,7 +79,7 @@ SANE_Word sanei_epson_usb_product_ids[] +@@ -85,7 +85,7 @@ SANE_Word sanei_epson_usb_product_ids[] in the config file as "usb <vendor> <product>" */ }; |