mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 05:15:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed port of quirc - patch did no longer apply / modified to fix build (#15252)

Browse Source 
* Fixed port of quirc - patch did no longer apply / modified to fix build

* Updated quirc to the latest version + removed obsolete patch-for-msvc.patch

* update baseline

* [quirc] Fix license file name

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
This commit is contained in:
Markus87 2020-12-30 00:57:56 +01:00 committed by GitHub
parent ba1c3aa63e
commit 3ddbba7ab6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/quirc/CONTROL
View File

@ -1,3 +1,4 @@
Source: quirc
Version: 1.1
Version: 1.1
Port-Version: 1
Description: quirc is one of the C library available for scanning QR Codes

36
ports/quirc/patch-for-msvc.patch
View File

@ -1,36 +0,0 @@
From 1c1ceecb70ad76751f0b573937380525d7643a87 Mon Sep 17 00:00:00 2001
From: reyzal <reyzal@163.com>
Date: Sun, 4 Mar 2018 12:09:34 +0800
Subject: [PATCH] for msvc
---
lib/identify.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/identify.c b/lib/identify.c
index bf7bd94..cd16b0a 100644
--- a/lib/identify.c
+++ b/lib/identify.c
@@ -196,9 +196,9 @@ static void threshold(struct quirc *q)
threshold_s = THRESHOLD_S_MIN;
for (y = 0; y < q->h; y++) {
- int row_average[q->w];
+ int *row_average = malloc(q->w * sizeof(int));
- memset(row_average, 0, sizeof(row_average));
+ memset(row_average, 0, q->w * sizeof(int));
for (x = 0; x < q->w; x++) {
int w, u;
@@ -229,6 +229,7 @@ static void threshold(struct quirc *q)
}
row += q->w;
+ free(row_average);
}
}
--
2.7.3.windows.1

11
ports/quirc/portfile.cmake
View File

@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO dlbeer/quirc
REF 2e8c4ce7bc45fbe137e50e338c297e265777e7dd # v1.1
SHA512 83eeab7c70c93477f9a7a2d3114e080ce831d27e035bb47c3fc114d5ede8852599c37af591af348dde1a870f65f8a860284e4a3e1e05585cb7948556b464f59c
REF 7e7ab596e4d0988faf1c12ae89c354b114181c40
SHA512 d10a783a33ffcc168a287b03250c5ac00b942ec724da641b13fe2ef3f456453b143146422b7e18129a75ce00f13d2d9e3097ac4620134d832de8be4adbbc61c2
HEAD_REF master
PATCHES
patch-for-msvc.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@ -18,10 +16,9 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright
file(COPY ${SOURCE_PATH}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/quirc)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/quirc/license ${CURRENT_PACKAGES_DIR}/share/quirc/copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/quirc/copyright)

8
scripts/ci.baseline.txt
View File

@ -1231,14 +1231,6 @@ quickfix:x64-uwp=fail
quickfix:x64-windows-static=fail
quickfix:x64-windows=fail
quickfix:x86-windows=fail
quirc:arm64-windows = skip
quirc:arm-uwp = skip
quirc:x64-linux = skip
quirc:x64-osx = skip
quirc:x64-uwp = skip
quirc:x64-windows = skip
quirc:x64-windows-static = skip
quirc:x86-windows = skip
qwt:x64-osx=fail
rabit:x64-osx=fail
ragel:arm-uwp=fail