microsoft
/
vcpkg
зеркало из https://github.com/microsoft/vcpkg.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[libhsplasma/libpcap/lv2/libcrafter] Update to the latest version (#19965) 

* [libhsplasma/libpcap/lv2] Update to the latest version

* [libpcap] Remove unused comments

* Update version files

* [lv2] Fix usage
[libpcap] Update ci.baseline.txt

* [libhsplasma] Remove x64-windows-static=fail from ci.baseline.txt

* [libcrafter] Update to 1.0

* [libcrafter] Add vcpkg.json

* Update version files

* Add CRT check for libpcap and update version as versin-semver for libpcap

* Update version files

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
NancyLi1013 2021-09-08 22:45:37 +08:00 коммит произвёл GitHub
Родитель 615547c1d5
Коммит 5b2ac1fed8
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
21 изменённых файлов: 184 добавлений и 234 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
ports/libcrafter/CONTROL
Просмотреть файл

@ -1,6 +0,0 @@
Source: libcrafter
Version: 0.3
Port-Version: 2
Homepage: https://github.com/pellegre/libcrafter
Description: Libcrafter is a high level library for C++ designed to create and decode network packets.
Build-Depends: libpcap

12
ports/libcrafter/portfile.cmake
Просмотреть файл

@ -1,15 +1,17 @@
vcpkg_fail_port_install(ON_TARGET "windows")
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO pellegre/libcrafter REPO pellegre/libcrafter
REF version-0.3 REF 86f81f101b5e3051ed04563b3ad3dd7a823afb21 #version-1.0
SHA512 7c396ba942b304dddfaa569adb44697f75568d3ef2ed48dda758e281f3b7c172439309033bbf5498069a4a61a952f93e41af99b129ce874ce76b5ec08da58116 SHA512 bd0eac06896df63f0fff0ed3cf7ca5176e56615476c8134bd26f035692ab9e583f58f1f57daa7673771a710d6921c0c6a6473ab181982ad57727584f2cde56d0
HEAD_REF master HEAD_REF master
PATCHES fix-build-error.patch PATCHES fix-build-error.patch
) )
vcpkg_configure_make( vcpkg_configure_make(
AUTOCONFIG AUTOCONFIG
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
PROJECT_SUBPATH libcrafter PROJECT_SUBPATH libcrafter
OPTIONS OPTIONS
"--with-libpcap=${CURRENT_INSTALLED_DIR}" "--with-libpcap=${CURRENT_INSTALLED_DIR}"
@ -17,9 +19,9 @@ vcpkg_configure_make(
vcpkg_install_make() vcpkg_install_make()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
# Handle copyright # Handle copyright
file(INSTALL ${SOURCE_PATH}/libcrafter/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) file(INSTALL "${SOURCE_PATH}/libcrafter/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

10
ports/libcrafter/vcpkg.json Normal file
Просмотреть файл

@ -0,0 +1,10 @@
{
"name": "libcrafter",
"version": "1.0",
"description": "Libcrafter is a high level library for C++ designed to create and decode network packets.",
"homepage": "https://github.com/pellegre/libcrafter",
"supports": "!windows",
"dependencies": [
"libpcap"
]
}

10
ports/libhsplasma/CONTROL
Просмотреть файл

@ -1,10 +0,0 @@
Source: libhsplasma
Version: 2020.08.30
Homepage: https://github.com/H-uru/libhsplasma
Description: Cross-platform Plasma data and network library
Build-Depends: libjpeg-turbo, libpng, string-theory, zlib
Supports: !(arm|uwp)
Feature: net
Description: Network functionality
Build-Depends: openssl

23
ports/libhsplasma/portfile.cmake
Просмотреть файл

@ -1,20 +1,20 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO H-uru/libhsplasma REPO H-uru/libhsplasma
REF afd9c46fa72afbbaf5260800ecfde0704ba2a475 REF e435db76f86a0258ccd6f62a8bcd1f8b42d4f22d #2021.06.08
SHA512 21774b465ede7fe5e44df4470ed6867977ac9249400ba6d0bed33fd0e856d467de1afe79afb8a4dc6145eef21c5a3f79590b5cfa3ea1337cc355ca8f3bf1a11c SHA512 ebd53633f22662793613c689b5a07f6149ed2b437c42a024e7c14a18d4411356edb11c95c08e1215dde443988fd1e4bcdd8d35fc30ca2545f507d6a61565cc69
HEAD_REF master HEAD_REF master
) )
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
net ENABLE_NET FEATURES
net ENABLE_NET
) )
vcpkg_configure_cmake( vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS OPTIONS
${FEATURE_OPTIONS} ${FEATURE_OPTIONS}
-DENABLE_PHYSX=OFF -DENABLE_PHYSX=OFF
@ -22,14 +22,11 @@ vcpkg_configure_cmake(
-DENABLE_TOOLS=OFF -DENABLE_TOOLS=OFF
) )
vcpkg_install_cmake() vcpkg_cmake_install()
vcpkg_fixup_cmake_targets( vcpkg_cmake_config_fixup(PACKAGE_NAME HSPlasma CONFIG_PATH share/cmake/HSPlasma)
CONFIG_PATH share/cmake/HSPlasma
TARGET_PATH share/HSPlasma
)
vcpkg_fixup_pkgconfig() vcpkg_fixup_pkgconfig()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

