From 773a68586705cdcf533a02b6263f018d835e946b Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Wed, 20 Mar 2019 23:40:43 -0700 Subject: [PATCH] [liblemon][lemon] deprecate duplicate port, forward to original (#5758) --- ports/lemon/CONTROL | 5 ++-- ports/lemon/portfile.cmake | 48 ++---------------------------- ports/lemon/remove-directory.patch | 21 ------------- ports/openmvg/CONTROL | 4 +-- 4 files changed, 7 insertions(+), 71 deletions(-) delete mode 100644 ports/lemon/remove-directory.patch diff --git a/ports/lemon/CONTROL b/ports/lemon/CONTROL index 04fec505c7..08b7393687 100644 --- a/ports/lemon/CONTROL +++ b/ports/lemon/CONTROL @@ -1,3 +1,4 @@ Source: lemon -Version: -Description: +Version: 0 +Description: Deprecated port, use liblemon instead +Build-Depends: liblemon diff --git a/ports/lemon/portfile.cmake b/ports/lemon/portfile.cmake index a7509bde4e..f599558f18 100644 --- a/ports/lemon/portfile.cmake +++ b/ports/lemon/portfile.cmake @@ -1,47 +1,3 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lemon-1.3.1) -vcpkg_download_distfile(ARCHIVE - URLS "http://lemon.cs.elte.hu/pub/sources/lemon-1.3.1.tar.gz" - FILENAME "lemon-1.3.1.tar.gz" - SHA512 715eb45e790c908e41de4c13e68b7880e1d86c54eca53f896c95b6bc411ded504f3f768bed9d63562ed4adad53167fb3a7828c67456fdea645a5d0a94ae2e038 -) -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR} remove-directory.patch) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(VCPKG_LIBRARY_LINKAGE static) -endif() - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja - # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 -) - -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/lemon RENAME copyright) - -# Post-build test for cmake libraries -# vcpkg_test_cmake(PACKAGE_NAME lemon) +message(WARNING "The lemon port is deprecated, use liblemon instead") diff --git a/ports/lemon/remove-directory.patch b/ports/lemon/remove-directory.patch deleted file mode 100644 index bda2c51ae5..0000000000 --- a/ports/lemon/remove-directory.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 03e1cc7..edbd05f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -256,11 +256,11 @@ ENDIF() - - ADD_SUBDIRECTORY(lemon) - IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR}) -- ADD_SUBDIRECTORY(contrib) -- ADD_SUBDIRECTORY(demo) -- ADD_SUBDIRECTORY(tools) -- ADD_SUBDIRECTORY(doc) -- ADD_SUBDIRECTORY(test) -+ # ADD_SUBDIRECTORY(contrib) -+ # ADD_SUBDIRECTORY(demo) -+ # ADD_SUBDIRECTORY(tools) -+ # ADD_SUBDIRECTORY(doc) -+ # ADD_SUBDIRECTORY(test) - ENDIF() - - CONFIGURE_FILE( diff --git a/ports/openmvg/CONTROL b/ports/openmvg/CONTROL index 261fd901fd..ce974a9d65 100644 --- a/ports/openmvg/CONTROL +++ b/ports/openmvg/CONTROL @@ -1,4 +1,4 @@ Source: openmvg -Version: 1.4-0 +Version: 1.4-1 Description: open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion. -Build-Depends: coinutils, clp, osi, lemon, flann, eigen3, ceres, cereal, libjpeg-turbo, tiff, libpng, zlib +Build-Depends: coinutils, clp, osi, liblemon, flann, eigen3, ceres, cereal, libjpeg-turbo, tiff, libpng, zlib