aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Kyne <xskyne@gmail.com>2021-08-31 03:35:02 +0200
committerGitHub <noreply@github.com>2021-08-30 18:35:02 -0700
commita761a22de8a5b82503837e58630f9aec38f05d52 (patch)
treea198e19f90ecc212ceb55e28319711affb0ee078
parent78b7f1ba6580c474f9e4705195b4d4e008f60265 (diff)
downloadvcpkg-a761a22de8a5b82503837e58630f9aec38f05d52.tar.gz
vcpkg-a761a22de8a5b82503837e58630f9aec38f05d52.zip
[liblo] Fix filenames for linux in liblo portfile (#19660)
* Fix filenames for linux vs windows in liblo portfile * Removed deprecated call and now using vcpkg_copy_tools * Upgraded to manifest file * Increment port-version * Remove now working builds from ci.baseline * Updated versioning files * Fixed type for vcpkg.json * Updated sha for liblo version
-rw-r--r--ports/liblo/CONTROL4
-rw-r--r--ports/liblo/portfile.cmake6
-rw-r--r--ports/liblo/vcpkg.json7
-rw-r--r--scripts/ci.baseline.txt2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/l-/liblo.json5
6 files changed, 14 insertions, 12 deletions
diff --git a/ports/liblo/CONTROL b/ports/liblo/CONTROL
deleted file mode 100644
index 4efcd14c7..000000000
--- a/ports/liblo/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: liblo
-Version: 0.31
-Homepage: https://github.com/radarsat1/liblo
-Description: liblo is an implementation of the Open Sound Control protocol for POSIX systems \ No newline at end of file
diff --git a/ports/liblo/portfile.cmake b/ports/liblo/portfile.cmake
index 9d02b6599..3ddfd9e7a 100644
--- a/ports/liblo/portfile.cmake
+++ b/ports/liblo/portfile.cmake
@@ -17,14 +17,10 @@ vcpkg_install_cmake()
# Install needed files into package directory
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/liblo)
-file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/oscsend.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/liblo)
-file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/oscdump.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/liblo)
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/liblo)
+vcpkg_copy_tools(TOOL_NAMES oscsend oscdump AUTO_CLEAN)
# Remove unnecessary files
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/oscsend.exe ${CURRENT_PACKAGES_DIR}/bin/oscdump.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/oscsend.exe ${CURRENT_PACKAGES_DIR}/debug/bin/oscdump.exe)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
diff --git a/ports/liblo/vcpkg.json b/ports/liblo/vcpkg.json
new file mode 100644
index 000000000..f013f968c
--- /dev/null
+++ b/ports/liblo/vcpkg.json
@@ -0,0 +1,7 @@
+{
+ "name": "liblo",
+ "version-string": "0.31",
+ "port-version": 1,
+ "description": "liblo is an implementation of the Open Sound Control protocol for POSIX systems",
+ "homepage": "https://github.com/radarsat1/liblo"
+}
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 6943e87ad..47a65e1fc 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -617,8 +617,6 @@ liblas:arm64-windows=fail
liblemon:arm-uwp=fail
liblemon:x64-uwp=fail
liblo:arm-uwp=fail
-liblo:x64-linux=fail
-liblo:x64-osx=fail
liblo:x64-uwp=fail
liblsl:arm64-windows=fail
liblsl:arm-uwp=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index defa9d78a..48d8f1f10 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3366,7 +3366,7 @@
},
"liblo": {
"baseline": "0.31",
- "port-version": 0
+ "port-version": 1
},
"liblsl": {
"baseline": "1.14.0",
diff --git a/versions/l-/liblo.json b/versions/l-/liblo.json
index 2905fd165..d7bfa72e1 100644
--- a/versions/l-/liblo.json
+++ b/versions/l-/liblo.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "c4df5a746fe8bc045b2287c0b6122717757a30a3",
+ "version-string": "0.31",
+ "port-version": 1
+ },
+ {
"git-tree": "04145d21ab7fff62c0bbf2a8846bc9ddea192fe2",
"version-string": "0.31",
"port-version": 0