Index: head/textproc/zxing-cpp/Makefile =================================================================== --- head/textproc/zxing-cpp/Makefile (revision 474235) +++ head/textproc/zxing-cpp/Makefile (revision 474236) @@ -1,21 +1,24 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= zxing-cpp -PORTVERSION= 0.20161114 -DISTVERSIONPREFIX= v +DISTVERSION= 0.20180320 CATEGORIES= textproc MAINTAINER= yuri@FreeBSD.org COMMENT= ZXing C++ Library for QR code recognition LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING +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= 97e9c5c +GH_TAGNAME= 5aad474 -USES= cmake:outsource iconv +CMAKE_ARGS= -DBUILD_SHARED_LIBS=ON .include Index: head/textproc/zxing-cpp/distinfo =================================================================== --- head/textproc/zxing-cpp/distinfo (revision 474235) +++ head/textproc/zxing-cpp/distinfo (revision 474236) @@ -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 Index: head/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.cpp =================================================================== --- head/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.cpp (revision 474235) +++ head/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.cpp (nonexistent) @@ -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 LinesSampler::init_ratios_table() { - // Pre-computes and outputs the symbol ratio table. - vector > table (BitMatrixParser::SYMBOL_TABLE_LENGTH); Property changes on: head/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.h =================================================================== --- head/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.h (revision 474235) +++ head/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.h (nonexistent) @@ -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 RATIOS_TABLE; - static std::vector init_ratios_table(); -- static const int BARCODE_START_OFFSET = 2; -+ static const int BARCODE_START_OFFSET; - - Ref linesMatrix_; - int symbolsPerLine_; Property changes on: head/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/zxing-cpp/files/patch-core_src_zxing_DecodeHints.cpp =================================================================== --- head/textproc/zxing-cpp/files/patch-core_src_zxing_DecodeHints.cpp (revision 474235) +++ head/textproc/zxing-cpp/files/patch-core_src_zxing_DecodeHints.cpp (nonexistent) @@ -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 | Property changes on: head/textproc/zxing-cpp/files/patch-core_src_zxing_DecodeHints.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/zxing-cpp/files/patch-CMakeLists.txt =================================================================== --- head/textproc/zxing-cpp/files/patch-CMakeLists.txt (nonexistent) +++ head/textproc/zxing-cpp/files/patch-CMakeLists.txt (revision 474236) @@ -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 Property changes on: head/textproc/zxing-cpp/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp =================================================================== --- head/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp (revision 474235) +++ head/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp (revision 474236) @@ -1,10 +1,10 @@ ---- 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 #include #include +#include #include #include - + #include Index: head/textproc/zxing-cpp/pkg-plist =================================================================== --- head/textproc/zxing-cpp/pkg-plist (revision 474235) +++ head/textproc/zxing-cpp/pkg-plist (revision 474236) @@ -1,104 +1,109 @@ bin/zxing include/zxing/BarcodeFormat.h include/zxing/Binarizer.h include/zxing/BinaryBitmap.h include/zxing/ChecksumException.h include/zxing/DecodeHints.h include/zxing/Exception.h 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 include/zxing/ReaderException.h include/zxing/Result.h include/zxing/ResultPoint.h include/zxing/ResultPointCallback.h include/zxing/ZXing.h include/zxing/aztec/AztecDetectorResult.h include/zxing/aztec/AztecReader.h include/zxing/aztec/decoder/Decoder.h include/zxing/aztec/detector/Detector.h include/zxing/common/Array.h include/zxing/common/BitArray.h include/zxing/common/BitMatrix.h include/zxing/common/BitSource.h include/zxing/common/CharacterSetECI.h include/zxing/common/Counted.h include/zxing/common/DecoderResult.h include/zxing/common/DetectorResult.h include/zxing/common/GlobalHistogramBinarizer.h include/zxing/common/GreyscaleLuminanceSource.h include/zxing/common/GreyscaleRotatedLuminanceSource.h include/zxing/common/GridSampler.h include/zxing/common/HybridBinarizer.h include/zxing/common/IllegalArgumentException.h include/zxing/common/PerspectiveTransform.h include/zxing/common/Point.h include/zxing/common/Str.h include/zxing/common/StringUtils.h include/zxing/common/detector/JavaMath.h include/zxing/common/detector/MathUtils.h include/zxing/common/detector/MonochromeRectangleDetector.h include/zxing/common/detector/WhiteRectangleDetector.h include/zxing/common/reedsolomon/GenericGF.h include/zxing/common/reedsolomon/GenericGFPoly.h include/zxing/common/reedsolomon/ReedSolomonDecoder.h include/zxing/common/reedsolomon/ReedSolomonException.h include/zxing/datamatrix/DataMatrixReader.h include/zxing/datamatrix/Version.h include/zxing/datamatrix/decoder/BitMatrixParser.h include/zxing/datamatrix/decoder/DataBlock.h include/zxing/datamatrix/decoder/DecodedBitStreamParser.h include/zxing/datamatrix/decoder/Decoder.h include/zxing/datamatrix/detector/CornerPoint.h include/zxing/datamatrix/detector/Detector.h include/zxing/datamatrix/detector/DetectorException.h include/zxing/multi/ByQuadrantReader.h include/zxing/multi/GenericMultipleBarcodeReader.h include/zxing/multi/MultipleBarcodeReader.h include/zxing/multi/qrcode/QRCodeMultiReader.h include/zxing/multi/qrcode/detector/MultiDetector.h include/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h include/zxing/oned/CodaBarReader.h include/zxing/oned/Code128Reader.h include/zxing/oned/Code39Reader.h include/zxing/oned/Code93Reader.h include/zxing/oned/EAN13Reader.h include/zxing/oned/EAN8Reader.h include/zxing/oned/ITFReader.h include/zxing/oned/MultiFormatOneDReader.h include/zxing/oned/MultiFormatUPCEANReader.h include/zxing/oned/OneDReader.h include/zxing/oned/OneDResultPoint.h include/zxing/oned/UPCAReader.h include/zxing/oned/UPCEANReader.h include/zxing/oned/UPCEReader.h include/zxing/pdf417/PDF417Reader.h include/zxing/pdf417/decoder/BitMatrixParser.h include/zxing/pdf417/decoder/DecodedBitStreamParser.h include/zxing/pdf417/decoder/Decoder.h include/zxing/pdf417/decoder/ec/ErrorCorrection.h include/zxing/pdf417/decoder/ec/ModulusGF.h include/zxing/pdf417/decoder/ec/ModulusPoly.h include/zxing/pdf417/detector/Detector.h include/zxing/pdf417/detector/LinesSampler.h include/zxing/qrcode/ErrorCorrectionLevel.h include/zxing/qrcode/FormatInformation.h include/zxing/qrcode/QRCodeReader.h include/zxing/qrcode/Version.h include/zxing/qrcode/decoder/BitMatrixParser.h include/zxing/qrcode/decoder/DataBlock.h include/zxing/qrcode/decoder/DataMask.h include/zxing/qrcode/decoder/DecodedBitStreamParser.h include/zxing/qrcode/decoder/Decoder.h include/zxing/qrcode/decoder/Mode.h include/zxing/qrcode/detector/AlignmentPattern.h include/zxing/qrcode/detector/AlignmentPatternFinder.h 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 +