commit: 49491819885af7f659dafe3a116ada80fbcfe1d7 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sun Jun 28 08:23:11 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sun Jun 28 08:24:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49491819
media-gfx/sane-backends: Fix genesys backend on bigendian Fixes a compile failure on HPPA (and other BE architectures): backend/genesys/low.cpp:542:9: error: ‘depth’ was not declared in this scope Package-Manager: Portage-2.3.103, Repoman-2.3.23 Bug: https://bugs.gentoo.org/729312 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> .../files/sane-backends-1.0.30-bigendian-depth.patch | 14 ++++++++++++++ media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) 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 new file mode 100644 index 00000000000..bac06593b9e --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch @@ -0,0 +1,14 @@ +Correct overlooked bigendian case. This has been fixed upstream in a different +way since the 1.0.30 release. + +--- a/backend/genesys/low.cpp ++++ b/backend/genesys/low.cpp +@@ -539,7 +539,7 @@ + } + + #ifdef WORDS_BIGENDIAN +- if (depth == 16) { ++ if (session.params.depth == 16) { + dev->pipeline.push_node<ImagePipelineNodeSwap16BitEndian>(); + } + #endif 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 index e7eb2d4d7dd..d81a991ad81 100644 --- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild @@ -168,7 +168,8 @@ PATCHES=( "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch "${FILESDIR}"/${P}-missing-stdint-include.patch - "${FILESDIR}"/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch + "${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch + "${FILESDIR}"/${PN}-1.0.30-bigendian-depth.patch ) S="${WORKDIR}/${MY_P}"