29
ports/libhsplasma/vcpkg.json Normal file
Просмотреть файл

@ -0,0 +1,29 @@
{
"name": "libhsplasma",
"version-string": "2021.06.08",
"description": "Cross-platform Plasma data and network library",
"homepage": "https://github.com/H-uru/libhsplasma",
"supports": "!(arm | uwp)",
"dependencies": [
"libjpeg-turbo",
"libpng",
"string-theory",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"zlib"
],
"features": {
"net": {
"description": "Network functionality",
"dependencies": [
"openssl"
]
}
}
}

12
ports/libpcap/0001-fix-package-name.patch
Просмотреть файл

@ -1,12 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55b93f1..f4f9d51 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2358,7 +2358,6 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-namedb.h DESTINATION include)
# On UN*X, and on Windows when not using MSVC, generate libpcap.pc and
# pcap-config and process man pages and arrange that they be installed.
if(NOT MSVC)
- set(PACKAGE_NAME ${LIBRARY_NAME})
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix "\${prefix}")
set(includedir "\${prefix}/include")

5
ports/libpcap/CONTROL
Просмотреть файл

@ -1,5 +0,0 @@
Source: libpcap
Version: 1.9.1-2
Description: A portable C/C++ library for network traffic capture
Homepage: https://www.tcpdump.org/
Supports: !(arm64|uwp|osx)

