3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 06:28:00 +08:00
Code Issues Projects Releases Wiki Activity

[many ports] Fix use of Readme as copyright (#24201)

Browse Source 
* [jack2] Update to 1.9.21

* [libxmlmm] Fix license

* [volk] Fix license

* [tmxlite] Fix license

* [tinyxml2] Fix license

* [stb] Fix license

* [rtmidi] Fix license

* [pugixml] Update to 1.12.1

* [physx] Fix license

* [physx] License expression

* version

* lowercase

* null

* Format

* Remove version-string

* stb

* Format

* version

* Format

* version

* [tinyxml] port version

* version

* Fix license

* version

* [rtmidi] remove patch

* version

* [pugixml] Remove unused variable

* version

* [physx] Remove from CI baseline for testing

* [physx] update supports statement

* version

* [tmxlite] add final newline

* version

* [libxmlmm] Don't use own copyright file

* version

* Fix license copy

* version
This commit is contained in:
Thomas1664 2022-04-19 23:31:08 +02:00 committed by GitHub
parent 7f7f1a5145
commit c37cc7836a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 145 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/jack2/portfile.cmake
View File

@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO jackaudio/jack2
REF v1.9.19
SHA512 d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d
REF v1.9.21
SHA512 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557
HEAD_REF master
)
@ -22,4 +22,4 @@ vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${SOURCE_PATH}/README.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

4
ports/jack2/vcpkg.json
View File

