Sunday, June 04, 2023

UPDATE: graphics/zxing

Hi Stuart, Hi ports@,

I would like to update zxing because I need zxing>=2.0 as a dependency
for KDE Gear 23.04 (kitinerary). Looks like our zxing port is pretty
old. The disadvantage of these update is the loss of bin/zxing.

Looks like nothing depends on it expect kitinerary.

Do we need BUILD_PYTHON_MODULE enabled?

If I get an okay I would commit it with the KDE Gear update.

diff --git a/graphics/zxing/Makefile b/graphics/zxing/Makefile
index fae0248dc9d..991ad70c90e 100644
--- a/graphics/zxing/Makefile
+++ b/graphics/zxing/Makefile
@@ -1,13 +1,10 @@
COMMENT= barcode image processing library

-SHARED_LIBS= zxing 0.0
-
-GH_ACCOUNT= glassechidna
+GH_ACCOUNT= zxing-cpp
GH_PROJECT= zxing-cpp
-GH_COMMIT= e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10
+GH_TAGNAME= v2.0.0

-DISTNAME= zxing-20190320
-REVISION= 2
+SHARED_LIBS += ZXing 0.0 # 0.0

MAINTAINER= Stuart Henderson <stu.ports@spacehopper.org>

@@ -16,24 +13,24 @@ CATEGORIES= graphics
# Apache 2.0
PERMIT_PACKAGE= Yes

-# uses pledge()
-WANTLIB += ${COMPILER_LIBCXX} c iconv m
-
+# C++17
COMPILER= base-clang ports-gcc

-DEBUG_PACKAGES= ${BUILD_PACKAGES}
+WANTLIB += ${COMPILER_LIBCXX} m
+
MODULES= devel/cmake
-LIB_DEPENDS= converters/libiconv
-BUILD_DEPENDS= devel/cppunit

-CONFIGURE_ARGS= -DCMAKE_LIBRARY_PATH=${LOCALBASE}/lib \
- -DBUILD_TESTING=yes
+DEBUG_PACKAGES= ${BUILD_PACKAGES}
+
+BUILD_DEPENDS= devel/gtest
+
+CONFIGURE_ARGS= -DCMAKE_LIBRARY_PATH=${LOCALBASE}/lib \
+ -DBUILD_UNIT_TESTS=yes

-SUBST_VARS+= LIBzxing_VERSION
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
+CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON \
+ -DBUILD_DEPENDENCIES=LOCAL

-do-test:
- ${WRKBUILD}/testrunner
+# Depends on stb
+CONFIGURE_ARGS += -DBUILD_EXAMPLES=OFF