48
ports/libpcap/add-disable-packet-option.patch
Просмотреть файл

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fe9979..23783d3 100644 index 2f675d1..e9d6d96 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -161,6 +161,7 @@ set(SEPTEL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../septel" CACHE PATH "Path to dire @@ -244,6 +244,7 @@ set(SEPTEL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../septel" CACHE PATH "Path to dire
option(DISABLE_SNF "Disable Myricom SNF support" OFF) option(DISABLE_SNF "Disable Myricom SNF support" OFF)
option(DISABLE_TC "Disable Riverbed TurboCap support" OFF) option(DISABLE_TC "Disable Riverbed TurboCap support" OFF)
@ -10,38 +10,22 @@ index 3fe9979..23783d3 100644
# #
# Debugging options. # Debugging options.
@@ -220,19 +221,21 @@ if(WIN32) @@ -302,7 +303,7 @@ if(WIN32)
if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common)
include_directories(${CMAKE_HOME_DIRECTORY}/../../Common) include_directories(${CMAKE_HOME_DIRECTORY}/../../Common)
endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common) endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common)
-
- find_package(Packet)
- if(PACKET_FOUND)
- set(HAVE_PACKET32 TRUE)
- include_directories(${PACKET_INCLUDE_DIRS})
- #
- # Check whether we have the NPcap PacketIsLoopbackAdapter()
- # function.
- #
- cmake_push_check_state()
- set(CMAKE_REQUIRED_LIBRARIES ${PACKET_LIBRARIES})
- check_function_exists(PacketIsLoopbackAdapter HAVE_PACKET_IS_LOOPBACK_ADAPTER)
- cmake_pop_check_state()
- endif(PACKET_FOUND)
+ if(NOT DISABLE_PACKET) + if(NOT DISABLE_PACKET)
+ find_package(Packet) find_package(Packet)
+ if(PACKET_FOUND) if(PACKET_FOUND)
+ set(HAVE_PACKET32 TRUE) set(HAVE_PACKET32 TRUE)
+ include_directories(${PACKET_INCLUDE_DIRS}) @@ -317,7 +318,8 @@ if(WIN32)
+ # check_function_exists(PacketGetTimestampModes HAVE_PACKET_GET_TIMESTAMP_MODES)
+ # Check whether we have the NPcap PacketIsLoopbackAdapter() cmake_pop_check_state()
+ # function. endif(PACKET_FOUND)
+ # -
+ cmake_push_check_state()
+ set(CMAKE_REQUIRED_LIBRARIES ${PACKET_LIBRARIES})
+ check_function_exists(PacketIsLoopbackAdapter HAVE_PACKET_IS_LOOPBACK_ADAPTER)
+ cmake_pop_check_state()
+ endif(PACKET_FOUND)
+ endif() + endif()
+
message(STATUS "checking for Npcap's version.h") message(STATUS "checking for Npcap's version.h")
check_symbol_exists(WINPCAP_PRODUCT_NAME "../../version.h" HAVE_VERSION_H) check_symbol_exists(WINPCAP_PRODUCT_NAME "${CMAKE_SOURCE_DIR}/../../version.h" HAVE_VERSION_H)
if(HAVE_VERSION_H)

104
ports/libpcap/install-pc-on-msvc.patch
Просмотреть файл

@ -1,97 +1,37 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55b93f1..3fe9979 100644 index b83fbbd..2f675d1 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -2355,48 +2355,54 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap.h DESTINATION include) @@ -2678,9 +2678,12 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap.h DESTINATION include)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-bpf.h DESTINATION include) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-bpf.h DESTINATION include)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-namedb.h DESTINATION include) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-namedb.h DESTINATION include)
-# On UN*X, and on Windows when not using MSVC, generate libpcap.pc and -# On UN*X, and on Windows when not using MSVC, generate libpcap.pc and
-# pcap-config and process man pages and arrange that they be installed.
-if(NOT MSVC)
+# Generate libpcap.pc +# Generate libpcap.pc
+if(BUILD_SHARED_LIBS) +if(BUILD_SHARED_LIBS)
+ set(PACKAGE_NAME ${LIBRARY_NAME}) + set(PACKAGE_NAME ${LIBRARY_NAME})
+else() +else()
+ set(PACKAGE_NAME pcap) + set(PACKAGE_NAME pcap)
+endif() +endif()
+set(prefix ${CMAKE_INSTALL_PREFIX}) set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix "\${prefix}") set(exec_prefix "\${prefix}")
+set(includedir "\${prefix}/include") set(includedir "\${prefix}/include")
+set(libdir "\${exec_prefix}/lib") @@ -2715,10 +2718,14 @@ if(NOT MSVC)
+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR foreach(LIB ${PCAP_LINK_LIBRARIES})
+ CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR set(LIBS "${LIBS} -l${LIB}")
+ CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR endforeach(LIB)
+ CMAKE_SYSTEM_NAME STREQUAL "DragonFly BSD" OR - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY)
+ CMAKE_SYSTEM_NAME STREQUAL "Linux" OR configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpcap.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc @ONLY)
+ CMAKE_SYSTEM_NAME STREQUAL "OSF1") - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin)
+ # install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc DESTINATION lib/pkgconfig)
+ # Platforms where the linker is the GNU linker +
+ # or accepts command-line arguments like +# On UN*X, and on Windows when not using MSVC, generate libpcap.pc and
+ # those the GNU linker accepts. +# pcap-config and process man pages and arrange that they be installed.
+ # +if(NOT MSVC)
+ set(V_RPATH_OPT "-Wl,-rpath,") + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_VERSION MATCHES "5[.][0-9.]*") + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin)
+ #
+ # SunOS 5.x.
+ #
+ # XXX - this assumes GCC is using the Sun linker,
+ # rather than the GNU linker.
+ #
+ set(V_RPATH_OPT "-Wl,-R,")
+else()
+ #
+ # No option needed to set the RPATH.
+ #
+ set(V_RPATH_OPT "")
+endif()
+set(LIBS "")
+foreach(LIB ${PCAP_LINK_LIBRARIES})
+ set(LIBS "${LIBS} -l${LIB}")
+endforeach(LIB)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpcap.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc DESTINATION lib/pkgconfig)
+
+# On UN*X, and on Windows when not using MSVC, generate
# pcap-config and process man pages and arrange that they be installed.
if(NOT MSVC)
- set(prefix ${CMAKE_INSTALL_PREFIX})
- set(exec_prefix "\${prefix}")
- set(includedir "\${prefix}/include")
- set(libdir "\${exec_prefix}/lib")
- if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR
- CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR
- CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR
- CMAKE_SYSTEM_NAME STREQUAL "DragonFly BSD" OR
- CMAKE_SYSTEM_NAME STREQUAL "Linux" OR
- CMAKE_SYSTEM_NAME STREQUAL "OSF1")
- #
- # Platforms where the linker is the GNU linker
- # or accepts command-line arguments like
- # those the GNU linker accepts.
- #
- set(V_RPATH_OPT "-Wl,-rpath,")
- elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_VERSION MATCHES "5[.][0-9.]*")
- #
- # SunOS 5.x.
- #
- # XXX - this assumes GCC is using the Sun linker,
- # rather than the GNU linker.
- #
- set(V_RPATH_OPT "-Wl,-R,")
- else()
- #
- # No option needed to set the RPATH.
- #
- set(V_RPATH_OPT "")
- endif()
- set(LIBS "")
- foreach(LIB ${PCAP_LINK_LIBRARIES})
- set(LIBS "${LIBS} -l${LIB}")
- endforeach(LIB)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpcap.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc @ONLY)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc DESTINATION lib/pkgconfig)
-
# #
# Man pages. # Man pages.
#

