diff options
Diffstat (limited to 'media-libs/zxing-cpp')
| -rw-r--r-- | media-libs/zxing-cpp/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/zxing-cpp/files/zxing-cpp-2.0.0-fix-crash.patch | 24 | ||||
| -rw-r--r-- | media-libs/zxing-cpp/zxing-cpp-2.0.0.ebuild (renamed from media-libs/zxing-cpp/zxing-cpp-1.3.0.ebuild) | 8 |
3 files changed, 32 insertions, 5 deletions
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest index 1d158a0aeb6e..d1569822dd93 100644 --- a/media-libs/zxing-cpp/Manifest +++ b/media-libs/zxing-cpp/Manifest @@ -1,6 +1,7 @@ AUX zxing-cpp-1.4.0-install-required-private-headers.patch 1473 BLAKE2B 8e2445934b118bdaf85b7567ee93fcf370d9e93ae23c2cb35a91e0c32ece380dcde92a0b34b9069805edf96a5f74ad5b20ffc4d8395f6084ed5bae14b961822d SHA512 98a8beaa4fafbc454663b9e8e3553e3859d6639f10a314eb7d668351a247222fb09636a36c68c32de8ffdc283dd3f92ec17cc706a9848099d20e74349d08cb0f -DIST zxing-cpp-1.3.0.tar.gz 97938087 BLAKE2B f0c9c906ab2b534c67cf66605eca0ecc22a90fc9d69e23397bcb0bc8eaf3d68a7ad41631ea6d9c7f292ee03165d2e038d84f497307384205e2d6f37fef5dddba SHA512 27821667dea3d09b91bf9825ff25483ed658d850fd238009f1c7e43b1b09e62d24b3a2cd78d4e39d29725931b32bfce3e21e7ec871830b3ad69a5a69c72d8de8 +AUX zxing-cpp-2.0.0-fix-crash.patch 1042 BLAKE2B 30045a15717fe7d64e9f8cb9769d84fdeeaadd1baa7b47509d32c2a454cef7d16098776db1af6029875f01cd902ed1f5f20818627a296e519cfded31407914ac SHA512 7275fac1ccc230393b1fe8432a3b37c782c8e5966d324054a39f415a51052697559b87fbcfdee8d531e878847d21672a284ad4de176453267dccae33b094da30 DIST zxing-cpp-1.4.0.tar.gz 1018225 BLAKE2B 98b6badfe0ddfa39650eb4fbfc02bc01f5237cdd5edfafd7b88067997a22caa2e64d067328b534c439d7d89fef5b6d48acf4bc29389142b332123b477f3e3dde SHA512 05c5b9282f13b76fa0897b21e5b73cb7df0c52e62f1a2d9760fe774aa0378fde97f5f9896690b65b28b4b96ba6ad2703bed53ffaf9d3784636d29cbe860d4bad -EBUILD zxing-cpp-1.3.0.ebuild 674 BLAKE2B beb366970d86e34a60eb7c156f62a43c251b167db59c85964258b57f68e49f08efa1cd97692607b2c63b295f7a666f3a60c60fafff0e84db77c0c5dc953599bf SHA512 0b064d67c9b1e3bf25059e906fae8e573300da28b2ee5d3b45ee9be33d13d1b8d690d596cd61b185083932aa122f8683120fdb8c2796b2ae3004d6721ba691e8 +DIST zxing-cpp-2.0.0.tar.gz 856413 BLAKE2B 8069d3e39a7ddf99510777df477a5e3503e5eead7adcbf175123ab59de47c3da75bb8187533dad552a07b1475756ff3981d30eaa3e8088c5c9b991e22a7127bd SHA512 fa22164f834a42194eafd0d3e9c09d953233c69843ac6e79c8d6513314be28d8082382b436c379368e687e0eed05cb5e566d2893ec6eb29233a36643904ae083 EBUILD zxing-cpp-1.4.0.ebuild 880 BLAKE2B 1e844eddf48251303915800e06fffaa909bc58e1a67848150f710ad58ad55f4bcc751ecd7a223570ef19477f30431ea3c4f428593fae5714e950805b4a028ed4 SHA512 031772c95e8db647cdecbebfe1aeed6121b09501e709d9db58dd215b53772043661a3704196f939fe2ec9f4eb8027e759e9049ba3168b6b82d972e9300bb643b +EBUILD zxing-cpp-2.0.0.ebuild 727 BLAKE2B a858a887e69fd5e4e917afc74dc32ce229837aa798132eb6f8c2a517d3b739f56ed4c229861a215b9067467520a6a526408c50f5add6d3759566469b05af4e11 SHA512 6fde12fda1f58acb1b1fb3f7148d86b5538e26345cdb5e36cb2d95968725d826974cd916636d7ea8d82400a3452c61e7bf12bc65cf43e972ec5a71a8f0335877 MISC metadata.xml 332 BLAKE2B f9f865eb6a86bdab5a5d7fe20c01e1ca84bc3977529b2826e1c6b161e31283c8108f57680442096da25a02b961f2f96a7c39458eaf62f654a56f5c17b9552ccc SHA512 f90cb5552e79b1bc3a1f17bd53b9dc756e6825beedf18c0eab5cb44c87c22b9789a19e0ebbfccb529bd935b8b842e48b335d15aab2b80e21a11ea85c1b388be5 diff --git a/media-libs/zxing-cpp/files/zxing-cpp-2.0.0-fix-crash.patch b/media-libs/zxing-cpp/files/zxing-cpp-2.0.0-fix-crash.patch new file mode 100644 index 000000000000..e6b25633e8e9 --- /dev/null +++ b/media-libs/zxing-cpp/files/zxing-cpp-2.0.0-fix-crash.patch @@ -0,0 +1,24 @@ +From 23c19c5f98602a4d69d1667fff99678308b28b5b Mon Sep 17 00:00:00 2001 +From: liule <levie.liu@gmail.com> +Date: Fri, 6 Jan 2023 22:06:24 +0800 +Subject: [PATCH] fix crash when the source image is less than 3 pixels + width/height + +--- + core/src/ReadBarcode.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/core/src/ReadBarcode.cpp b/core/src/ReadBarcode.cpp +index 905dd191c..5ac61e250 100644 +--- a/core/src/ReadBarcode.cpp ++++ b/core/src/ReadBarcode.cpp +@@ -76,7 +76,8 @@ class LumImagePyramid + + layers.push_back(iv); + // TODO: if only matrix codes were considered, then using std::min would be sufficient (see #425) +- while (threshold > 0 && std::max(layers.back().width(), layers.back().height()) > threshold) ++ while (threshold > 0 && std::max(layers.back().width(), layers.back().height()) > threshold && ++ std::min(layers.back().width(), layers.back().height()) >= N) + addLayer(); + #if 0 + // Reversing the layers means we'd start with the smallest. that can make sense if we are only looking for a diff --git a/media-libs/zxing-cpp/zxing-cpp-1.3.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-2.0.0.ebuild index dcef8e111198..6da2db080577 100644 --- a/media-libs/zxing-cpp/zxing-cpp-1.3.0.ebuild +++ b/media-libs/zxing-cpp/zxing-cpp-2.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,10 +10,12 @@ HOMEPAGE="https://github.com/nu-book/zxing-cpp" SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +SLOT="0/3" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="" +PATCHES=( "${FILESDIR}/${P}-fix-crash.patch" ) + src_configure() { local mycmakeargs=( -DBUILD_EXAMPLES=OFF # nothing is installed |