aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/aixlog/CONTROL2
-rw-r--r--ports/aixlog/portfile.cmake4
-rw-r--r--ports/chakracore/CONTROL2
-rw-r--r--ports/chakracore/portfile.cmake4
-rw-r--r--ports/cpp-httplib/CONTROL2
-rw-r--r--ports/cpp-httplib/portfile.cmake4
-rw-r--r--ports/embree3/CONTROL2
-rw-r--r--ports/embree3/fix-embree-path.patch26
-rw-r--r--ports/embree3/portfile.cmake5
-rw-r--r--ports/ffmpeg/CONTROL2
-rw-r--r--ports/ffmpeg/portfile.cmake4
-rw-r--r--ports/imgui/CONTROL6
-rw-r--r--ports/imgui/portfile.cmake19
-rw-r--r--ports/libarchive/CONTROL2
-rw-r--r--ports/libarchive/fix-zstd.patch28
-rw-r--r--ports/libarchive/portfile.cmake3
-rw-r--r--ports/libcrafter/CONTROL5
-rw-r--r--ports/libcrafter/fix-build-error.patch20
-rw-r--r--ports/libcrafter/portfile.cmake27
-rw-r--r--ports/libudns/CONTROL4
-rw-r--r--ports/libudns/portfile.cmake31
-rw-r--r--ports/libyuv/fix_cmakelists.patch16
-rw-r--r--ports/portaudio/CONTROL6
-rw-r--r--ports/portaudio/cmakelists-install.patch11
-rw-r--r--ports/portaudio/crt_linkage_build_config.patch61
-rw-r--r--ports/portaudio/find_dsound.patch114
-rw-r--r--ports/portaudio/pa_win_waveformat.patch27
-rw-r--r--ports/portaudio/portfile.cmake19
-rw-r--r--ports/portaudio/wasapi_support.patch11
-rw-r--r--ports/range-v3/CONTROL2
-rw-r--r--ports/range-v3/portfile.cmake4
-rw-r--r--ports/sqlite3/CONTROL2
-rw-r--r--ports/sqlite3/portfile.cmake4
-rw-r--r--scripts/bootstrap.sh2
-rw-r--r--toolsrc/CMakeLists.txt8
35 files changed, 220 insertions, 269 deletions
diff --git a/ports/aixlog/CONTROL b/ports/aixlog/CONTROL
index ba6d2c228..409fb2a3e 100644
--- a/ports/aixlog/CONTROL
+++ b/ports/aixlog/CONTROL
@@ -1,3 +1,3 @@
Source: aixlog
-Version: 1.2.1-1
+Version: 1.2.2
Description: Header-only C++ logging library
diff --git a/ports/aixlog/portfile.cmake b/ports/aixlog/portfile.cmake
index 64ffb29ef..90c96b99d 100644
--- a/ports/aixlog/portfile.cmake
+++ b/ports/aixlog/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO badaix/aixlog
- REF v1.2.1
- SHA512 776558fdd911f0cc9e8d467bf8e00a1930d2e51bb8ccd5f36f95955fefecab65faf575a80fdaacfe83fd32808f8b9c2e0323b16823e0431300df7bc0c1dfde12
+ REF v1.2.2
+ SHA512 384ffe4a40970150d7cbc64f5bd5a64486415f11487b5a432502f16e190f9a96383e65173cbb6624b4ec8bc5168addef93a895dc9b16f874e4a4c8d93be55dd6
)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL
index 6b6ba2469..7248c46a3 100644
--- a/ports/chakracore/CONTROL
+++ b/ports/chakracore/CONTROL
@@ -1,4 +1,4 @@
Source: chakracore
-Version: 1.11.13
+Version: 1.11.14
Homepage: https://github.com/Microsoft/ChakraCore
Description: Core part of the Chakra Javascript engine
diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake
index 06dc945d2..dabadcea9 100644
--- a/ports/chakracore/portfile.cmake
+++ b/ports/chakracore/portfile.cmake
@@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/ChakraCore
- REF v1.11.13
- SHA512 d5ffe0bc1c9463f301fb7af6d2e27b5794a4a005787c50a06501b369d6055c5f2c396d053bf1868036b5a36e8a596d1b47c3dc9d7fe5947e4682beac26bf0178
+ REF v1.11.14
+ SHA512 b14d52ae7edeb9ef6327447a11cc7dd197abf473e292ef3e913cadb4a328b0fe5330d264367280c68b0b111be95c758b3ca7d74cb2e19b5ffb04182f72d5c32b
HEAD_REF master
)
diff --git a/ports/cpp-httplib/CONTROL b/ports/cpp-httplib/CONTROL
index 3a8e76548..180ec102a 100644
--- a/ports/cpp-httplib/CONTROL
+++ b/ports/cpp-httplib/CONTROL
@@ -1,4 +1,4 @@
Source: cpp-httplib
-Version: 0.2.4
+Version: 0.2.5
Homepage: https://github.com/yhirose/cpp-httplib
Description: A single file C++11 header-only HTTP/HTTPS server and client library
diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake
index c74e52496..a23fbe461 100644
--- a/ports/cpp-httplib/portfile.cmake
+++ b/ports/cpp-httplib/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO yhirose/cpp-httplib
- REF v0.2.4
- SHA512 d8b226961f7b9d516b17f2f1c85657a017d63c00d0d2c5478717354cc6f8cfad9a0fb5f189a21242cbeef8579b08a1cd9991271d365afd126cad341f7d5758fd
+ REF v0.2.5
+ SHA512 2b898acb0534517386d14ffa8c2d4640e27cdbbb7ed627a29c289a3012348950bbe1c64711315e8d8654688ab447735d73b9c03be39caaf10e783f612f65e31a
HEAD_REF master
)
diff --git a/ports/embree3/CONTROL b/ports/embree3/CONTROL
index be2b8ba86..d27eefbcc 100644
--- a/ports/embree3/CONTROL
+++ b/ports/embree3/CONTROL
@@ -1,5 +1,5 @@
Source: embree3
-Version: 3.5.2-2
+Version: 3.5.2-3
Homepage: https://github.com/embree/embree
Description: High Performance Ray Tracing Kernels.
Build-Depends: tbb
diff --git a/ports/embree3/fix-embree-path.patch b/ports/embree3/fix-embree-path.patch
new file mode 100644
index 000000000..316112755
--- /dev/null
+++ b/ports/embree3/fix-embree-path.patch
@@ -0,0 +1,26 @@
+diff --git a/common/cmake/embree-config.cmake b/common/cmake/embree-config.cmake
+index cab4d41..da84d3d 100644
+--- a/common/cmake/embree-config.cmake
++++ b/common/cmake/embree-config.cmake
+@@ -14,11 +14,19 @@
+ ## limitations under the License. ##
+ ## ======================================================================== ##
+
+-SET(EMBREE_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/@EMBREE_RELATIV_ROOT_DIR@)
++SET(EMBREE_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../../@EMBREE_RELATIV_ROOT_DIR@)
+ GET_FILENAME_COMPONENT(EMBREE_ROOT_DIR "${EMBREE_ROOT_DIR}" ABSOLUTE)
+
+ SET(EMBREE_INCLUDE_DIRS ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_INCLUDEDIR@)
+-SET(EMBREE_LIBRARY ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_LIBDIR@/@EMBREE_LIBRARY_FULLNAME@)
++
++IF (CMAKE_BUILD_TYPE STREQUAL Debug)
++ SET(EMBREE_LIBRARY ${EMBREE_ROOT_DIR}/debug/@CMAKE_INSTALL_LIBDIR@/@EMBREE_LIBRARY_FULLNAME@)
++ENDIF ()
++
++IF (CMAKE_BUILD_TYPE STREQUAL Release)
++ SET(EMBREE_LIBRARY ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_LIBDIR@/@EMBREE_LIBRARY_FULLNAME@)
++ENDIF ()
++
+ SET(EMBREE_LIBRARIES ${EMBREE_LIBRARY})
+
+ MARK_AS_ADVANCED(embree_DIR)
diff --git a/ports/embree3/portfile.cmake b/ports/embree3/portfile.cmake
index c43dbb45c..32deef693 100644
--- a/ports/embree3/portfile.cmake
+++ b/ports/embree3/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
PATCHES
fix-InstallPath.patch
fix-cmake-path.patch
+ fix-embree-path.patch
)
file(REMOVE ${SOURCE_PATH}/common/cmake/FindTBB.cmake)
@@ -43,12 +44,12 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/embree3)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/embree3 TARGET_PATH share/embree)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/share/${PORT}/doc)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/share/embree/doc)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index 578a8a91a..e8f12f97e 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -1,5 +1,5 @@
Source: ffmpeg
-Version: 4.2
+Version: 4.2-1
Build-Depends: zlib
Homepage: https://ffmpeg.org
Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index 394eb9cbc..71bea6e95 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -182,6 +182,8 @@ message(STATUS "Building Options: ${OPTIONS}")
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release)
message(STATUS "Building Relase Options: ${OPTIONS_RELEASE}")
set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/lib${SEP}${ENV_LIB_PATH}")
+ set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}")
+ set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}")
message(STATUS "Building ${_csc_PROJECT_PATH} for Release")
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
vcpkg_execute_required_process(
@@ -199,6 +201,8 @@ endif()
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
message(STATUS "Building Debug Options: ${OPTIONS_DEBUG}")
set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/debug/lib${SEP}${ENV_LIB_PATH}")
+ set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}")
+ set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}")
message(STATUS "Building ${_csc_PROJECT_PATH} for Debug")
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
vcpkg_execute_required_process(
diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL
index fed08d80d..6484a925a 100644
--- a/ports/imgui/CONTROL
+++ b/ports/imgui/CONTROL
@@ -1,4 +1,8 @@
Source: imgui
-Version: 1.73
+Version: 1.73-1
Homepage: https://github.com/ocornut/imgui
Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.
+
+Feature: example
+Description: build with examples
+Build-Depends: glfw3, freeglut, opengl, sdl1
diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake
index 14217b778..62d674353 100644
--- a/ports/imgui/portfile.cmake
+++ b/ports/imgui/portfile.cmake
@@ -20,6 +20,25 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
+
+if ("example" IN_LIST FEATURES)
+ if (NOT VCPKG_TARGET_IS_WINDOWS)
+ message(FATAL_ERROR "Feature example only support windows.")
+ endif()
+ vcpkg_build_msbuild(
+ USE_VCPKG_INTEGRATION
+ PROJECT_PATH ${SOURCE_PATH}/examples/imgui_examples.sln
+ )
+
+ # Install headers
+ file(GLOB IMGUI_EXAMPLE_INCLUDES ${SOURCE_PATH}/examples/*.h)
+ file(INSTALL ${IMGUI_EXAMPLE_INCLUDES} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+ # Install tools
+ file(GLOB_RECURSE IMGUI_EXAMPLE_BINARIES ${SOURCE_PATH}/examples/*${VCPKG_TARGET_EXECUTABLE_SUFFIX})
+ file(INSTALL ${IMGUI_EXAMPLE_BINARIES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
+endif()
+
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets()
diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL
index 78c63e4b5..19bee0af1 100644
--- a/ports/libarchive/CONTROL
+++ b/ports/libarchive/CONTROL
@@ -1,5 +1,5 @@
Source: libarchive
-Version: 3.4.0
+Version: 3.4.0-1
Homepage: https://github.com/libarchive/libarchive
Description: Library for reading and writing streaming archives
Build-Depends: zlib
diff --git a/ports/libarchive/fix-zstd.patch b/ports/libarchive/fix-zstd.patch
new file mode 100644
index 000000000..5c3b6cd54
--- /dev/null
+++ b/ports/libarchive/fix-zstd.patch
@@ -0,0 +1,28 @@
+From 9397ed51eddf43481d5710eb80441ce4a64356ea Mon Sep 17 00:00:00 2001
+From: Julian Scholle <julian.scholle@iff.fraunhofer.de>
+Date: Fri, 11 Oct 2019 16:46:06 +0200
+Subject: [PATCH] test
+
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13da432..911ae5b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -588,7 +588,10 @@ IF(ENABLE_ZSTD)
+ ENDIF (ZSTD_INCLUDE_DIR)
+
+ FIND_PATH(ZSTD_INCLUDE_DIR zstd.h)
+- FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd)
++ FIND_LIBRARY(ZSTD_LIBRARY_DEBUG NAMES zstdd libzstdd)
++ FIND_LIBRARY(ZSTD_LIBRARY_RELEASE NAMES zstd libzstd)
++ INCLUDE(SelectLibraryConfigurations)
++ SELECT_LIBRARY_CONFIGURATIONS(ZSTD)
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR)
+ ELSE(ENABLE_ZSTD)
+--
+2.16.1.windows.1
+
diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake
index c3973d8ab..3b69a69b9 100644
--- a/ports/libarchive/portfile.cmake
+++ b/ports/libarchive/portfile.cmake
@@ -7,13 +7,14 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libarchive/libarchive
- REF 614110e76d9dbb9ed3e159a71cbd75fa3b23efe3
+ REF 614110e76d9dbb9ed3e159a71cbd75fa3b23efe3
SHA512 8feac2c0e22e5b7c05f3be97c774ad82d39bdea4b3fa3a2b297b85f8a5a9f548c528ef63f5495afd42fb75759e03a4108f3831b27103f899f8fe4ef7e8e2d1cf
HEAD_REF master
PATCHES
fix-buildsystem.patch
fix-dependencies.patch
fix-lz4.patch
+ fix-zstd.patch
)
set(BUILD_libarchive_bzip2 OFF)
diff --git a/ports/libcrafter/CONTROL b/ports/libcrafter/CONTROL
new file mode 100644
index 000000000..76c3c1bc2
--- /dev/null
+++ b/ports/libcrafter/CONTROL
@@ -0,0 +1,5 @@
+Source: libcrafter
+Version: 0.3
+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 \ No newline at end of file
diff --git a/ports/libcrafter/fix-build-error.patch b/ports/libcrafter/fix-build-error.patch
new file mode 100644
index 000000000..cc97b4a63
--- /dev/null
+++ b/ports/libcrafter/fix-build-error.patch
@@ -0,0 +1,20 @@
+diff --git a/libcrafter/configure.ac b/libcrafter/configure.ac
+index 860d98b..b04ccce 100644
+--- a/libcrafter/configure.ac
++++ b/libcrafter/configure.ac
+@@ -35,14 +35,13 @@ AC_ARG_WITH(libpcap,
+ PCAPINC="-I$withval -I$withval/bpf"
+ PCAPLIB="-L$withval -lpcap"
+ elif test -f $withval/include/pcap.h -a \
+- -f $withval/include/net/bpf.h -a \
+ -f $withval/lib/libpcap.a; then
+ owd=`pwd`
+ if cd $withval; then withval=`pwd`; cd $owd; fi
+ PCAPINC="-I$withval/include"
+ PCAPLIB="-L$withval/lib -lpcap"
+ else
+- AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval)
++ AC_ERROR(pcap.h, or libpcap.a not found in $withval)
+ fi
+ ;;
+ esac ],
diff --git a/ports/libcrafter/portfile.cmake b/ports/libcrafter/portfile.cmake
new file mode 100644
index 000000000..57427906b
--- /dev/null
+++ b/ports/libcrafter/portfile.cmake
@@ -0,0 +1,27 @@
+vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux platforms" ON_TARGET "Windows" "OSX")
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO pellegre/libcrafter
+ REF version-0.3
+ SHA512 7c396ba942b304dddfaa569adb44697f75568d3ef2ed48dda758e281f3b7c172439309033bbf5498069a4a61a952f93e41af99b129ce874ce76b5ec08da58116
+ HEAD_REF master
+ PATCHES fix-build-error.patch
+)
+
+vcpkg_configure_make(
+ SOURCE_PATH ${SOURCE_PATH}
+ AUTOCONFIG
+ PROJECT_SUBPATH libcrafter
+ OPTIONS
+ --with-libpcap=${CURRENT_INSTALLED_DIR}
+)
+
+vcpkg_install_make()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+vcpkg_copy_pdbs()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/libcrafter/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file
diff --git a/ports/libudns/CONTROL b/ports/libudns/CONTROL
new file mode 100644
index 000000000..91eca4fc4
--- /dev/null
+++ b/ports/libudns/CONTROL
@@ -0,0 +1,4 @@
+Source: libudns
+Version: 0.4
+Homepage: https://github.com/ortclib/udns
+Description: The DNS library, udns, implements thread-safe stub DNS resolver functionality, which may be used both traditional, syncronous way and asyncronously, with application-supplied event loop. \ No newline at end of file
diff --git a/ports/libudns/portfile.cmake b/ports/libudns/portfile.cmake
new file mode 100644
index 000000000..a20fc5c20
--- /dev/null
+++ b/ports/libudns/portfile.cmake
@@ -0,0 +1,31 @@
+vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux platform" ON_TARGET "Windows" "OSX")
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO ortclib/udns
+ REF udns_0_4
+ SHA512 4df8def718c75872536d42a757237d6c8e0afce8a53aedd7fea73814dc5cf8b5d6c9ae8f01a8cfc76864aa8293c172f08953a6750a66749ba19a3721bb4cf2ec
+ HEAD_REF master
+)
+
+vcpkg_configure_make(
+ SOURCE_PATH ${SOURCE_PATH}
+ DISABLE_AUTO_DST
+)
+
+vcpkg_build_make()
+
+# Install
+if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL debug)
+ file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libudns.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+endif()
+if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL release)
+ file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libudns.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+endif()
+
+file(INSTALL ${SOURCE_PATH}/udns.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+vcpkg_copy_pdbs()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/COPYING.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
diff --git a/ports/libyuv/fix_cmakelists.patch b/ports/libyuv/fix_cmakelists.patch
index 67c973acd..bebfe7155 100644
--- a/ports/libyuv/fix_cmakelists.patch
+++ b/ports/libyuv/fix_cmakelists.patch
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ed4948f0..aee019be 100644
+index ed4948f0..9f48ebde 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,10 +2,14 @@
@@ -18,12 +18,19 @@ index ed4948f0..aee019be 100644
SET ( ly_base_dir ${PROJECT_SOURCE_DIR} )
SET ( ly_src_dir ${ly_base_dir}/source )
SET ( ly_inc_dir ${ly_base_dir}/include )
-@@ -24,6 +28,8 @@ INCLUDE_DIRECTORIES( BEFORE ${ly_inc_dir} )
+@@ -14,6 +18,7 @@ SET ( ly_lib_name yuv )
+ SET ( ly_lib_static ${ly_lib_name} )
+ SET ( ly_lib_shared ${ly_lib_name}_shared )
+
++FILE ( GLOB_RECURSE ly_include_files ${ly_inc_dir}/libyuv/*.h )
+ FILE ( GLOB_RECURSE ly_source_files ${ly_src_dir}/*.cc )
+ LIST ( SORT ly_source_files )
+
+@@ -24,6 +29,7 @@ INCLUDE_DIRECTORIES( BEFORE ${ly_inc_dir} )
# this creates the static library (.a)
ADD_LIBRARY ( ${ly_lib_static} STATIC ${ly_source_files} )
+SET_TARGET_PROPERTIES( ${ly_lib_static} PROPERTIES PUBLIC_HEADER include/libyuv.h )
-+
# this creates the shared library (.so)
ADD_LIBRARY ( ${ly_lib_shared} SHARED ${ly_source_files} )
@@ -35,7 +42,7 @@ index ed4948f0..aee019be 100644
target_link_libraries( yuvconvert ${JPEG_LIBRARY} )
add_definitions( -DHAVE_JPEG )
endif()
-@@ -81,10 +88,11 @@ endif()
+@@ -81,10 +88,12 @@ endif()
# install the conversion tool, .so, .a, and all the header files
@@ -44,6 +51,7 @@ index ed4948f0..aee019be 100644
-INSTALL ( TARGETS ${ly_lib_shared} LIBRARY DESTINATION lib RUNTIME DESTINATION bin )
-INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include )
+INSTALL ( TARGETS yuvconvert DESTINATION bin )
++INSTALL ( FILES ${ly_include_files} DESTINATION include/libyuv )
+INSTALL ( TARGETS ${ly_lib_static} EXPORT libyuv-export DESTINATION lib INCLUDES DESTINATION include PUBLIC_HEADER DESTINATION include )
+INSTALL ( TARGETS ${ly_lib_shared} EXPORT libyuv-export LIBRARY DESTINATION lib RUNTIME DESTINATION bin )
+
diff --git a/ports/portaudio/CONTROL b/ports/portaudio/CONTROL
index a60d59859..2337719bd 100644
--- a/ports/portaudio/CONTROL
+++ b/ports/portaudio/CONTROL
@@ -1,4 +1,4 @@
Source: portaudio
-Version: 19.0.6.00-5
-Homepage: https://www.portaudio.com/
-Description: PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library. It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O.
+Version: 2019-09-30
+Homepage: https://app.assembla.com/spaces/portaudio/wiki
+Description: PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library. It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O. \ No newline at end of file
diff --git a/ports/portaudio/cmakelists-install.patch b/ports/portaudio/cmakelists-install.patch
deleted file mode 100644
index 88c95260d..000000000
--- a/ports/portaudio/cmakelists-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -372,6 +372,8 @@
- ENDIF()
- SET_TARGET_PROPERTIES(portaudio PROPERTIES OUTPUT_NAME portaudio_${TARGET_POSTFIX} FOLDER "Portaudio")
- SET_TARGET_PROPERTIES(portaudio_static PROPERTIES OUTPUT_NAME portaudio_static_${TARGET_POSTFIX} FOLDER "Portaudio")
-+ INSTALL(FILES ${PA_PUBLIC_INCLUDES} DESTINATION include)
-+ INSTALL(TARGETS portaudio portaudio_static RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
- ELSE()
- IF(APPLE AND CMAKE_VERSION VERSION_GREATER 3.4.2)
- OPTION(PA_OUTPUT_OSX_FRAMEWORK "Generate an OS X framework instead of the simple library" OFF)
diff --git a/ports/portaudio/crt_linkage_build_config.patch b/ports/portaudio/crt_linkage_build_config.patch
deleted file mode 100644
index b1cef3014..000000000
--- a/ports/portaudio/crt_linkage_build_config.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,32 +10,32 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
- # project. If this is part of a larger project (i.e. the CMakeLists.txt has
- # been imported by some other CMakeLists.txt), we don't want to trump over
- # the top of that project's global settings.
--IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_LIST_DIR})
-- IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-- MESSAGE(STATUS "Setting CMAKE_BUILD_TYPE type to 'Debug' as none was specified.")
-- SET(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
-- SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
-- ENDIF()
--
-- PROJECT(portaudio)
--
-- SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
--
-- IF(WIN32 AND MSVC)
-- OPTION(PA_DLL_LINK_WITH_STATIC_RUNTIME "Link with static runtime libraries (minimizes runtime dependencies)" ON)
-- IF(PA_DLL_LINK_WITH_STATIC_RUNTIME)
-- FOREACH(flag_var
-- CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
-- CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
-- CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-- CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-- IF(${flag_var} MATCHES "/MD")
-- STRING(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-- ENDIF()
-- ENDFOREACH()
-- ENDIF()
-- ENDIF()
--ENDIF()
-+# IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_LIST_DIR})
-+ # IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-+ # MESSAGE(STATUS "Setting CMAKE_BUILD_TYPE type to 'Debug' as none was specified.")
-+ # SET(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
-+ # SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
-+ # ENDIF()
-+
-+ # PROJECT(portaudio)
-+
-+ # SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
-+
-+ # IF(WIN32 AND MSVC)
-+ # OPTION(PA_DLL_LINK_WITH_STATIC_RUNTIME "Link with static runtime libraries (minimizes runtime dependencies)" ON)
-+ # IF(PA_DLL_LINK_WITH_STATIC_RUNTIME)
-+ # FOREACH(flag_var
-+ # CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
-+ # CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
-+ # CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-+ # CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-+ # IF(${flag_var} MATCHES "/MD")
-+ # STRING(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-+ # ENDIF()
-+ # ENDFOREACH()
-+ # ENDIF()
-+ # ENDIF()
-+# ENDIF()
-
- SET(PA_PKGCONFIG_VERSION 19)
-
diff --git a/ports/portaudio/find_dsound.patch b/ports/portaudio/find_dsound.patch
deleted file mode 100644
index be82b5641..000000000
--- a/ports/portaudio/find_dsound.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- a/cmake_support/FindDXSDK.cmake
-+++ b/cmake_support/FindDXSDK.cmake
-@@ -16,44 +16,70 @@ else(WIN32)
- message(FATAL_ERROR "FindDXSDK.cmake: Unsupported platform ${CMAKE_SYSTEM_NAME}" )
- endif(WIN32)
-
--find_path(DXSDK_ROOT_DIR
-- include/dxsdkver.h
-- HINTS
-- $ENV{DXSDK_DIR}
--)
--
--find_path(DXSDK_INCLUDE_DIR
-- dxsdkver.h
-- PATHS
-- ${DXSDK_ROOT_DIR}/include
--)
--
--IF(CMAKE_CL_64)
--find_path(DXSDK_LIBRARY_DIR
-- dsound.lib
-- PATHS
-- ${DXSDK_ROOT_DIR}/lib/x64
--)
--ELSE(CMAKE_CL_64)
--find_path(DXSDK_LIBRARY_DIR
-- dsound.lib
-- PATHS
-- ${DXSDK_ROOT_DIR}/lib/x86
--)
--ENDIF(CMAKE_CL_64)
--
--find_library(DXSDK_DSOUND_LIBRARY
-- dsound.lib
-- PATHS
-- ${DXSDK_LIBRARY_DIR}
--)
--
--# handle the QUIETLY and REQUIRED arguments and set DXSDK_FOUND to TRUE if
--# all listed variables are TRUE
--INCLUDE(FindPackageHandleStandardArgs)
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(DXSDK DEFAULT_MSG DXSDK_ROOT_DIR DXSDK_INCLUDE_DIR)
--
--MARK_AS_ADVANCED(
-- DXSDK_ROOT_DIR DXSDK_INCLUDE_DIR
-- DXSDK_LIBRARY_DIR DXSDK_DSOUND_LIBRARY
--)
-+# Dsound.lib is statically linked (i.e. dsound.dll not required) and DXSDK_LIBRARY_DIR not used.
-+# In the environments supported by VCPKG we may as well avoid looking out for DX9 to avoid version
-+# mismatch in find.
-+
-+if(MSVC AND MSVC_VERSION GREATER_EQUAL 1900)
-+
-+ # if the environment is set up properly, matching lib and header will be found
-+
-+ find_path(DXSDK_INCLUDE_DIR
-+ dsound.h
-+ )
-+ find_library(DXSDK_DSOUND_LIBRARY
-+ dsound.lib
-+ )
-+
-+ INCLUDE(FindPackageHandleStandardArgs)
-+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(DXSDK DEFAULT_MSG DXSDK_INCLUDE_DIR DXSDK_DSOUND_LIBRARY)
-+
-+ MARK_AS_ADVANCED(
-+ DXSDK_INCLUDE_DIR DXSDK_DSOUND_LIBRARY
-+ )
-+
-+else()
-+
-+ find_path(DXSDK_ROOT_DIR
-+ include/dxsdkver.h
-+ HINTS
-+ $ENV{DXSDK_DIR}
-+ )
-+
-+ find_path(DXSDK_INCLUDE_DIR
-+ dxsdkver.h
-+ HINTS
-+ ${DXSDK_ROOT_DIR}/include
-+ )
-+
-+ IF(CMAKE_CL_64)
-+ find_path(DXSDK_LIBRARY_DIR
-+ dsound.lib
-+ HINTS
-+ ${DXSDK_ROOT_DIR}/lib/x64
-+ )
-+ ELSE(CMAKE_CL_64)
-+ find_path(DXSDK_LIBRARY_DIR
-+ dsound.lib
-+ HINTS
-+ ${DXSDK_ROOT_DIR}/lib/x86
-+ )
-+ ENDIF(CMAKE_CL_64)
-+
-+ find_library(DXSDK_DSOUND_LIBRARY
-+ dsound.lib
-+ HINTS
-+ ${DXSDK_LIBRARY_DIR}
-+ )
-+
-+ # handle the QUIETLY and REQUIRED arguments and set DXSDK_FOUND to TRUE if
-+ # all listed variables are TRUE
-+ INCLUDE(FindPackageHandleStandardArgs)
-+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(DXSDK DEFAULT_MSG DXSDK_ROOT_DIR DXSDK_INCLUDE_DIR)
-+
-+ MARK_AS_ADVANCED(
-+ DXSDK_ROOT_DIR DXSDK_INCLUDE_DIR
-+ DXSDK_LIBRARY_DIR DXSDK_DSOUND_LIBRARY
-+ )
-+
-+endif()
diff --git a/ports/portaudio/pa_win_waveformat.patch b/ports/portaudio/pa_win_waveformat.patch
deleted file mode 100644
index cba073947..000000000
--- a/ports/portaudio/pa_win_waveformat.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From fa727918e9e56c2a18dbdcfd276c60ac616c56ba Mon Sep 17 00:00:00 2001
-From: Etienne Dechamps <etienne@edechamps.fr>
-Date: Sat, 27 Oct 2018 15:14:27 +0100
-Subject: [PATCH] Add pa_win_waveformat.h to public includes.
-
-pa_win_wasapi.h includes pa_win_waveformat.h, so it has to be
-distributed for pa_win_wasapi.h to be usable.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 789671a..6a3ed8e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -210,7 +210,7 @@ IF(WIN32)
- IF(PA_USE_WASAPI)
- SET(PA_WASAPI_SOURCES src/hostapi/wasapi/pa_win_wasapi.c)
- SOURCE_GROUP("hostapi\\wasapi" FILES ${PA_WASAPI_SOURCES})
-- SET(PA_PUBLIC_INCLUDES ${PA_PUBLIC_INCLUDES} include/pa_win_wasapi.h)
-+ SET(PA_PUBLIC_INCLUDES ${PA_PUBLIC_INCLUDES} include/pa_win_wasapi.h include/pa_win_waveformat.h)
- SET(PA_SOURCES ${PA_SOURCES} ${PA_WASAPI_SOURCES})
- SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ole32 uuid)
- IF(NOT MSVC)
---
-2.14.1.windows.1
-
diff --git a/ports/portaudio/portfile.cmake b/ports/portaudio/portfile.cmake
index 6fcbdf437..ea356d5ae 100644
--- a/ports/portaudio/portfile.cmake
+++ b/ports/portaudio/portfile.cmake
@@ -1,19 +1,9 @@
include(vcpkg_common_functions)
-vcpkg_download_distfile(ARCHIVE
- URLS "http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz"
- FILENAME "pa_stable_v190600_20161030.tgz"
- SHA512 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
-)
-vcpkg_extract_source_archive_ex(
+vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE ${ARCHIVE}
- PATCHES
- cmakelists-install.patch
- find_dsound.patch
- wasapi_support.patch
- crt_linkage_build_config.patch
- pa_win_waveformat.patch
+ URL https://git.assembla.com/portaudio.git
+ REF c5d2c51bd6fe354d0ee1119ba932bfebd3ebfacc
)
# NOTE: the ASIO backend will be built automatically if the ASIO-SDK is provided
@@ -49,6 +39,8 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStor
file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
endif ()
endif ()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
vcpkg_copy_pdbs()
# Handle copyright
@@ -56,3 +48,4 @@ file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/p
file(RENAME ${CURRENT_PACKAGES_DIR}/share/portaudio/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/portaudio/copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) \ No newline at end of file
diff --git a/ports/portaudio/wasapi_support.patch b/ports/portaudio/wasapi_support.patch
deleted file mode 100644
index 0ff8a2134..000000000
--- a/ports/portaudio/wasapi_support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists_org.txt
-+++ b/CMakeLists.txt
-@@ -200,7 +200,7 @@
- SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ole32 uuid)
- ENDIF()
-
-- IF(MSVS)
-+ IF(MSVC)
- OPTION(PA_USE_WASAPI "Enable support for WASAPI" ON)
- ELSE()
- # I was unable to get WASAPI to compile outside of Visual Studio. If
diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL
index 45e81281e..53a919192 100644
--- a/ports/range-v3/CONTROL
+++ b/ports/range-v3/CONTROL
@@ -1,4 +1,4 @@
Source: range-v3
-Version: 0.9.0-20190822
+Version: 0.9.1
Homepage: https://github.com/ericniebler/range-v3
Description: Range library for C++11/14/17.
diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake
index c208a55f8..9fb05fbcf 100644
--- a/ports/range-v3/portfile.cmake
+++ b/ports/range-v3/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ericniebler/range-v3
- REF 94f95160f23ab3ee5089b58eb2d9e66a4429d358
- SHA512 e4669076fff12e5c48c97cbc67c9d5ee98ac30ea14beba35c9882d05f741a3de9f0125d3f5a27854f56919c61a473dbcfe1f92d6266cb632b7fe38f2d49194db
+ REF 8a732ee6736af8af024b5b2032580b85a9be8239
+ SHA512 a052d29fd0164d8a0ad2c70da0fe4e771c98bac3fb5ccdde4819f1b9b865504f9e649736a2adf996e62b08f2499feeaedf19dc47a0ff846d3482b79ef2946ead
HEAD_REF master
)
diff --git a/ports/sqlite3/CONTROL b/ports/sqlite3/CONTROL
index d4109ccc9..b6667cdd8 100644
--- a/ports/sqlite3/CONTROL
+++ b/ports/sqlite3/CONTROL
@@ -1,5 +1,5 @@
Source: sqlite3
-Version: 3.29.0-1
+Version: 3.30.1
Homepage: https://sqlite.org/
Description: SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.
diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake
index 4ddc2d8b2..2cb778aad 100644
--- a/ports/sqlite3/portfile.cmake
+++ b/ports/sqlite3/portfile.cmake
@@ -1,7 +1,7 @@
include(vcpkg_common_functions)
-set(SQLITE_VERSION 3290000)
-set(SQLITE_HASH 3306ac3e37ec46f1b2ac74155756c82afadff7bf5b8b4c9b5516f5e8c1c785b5f50ec9b840482292f2f6c5d72cf6d9a78a0dfb727f0a9cf134b6c5522606e9b3 )
+set(SQLITE_VERSION 3300100)
+set(SQLITE_HASH 030b53fe684e0fb8e9747b1f160e5e875807eabb0763caff66fe949ee6aa92f26f409b9b25034d8d1f5cee554a99e56a2bb92129287b0fe0671409babe9d18ea )
vcpkg_download_distfile(ARCHIVE
URLS "https://sqlite.org/2019/sqlite-amalgamation-${SQLITE_VERSION}.zip"
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index d89d5a15b..55859d1f8 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -244,7 +244,7 @@ else
fi
if [ "$os" = "osx" ]; then
if [ "$vcpkgAllowAppleClang" = "true" ] ; then
- CXX=clang
+ CXX=clang++
else
selectCXX CXX || exit 1
fi
diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt
index 3ae7cdae5..bbecb8f30 100644
--- a/toolsrc/CMakeLists.txt
+++ b/toolsrc/CMakeLists.txt
@@ -23,7 +23,11 @@ endif()
if(CMAKE_COMPILER_IS_GNUXX OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
set(GCC 1)
elseif(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
- if(NOT VCPKG_ALLOW_APPLE_CLANG)
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "11.0.0")
+ set(CLANG 1)
+ # Disable linking with libc++fs because this features are added in libc++ library
+ set(NO_LIBCXXFS 1)
+ elseif(NOT VCPKG_ALLOW_APPLE_CLANG)
message(FATAL_ERROR
"Building the vcpkg tool requires support for the C++ Filesystem TS.
Apple clang versions 10.01 and below do not have support for it.
@@ -58,7 +62,7 @@ endif()
if(GCC OR (CLANG AND USES_LIBSTDCXX))
link_libraries(stdc++fs)
-elseif(CLANG AND NOT MSVC)
+elseif(CLANG AND NOT MSVC AND NOT NO_LIBCXXFS)
link_libraries(c++fs)
endif()