From bf1a138f9276718a76589b3b170648d85bbb8c0b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 20 Feb 2021 18:13:33 -0800 Subject: [PATCH] sane-backends: remove outdated C++ patch std::round was unavailable because of a wrong configure var from the uClibc days. Fixed upstream with 1647790ae6202bd70b199e2aa44f8eb43e8d3af1 Refreshed patches with make package/sane-backends/refresh Signed-off-by: Rosen Penev --- utils/sane-backends/Makefile | 2 +- .../patches/101-fix_uclibc_std_rand.patch | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 utils/sane-backends/patches/101-fix_uclibc_std_rand.patch diff --git a/utils/sane-backends/Makefile b/utils/sane-backends/Makefile index db607171ff..ab53eff9ea 100644 --- a/utils/sane-backends/Makefile +++ b/utils/sane-backends/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sane-backends PKG_VERSION:=1.0.31 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://gitlab.com/sane-project/backends/uploads/8bf1cae2e1803aefab9e5331550e5d5d/ diff --git a/utils/sane-backends/patches/101-fix_uclibc_std_rand.patch b/utils/sane-backends/patches/101-fix_uclibc_std_rand.patch deleted file mode 100644 index 5478a3865e..0000000000 --- a/utils/sane-backends/patches/101-fix_uclibc_std_rand.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://gitlab.com/sane-project/backends/issues/237 - ---- a/backend/genesys/image_pipeline.cpp -+++ b/backend/genesys/image_pipeline.cpp -@@ -754,7 +754,11 @@ bool ImagePipelineNodeCalibrate::get_nex - - float value_f = static_cast(value) / max_value; - value_f = (value_f - offset_[curr_calib_i]) * multiplier_[curr_calib_i]; -+#if defined(__UCLIBC__) -+ value_f = round(value_f * max_value); -+#else - value_f = std::round(value_f * max_value); -+#endif - value = clamp(static_cast(value_f), 0, max_value); - set_raw_channel_to_row(out_data, x, ch, value, format); - -- 2.30.2