summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-08-23 07:20:15 +0200
committerErich Eckner <git@eckner.net>2019-08-23 07:20:15 +0200
commit1e723e74f3612208dc1029ee81146e216daef920 (patch)
tree66a7186ad73e49bc08aa3506f916dd6bd1a73cf2
parentda73639baa83ae3a81d53139ca75dee223af6b10 (diff)
downloadcrux-patches-1e723e74f3612208dc1029ee81146e216daef920.tar.xz
rm opt/sane: was upstreamed
-rw-r--r--opt/sane/Pkgfile.patch18
-rw-r--r--opt/sane/streifen.patch.new19
2 files changed, 0 insertions, 37 deletions
diff --git a/opt/sane/Pkgfile.patch b/opt/sane/Pkgfile.patch
deleted file mode 100644
index 050e5ac..0000000
--- a/opt/sane/Pkgfile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Pkgfile 2017-07-18 21:35:31.319090107 +0200
-+++ Pkgfile 2018-03-06 18:22:31.614780429 +0100
-@@ -6,11 +6,14 @@
- name=sane
- version=1.0.28
- release=1
--source=(https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/$name-backends-$version.tar.gz)
-+source=(https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/$name-backends-$version.tar.gz
-+streifen.patch)
-
- build () {
- cd $name-backends-$version
-
-+ patch -p1 -i $SRC/streifen.patch
-+
- ./configure --prefix=/usr \
- --localstatedir=/var \
- --sysconfdir=/etc \
diff --git a/opt/sane/streifen.patch.new b/opt/sane/streifen.patch.new
deleted file mode 100644
index 7923e85..0000000
--- a/opt/sane/streifen.patch.new
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/backend/genesys.c b/backend/genesys.c
-index e0ee9509..19b3a827 100644
---- a/backend/genesys.c
-+++ b/backend/genesys.c
-@@ -2069,12 +2069,9 @@ genesys_white_shading_calibration (Genesys_Device * dev)
- /* turn on motor and lamp power */
- dev->model->cmd_set->set_lamp_power (dev, dev->calib_reg, SANE_TRUE);
- dev->model->cmd_set->set_motor_power (dev->calib_reg, motor);
--
-- /* if needed, go back before doin next scan, by using rewind, registers and
-- * slopes table are kept intact from previous scan */
-- if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK && dev->model->cmd_set->rewind)
-+ if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK)
- {
-- status = dev->model->cmd_set->rewind (dev);
-+ status = dev->model->cmd_set->slow_back_home (dev, SANE_TRUE);
- }
-
- status =