forked from pool/zxing-cpp
Compare commits
2 Commits
Author | SHA256 | Date | |
---|---|---|---|
8e80b9e96a | |||
f608c92aee |
39
cmake.patch
39
cmake.patch
@ -1,39 +0,0 @@
|
||||
Index: zxing-cpp-2.2.1/CMakeLists.txt
|
||||
===================================================================
|
||||
--- zxing-cpp-2.2.1.orig/CMakeLists.txt
|
||||
+++ zxing-cpp-2.2.1/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.15)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
project(ZXing)
|
||||
|
||||
@@ -37,9 +37,6 @@ if (BUILD_SHARED_LIBS)
|
||||
set (CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
|
||||
endif()
|
||||
|
||||
-if (NOT CMAKE_CXX_STANDARD)
|
||||
- set (CMAKE_CXX_STANDARD 17)
|
||||
-endif()
|
||||
if (NOT CMAKE_CXX_EXTENSIONS)
|
||||
set (CMAKE_CXX_EXTENSIONS OFF)
|
||||
endif()
|
||||
Index: zxing-cpp-2.2.1/core/CMakeLists.txt
|
||||
===================================================================
|
||||
--- zxing-cpp-2.2.1.orig/core/CMakeLists.txt
|
||||
+++ zxing-cpp-2.2.1/core/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.15)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
project (ZXing VERSION "2.2.1")
|
||||
set (ZXING_SONAME 3) # see https://github.com/zxing-cpp/zxing-cpp/issues/333
|
||||
@@ -464,8 +464,6 @@ if (COMPILER_NEEDS_FLOAT_STORE)
|
||||
)
|
||||
endif()
|
||||
|
||||
-target_compile_features(ZXing PUBLIC cxx_std_17)
|
||||
-
|
||||
target_link_libraries (ZXing PRIVATE Threads::Threads)
|
||||
|
||||
add_library(ZXing::ZXing ALIAS ZXing)
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635
|
||||
size 891055
|
3
zxing-cpp-2.3.0.tar.gz
Normal file
3
zxing-cpp-2.3.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:64e4139103fdbc57752698ee15b5f0b0f7af9a0331ecbdc492047e0772c417ba
|
||||
size 1008541
|
@ -1,3 +1,61 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 24 08:43:16 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 2.3.0
|
||||
New features:
|
||||
* Add support for DX Film Edge read
|
||||
* Add support for detecting and reading Aztec Runes
|
||||
* Add reader support for DataBarLimited symbols
|
||||
* Add C-API in official build (EDIT: unfortunately the default
|
||||
is still off, to enable do cmake -DZXING_C_API=ON)
|
||||
* Add Kotlin/Native Wrapper
|
||||
* Add Rust wrapper based on C-API
|
||||
* Add .NET wrapper based on C-API
|
||||
* Introduce new name Barcode for Result which will be removed
|
||||
in 3.0
|
||||
* LocalAverage binarizer: re-implement with symmetric
|
||||
threshold interpolation for improved detection of inverted
|
||||
symbols
|
||||
* cmake: replace BUILD_... prefix of cmake options with ZXING_...
|
||||
* cmake: switch to c++-20 by default for the core library
|
||||
* ImageView: introduce bounds checks in constructor
|
||||
* ImageView: Add ImageFormat::LumX for 2-byte grey + alpha input
|
||||
* ImageFormat: replace 'X' with 'A', e.g. RGBX -> RGBA
|
||||
* ZXingReader: add -binarizer <local|global|fixed> command
|
||||
line option
|
||||
* ZXingReader: add -single option to setMaxNumberOfSymbols(1)
|
||||
* ZXingReader: parse -formats (including 's') command line
|
||||
argument
|
||||
* ZXingReader: support reading image file from stdin by passing '-'
|
||||
* android: switch 'namespace' from zxingcpp to zxingcpp.lib to fix
|
||||
issue with maven central publication
|
||||
* Python: add support to write bytes as binary data
|
||||
* ZXing::Version() function to query the library version at
|
||||
runtime (useful when dynamically linked)
|
||||
Minor changes and bug fixes:
|
||||
* Complete ZXIReaderOptions in iOS Wrapper
|
||||
* ios: remove initWithFormats initializer
|
||||
* cmake: Make build reproducible across different build directories
|
||||
* Release color space after use in iOS wrapper
|
||||
* cmake: allow overriding python install directories
|
||||
* Refine MultiFormatReader results filtering and apply C++20 erase_if
|
||||
* HRI: update AIs to latest gs1-syntax-dictionary.txt
|
||||
* android: add linker flag to support flexible page sizes in Android 15
|
||||
* Deprecate validateITFCheckSum, validateCode39CheckSum,
|
||||
returnCodabarStartEnd
|
||||
* BitHacks: fix random QRCode content on pre-Haswell Windows machines
|
||||
* DataMatrix: improve detection of near 45° rotated symbols
|
||||
* cmake: add /utf-8 to MSVC compile flags
|
||||
* Barcode: tune operator==() to not split up overly tall linear symbols
|
||||
* Several ITFReader improvements
|
||||
* QRDecoder: return some content even in the presence of a checksum error
|
||||
* DataBar: improve detection rate by incorporating edge-2-edge pattern
|
||||
* PDF417: prevent wrong position info with right side collapsing to (0,0)
|
||||
* Python: make sure macOS and 64bit Linux packes on pypi.org support
|
||||
multi-symbol DataMatrix detection (c++20 support)
|
||||
- Drop obsolete version checks
|
||||
- Drop cmake.patch, no longer needed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 2 21:46:34 UTC 2024 - Martin Schreiner <martin.schreiner@suse.com>
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
%define sover 3
|
||||
Name: zxing-cpp
|
||||
Version: 2.2.1
|
||||
Version: 2.3.0
|
||||
Release: 0
|
||||
Summary: Library for processing 1D and 2D barcodes
|
||||
License: Apache-2.0 AND Zlib AND LGPL-2.1-with-Qt-Company-Qt-exception-1.1
|
||||
@ -26,20 +26,14 @@ Group: Development/Languages/C and C++
|
||||
URL: https://github.com/nu-book/zxing-cpp/
|
||||
Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Source99: baselibs.conf
|
||||
Patch1: cmake.patch
|
||||
BuildRequires: cmake >= 3.5
|
||||
BuildRequires: pkgconfig
|
||||
%if 0%{?suse_version} > 1500
|
||||
# build the C wrapper only in TW. This package is too old on Leap <= 15.5
|
||||
BuildRequires: stb-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} < 1500
|
||||
BuildRequires: gcc7
|
||||
BuildRequires: gcc7-c++
|
||||
%else
|
||||
BuildRequires: gcc >= 7
|
||||
BuildRequires: gcc-c++ >= 7
|
||||
%endif
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
# only TW has fmt
|
||||
%if 0%{?suse_version} > 1500
|
||||
# For blackbox tests
|
||||
@ -75,10 +69,6 @@ other applications.
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%if 0%{?suse_version} < 1500
|
||||
export CC="gcc-7"
|
||||
export CXX="g++-7"
|
||||
%endif
|
||||
export CXXFLAGS="%{optflags} -std=c++17"
|
||||
# Examples require QT5-base/multimedia, but doing so creates a cycle
|
||||
# Blackbox tests require fmt
|
||||
@ -93,8 +83,7 @@ export CXXFLAGS="%{optflags} -std=c++17"
|
||||
%install
|
||||
%cmake_install
|
||||
|
||||
%post -n libZXing%{sover} -p /sbin/ldconfig
|
||||
%postun -n libZXing%{sover} -p /sbin/ldconfig
|
||||
%ldconfig_scriptlets -n libZXing%{sover}
|
||||
|
||||
%files -n libZXing%{sover}
|
||||
%doc README.md
|
||||
|
Loading…
x
Reference in New Issue
Block a user