@ -1,9 +1,9 @@
{
"name": "jack2",
"version-semver": "1.9.19",
"port-version": 1,
"version-semver": "1.9.21",
"description": "Cross-platform API that enables device sharing and inter-application audio routing",
"homepage": "https://jackaudio.org/",
"license": "GPL-2.0",
"supports": "!uwp",
"dependencies": [
{

15
ports/libxmlmm/portfile.cmake
View File

@ -6,18 +6,17 @@ vcpkg_from_github(
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(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)
vcpkg_install_cmake()
# Handle copyright
configure_file(${SOURCE_PATH}/README.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

10
ports/libxmlmm/vcpkg.json
View File

@ -1,10 +1,14 @@
{
"name": "libxmlmm",
"version-string": "0.6.0",
"port-version": 1,
"version": "0.6.0",
"port-version": 2,
"description": "Libxmlmm is a C++ wrapper for libxml 2.0 that only relies on standard C++ and libxml2.",
"homepage": "https://github.com/rioki/libxmlmm",
"dependencies": [
"libxml2"
"libxml2",
{
"name": "vcpkg-cmake",
"host": true
}
]
}

2
ports/physx/portfile.cmake
View File

@ -136,4 +136,4 @@ file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/source"
"${CURRENT_PACKAGES_DIR}/source"
)
file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

5
ports/physx/vcpkg.json
View File

@ -1,10 +1,11 @@
{
"name": "physx",
"version-semver": "4.1.2",
"port-version": 1,
"port-version": 2,
"description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs",
"homepage": "https://github.com/NVIDIAGameWorks/PhysX",
"supports": "!mingw",
"license": null,
"supports": "!mingw & !(windows & arm)",
"dependencies": [
{
"name": "vcpkg-cmake",

20
ports/pugixml/portfile.cmake
View File

@ -1,22 +1,22 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO zeux/pugixml
REF v1.11.4
SHA512 a1fdf4cbd744318fd339362465472279767777b18a3c8c7e8618d5e637213c632bf9dd8144d16ae22a75cfbde007f383e2feb49084e681c930fc89a2e3f2bc4f
REF v1.12.1
SHA512 c1a80518e8d7b21f2a15b2023b77e87484f5b7581e68ff508785a60cab53d1689b5508f5a652d6f0d4fbcc91f66d59246fdfe499fd6b0e188c7914ed5919980b
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DUSE_POSTFIX=ON
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DPUGIXML_BUILD_TESTS=OFF
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/pugixml)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/pugixml)
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

16
ports/pugixml/vcpkg.json
View File

@ -1,7 +1,17 @@
{
"name": "pugixml",
"version-string": "1.11.4",
"port-version": 1,
"version": "1.12.1",
"description": "Light-weight, simple and fast XML parser for C++ with XPath support",
"homepage": "https://github.com/zeux/pugixml"
"homepage": "https://github.com/zeux/pugixml",
"license": "MIT",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

17
ports/rtmidi/fix-POSIXname.patch
View File

@ -1,17 +0,0 @@
diff --git a/rtmidi_c.cpp b/rtmidi_c.cpp
index 248c9e5..ec1dd38 100644
--- a/rtmidi_c.cpp
+++ b/rtmidi_c.cpp
@@ -136,7 +136,11 @@ const char* rtmidi_get_port_name (RtMidiPtr device, unsigned int portNumber)
{
try {
std::string name = ((RtMidi*) device->ptr)->getPortName (portNumber);
- return strdup (name.c_str ());
+#if defined(_WIN) || defined(WINAPI_FAMILY) //Windows platform
+ return _strdup (name.c_str ());
+#else // Unix platform
+ return strdup (name.c_str ());
+#endif
} catch (const RtMidiError & err) {
device->ok = false;

18
ports/rtmidi/portfile.cmake
View File

@ -5,24 +5,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO thestk/rtmidi
REF dda792c5394375769466ab1c1d7773e741bbd950 # 4.0.0
SHA512 cb1ded29c0b22cf7f38719131a9572a4daba7071fd8cf8b5b8d7306560a218bb0ef42150bf341b76f4ddee0ae087da975116c3b153e7bb908f2a674ecacb9d7a
REF 84a99422a3faf1ab417fe71c0903a48debb9376a # 5.0.0
SHA512 388e280b7966281e22b0048d6fb2541921df1113d84e49bbc444fff591d2025588edd8d61dbe5ff017afd76c26fd05edc8f9f15d0cce16315ccc15e6aac1d57f
HEAD_REF master
PATCHES
fix-POSIXname.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DRTMIDI_API_ALSA=OFF
-DRTMIDI_API_JACK=OFF
-DRTMIDI_BUILD_TESTING=OFF
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets()
vcpkg_cmake_install()
vcpkg_cmake_config_fixup()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

15
ports/rtmidi/vcpkg.json
View File

@ -1,8 +1,19 @@
{
"name": "rtmidi",
"version-semver": "4.0.0",
"port-version": 4,
"port-version": 5,
"description": "A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK) and Windows (Multimedia)",
"homepage": "https://github.com/thestk/rtmidi",
"supports": "!uwp"
"license": "MIT",
"supports": "!uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

11
ports/stb/portfile.cmake
View File

@ -6,9 +6,10 @@ vcpkg_from_github(
HEAD_REF master
)
file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h)
file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h")
file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindStb.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindStb.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

7
ports/stb/vcpkg.json
View File

@ -1,7 +1,8 @@
{
"name": "stb",
"version-string": "2020-09-14",
"port-version": 1,
"version": "2020-09-14",
"port-version": 2,
"description": "public domain header-only libraries",
"homepage": "https://github.com/nothings/stb"
"homepage": "https://github.com/nothings/stb",
"license": "MIT OR CC-PDDC"
}

4
ports/tinyxml2/portfile.cmake
View File

@ -8,6 +8,8 @@ vcpkg_from_github(
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-Dtinyxml2_BUILD_TESTING=OFF
)
vcpkg_cmake_install()
@ -19,4 +21,4 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${SOURCE_PATH}/readme.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

2
ports/tinyxml2/vcpkg.json
View File

@ -1,8 +1,10 @@
{
"name": "tinyxml2",
"version-semver": "9.0.0",
"port-version": 1,
"description": "A simple, small, efficient, C++ XML parser",
"homepage": "https://github.com/leethomason/tinyxml2",
"license": "Zlib",
"dependencies": [
{
"name": "vcpkg-cmake",

6
ports/tmxlite/portfile.cmake
View File

@ -1,9 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO fallahn/tmxlite
REF v1.3.0
REF v1.3.0
HEAD_REF master
SHA512 3D432152080F7FDDD14A150FF87C34932695C96D7F676399C7610FF373972223CE54C9483BD9A872FD53668C113E334FCBF8596AE21CFDAF83B6159C7287A4A3
SHA512 3D432152080F7FDDD14A150FF87C34932695C96D7F676399C7610FF373972223CE54C9483BD9A872FD53668C113E334FCBF8596AE21CFDAF83B6159C7287A4A3
)
vcpkg_cmake_configure(
@ -18,4 +18,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
file(INSTALL "${SOURCE_PATH}/readme.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

2
ports/tmxlite/vcpkg.json
View File

@ -1,7 +1,9 @@
{
"name": "tmxlite",
"version": "1.3.0",
"port-version": 1,
"description": "A lightweight C++14 parsing library for tmx map files created with the Tiled map editor.",
"license": "Zlib",
"dependencies": [
{
"name": "vcpkg-cmake",

4
ports/volk/portfile.cmake
View File

@ -20,6 +20,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/volk)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
# Put the file containing the license where vcpkg expects it
file(COPY "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/volk/")
file(RENAME "${CURRENT_PACKAGES_DIR}/share/volk/README.md" "${CURRENT_PACKAGES_DIR}/share/volk/copyright")
file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

1
ports/volk/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "volk",
"version": "1.3.204",
"port-version": 1,
"description": [
"Meta loader for Vulkan API.",
"Note that the static library target volk::volk is built without platform-specific defines.",

1
scripts/ci.baseline.txt
View File

@ -953,7 +953,6 @@ pfring:x64-osx=fail
# pfring on Linux currently fails because its build scripts enable warnings as
# errors, and warnings trigger with the Linux kernel headers in the Azure images.
pfring:x64-linux=fail
physx:arm64-windows=fail
pixman:arm-uwp=fail
platform-folders:arm-uwp=fail
platform-folders:x64-uwp=fail

22
versions/baseline.json
View File

@ -3001,8 +3001,8 @@
"port-version": 0
},
"jack2": {
"baseline": "1.9.19",
"port-version": 1
"baseline": "1.9.21",
"port-version": 0
},
"jaeger-client-cpp": {
"baseline": "0.7.0",
@ -4186,7 +4186,7 @@
},
"libxmlmm": {
"baseline": "0.6.0",
"port-version": 1
"port-version": 2
},
"libxmlpp": {
"baseline": "5.0.0",
@ -5386,7 +5386,7 @@
},
"physx": {
"baseline": "4.1.2",
"port-version": 1
"port-version": 2
},
"picojson": {
"baseline": "1.3.0",
@ -5609,8 +5609,8 @@
"port-version": 0
},
"pugixml": {
"baseline": "1.11.4",
"port-version": 1
"baseline": "1.12.1",
"port-version": 0
},
"pybind11": {
"baseline": "2.9.2",
@ -6262,7 +6262,7 @@
},
"rtmidi": {
"baseline": "4.0.0",
"port-version": 4
"port-version": 5
},
"rttr": {
"baseline": "0.9.6",
@ -6766,7 +6766,7 @@
},
"stb": {
"baseline": "2020-09-14",
"port-version": 1
"port-version": 2
},
"stlab": {
"baseline": "1.6.2",
@ -7030,7 +7030,7 @@
},
"tinyxml2": {
"baseline": "9.0.0",
"port-version": 0
"port-version": 1
},
"tl-expected": {
"baseline": "1.0.0",
@ -7062,7 +7062,7 @@
},
"tmxlite": {
"baseline": "1.3.0",
"port-version": 0
"port-version": 1
},
"tmxparser": {
"baseline": "2.1.0",
@ -7370,7 +7370,7 @@
},
"volk": {
"baseline": "1.3.204",
"port-version": 0
"port-version": 1
},
"vs-yasm": {
"baseline": "0.5.0",

5
versions/j-/jack2.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "84f683fbf07cae4c021f1d0d5fd5cab7b58d991e",
"version-semver": "1.9.21",
"port-version": 0
},
{
"git-tree": "f5494181c269f8b65a26fd702664bfde1a3f2e3f",
"version-semver": "1.9.19",

5
versions/l-/libxmlmm.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "869d2ab96342804f872b8d56ad8ccd5e80b274b6",
"version": "0.6.0",
"port-version": 2
},
{
"git-tree": "4f34eb9988a27e6184d3271ca0e346793b30d836",
"version-string": "0.6.0",

5
versions/p-/physx.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8e20a94664b966271a5e7684e73b2efab2461ba8",
"version-semver": "4.1.2",
"port-version": 2
},
{
"git-tree": "3efd7a1c7727eec4a15ba3ac6f8f013550750760",
"version-semver": "4.1.2",

5
versions/p-/pugixml.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ffaef9b7ddc94c06bf1293ff4f04906960f0de4c",
"version": "1.12.1",
"port-version": 0
},
{
"git-tree": "2af3faa6e86d241d2d6845f27c21afa51741f391",
"version-string": "1.11.4",

5
versions/r-/rtmidi.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1d922425c684e2dd87ea1691b2ac8f1c0fd808e4",
"version-semver": "4.0.0",
"port-version": 5
},
{
"git-tree": "9d72ff2345f2c1b08f4808cedaa0caf87156d295",
"version-semver": "4.0.0",

5
versions/s-/stb.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "41ce7d73e93526a943f08e5e4601c6b2325ba527",
"version": "2020-09-14",
"port-version": 2
},
{
"git-tree": "fa6d7e998f98f122efa37f456ffa498d546185b9",
"version-string": "2020-09-14",

5
versions/t-/tinyxml2.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5ef0e856167ad66665f51776d78fcffb1fcc1cb1",
"version-semver": "9.0.0",
"port-version": 1
},
{
"git-tree": "a8b086bdb3eaa94fea466bf8565d7c98b00c9f94",
"version-semver": "9.0.0",

5
versions/t-/tmxlite.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b176cf2abbb6262dc616d68625f90f35e65fe4c1",
"version": "1.3.0",
"port-version": 1
},
{
"git-tree": "a60946b8d791faf0936b14f7ad9868d74b0dd872",
"version": "1.3.0",

5
versions/v-/volk.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c3c879b8f9516e71bcad0365c64b9c993ec6b254",
"version": "1.3.204",
"port-version": 1
},
{
"git-tree": "83175cabc17042125828c2e0230f75b60d140cc0",
"version": "1.3.204",