.include <bsd.port.mk>
diff --git a/graphics/zxing/distinfo b/graphics/zxing/distinfo
index 6555f5d2156..88f73c3e32f 100644
--- a/graphics/zxing/distinfo
+++ b/graphics/zxing/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zxing-20190320-e0e40dde.tar.gz) = TCuGAdDjN3FDwaC7qyIBRq+fpaXino++9Chi/j04+OY=
-SIZE (zxing-20190320-e0e40dde.tar.gz) = 312576
+SHA256 (zxing-cpp-2.0.0.tar.gz) = ErdrcAXDDTQmX8IDVtNA2hebC01D0sGzW8yoZ3YGn3Y=
+SIZE (zxing-cpp-2.0.0.tar.gz) = 856413
diff --git a/graphics/zxing/patches/patch-CMakeLists_txt b/graphics/zxing/patches/patch-CMakeLists_txt
deleted file mode 100644
index d160f20f5a9..00000000000
--- a/graphics/zxing/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -45,7 +45,7 @@ else()
- endif()
-
- # OpenCV classes
--find_package(OpenCV)
-+#find_package(OpenCV)
- if(OpenCV_FOUND)
- list(APPEND LIBZXING_FILES
- opencv/src/zxing/MatSource.cpp
-@@ -57,8 +57,8 @@ if(OpenCV_FOUND)
- endif()
-
- include_directories(core/src)
--add_library(libzxing ${LIBZXING_FILES})
--set_target_properties(libzxing PROPERTIES PREFIX "")
-+add_library(libzxing SHARED ${LIBZXING_FILES})
-+set_target_properties(libzxing PROPERTIES PREFIX "" VERSION ${LIBzxing_VERSION})
-
- find_package(Iconv)
- if(ICONV_FOUND)
diff --git a/graphics/zxing/patches/patch-cli_src_main_cpp b/graphics/zxing/patches/patch-cli_src_main_cpp
deleted file mode 100644
index a33de9d946b..00000000000
--- a/graphics/zxing/patches/patch-cli_src_main_cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cli/src/main.cpp
---- cli/src/main.cpp.orig
-+++ cli/src/main.cpp
-@@ -18,6 +18,7 @@
- #include <iostream>
- #include <fstream>
- #include <string>
-+#include <unistd.h>
- #include "ImageReaderSource.h"
- #include <zxing/common/Counted.h>
- #include <zxing/Binarizer.h>
-@@ -180,6 +181,10 @@ string read_expected(string imagefilename) {
- }
-
- int main(int argc, char** argv) {
-+ if (pledge("stdio rpath", NULL) == -1) {
-+ cerr << "pledge" << endl;
-+ return 1;
-+ }
- if (argc <= 1) {
- cout << "Usage: " << argv[0] << " [OPTION]... <IMAGE>..." << endl
- << "Read barcodes from each IMAGE file." << endl
diff --git a/graphics/zxing/pkg/PLIST b/graphics/zxing/pkg/PLIST
index b35ccaac754..69226a87ff6 100644
--- a/graphics/zxing/pkg/PLIST
+++ b/graphics/zxing/pkg/PLIST
@@ -1,130 +1,33 @@
-@bin bin/zxing
-include/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/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/
-include/zxing/aztec/AztecDetectorResult.h
-include/zxing/aztec/AztecReader.h
-include/zxing/aztec/decoder/
-include/zxing/aztec/decoder/Decoder.h
-include/zxing/aztec/detector/
-include/zxing/aztec/detector/Detector.h
-include/zxing/common/
-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/
-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/
-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/
-include/zxing/datamatrix/DataMatrixReader.h
-include/zxing/datamatrix/Version.h
-include/zxing/datamatrix/decoder/
-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/
-include/zxing/datamatrix/detector/CornerPoint.h
-include/zxing/datamatrix/detector/Detector.h
-include/zxing/datamatrix/detector/DetectorException.h
-include/zxing/multi/
-include/zxing/multi/ByQuadrantReader.h
-include/zxing/multi/GenericMultipleBarcodeReader.h
-include/zxing/multi/MultipleBarcodeReader.h
-include/zxing/multi/qrcode/
-include/zxing/multi/qrcode/QRCodeMultiReader.h
-include/zxing/multi/qrcode/detector/
-include/zxing/multi/qrcode/detector/MultiDetector.h
-include/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h
-include/zxing/oned/
-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/
-include/zxing/pdf417/PDF417Reader.h
-include/zxing/pdf417/decoder/
-include/zxing/pdf417/decoder/BitMatrixParser.h
-include/zxing/pdf417/decoder/DecodedBitStreamParser.h
-include/zxing/pdf417/decoder/Decoder.h
-include/zxing/pdf417/decoder/ec/
-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/
-include/zxing/pdf417/detector/Detector.h
-include/zxing/pdf417/detector/LinesSampler.h
-include/zxing/qrcode/
-include/zxing/qrcode/ErrorCorrectionLevel.h
-include/zxing/qrcode/FormatInformation.h
-include/zxing/qrcode/QRCodeReader.h
-include/zxing/qrcode/Version.h
-include/zxing/qrcode/decoder/
-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/
-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 lib/libzxing.so.${LIBzxing_VERSION}
-lib/zxing/
-lib/zxing/cmake/
-lib/zxing/cmake/zxing-config.cmake
-lib/zxing/cmake/zxing-targets${MODCMAKE_BUILD_SUFFIX}
-lib/zxing/cmake/zxing-targets.cmake
+include/ZXing/
+include/ZXing/BarcodeFormat.h
+include/ZXing/BitHacks.h
+include/ZXing/BitMatrix.h
+include/ZXing/BitMatrixIO.h
+include/ZXing/ByteArray.h
+include/ZXing/CharacterSet.h
+include/ZXing/Content.h
+include/ZXing/DecodeHints.h
+include/ZXing/Error.h
+include/ZXing/Flags.h
+include/ZXing/GTIN.h
+include/ZXing/ImageView.h
+include/ZXing/Matrix.h
+include/ZXing/MultiFormatWriter.h
+include/ZXing/Point.h
+include/ZXing/Quadrilateral.h
+include/ZXing/Range.h
+include/ZXing/ReadBarcode.h
+include/ZXing/Result.h
+include/ZXing/StructuredAppend.h
+include/ZXing/TextUtfEncoding.h
+include/ZXing/ZXAlgorithms.h
+include/ZXing/ZXConfig.h
+include/ZXing/ZXVersion.h
+lib/cmake/
+lib/cmake/ZXing/
+lib/cmake/ZXing/ZXingConfig.cmake
+lib/cmake/ZXing/ZXingConfigVersion.cmake
+lib/cmake/ZXing/ZXingTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/ZXing/ZXingTargets.cmake
+@lib lib/libZXing.so.${LIBZXing_VERSION}
+lib/pkgconfig/zxing.pc

No comments:

Post a Comment

Subscribe to: Post Comments (Atom)