1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-02 01:20:54 +00:00

textproc/zxing-cpp: Update 0.20161114 -> 0.20180320

Port changes:
* Switch to the static library
* Order USExx section
* It now depends on OpenCV
This commit is contained in:
Yuri Victorovich 2018-07-09 08:05:30 +00:00
parent b8bcb4f708
commit 7deba83622
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=474236
8 changed files with 30 additions and 55 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= zxing-cpp
PORTVERSION= 0.20161114
DISTVERSIONPREFIX= v
DISTVERSION= 0.20180320
CATEGORIES= textproc
MAINTAINER= yuri@FreeBSD.org
@ -12,10 +11,14 @@ COMMENT= ZXing C++ Library for QR code recognition
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GITHUB= yes
GH_ACCOUNT= glassechidna
GH_TAGNAME= 97e9c5c
LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \
libopencv_photo.so:graphics/opencv
USES= cmake:outsource iconv
USE_GITHUB= yes
GH_ACCOUNT= glassechidna
GH_TAGNAME= 5aad474
CMAKE_ARGS= -DBUILD_SHARED_LIBS=ON
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1479160657
SHA256 (glassechidna-zxing-cpp-v0.20161114-97e9c5c_GH0.tar.gz) = 5084329c0d3a045b2c1e416c42e8f52bf4b1afea5d44cb9442b8af12a19cba05
SIZE (glassechidna-zxing-cpp-v0.20161114-97e9c5c_GH0.tar.gz) = 307807
TIMESTAMP = 1531121512
SHA256 (glassechidna-zxing-cpp-0.20180320-5aad474_GH0.tar.gz) = dee73f487b9160582a48dd71d521a48403a635d0f482a6a6ddfa331daf938f57
SIZE (glassechidna-zxing-cpp-0.20180320-5aad474_GH0.tar.gz) = 312290

View File

@ -0,0 +1,11 @@
--- CMakeLists.txt.orig 2018-07-09 07:47:42 UTC
+++ CMakeLists.txt
@@ -83,7 +83,7 @@ file(GLOB_RECURSE ZXING_FILES
)
add_executable(zxing ${ZXING_FILES})
-target_link_libraries(zxing libzxing)
+target_link_libraries(zxing libzxing ${OpenCV_LIBRARIES})
install(TARGETS zxing libzxing EXPORT zxing-targets
LIBRARY DESTINATION lib

View File

@ -1,11 +0,0 @@
--- core/src/zxing/DecodeHints.cpp.orig 2016-11-10 14:45:28 UTC
+++ core/src/zxing/DecodeHints.cpp
@@ -29,7 +29,7 @@ using zxing::DecodeHints;
// VC++
using zxing::BarcodeFormat;
-// const DecodeHintType DecodeHints::CHARACTER_SET;
+const DecodeHintType DecodeHints::CHARACTER_SET;
const DecodeHints DecodeHints::PRODUCT_HINT(
UPC_A_HINT |

View File

@ -1,4 +1,4 @@
--- core/src/zxing/oned/OneDReader.cpp.orig 2016-11-10 14:45:28 UTC
--- core/src/zxing/oned/OneDReader.cpp.orig 2018-03-20 15:08:49 UTC
+++ core/src/zxing/oned/OneDReader.cpp
@@ -21,6 +21,7 @@
#include <zxing/oned/OneDResultPoint.h>
@ -7,4 +7,4 @@
+#include <float.h>
#include <limits.h>
#include <algorithm>
#include <cfloat>

View File

@ -1,14 +0,0 @@
--- core/src/zxing/pdf417/detector/LinesSampler.cpp.orig 2016-11-10 14:45:28 UTC
+++ core/src/zxing/pdf417/detector/LinesSampler.cpp
@@ -75,6 +75,11 @@ VoteResult getValueWithMaxVotes(map<int,
}
+const int LinesSampler::MODULES_IN_SYMBOL = 17;
+const int LinesSampler::BARS_IN_SYMBOL = 8;
+const int LinesSampler::POSSIBLE_SYMBOLS = 2787;
+const int LinesSampler::BARCODE_START_OFFSET = 2;
+
vector<float> LinesSampler::init_ratios_table() {
// Pre-computes and outputs the symbol ratio table.
vector<vector<float> > table (BitMatrixParser::SYMBOL_TABLE_LENGTH);

View File

@ -1,19 +0,0 @@
--- core/src/zxing/pdf417/detector/LinesSampler.h.orig 2016-11-14 22:55:07 UTC
+++ core/src/zxing/pdf417/detector/LinesSampler.h
@@ -28,12 +28,12 @@ namespace detector {
class LinesSampler {
protected:
- static const int MODULES_IN_SYMBOL = 17;
- static const int BARS_IN_SYMBOL = 8;
- static const int POSSIBLE_SYMBOLS = 2787;
+ static const int MODULES_IN_SYMBOL;
+ static const int BARS_IN_SYMBOL;
+ static const int POSSIBLE_SYMBOLS;
static const std::vector<float> RATIOS_TABLE;
static std::vector<float> init_ratios_table();
- static const int BARCODE_START_OFFSET = 2;
+ static const int BARCODE_START_OFFSET;
Ref<BitMatrix> linesMatrix_;
int symbolsPerLine_;

View File

@ -9,6 +9,7 @@ include/zxing/FormatException.h
include/zxing/IllegalStateException.h
include/zxing/InvertedLuminanceSource.h
include/zxing/LuminanceSource.h
include/zxing/MatSource.h
include/zxing/MultiFormatReader.h
include/zxing/NotFoundException.h
include/zxing/Reader.h
@ -101,4 +102,8 @@ include/zxing/qrcode/detector/Detector.h
include/zxing/qrcode/detector/FinderPattern.h
include/zxing/qrcode/detector/FinderPatternFinder.h
include/zxing/qrcode/detector/FinderPatternInfo.h
lib/libzxing.a
lib/libzxing.so
lib/zxing/cmake/zxing-config.cmake
lib/zxing/cmake/zxing-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/zxing/cmake/zxing-targets.cmake