aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Mach <machpavel@gmail.com>2018-12-19 02:47:01 +0100
committerRobert Schumacher <roschuma@microsoft.com>2018-12-18 17:47:01 -0800
commitd40eb181742082f25c1de6a829552174ae0350d7 (patch)
tree63f0df75abc4a8dfdb20074141b07e42107ab959
parent87fa0fc83880505344b4ec392741c52f6c4f002c (diff)
downloadvcpkg-d40eb181742082f25c1de6a829552174ae0350d7.tar.gz
vcpkg-d40eb181742082f25c1de6a829552174ae0350d7.zip
[zxing] ZXing library port added. (#4854)
* ZXing library port added. * ZXing dependency to opencv[webp] added. * [zxing-cpp] Rename from zxing. Use full ref. Only require opencv[core]. * [tiff] Disable zstd dependency. Todo: add feature. * [zxing-cpp] Disable optional iconv reference
-rw-r--r--ports/tiff/CONTROL2
-rw-r--r--ports/tiff/portfile.cmake1
-rw-r--r--ports/zxing-cpp/CONTROL4
-rw-r--r--ports/zxing-cpp/portfile.cmake43
4 files changed, 49 insertions, 1 deletions
diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL
index 866437737..45499f1fd 100644
--- a/ports/tiff/CONTROL
+++ b/ports/tiff/CONTROL
@@ -1,4 +1,4 @@
Source: tiff
-Version: 4.0.10
+Version: 4.0.10-1
Build-Depends: zlib, libjpeg-turbo, liblzma (!uwp)
Description: A library that supports the manipulation of TIFF image files
diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake
index 13d8ac7bc..92ba3963c 100644
--- a/ports/tiff/portfile.cmake
+++ b/ports/tiff/portfile.cmake
@@ -31,6 +31,7 @@ vcpkg_configure_cmake(
-DBUILD_TESTS=OFF
-Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing.
-Djpeg12=OFF
+ -Dzstd=OFF
${TIFF_CXX_TARGET}
)
diff --git a/ports/zxing-cpp/CONTROL b/ports/zxing-cpp/CONTROL
new file mode 100644
index 000000000..52dfd95b2
--- /dev/null
+++ b/ports/zxing-cpp/CONTROL
@@ -0,0 +1,4 @@
+Source: zxing-cpp
+Version: 3.3.3-2
+Build-Depends: opencv[core]
+Description: Barcode detection and decoding library.
diff --git a/ports/zxing-cpp/portfile.cmake b/ports/zxing-cpp/portfile.cmake
new file mode 100644
index 000000000..405210d9c
--- /dev/null
+++ b/ports/zxing-cpp/portfile.cmake
@@ -0,0 +1,43 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO glassechidna/zxing-cpp
+ REF 5aad4744a3763d814df98a18886979893e638274
+ SHA512 a079ad47171224de4469e76bf0779b6ebc9c6dfb3604bd5dbf5e6e5f321d9e6255f689daa749855f8400023602f1773214013c006442e9b32dd4b8146c888c02
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Iconv=ON
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/zxing/cmake" TARGET_PATH share/zxing)
+
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/zxing)
+if (WIN32)
+ file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/zxing)
+else(WIN32)
+ file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing DESTINATION ${CURRENT_PACKAGES_DIR}/tools/zxing)
+endif(WIN32)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/zxing)
+
+vcpkg_copy_pdbs()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/zxing)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/zxing)
+
+# Handle copyright
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/zxing-cpp)
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/zxing-cpp)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/zxing-cpp/COPYING ${CURRENT_PACKAGES_DIR}/share/zxing-cpp/copyright)