mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 04:19:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg baseline] Fix baseline error (#11896)

Browse Source 
* [tinyfiledialogs] Re-trigger CI test

* [msix] Fix source hash

* [geographiclib] Re-trigger CI test

* [soundtouch] Re-trigger CI test

* update baseline

* [plplot] Re-trigger CI test

* [dmlc] Fix issues with parallel configuration

* [tclap] Re-trigger CI test

* [itpp] Re-trigger CI test

* [mpg123] Re-trigger CI test

* [qwt] Re-trigger CI test

* [soundtouch] Re-trigger CI test

* [pthreads] Re-trigger CI test
This commit is contained in:
Jack·Boos·Yu 2020-06-13 04:09:46 +08:00 committed by GitHub
parent 250e35a961
commit 83627767af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/dmlc/CONTROL
View File

@ -1,5 +1,5 @@
Source: dmlc
Version: 2019-08-12-3
Version: 2019-08-12-4
Homepage: https://github.com/dmlc/dmlc-core
Description: DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries.
Default-Features: openmp

2
ports/dmlc/portfile.cmake
View File

@ -23,7 +23,7 @@ endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
NO_PARALLEL_CONFIGURE
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DDMLC_FORCE_SHARED_CRT=${DMLC_FORCE_SHARED_CRT}
-DUSE_OPENMP=${ENABLE_OPENMP}

2
ports/geographiclib/CONTROL
View File

@ -1,4 +1,4 @@
Source: geographiclib
Version: 1.47-patch1-11
Version: 1.47-patch1-12
Homepage: https://sourceforge.net/projects/geographiclib/
Description: a small set of C++ classes for performing conversions between geographic, UTM, UPS, MGRS, geocentric, and local cartesian coordinates, for gravity (e.g., EGM2008), geoid height, and geomagnetic field (e.g., WMM2010) calculations, and for solving geodesic problems.

2
ports/geographiclib/portfile.cmake
View File

@ -45,4 +45,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

3
ports/itpp/CONTROL
View File

@ -1,3 +1,4 @@
Source: itpp
Version: 4.3.1-1
Version: 4.3.1-2
Homepage: http://itpp.sourceforge.net
Description: IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.

2
ports/itpp/portfile.cmake
View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
set(ITPP_VERSION 4.3.1)
vcpkg_download_distfile(ARCHIVE
URLS "https://sourceforge.net/projects/itpp/files/itpp/${ITPP_VERSION}/itpp-${ITPP_VERSION}.tar.bz2"

2
ports/mpg123/CONTROL
View File

@ -1,4 +1,4 @@
Source: mpg123
Version: 1.25.8-9
Version: 1.25.8-10
Homepage: https://sourceforge.net/projects/mpg123/
Description: mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).

2
ports/mpg123/portfile.cmake
View File

@ -192,6 +192,6 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR VCPKG_CMAKE_SYSTEM_NAME STRE
)
endif()
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mpg123 RENAME copyright)
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
message(STATUS "Installing done")

2
ports/msix/CONTROL
View File

@ -1,5 +1,5 @@
Source: msix
Version: 1.7-1
Version: 1.7-2
Build-Depends: xerces-c, zlib, openssl (!uwp&!windows), catch2
Homepage: https://github.com/microsoft/msix-packaging
Description: The MSIX Packaging SDK project is an effort to enable developers on a variety of platforms to pack and unpack packages for the purposes of distribution from either the Microsoft Store, or their own content distribution networks.

5
ports/msix/portfile.cmake
View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO microsoft/msix-packaging
REF ab322965d64baf1448548cbe18139e8872d686f2 # v1.7
SHA512 67f07b3f374a7493f1aa85dc5f18759daa9c3e39294f24f5d5023b5d7d9ada88b1fcf9daa497b4c2012547bab674a4b74c2236310229f29b998bf0731574a711
SHA512 d64767c84d5933bf3d1e0e62e9dc21fa13e02b8cf31776ccbe2e7066e514798d8ff758dc2b6fd64f6eabcf3deb83ef0eaa03e1a7d407307f347a045e8a75d3dd
HEAD_REF master
PATCHES
install-cmake.patch
@ -43,7 +43,8 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/plplot/CONTROL
View File

@ -1,5 +1,5 @@
Source: plplot
Version: 5.13.0-4
Version: 5.13.0-5
Build-Depends: freetype, zlib, libpng, bzip2
Description: PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.

