From 75bd2efe0dce862dfa025209b8cecc61a00a1852 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 13 Oct 2020 13:17:32 -0700 Subject: [many ports] 2019.09.14 Updates (#13536) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [many ports] 2019.09.14 Updates * Revert failure ports * Revert failure ports * Revert failure ports * [urdfdom] Fix find dependency console_bridge * Revert failure ports * [devil] Compatible with jasper 2.0.20 * [devil] Refix compatible with jasper functions declaration on different os * Update ports/alembic/CONTROL Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Revert failure ports wangle * [azure-kinect-sensor-sdk] Fix build with matroska 1.6.2 * Revert failure ports * Revert failure ports * [urdfdom-headers] Fix include path in config.cmake file * upload patch * [urdfdom-headers] Refix include path in config.cmake file * [qt5-imageformats] Fix missing include math.h * [urdfdom-headers] Refix include path in config.cmake file * [qt5] Fix adding option PATCHES and other options when using qt_submodule_installation * Remove updated ports version * Commit suggestions * [libideviceactivation] revert Co-authored-by: JackBoosY Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/urdfdom/0004_fix-dependency-console_bridge.patch | 13 +++++++++++++ ports/urdfdom/CONTROL | 3 ++- ports/urdfdom/portfile.cmake | 7 +++---- 3 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 ports/urdfdom/0004_fix-dependency-console_bridge.patch (limited to 'ports/urdfdom') diff --git a/ports/urdfdom/0004_fix-dependency-console_bridge.patch b/ports/urdfdom/0004_fix-dependency-console_bridge.patch new file mode 100644 index 000000000..4e149b1a0 --- /dev/null +++ b/ports/urdfdom/0004_fix-dependency-console_bridge.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 92762f1..f0d115d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,7 +41,7 @@ if (NOT MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + endif() + +-find_package(console_bridge 0.3 REQUIRED) ++find_package(console_bridge REQUIRED) + include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS}) + link_directories(${console_bridge_LIBRARY_DIRS}) + diff --git a/ports/urdfdom/CONTROL b/ports/urdfdom/CONTROL index 0775dddd0..67fb4a326 100644 --- a/ports/urdfdom/CONTROL +++ b/ports/urdfdom/CONTROL @@ -1,5 +1,6 @@ Source: urdfdom -Version: 1.0.4-1 +Version: 1.0.4 +Port-Version: 2 Homepage: https://github.com/ros/urdfdom Description: Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file. Build-Depends: console-bridge, tinyxml, urdfdom-headers diff --git a/ports/urdfdom/portfile.cmake b/ports/urdfdom/portfile.cmake index 2c45455ea..b2dfeaf0c 100644 --- a/ports/urdfdom/portfile.cmake +++ b/ports/urdfdom/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( @@ -12,6 +10,7 @@ vcpkg_from_github( 0001_use_math_defines.patch 0002_fix_exports.patch 0003_import_prefix.patch + 0004_fix-dependency-console_bridge.patch ) vcpkg_configure_cmake( @@ -34,7 +33,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/ ${CURRENT_PACKAGES_DIR}/tools/urdfdom/) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/ ${CURRENT_PACKAGES_DIR}/tools/${PORT}/) file(GLOB URDFDOM_DLLS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) foreach(URDFDOM_DLL_DEBUG ${URDFDOM_DLLS_DEBUG}) @@ -48,4 +47,4 @@ foreach(URDFDOM_DLL_RELEASE ${URDFDOM_DLLS_RELEASE}) file(REMOVE ${URDFDOM_DLL_RELEASE}) endforeach() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/urdfdom RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -- cgit v1.2.3