diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2021-04-13 01:10:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-12 10:10:51 -0700 |
| commit | 407ca922594a85dd532c9ccff60ae06e96a18d5b (patch) | |
| tree | 141823ddc672ff20cff41fc8a9a36232e64ad408 | |
| parent | 66e1e5c1dfd539a54e4e5dc3ae85fc2199acb24c (diff) | |
| download | vcpkg-407ca922594a85dd532c9ccff60ae06e96a18d5b.tar.gz vcpkg-407ca922594a85dd532c9ccff60ae06e96a18d5b.zip | |
[zxing-cpp] Update zxing-cpp and fix iconv dependency (#14918)
* Update zxing-cpp and fix iconv dependency
* Convert PATCH file format
* update patch
* update version
* update patch
* update version
* revert the line end
* update version
* delete c++ 11
* update version
| -rw-r--r-- | ports/zxing-cpp/0003-fix-dependency-bigint.patch | 8 | ||||
| -rw-r--r-- | ports/zxing-cpp/CONTROL | 3 | ||||
| -rw-r--r-- | ports/zxing-cpp/portfile.cmake | 4 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/z-/zxing-cpp.json | 5 |
5 files changed, 16 insertions, 8 deletions
diff --git a/ports/zxing-cpp/0003-fix-dependency-bigint.patch b/ports/zxing-cpp/0003-fix-dependency-bigint.patch index eff577f44..e1453a21d 100644 --- a/ports/zxing-cpp/0003-fix-dependency-bigint.patch +++ b/ports/zxing-cpp/0003-fix-dependency-bigint.patch @@ -1,9 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 54071bd..0edd0e9 100644 +index 0f172d3..4999942 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -44,6 +44,11 @@ if(WIN32) +@@ -42,10 +42,13 @@ include(source_files.cmake) + if(WIN32) + include_directories(core/lib/win32) set(CMAKE_DEBUG_POSTFIX -debug) +-else() +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") endif() +# Bigint diff --git a/ports/zxing-cpp/CONTROL b/ports/zxing-cpp/CONTROL index 4f661dd19..73507fea1 100644 --- a/ports/zxing-cpp/CONTROL +++ b/ports/zxing-cpp/CONTROL @@ -1,6 +1,5 @@ Source: zxing-cpp -Version: 3.3.3 -Port-Version: 8 +Version: 2020-12-2 Homepage: https://github.com/glassechidna/zxing-cpp Description: Barcode detection and decoding library. Build-Depends: bigint diff --git a/ports/zxing-cpp/portfile.cmake b/ports/zxing-cpp/portfile.cmake index 9211ef3c6..ce2a45669 100644 --- a/ports/zxing-cpp/portfile.cmake +++ b/ports/zxing-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO glassechidna/zxing-cpp - REF 5aad4744a3763d814df98a18886979893e638274 - SHA512 a079ad47171224de4469e76bf0779b6ebc9c6dfb3604bd5dbf5e6e5f321d9e6255f689daa749855f8400023602f1773214013c006442e9b32dd4b8146c888c02 + REF e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10 + SHA512 222be56e3937136bd699a5d259a068b354ffcd34287bc8e0e8c33b924e9760501b81c56420d8062e0a924fefe95451778781b2aaa07207b0f18ce4ec33732581 HEAD_REF master PATCHES 0001-opencv4-compat.patch diff --git a/versions/baseline.json b/versions/baseline.json index 8fb80742b..d5bd028ae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6597,8 +6597,8 @@ "port-version": 0 }, "zxing-cpp": { - "baseline": "3.3.3", - "port-version": 8 + "baseline": "2020-12-2", + "port-version": 0 }, "zydis": { "baseline": "3.1.0-1", diff --git a/versions/z-/zxing-cpp.json b/versions/z-/zxing-cpp.json index 3a1eca920..d3cfdd84c 100644 --- a/versions/z-/zxing-cpp.json +++ b/versions/z-/zxing-cpp.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "4891ff3ded94308cdc3f4c3b73956b80317a4767", + "version-string": "2020-12-2", + "port-version": 0 + }, + { "git-tree": "d7761651d4c426d0322f52d5508b5beb66af6c9d", "version-string": "3.3.3", "port-version": 8 |