diff --git a/ports/libfreenect2/fix-dependency-libusb.patch b/ports/libfreenect2/fix-dependency-libusb.patch deleted file mode 100644 index f8f21044902924..00000000000000 --- a/ports/libfreenect2/fix-dependency-libusb.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3648fb5..43c3d28 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -91,7 +91,7 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) - - # dependencies - FIND_PACKAGE(PkgConfig) # try find PKGConfig as it will be used if found --FIND_PACKAGE(LibUSB REQUIRED) -+pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0) - - # Add includes - INCLUDE_DIRECTORIES( -@@ -99,7 +99,7 @@ INCLUDE_DIRECTORIES( - "${MY_DIR}/include/internal" - ${PROJECT_BINARY_DIR} # for generated headers - ${LIBFREENECT2_THREADING_INCLUDE_DIR} -- ${LibUSB_INCLUDE_DIRS} -+ ${libusb_INCLUDE_DIRS} - ) - - SET(RESOURCES_INC_FILE "${PROJECT_BINARY_DIR}/resources.inc.h") -@@ -157,7 +157,7 @@ SET(SOURCES - ) - - SET(LIBRARIES -- ${LibUSB_LIBRARIES} -+ PkgConfig::libusb - ${LIBFREENECT2_THREADING_LIBRARIES} - ) - diff --git a/ports/libfreenect2/fix-macbuild.patch b/ports/libfreenect2/fix-macbuild.patch deleted file mode 100644 index cb675a6690439c..00000000000000 --- a/ports/libfreenect2/fix-macbuild.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index aedc576..4f16abc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -165,6 +165,8 @@ SET(LIBFREENECT2_DLLS - SET(HAVE_VideoToolbox "no (Apple only)") - IF(APPLE) - FIND_LIBRARY(VIDEOTOOLBOX_LIBRARY VideoToolbox) -+ FIND_LIBRARY(CF_LIBRARY CoreFoundation) -+ FIND_LIBRARY(IOK_LIBRARY IOKit) - - SET(HAVE_VideoToolbox no) - IF(VIDEOTOOLBOX_LIBRARY) -@@ -184,6 +186,8 @@ IF(APPLE) - ${COREFOUNDATION_LIBRARY} - ${COREMEDIA_LIBRARY} - ${COREVIDEO_LIBRARY} -+ ${CF_LIBRARY} -+ ${IOK_LIBRARY} - ) - ENDIF(VIDEOTOOLBOX_LIBRARY) - ENDIF(APPLE) diff --git a/ports/libfreenect2/portfile.cmake b/ports/libfreenect2/portfile.cmake deleted file mode 100644 index efc6c9980d8c35..00000000000000 --- a/ports/libfreenect2/portfile.cmake +++ /dev/null @@ -1,55 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO OpenKinect/libfreenect2 - REF "v${VERSION}" - SHA512 0fcee5471deb013d2b57581ef8d8838f652dfed2f457c4240d5b754674e949c59337a167ac74ad04b25ace69af470a7e014e0474a688d930a3323946feadee67 - HEAD_REF master - PATCHES - fix-dependency-libusb.patch - fix-macbuild.patch -) - -file(READ "${SOURCE_PATH}/cmake_modules/FindLibUSB.cmake" FINDLIBUSB) -string(REPLACE "(WIN32)" - "(WIN32_DISABLE)" FINDLIBUSB "${FINDLIBUSB}") -file(WRITE "${SOURCE_PATH}/cmake_modules/FindLibUSB.cmake" "${FINDLIBUSB}") - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - opengl ENABLE_OPENGL - opencl ENABLE_OPENCL - openni2 BUILD_OPENNI2_DRIVER -) - -vcpkg_find_acquire_program(PKGCONFIG) - -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(path_suffix "/debug") -endif() -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(path_suffix "") -endif() -vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH) -vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}${path_suffix}/lib/pkgconfig") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" - -DENABLE_CUDA=OFF - -DBUILD_EXAMPLES=OFF - ${FEATURE_OPTIONS} -) -vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(PACKAGE_NAME freenect2 CONFIG_PATH lib/cmake/freenect2) - -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/GPL2") - -vcpkg_fixup_pkgconfig() diff --git a/ports/libfreenect2/vcpkg.json b/ports/libfreenect2/vcpkg.json deleted file mode 100644 index c8f3262c248a68..00000000000000 --- a/ports/libfreenect2/vcpkg.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "libfreenect2", - "version": "0.2.1", - "port-version": 2, - "description": "Open source drivers for the Kinect for Windows v2 device", - "homepage": "https://github.com/OpenKinect/libfreenect2", - "license": "GPL-2.0-only OR Apache-2.0", - "supports": "!xbox", - "dependencies": [ - "libjpeg-turbo", - "libusb", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "default-features": [ - "opengl" - ], - "features": { - "opencl": { - "description": "OpenCL support for libfreenect2", - "dependencies": [ - "opencl" - ] - }, - "opengl": { - "description": "OpenGL support for libfreenect2", - "dependencies": [ - "glfw3", - "opengl" - ] - }, - "openni2": { - "description": "OpenNI2 support for libfreenect2", - "dependencies": [ - "openni2" - ] - } - } -} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index fccdaff694dfc4..5a3d8ac478a811 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -771,8 +771,6 @@ libdc1394:arm-neon-android=fail libdc1394:arm64-android=fail libdc1394:x64-android=fail libedit:arm64-linux=fail -libfreenect2:arm64-windows-static-md=fail -libfreenect2:arm64-windows=fail libgo:x64-android=fail libgxps:x64-windows-static=fail libharu:arm64-linux=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index c1d7f1ffcb5f42..19eb96f4b6c1c9 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -581,14 +581,6 @@ libcerf:x64-windows-static-md=fail libcopp:arm64-windows=fail libdc1394:arm64-linux=cascade libedit:arm64-linux=fail -libfreenect2:arm64-linux=cascade -libfreenect2:arm64-windows=fail -libfreenect2[opengl]:arm64-linux=cascade -libfreenect2[openni2]:arm64-linux=cascade -libfreenect2[openni2]:arm64-osx=cascade -libfreenect2[openni2]:arm64-windows=cascade -libfreenect2[openni2]:x64-linux=cascade -libfreenect2[openni2]:x64-windows-static=cascade libftdi:arm64-linux=cascade libftdi:arm64-osx=cascade libftdi:x64-linux=cascade diff --git a/versions/baseline.json b/versions/baseline.json index bc8bfd7bee377e..4abe3bbd371cfe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5072,10 +5072,6 @@ "baseline": "0.4.2", "port-version": 1 }, - "libfreenect2": { - "baseline": "0.2.1", - "port-version": 2 - }, "libfs": { "baseline": "1.0.10", "port-version": 1