Date: Mon, 9 Jul 2018 08:05:30 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474236 - in head/textproc/zxing-cpp: . files Message-ID: <201807090805.w6985Ufk046559@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Mon Jul 9 08:05:30 2018 New Revision: 474236 URL: https://svnweb.freebsd.org/changeset/ports/474236 Log: textproc/zxing-cpp: Update 0.20161114 -> 0.20180320 Port changes: * Switch to the static library * Order USExx section * It now depends on OpenCV Added: head/textproc/zxing-cpp/files/patch-CMakeLists.txt (contents, props changed) Deleted: head/textproc/zxing-cpp/files/patch-core_src_zxing_DecodeHints.cpp 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.h Modified: head/textproc/zxing-cpp/Makefile head/textproc/zxing-cpp/distinfo head/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp head/textproc/zxing-cpp/pkg-plist Modified: head/textproc/zxing-cpp/Makefile ============================================================================== --- head/textproc/zxing-cpp/Makefile Mon Jul 9 08:01:21 2018 (r474235) +++ head/textproc/zxing-cpp/Makefile Mon Jul 9 08:05:30 2018 (r474236) @@ -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 +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 <bsd.port.mk> Modified: head/textproc/zxing-cpp/distinfo ============================================================================== --- head/textproc/zxing-cpp/distinfo Mon Jul 9 08:01:21 2018 (r474235) +++ head/textproc/zxing-cpp/distinfo Mon Jul 9 08:05:30 2018 (r474236) @@ -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 Added: head/textproc/zxing-cpp/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/zxing-cpp/files/patch-CMakeLists.txt Mon Jul 9 08:05:30 2018 (r474236) @@ -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 Modified: head/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp ============================================================================== --- head/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp Mon Jul 9 08:01:21 2018 (r474235) +++ head/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp Mon Jul 9 08:05:30 2018 (r474236) @@ -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> Modified: head/textproc/zxing-cpp/pkg-plist ============================================================================== --- head/textproc/zxing-cpp/pkg-plist Mon Jul 9 08:01:21 2018 (r474235) +++ head/textproc/zxing-cpp/pkg-plist Mon Jul 9 08:05:30 2018 (r474236) @@ -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 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807090805.w6985Ufk046559>