sane-backends: remove outdated C++ patch
authorRosen Penev <[email protected]>
Sun, 21 Feb 2021 02:13:33 +0000 (18:13 -0800)
committerRosen Penev <[email protected]>
Sun, 21 Feb 2021 04:03:55 +0000 (20:03 -0800)
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 <[email protected]>
utils/sane-backends/Makefile
utils/sane-backends/patches/101-fix_uclibc_std_rand.patch [deleted file]

index db607171ff8ab63574b18fe8e9da805048e427e4..ab53eff9ea9f25ab47c4ab9b875af2af2922e86d 100644 (file)
@@ -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 (file)
index 5478a38..0000000
+++ /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<float>(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<std::int32_t>(static_cast<std::int32_t>(value_f), 0, max_value);
-             set_raw_channel_to_row(out_data, x, ch, value, format);