| 1 |
commit: 49491819885af7f659dafe3a116ada80fbcfe1d7 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 28 08:23:11 2020 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 28 08:24:53 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49491819 |
| 7 |
|
| 8 |
media-gfx/sane-backends: Fix genesys backend on bigendian |
| 9 |
|
| 10 |
Fixes a compile failure on HPPA (and other BE architectures): |
| 11 |
|
| 12 |
backend/genesys/low.cpp:542:9: error: ‘depth’ was not declared in this |
| 13 |
scope |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 16 |
Bug: https://bugs.gentoo.org/729312 |
| 17 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 18 |
|
| 19 |
.../files/sane-backends-1.0.30-bigendian-depth.patch | 14 ++++++++++++++ |
| 20 |
media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild | 3 ++- |
| 21 |
2 files changed, 16 insertions(+), 1 deletion(-) |
| 22 |
|
| 23 |
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch b/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch |
| 24 |
new file mode 100644 |
| 25 |
index 00000000000..bac06593b9e |
| 26 |
--- /dev/null |
| 27 |
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch |
| 28 |
@@ -0,0 +1,14 @@ |
| 29 |
+Correct overlooked bigendian case. This has been fixed upstream in a different |
| 30 |
+way since the 1.0.30 release. |
| 31 |
+ |
| 32 |
+--- a/backend/genesys/low.cpp |
| 33 |
++++ b/backend/genesys/low.cpp |
| 34 |
+@@ -539,7 +539,7 @@ |
| 35 |
+ } |
| 36 |
+ |
| 37 |
+ #ifdef WORDS_BIGENDIAN |
| 38 |
+- if (depth == 16) { |
| 39 |
++ if (session.params.depth == 16) { |
| 40 |
+ dev->pipeline.push_node<ImagePipelineNodeSwap16BitEndian>(); |
| 41 |
+ } |
| 42 |
+ #endif |
| 43 |
|
| 44 |
diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild |
| 45 |
index e7eb2d4d7dd..d81a991ad81 100644 |
| 46 |
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild |
| 47 |
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild |
| 48 |
@@ -168,7 +168,8 @@ PATCHES=( |
| 49 |
"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch |
| 50 |
"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch |
| 51 |
"${FILESDIR}"/${P}-missing-stdint-include.patch |
| 52 |
- "${FILESDIR}"/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch |
| 53 |
+ "${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch |
| 54 |
+ "${FILESDIR}"/${PN}-1.0.30-bigendian-depth.patch |
| 55 |
) |
| 56 |
|
| 57 |
S="${WORKDIR}/${MY_P}" |
Archives