update to a newer snapshot of glassechidna's version of zxing-cpp

This commit is contained in:
sthen 2019-07-19 10:48:52 +00:00
parent 6a479e33b2
commit e98e7f0df0
3 changed files with 19 additions and 28 deletions

View File

@ -1,27 +1,27 @@
# $OpenBSD: Makefile,v 1.13 2019/07/12 20:47:12 sthen Exp $
# $OpenBSD: Makefile,v 1.14 2019/07/19 10:48:52 sthen Exp $
COMMENT = barcode image processing library
COMMENT= barcode image processing library
GH_ACCOUNT = glassechidna
GH_PROJECT = zxing-cpp
GH_COMMIT = 5aad4744a3763d814df98a18886979893e638274
GH_ACCOUNT= glassechidna
GH_PROJECT= zxing-cpp
GH_COMMIT= e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10
DISTNAME = zxing-20180320
REVISION = 0
DISTNAME= zxing-20190320
CATEGORIES = graphics
CATEGORIES= graphics
# Apache 2.0
PERMIT_PACKAGE = Yes
PERMIT_PACKAGE= Yes
WANTLIB += c iconv m ${COMPILER_LIBCXX}
WANTLIB += ${COMPILER_LIBCXX} c iconv m
COMPILER = base-clang ports-gcc base-gcc
COMPILER= base-clang ports-gcc
MODULES = devel/cmake
LIB_DEPENDS = converters/libiconv
BUILD_DEPENDS = devel/cppunit
CONFIGURE_ARGS = -DCMAKE_LIBRARY_PATH=${LOCALBASE}/lib \
MODULES= devel/cmake
LIB_DEPENDS= converters/libiconv
BUILD_DEPENDS= devel/cppunit
CONFIGURE_ARGS= -DCMAKE_LIBRARY_PATH=${LOCALBASE}/lib \
-DBUILD_TESTING=yes
do-test:

View File

@ -1,2 +1,2 @@
SHA256 (zxing-20180320-5aad4744.tar.gz) = ml7udix3a1WIzeJSAMp7g9iZTOGB488wCcve0n+50IY=
SIZE (zxing-20180320-5aad4744.tar.gz) = 312487
SHA256 (zxing-20190320-e0e40dde.tar.gz) = TCuGAdDjN3FDwaC7qyIBRq+fpaXino++9Chi/j04+OY=
SIZE (zxing-20190320-e0e40dde.tar.gz) = 312576

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2018/09/28 14:14:03 sthen Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.2 2019/07/19 10:48:52 sthen Exp $
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -43,7 +43,7 @@ if(WIN32)
@@ -45,7 +45,7 @@ else()
endif()
# OpenCV classes
@ -12,12 +12,3 @@ Index: CMakeLists.txt
if(OpenCV_FOUND)
list(APPEND LIBZXING_FILES
opencv/src/zxing/MatSource.cpp
@@ -61,7 +61,7 @@ set_target_properties(libzxing PROPERTIES PREFIX "")
find_package(Iconv)
if(ICONV_FOUND)
include_directories(${ICONV_INCLUDE_DIR})
- target_link_libraries(libzxing ${ICONV_LIBRARIES})
+ target_link_libraries(libzxing ${ICONV_LIBRARY})
else()
add_definitions(-DNO_ICONV=1)
endif()