5
ports/plplot/portfile.cmake
View File

@ -45,6 +45,8 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/plplot)
# Remove unnecessary tool
@ -67,5 +69,4 @@ endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/Copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/plplot RENAME copyright)
file(INSTALL ${SOURCE_PATH}/Copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/pthreads/CONTROL
View File

@ -1,5 +1,5 @@
Source: pthreads
Version: 3.0.0-4
Version: 3.0.0-5
Homepage: https://sourceware.org/pub/pthreads-win32/
Description: pthreads for windows
Supports: !(uwp|arm|arm64)

9
ports/pthreads/portfile.cmake
View File

@ -1,11 +1,9 @@
if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if(NOT VCPKG_TARGET_IS_WINDOWS)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
return()
endif()
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
message(FATAL_ERROR "${PORT} does not currently support UWP platform nor ARM architectures")
endif()
vcpkg_fail_port_install(MESSAGE "${PORT} does not currently support UWP platform nor ARM architectures" ON_TARGET "UWP" ON_ARCH "arm" )
set(PTHREADS4W_VERSION "3.0.0")
@ -92,9 +90,10 @@ endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads RENAME copyright)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthread)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads_windows)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)

2
ports/qwt/CONTROL
View File

@ -1,5 +1,5 @@
Source: qwt
Version: 6.1.3-10
Version: 6.1.3-11
Homepage: https://sourceforge.net/projects/qwt
Description: Qt widgets library for technical applications
Build-Depends: qt5-base, qt5-svg, qt5-tools

5
ports/qwt/portfile.cmake
View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
vcpkg_download_distfile(ARCHIVE
URLS "https://sourceforge.net/projects/qwt/files/qwt/6.1.3/qwt-6.1.3.zip"
FILENAME "qwt-6.1.3.zip"
@ -35,5 +33,4 @@ file(GLOB HEADER_FILES ${SOURCE_PATH}/src/*.h)
file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/qwt)
# Handle copyright
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/qwt)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/qwt/COPYING ${CURRENT_PACKAGES_DIR}/share/qwt/copyright)
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/soundtouch/CONTROL
View File

@ -1,5 +1,5 @@
Source: soundtouch
Version: 2.0.0-4
Version: 2.0.0-6
Homepage: https://www.surina.net/soundtouch
Description: SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files.
Build-Depends: atlmfc (windows)

4
ports/soundtouch/portfile.cmake
View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
@ -30,4 +28,4 @@ vcpkg_install_cmake()
file(INSTALL ${SOURCE_PATH}/source/SoundTouchDLL/SoundTouchDLL.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(INSTALL ${SOURCE_PATH}/COPYING.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/COPYING.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/tclap/CONTROL
View File

@ -1,4 +1,4 @@
Source: tclap
Version: 1.2.2-1
Version: 1.2.2-2
Homepage: https://sourceforge.net/projects/tclap/
Description: Templatized command-line argument parser for C++

2
ports/tclap/portfile.cmake
View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
vcpkg_download_distfile(ARCHIVE
URLS "http://downloads.sourceforge.net/project/tclap/tclap-1.2.2.tar.gz"
FILENAME "tclap-1.2.2.tar.gz"

2
ports/tinyfiledialogs/CONTROL
View File

@ -1,5 +1,5 @@
Source: tinyfiledialogs
Version: 3.4.3-1
Version: 3.4.3-2
Description: Highly portable and cross-platform dialogs for native inputbox, passwordbox, colorpicker and more
Homepage: https://sourceforge.net/projects/tinyfiledialogs/
Supports: !uwp

2
ports/tinyfiledialogs/portfile.cmake
View File

@ -28,4 +28,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(READ ${CURRENT_PACKAGES_DIR}/include/tinyfiledialogs/tinyfiledialogs.h _contents)
string(SUBSTRING "${_contents}" 0 1024 _contents)
file(WRITE ${CURRENT_PACKAGES_DIR}/share/tinyfiledialogs/copyright "${_contents}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "${_contents}")

1
scripts/ci.baseline.txt
View File

@ -881,6 +881,7 @@ libpng-apng:x64-windows = skip
libpng-apng:x64-windows-static = skip
libpng-apng:x86-windows = skip
libpq:arm-uwp=fail
libpq:arm64-windows=fail
libpq:x64-uwp=fail
libqcow:arm-uwp=fail
libqcow:x64-uwp=fail