aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCheney Wang <38240633+Cheney-W@users.noreply.github.com>2021-01-27 07:09:03 +0800
committerGitHub <noreply@github.com>2021-01-26 15:09:03 -0800
commit62f5be4fab1c37ff245e506d501d4cde5215845d (patch)
tree165fbde30409a20a2183761e3b9dce42033ac5b9
parent786d8f1261b0cb91037d338c1f546396c41af772 (diff)
downloadvcpkg-62f5be4fab1c37ff245e506d501d4cde5215845d.tar.gz
vcpkg-62f5be4fab1c37ff245e506d501d4cde5215845d.zip
[kinectsdk1] Update hash (#15856)
* [kinectsdk1] Update Hash * Fix error in vcpkg.json file * Add kinectsdk1.json Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
-rw-r--r--ports/kinectsdk1/CONTROL4
-rw-r--r--ports/kinectsdk1/portfile.cmake9
-rw-r--r--ports/kinectsdk1/vcpkg.json7
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/k-/kinectsdk1.json5
5 files changed, 17 insertions, 12 deletions
diff --git a/ports/kinectsdk1/CONTROL b/ports/kinectsdk1/CONTROL
deleted file mode 100644
index d4cd1d273..000000000
--- a/ports/kinectsdk1/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: kinectsdk1
-Version: 1.8-2
-Description: Kinect for Windows SDK for Kinect v1 sensor.
-Supports: !arm \ No newline at end of file
diff --git a/ports/kinectsdk1/portfile.cmake b/ports/kinectsdk1/portfile.cmake
index cde6b6148..adcb82a52 100644
--- a/ports/kinectsdk1/portfile.cmake
+++ b/ports/kinectsdk1/portfile.cmake
@@ -1,12 +1,10 @@
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
- message(FATAL_ERROR "This port does not currently support architecture: ${VCPKG_TARGET_ARCHITECTURE}")
-endif()
+vcpkg_fail_port_install(ON_ARCH "arm")
set(KINECTSDK10_VERSION "v1.8")
vcpkg_download_distfile(KINECTSDK10_INSTALLER
URLS "https://download.microsoft.com/download/E/1/D/E1DEC243-0389-4A23-87BF-F47DE869FC1A/KinectSDK-${KINECTSDK10_VERSION}-Setup.exe"
FILENAME "KinectSDK-${KINECTSDK10_VERSION}-Setup.exe"
- SHA512 ee8a0f70c86aad80fe214108e315e4550a90ed39f278ce00a7137532174ee5bf3bdeb1d0b499fc5ffdb5e176adecfd68963ee3731e1d2f00d69d32d1b8a3c555
+ SHA512 d7e886d639b4310addc7c1350311f81289ffbcd653237882da7bf3d4074281ed35d217cb8be101579cac880c574dd89c62cd6a87772d60905c446d0be5fd1932
)
vcpkg_find_acquire_program(DARK)
@@ -65,5 +63,4 @@ file(
)
# Handle copyright
-file(COPY "${KINECTSDK10_DIR}/SDKEula.rtf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/kinectsdk1)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/kinectsdk1/SDKEula.rtf ${CURRENT_PACKAGES_DIR}/share/kinectsdk1/copyright) \ No newline at end of file
+file(INSTALL ${KINECTSDK10_DIR}/SDKEula.rtf DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file
diff --git a/ports/kinectsdk1/vcpkg.json b/ports/kinectsdk1/vcpkg.json
new file mode 100644
index 000000000..230677a25
--- /dev/null
+++ b/ports/kinectsdk1/vcpkg.json
@@ -0,0 +1,7 @@
+{
+ "name": "kinectsdk1",
+ "version-string": "1.8",
+ "port-version": 3,
+ "description": "Kinect for Windows SDK for Kinect v1 sensor.",
+ "supports": "!arm"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index b195a3a79..c39c26da4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2733,8 +2733,8 @@
"port-version": 0
},
"kinectsdk1": {
- "baseline": "1.8-2",
- "port-version": 0
+ "baseline": "1.8",
+ "port-version": 3
},
"kinectsdk2": {
"baseline": "2.0-2",
diff --git a/versions/k-/kinectsdk1.json b/versions/k-/kinectsdk1.json
index 1d9148b1d..6ddfc2b12 100644
--- a/versions/k-/kinectsdk1.json
+++ b/versions/k-/kinectsdk1.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "b48f4bf28923981e5a8ad549daa4dc8ee64dac83",
+ "version-string": "1.8",
+ "port-version": 3
+ },
+ {
"git-tree": "6f1b6079d522449e9e015c19c96b021bef51d3f8",
"version-string": "1.8-2",
"port-version": 0