Hello community, here is the log from the commit of package sane-backends for openSUSE:Factory checked in at 2013-09-25 17:20:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sane-backends (Old) and /work/SRC/openSUSE:Factory/.sane-backends.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sane-backends" Changes: -------- --- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes 2013-04-05 13:15:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 2013-09-25 17:20:04.000000000 +0200 @@ -1,0 +2,19 @@ +Mon Sep 15 23:23:23 UTC 2013 - p...@gmx.com + +- workaround for hp scanjet 8200 + As described in <https://bugzilla.novell.com/show_bug.cgi?id=840443> + when operating on a hp scanjet 8200 the avision driver gets stuck + in a loop trying to detect an ADF, even if none is present. + In order circumvent this issue, following workaround has been implemented: + 1) create an option "enforce-no-adf" in the file avision.conf + 2) patch the code in avision.c to make use of this option, + if the conditions that lead to the unsuccessful ADF search + (namely detection of NO ADF but reporting of SOME ADF type) is given. + Per default the new option is inactive by comment; activate at your own risk! + An upstream report was added to + <https://alioth.debian.org/tracker/index.php?func=detail&aid=314108&group_id=30186&atid=410366> +- created patch110 for avision.conf +- created patch111 for avision.c +- introduced patch110 and patch111 into sane-backends.spec + +------------------------------------------------------------------- New: ---- avision.c.patch avision.conf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sane-backends.spec ++++++ --- /var/tmp/diff_new_pack.25yMmk/_old 2013-09-25 17:20:05.000000000 +0200 +++ /var/tmp/diff_new_pack.25yMmk/_new 2013-09-25 17:20:05.000000000 +0200 @@ -188,6 +188,12 @@ # Furthermore it removes "unsupported" models from epkowa.desc because # otherwise there would be confusing model entries shown in yast2-scanner: Patch109: adapt_epkowa.desc_for_yast2-scanner.patch +# +# Patch 110 and 111 implement scanjet 8200 ADF workaround - bnc#840443 +# https://alioth.debian.org/tracker/index.php?func=detail&aid=314108&group_id=30186&atid=410366 +Patch110: avision.conf.patch +Patch111: avision.c.patch +# # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build # Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun: @@ -284,6 +290,11 @@ # Patch109 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner # see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14 %patch109 +# +# hope this is the right place to insert +%patch110 +%patch111 +# # Source100... is SUSE specific stuff: # Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc # because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is dropped. ++++++ avision.c.patch ++++++ --- backend/avision.c.orig 2012-07-01 04:00:44.000000000 +0200 +++ backend/avision.c 2013-09-15 13:24:31.150933718 +0200 @@ -1273,6 +1273,12 @@ static SANE_Bool force_a4 = SANE_FALSE; static SANE_Bool force_a3 = SANE_FALSE; +/* <2013-09-15_PNu> + * HP Scanjet 8200 w/o ADF fails during the ADF reset loop in get_accessories_info() + * Brute force option enforce-no-adf + */ +static SANE_Bool enforce_no_adf = SANE_FALSE; + /* hardware resolutions to interpolate from */ static const int hw_res_list_c5[] = { @@ -3208,6 +3214,17 @@ dev->inquiry_adf |= result [0]; + /* <2013-09-15_PNu> + * HP Scanjet 8200 w/o ADF fails during the following ADF reset loop + */ + if (enforce_no_adf) { + if (result[0] == 0) { + result[2] = 0; /* to prevent fail of following loop */ + DBG (3, "get_accessories_info: no adf enforced!\n"); + } + } + /* </2013-09-15_PNu> */ + if (dev->hw->feature_type2 & AV_ADF_FLIPPING_DUPLEX) { if (result[0] == 1) @@ -7637,6 +7654,14 @@ linenumber); static_calib_list [2] = SANE_TRUE; } + else if (strcmp (word, "enforce-no-adf") == 0) { + /* <2013-09-15_PNu> + * Brute force option enforce-no-adf + */ + DBG (3, "sane_reload_devices: config file line %d: enforce-no-adf\n", + linenumber); + enforce_no_adf = SANE_TRUE; + } else DBG (1, "sane_reload_devices: config file line %d: options unknown!\n", linenumber); ++++++ avision.conf.patch ++++++ --- backend/avision.conf.in.orig 2013-09-09 01:19:36.843243005 +0200 +++ backend/avision.conf.in 2013-09-15 13:13:40.697769805 +0200 @@ -8,6 +8,7 @@ #option disable-gamma-table #option disable-calibration #option force-a4 +#option enforce-no-adf #scsi AVISION #scsi FCPA -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
