From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 37F6B1382C5 for ; Sun, 28 Jun 2020 08:25:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53173E0849; Sun, 28 Jun 2020 08:25:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 356B1E0849 for ; Sun, 28 Jun 2020 08:25:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9EBB634E95B for ; Sun, 28 Jun 2020 08:25:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6727027F for ; Sun, 28 Jun 2020 08:24:58 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1593332693.49491819885af7f659dafe3a116ada80fbcfe1d7.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/sane-backends/, media-gfx/sane-backends/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild X-VCS-Directories: media-gfx/sane-backends/ media-gfx/sane-backends/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 49491819885af7f659dafe3a116ada80fbcfe1d7 X-VCS-Branch: master Date: Sun, 28 Jun 2020 08:24:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8a231dbd-b651-46e4-a20a-8b67a380050b X-Archives-Hash: c4899e4f845bf0679c0e35005841785a commit: 49491819885af7f659dafe3a116ada80fbcfe1d7 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Jun 28 08:23:11 2020 +0000 Commit: Jeroen Roovers gentoo 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 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(); + } + #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}"