77
ports/libpcap/portfile.cmake
Просмотреть файл

@ -1,10 +1,10 @@
vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports x64-windows, x86-windows and Linux" ON_TARGET "UWP" "OSX" ON_ARCH "arm64") vcpkg_fail_port_install(ON_TARGET "UWP" "OSX")
if(EXISTS "${CURRENT_INSTALLED_DIR}/share/winpcap") if(EXISTS "${CURRENT_INSTALLED_DIR}/share/winpcap")
message(FATAL_ERROR "FATAL ERROR: winpcap and libpcap are incompatible.") message(FATAL_ERROR "FATAL ERROR: winpcap and libpcap are incompatible.")
endif() endif()
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") if(VCPKG_TARGET_IS_LINUX)
message( message(
"libpcap currently requires the following libraries from the system package manager: "libpcap currently requires the following libraries from the system package manager:
flex flex
@ -13,30 +13,19 @@ These can be installed on Ubuntu systems via sudo apt install flex libbison-dev"
) )
endif() endif()
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
vcpkg_download_distfile( vcpkg_from_github(
SOURCE_ARCHIVE_PATH
URLS http://www.tcpdump.org/release/libpcap-1.9.1.tar.gz
FILENAME libpcap-1.9.1.tar.gz
SHA512 ae0d6b0ad8253e7e059336c0f4ed3850d20d7d2f4dc1d942c2951f99a5443a690f0cc42c6f8fdc4a0ccb19e9e985192ba6f399c4bde2c7076e420f547fddfb08
)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${SOURCE_ARCHIVE_PATH} REPO the-tcpdump-group/libpcap
REF 1.9.1 REF c7642e2cc0c5bd65754685b160d25dc23c76c6bd #1.10.1
SHA512 ed46095863aaee79ca2833d26438f6c837cc3e64acb73efd5a388a11ff7d0d1245d23e5404070a9f2c2c77840c93c09328746761e4481e9a530593a5cbf2ad6f
HEAD_REF master
PATCHES PATCHES
0001-fix-package-name.patch
install-pc-on-msvc.patch install-pc-on-msvc.patch
add-disable-packet-option.patch add-disable-packet-option.patch
) )
# Only dynamic builds are currently supported on Windows
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
endif()
vcpkg_find_acquire_program(BISON) vcpkg_find_acquire_program(BISON)
get_filename_component(BISON_PATH ${BISON} DIRECTORY) get_filename_component(BISON_PATH ${BISON} DIRECTORY)
vcpkg_add_to_path(${BISON_PATH}) vcpkg_add_to_path(${BISON_PATH})
@ -44,11 +33,11 @@ vcpkg_find_acquire_program(FLEX)
get_filename_component(FLEX_PATH ${FLEX} DIRECTORY) get_filename_component(FLEX_PATH ${FLEX} DIRECTORY)
vcpkg_add_to_path(${FLEX_PATH}) vcpkg_add_to_path(${FLEX_PATH})
vcpkg_configure_cmake( string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RT)
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
-DDISABLE_USB=ON
-DDISABLE_NETMAP=ON -DDISABLE_NETMAP=ON
-DDISABLE_BLUETOOTH=ON -DDISABLE_BLUETOOTH=ON
-DDISABLE_DBUS=ON -DDISABLE_DBUS=ON
@ -59,37 +48,37 @@ vcpkg_configure_cmake(
-DDISABLE_TC=ON -DDISABLE_TC=ON
-DDISABLE_PACKET=ON -DDISABLE_PACKET=ON
-DENABLE_REMOTE=OFF -DENABLE_REMOTE=OFF
-DUSE_STATIC_RT=${USE_STATIC_RT}
) )
vcpkg_install_cmake() vcpkg_cmake_install()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
# On Windows 64-bit, libpcap 1.9.1 installs the libraries in a amd64 subdirectory of the usual directories # On Windows 64-bit, libpcap 1.10.1 installs the libraries in a x64 subdirectory of the usual directories
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
set(libsubdir "amd64") set(libsubdir "x64")
file(GLOB_RECURSE FILES_TO_MOVE ${CURRENT_PACKAGES_DIR}/lib/${libsubdir}/*) file(GLOB_RECURSE FILES_TO_MOVE "${CURRENT_PACKAGES_DIR}/lib/${libsubdir}/*")
file(COPY ${FILES_TO_MOVE} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(COPY ${FILES_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
file(GLOB_RECURSE FILES_TO_MOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${libsubdir}/*) file(GLOB_RECURSE FILES_TO_MOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${libsubdir}/*")
file(COPY ${FILES_TO_MOVE} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) file(COPY ${FILES_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
file(GLOB_RECURSE FILES_TO_MOVE ${CURRENT_PACKAGES_DIR}/bin/${libsubdir}/*) file(GLOB_RECURSE FILES_TO_MOVE "${CURRENT_PACKAGES_DIR}/bin/${libsubdir}/*")
file(COPY ${FILES_TO_MOVE} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(COPY ${FILES_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
file(GLOB_RECURSE FILES_TO_MOVE ${CURRENT_PACKAGES_DIR}/debug/bin/${libsubdir}/*) file(GLOB_RECURSE FILES_TO_MOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${libsubdir}/*")
file(COPY ${FILES_TO_MOVE} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) file(COPY ${FILES_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/${libsubdir} file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/${libsubdir}"
${CURRENT_PACKAGES_DIR}/debug/lib/${libsubdir} "${CURRENT_PACKAGES_DIR}/debug/lib/${libsubdir}"
${CURRENT_PACKAGES_DIR}/bin/${libsubdir} "${CURRENT_PACKAGES_DIR}/bin/${libsubdir}"
${CURRENT_PACKAGES_DIR}/debug/bin/${libsubdir}) "${CURRENT_PACKAGES_DIR}/debug/bin/${libsubdir}")
endif() endif()
# Even if compiled with BUILD_SHARED_LIBS=ON, pcap also install a pcap_static library # Even if compiled with BUILD_SHARED_LIBS=ON, pcap also install a pcap_static library
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/pcap_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/pcap_static.lib) file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pcap_static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/pcap_static.lib")
endif() endif()
vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES ws2_32) vcpkg_fixup_pkgconfig()
if(VCPKG_LIBRARY_LINKAGE STREQUAL static) if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif() endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/man) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/man")

13
ports/libpcap/vcpkg.json Normal file
Просмотреть файл

@ -0,0 +1,13 @@
{
"name": "libpcap",
"version-semver": "1.10.1",
"description": "A portable C/C++ library for network traffic capture",
"homepage": "https://www.tcpdump.org/",
"supports": "!(uwp | osx)",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
}
]
}

2
ports/lv2/CMakeLists.txt
Просмотреть файл

@ -31,5 +31,5 @@ endforeach()
install( install(
EXPORT lv2-config EXPORT lv2-config
NAMESPACE lv2:: NAMESPACE lv2::
DESTINATION "${CMAKE_INSTALL_PREFIX}/share/lv2" DESTINATION share/lv2
) )

14
ports/lv2/portfile.cmake
Просмотреть файл

@ -1,22 +1,20 @@
vcpkg_from_gitlab( vcpkg_from_github(
GITLAB_URL https://gitlab.com
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO lv2/lv2 REPO lv2/lv2
REF v1.18.0 REF cd152104c84bcee9fec22ef780cec2af7ba85d0c #v1.18.2
SHA512 f84c5f2b31f42ed5cab10976d1975743c62f06025a5b67bc99778ba5d0f354c06cb9fad8f5899a52b8c1131f4c9085f5867c83da4d8269c234fd2a22a2c6a689 SHA512 77220524481e97222b12782a89efdcfcb73ee6ac9b9aac88741475c60a2c21049153297860a24b77c0ebd4de32d38a38232ba4fc64d12b8558a56ef50b316801
HEAD_REF master HEAD_REF master
) )
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
vcpkg_configure_cmake( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
) )
vcpkg_install_cmake() vcpkg_cmake_install()
vcpkg_fixup_cmake_targets() vcpkg_cmake_config_fixup()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
file( file(
INSTALL "${SOURCE_PATH}/COPYING" INSTALL "${SOURCE_PATH}/COPYING"

14
ports/lv2/vcpkg.json
Просмотреть файл

@ -1,7 +1,17 @@
{ {
"name": "lv2", "name": "lv2",
"version-string": "1.18.0", "version-semver": "1.18.2",
"description": "LV2 is a plugin standard for audio systems. It defines a minimal yet extensible C API for plugin code and a format for plugin \"bundles\".", "description": "LV2 is a plugin standard for audio systems. It defines a minimal yet extensible C API for plugin code and a format for plugin \"bundles\".",
"homepage": "https://lv2plug.in", "homepage": "https://lv2plug.in",
"license": "ISC" "license": "ISC",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
} }

9
scripts/ci.baseline.txt
Просмотреть файл

@ -438,7 +438,6 @@ hiredis:x64-uwp=fail
hpx:x64-windows-static=fail hpx:x64-windows-static=fail
hpx:x64-linux=fail hpx:x64-linux=fail
hunspell:x64-windows-static-md=fail hunspell:x64-windows-static-md=fail
libhsplasma:x64-windows-static=fail
ideviceinstaller:x64-windows-static-md=fail ideviceinstaller:x64-windows-static-md=fail
idevicerestore:x64-linux=fail idevicerestore:x64-linux=fail
idevicerestore:x64-osx=fail idevicerestore:x64-osx=fail
@ -544,14 +543,11 @@ libcds:arm-uwp=fail
libcds:x64-uwp=fail libcds:x64-uwp=fail
libcopp:arm64-windows=fail libcopp:arm64-windows=fail
libcopp:arm-uwp=fail libcopp:arm-uwp=fail
libcrafter:x86-windows=fail
libcrafter:x64-windows=fail
libgeotiff:arm-uwp=fail libgeotiff:arm-uwp=fail
libgeotiff:x64-uwp=fail libgeotiff:x64-uwp=fail
# Missing system libraries on linux to run/prepare autoconf # Missing system libraries on linux to run/prepare autoconf
libgpod:x64-linux=fail libgpod:x64-linux=fail
libgpod:x64-osx=fail libgpod:x64-osx=fail
libcrafter:x64-windows-static-md=fail
cpuid:arm-uwp=fail cpuid:arm-uwp=fail
cpuid:x64-uwp=fail cpuid:x64-uwp=fail
cpuid:arm64-windows=fail cpuid:arm64-windows=fail
@ -673,11 +669,6 @@ libopusenc:arm-uwp=fail
libopusenc:x64-osx=fail libopusenc:x64-osx=fail
libopusenc:x64-uwp=fail libopusenc:x64-uwp=fail
libosip2:x64-windows-static-md=fail libosip2:x64-windows-static-md=fail
libpcap:arm64-windows=fail
libpcap:arm-uwp=fail
libpcap:x64-osx=fail
libpcap:x64-uwp=fail
libpcap:x64-windows-static=fail
libpff:arm-uwp=fail libpff:arm-uwp=fail
libpff:x64-linux=fail libpff:x64-linux=fail
libpff:x64-osx=fail libpff:x64-osx=fail

10
versions/baseline.json
Просмотреть файл

@ -3165,8 +3165,8 @@
"port-version": 0 "port-version": 0
}, },
"libcrafter": { "libcrafter": {
"baseline": "0.3", "baseline": "1.0",
"port-version": 2 "port-version": 0
}, },
"libcroco": { "libcroco": {
"baseline": "0.6.13", "baseline": "0.6.13",
@ -3317,7 +3317,7 @@
"port-version": 3 "port-version": 3
}, },
"libhsplasma": { "libhsplasma": {
"baseline": "2020.08.30", "baseline": "2021.06.08",
"port-version": 0 "port-version": 0
}, },
"libhv": { "libhv": {
@ -3537,7 +3537,7 @@
"port-version": 0 "port-version": 0
}, },
"libpcap": { "libpcap": {
"baseline": "1.9.1-2", "baseline": "1.10.1",
"port-version": 0 "port-version": 0
}, },
"libpff": { "libpff": {
@ -3961,7 +3961,7 @@
"port-version": 0 "port-version": 0
}, },
"lv2": { "lv2": {
"baseline": "1.18.0", "baseline": "1.18.2",
"port-version": 0 "port-version": 0
}, },
"lz4": { "lz4": {

5
versions/l-/libcrafter.json
Просмотреть файл

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "2d64cfcfa4f2d76c110499477112db136cca34ca",
"version": "1.0",
"port-version": 0
},
{ {
"git-tree": "ab60b081bd44f7a40a649a66c793373931815487", "git-tree": "ab60b081bd44f7a40a649a66c793373931815487",
"version-string": "0.3", "version-string": "0.3",

5
versions/l-/libhsplasma.json
Просмотреть файл

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "9ffbd25ec776fbae40999d98a50d927180b560b5",
"version-string": "2021.06.08",
"port-version": 0
},
{ {
"git-tree": "3cc323670945b88a5da121aa2823e4ac154d964e", "git-tree": "3cc323670945b88a5da121aa2823e4ac154d964e",
"version-string": "2020.08.30", "version-string": "2020.08.30",

5
versions/l-/libpcap.json
Просмотреть файл

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "5fb18d1935c9d7db3a7ff158e2aba95d5a9c6cd2",
"version-semver": "1.10.1",
"port-version": 0
},
{ {
"git-tree": "7dbf78276e1e48505930da6993e36bf381a51b3e", "git-tree": "7dbf78276e1e48505930da6993e36bf381a51b3e",
"version-string": "1.9.1-2", "version-string": "1.9.1-2",

5
versions/l-/lv2.json
Просмотреть файл

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "3a811ec51d55cce1d5eaf4a430a8e274f1916bb9",
"version-semver": "1.18.2",
"port-version": 0
},
{ {
"git-tree": "4fcc1df0a11567c74dccb3fafe922a1f2686eff3", "git-tree": "4fcc1df0a11567c74dccb3fafe922a1f2686eff3",
"version-string": "1.18.0", "version-string": "1.18.0",