microsoft · ras0219-msft · Jul 24, 2020 · May 24, 2020 · May 24, 2020 · May 24, 2020
diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL
@@ -1,5 +1,6 @@
 Source: apr
-Version: 1.7.0-1
+Version: 1.7.0
+Port-Version: 2
 Homepage: https://apr.apache.org/
 Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
 Supports: !uwp

diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
@@ -82,7 +82,7 @@ else()
     vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/lib/pkgconfig/apr-1.pc
         "-lapr-\${APR_MAJOR_VERSION}" "-lapr-1"
     )
-    vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread rt dl)
+    vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread rt dl uuid crypt)
 endif()
 
 # Handle copyright

diff --git a/ports/bzip2/CONTROL b/ports/bzip2/CONTROL
@@ -1,4 +1,4 @@
 Source: bzip2
-Version: 1.0.6-5
+Version: 1.0.6-6
 Homepage: http://www.bzip.org/
 Description: High-quality data compressor.
diff --git a/ports/bzip2/bzip2.pc.in b/ports/bzip2/bzip2.pc.in
@@ -0,0 +1,11 @@
+prefix=@BZIP2_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: bzip2
+Description: bzip2
+Version: 1.0.6
+Requires: 
+Libs: -L${libdir} -l@bzname@
+Cflags: -I${includedir}
diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake
@@ -1,6 +1,6 @@
 include(vcpkg_common_functions)
-set(BZIP2_VERSION 1.0.6)
-vcpkg_download_distfile(ARCHIVE
+set(BZIP2_VERSION 1.0.6) # TODO: Update to 1.0.8
+vcpkg_download_distfile(ARCHIVE # TODO: switch to vcpkg_from_git with https://sourceware.org/git/?p=bzip2.git;a=summary
     URLS "https://github.com/past-due/bzip2-mirror/releases/download/v${BZIP2_VERSION}/bzip2-${BZIP2_VERSION}.tar.gz"
     FILENAME "bzip2-${BZIP2_VERSION}.tar.gz"
     SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12)
@@ -14,7 +14,7 @@ vcpkg_extract_source_archive_ex(
         fix-windows-include.patch
 )
 
-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}
@@ -27,17 +27,25 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-file(READ ${CURRENT_PACKAGES_DIR}/include/bzlib.h BZLIB_H)
+file(READ "${CURRENT_PACKAGES_DIR}/include/bzlib.h" BZLIB_H)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     string(REPLACE "defined(BZ_IMPORT)" "0" BZLIB_H "${BZLIB_H}")
 else()
     string(REPLACE "defined(BZ_IMPORT)" "1" BZLIB_H "${BZLIB_H}")
 endif()
-file(WRITE ${CURRENT_PACKAGES_DIR}/include/bzlib.h "${BZLIB_H}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/include/bzlib.h" "${BZLIB_H}")
 
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bzip2)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE ${CURRENT_PACKAGES_DIR}/share/bzip2/copyright)
+file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/bzip2")
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE" "${CURRENT_PACKAGES_DIR}/share/bzip2/copyright")
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
 vcpkg_test_cmake(PACKAGE_NAME BZip2 MODULE)
+
+set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}")
+set(bzname bz2)
+configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/bzip2.pc" @ONLY)
+set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}/debug")
+set(bzname bz2d)
+configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/bzip2.pc" @ONLY)
+vcpkg_fixup_pkgconfig()
diff --git a/ports/gmp/CONTROL b/ports/gmp/CONTROL
@@ -1,5 +1,5 @@
 Source: gmp
-Version: 6.2.0-1
+Version: 6.2.0-2
 Homepage: https://gmplib.org/
 Description: The GNU Multiple Precision Arithmetic Library
 Build-Depends: vs-yasm (windows)
diff --git a/ports/ignition-modularscripts/CONTROL b/ports/ignition-modularscripts/CONTROL
@@ -1,3 +1,4 @@
 Source: ignition-modularscripts
 Version: 2020-05-16
+Port-Version: 1
 Description: Vcpkg helpers to package ignition libraries
diff --git a/ports/ignition-modularscripts/ignition_modular_library.cmake b/ports/ignition-modularscripts/ignition_modular_library.cmake
@@ -38,7 +38,10 @@ function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PAC
 
     # Make pkg-config files relocatable
     if(NOT IML_DISABLE_PKGCONFIG_INSTALL)
-        vcpkg_fixup_pkgconfig()
+        if(VCPKG_TARGET_IS_LINUX)
+            set(SYSTEM_LIBRARIES SYSTEM_LIBRARIES pthread)
+        endif()
+        vcpkg_fixup_pkgconfig(${SYSTEM_LIBRARIES})
     else()
         file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig
                             ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)

diff --git a/ports/ignition-msgs5/CONTROL b/ports/ignition-msgs5/CONTROL
@@ -1,5 +1,6 @@
 Source: ignition-msgs5
 Version: 5.1.0
+Port-Version: 1
 Build-Depends: ignition-modularscripts, ignition-cmake2, ignition-math6, protobuf, tinyxml2
 Description: Middleware protobuf messages for robotics
 Supports: !(arm|linux|uwp)
diff --git a/ports/ignition-msgs5/portfile.cmake b/ports/ignition-msgs5/portfile.cmake
@@ -17,4 +17,4 @@ ignition_modular_library(NAME msgs
                            "01-protobuf.patch")
 
 # Restore old path
-set(ENV{PATH} ${path_backup})
+set(ENV{PATH} "${path_backup}")
diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL
@@ -1,5 +1,5 @@
 Source: libpng
-Version: 1.6.37-9
+Version: 1.6.37-10
 Build-Depends: zlib
 Homepage: https://github.com/glennrp/libpng
 Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files.

diff --git a/ports/libpng/pkgconfig.2.patch b/ports/libpng/pkgconfig.2.patch
@@ -0,0 +1,47 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6f85d17ef..8de0eb299 100644
+--- a/CMakeLists.txt	
++++ b/CMakeLists.txt
+@@ -814,20 +814,31 @@ endif()
+ # Only do this on Windows for Cygwin - the files don't make much sense outside
+ # of a UNIX look-alike.
+ if(NOT WIN32 OR CYGWIN OR MINGW)
+-  set(prefix      ${CMAKE_INSTALL_PREFIX})
+-  set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+-  set(libdir      ${CMAKE_INSTALL_FULL_LIBDIR})
+-  set(includedir  ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+-  set(LIBS        "-lz -lm")
++  set(LIBS        "-lz")
++  if(NOT APPLE)
++    string(APPEND LIBS " -lm")
++  endif()
+-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in
+-    ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY)
+-  create_symlink(libpng.pc FILE ${PNGLIB_NAME}.pc)
+-
+-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
+-    ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY)
+   create_symlink(libpng-config FILE ${PNGLIB_NAME}-config)
++else()
++  if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
++  	set(LIBS "-lzlibd")
++  else()
++	set(LIBS "-lzlib")
++  endif()
+ endif()
+
++set(prefix      ${CMAKE_INSTALL_PREFIX})
++set(exec_prefix ${CMAKE_INSTALL_PREFIX})
++set(libdir      ${CMAKE_INSTALL_FULL_LIBDIR})
++set(includedir  ${CMAKE_INSTALL_FULL_INCLUDEDIR})
++
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in
++  ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY)
++create_symlink(libpng.pc FILE ${PNGLIB_NAME}.pc)
++
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
++  ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY)
++
+ # SET UP LINKS
+ if(PNG_SHARED)
+   set_target_properties(png PROPERTIES
diff --git a/ports/libpng/pkgconfig.patch b/ports/libpng/pkgconfig.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6599e1d7d..c0bb2fad2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -894,13 +894,13 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL)
+   install(FILES libpng.3 libpngpf.3 DESTINATION ${PNG_MAN_DIR}/man3)
+   install(FILES png.5 DESTINATION ${PNG_MAN_DIR}/man5)
+   # Install pkg-config files
++  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+   if(NOT CMAKE_HOST_WIN32 OR CYGWIN OR MINGW)
+-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc
+-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config
+-             DESTINATION bin)
++             DESTINATION tools/libpng)
+-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc
+-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
+-             DESTINATION bin)
++             DESTINATION tools/libpng)
+   endif()
diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake
@@ -14,16 +14,13 @@ if ("apng" IN_LIST FEATURES)
             FILENAME "${LIBPNG_APG_PATCH_NAME}.gz"
             SHA512 226adcb3a8c60f2267fe2976ab531329ae43c2603dab4d0cf8f16217d64069936b879f3d6516b75d259c47d6f5c5b1f24f887602206c8e46abde0fb7f5c7946b
         )
-
         vcpkg_find_acquire_program(7Z)
-
         vcpkg_execute_required_process(
             COMMAND ${7Z} x ${LIBPNG_APNG_PATCH_ARCHIVE} -aoa
             WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src
             LOGNAME extract-patch.log
         )
     endif()
-
     set(APNG_EXTRA_PATCH ${LIBPNG_APG_PATCH_PATH})
     set(LIBPNG_APNG_OPTION "-DPNG_PREFIX=a")
 endif()
@@ -37,6 +34,8 @@ vcpkg_from_github(
     PATCHES
         use_abort.patch
         cmake.patch
+        pkgconfig.patch
+        pkgconfig.2.patch
         ${APNG_EXTRA_PATCH}
 )
 
@@ -62,6 +61,7 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
+        -DPNG_MAN_DIR=share/${PORT}/man
         ${LIBPNG_APNG_OPTION}
         ${LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION}
         ${LD_VERSION_SCRIPT_OPTION}
@@ -71,15 +71,51 @@ vcpkg_configure_cmake(
         -DPNG_TESTS=OFF
         -DSKIP_INSTALL_PROGRAMS=ON
         -DSKIP_INSTALL_EXECUTABLES=ON
-        -DSKIP_INSTALL_FILES=ON
-        OPTIONS_DEBUG
-            -DSKIP_INSTALL_HEADERS=ON
+        -DSKIP_INSTALL_FILES=OFF
+    OPTIONS_DEBUG
+        -DSKIP_INSTALL_HEADERS=ON
 )
-
 vcpkg_install_cmake()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/libpng)
+set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc")
+if(EXISTS ${_file})
+    file(READ "${_file}" _contents)
+    if(VCPKG_TARGET_IS_WINDOWS)
+        string(REGEX REPLACE "-lpng16(d)?" "-llibpng16d" _contents "${_contents}")
+    else()
+        string(REGEX REPLACE "-lpng16(d)?" "-lpng16d" _contents "${_contents}")
+    endif()
+    string(REPLACE "-lzlib" "-lzlibd" _contents "${_contents}")
+    file(WRITE "${_file}" "${_contents}")
+endif()
+set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng.pc")
+if(EXISTS ${_file})
+    file(READ "${_file}" _contents)
+    if(VCPKG_TARGET_IS_WINDOWS)
+        string(REGEX REPLACE "-lpng16(d)?" "-llibpng16d" _contents "${_contents}")
+    else()
+        string(REGEX REPLACE "-lpng16(d)?" "-lpng16d" _contents "${_contents}")
+    endif()
+    string(REPLACE "-lzlib" "-lzlibd" _contents "${_contents}")
+    file(WRITE "${_file}" "${_contents}")
+endif()
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng16.pc")
+    if(EXISTS ${_file})
+        file(READ "${_file}" _contents)
+        string(REPLACE "-lpng16" "-llibpng16" _contents "${_contents}")
+        file(WRITE "${_file}" "${_contents}")
+    endif()
+    set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng.pc")
+    if(EXISTS ${_file})
+        file(READ "${_file}" _contents)
+        string(REPLACE "-lpng16" "-llibpng16" _contents "${_contents}")
+        file(WRITE "${_file}" "${_contents}")
+    endif()
+endif()
+vcpkg_fixup_pkgconfig()
 
 vcpkg_copy_pdbs()
-
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/nettle/CONTROL b/ports/nettle/CONTROL
@@ -1,5 +1,5 @@
 Source: nettle
-Version: 3.5.1-1
+Version: 3.5.1-2
 Homepage: https://git.lysator.liu.se/nettle/nettle
 Description: Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.
 Build-Depends: gmp, vs-yasm (windows)
diff --git a/ports/ompl/CONTROL b/ports/ompl/CONTROL
@@ -1,5 +1,6 @@
 Source: ompl
-Version: 1.4.2-4
+Version: 1.4.2
+Port-Version: 5
 Homepage: https://bitbucket.org/ompl
 Description: The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms
 Build-Depends: boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, boost-timer, eigen3

diff --git a/ports/ompl/portfile.cmake b/ports/ompl/portfile.cmake
@@ -29,6 +29,7 @@ file(WRITE ${SOURCE_PATH}/CMakeLists.txt "${_contents}")
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DOMPL_VERSIONED_INSTALL=OFF
         -DOMPL_REGISTRATION=OFF

diff --git a/ports/pcre/CONTROL b/ports/pcre/CONTROL
@@ -1,5 +1,5 @@
 Source: pcre
 Version: 8.44
-Port-Version: 5
+Port-Version: 6
 Homepage: https://www.pcre.org/
 Description: Perl Compatible Regular Expressions
diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake
@@ -110,7 +110,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     file(WRITE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpcreposix.pc ${LIBPCREPOSIX.PC})
 endif()
 
-vcpkg_fixup_pkgconfig()
+vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL
@@ -1,5 +1,6 @@
 Source: protobuf
 Version: 3.12.3
+Port-Version: 1
 Homepage: https://github.com/google/protobuf
 Description: Protocol Buffers - Google's data interchange format
 

diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
@@ -122,3 +122,15 @@ endif()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 vcpkg_copy_pdbs()
+set(packages protobuf protobuf-lite)
+foreach(_package IN LISTS packages)
+    set(_file ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${_package}.pc)
+    if(EXISTS "${_file}")
+        vcpkg_replace_string(${_file} "-l${_package}" "-l${_package}d")
+    endif()
+endforeach()
+
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    set(SYSTEM_LIBRARIES SYSTEM_LIBRARIES pthread)
+endif()
+vcpkg_fixup_pkgconfig(${SYSTEM_LIBRARIES})
diff --git a/ports/sdl1/CONTROL b/ports/sdl1/CONTROL
@@ -1,4 +1,5 @@
 Source: sdl1
-Version: 1.2.15-11
+Version: 1.2.15
+Port-Version: 12
 Homepage: https://www.libsdl.org
 Description: Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.
diff --git a/ports/sdl1/portfile.cmake b/ports/sdl1/portfile.cmake
@@ -54,11 +54,13 @@ else()
     message("libgles2-mesa-dev must be installed before sdl1 can build. Install it with \"apt install libgles2-mesa-dev\".")
 
     vcpkg_configure_make(
-        SOURCE_PATH ${SOURCE_PATH}     
+        SOURCE_PATH ${SOURCE_PATH}
     )
 
     vcpkg_install_make()
-    vcpkg_fixup_pkgconfig(IGNORE_FLAGS -Wl,-rpath,\${libdir} SYSTEM_LIBRARIES -lm -ldl -lpthread)
+    vcpkg_fixup_pkgconfig(IGNORE_FLAGS -Wl,-rpath,${CURRENT_PACKAGES_DIR}/lib/pkgconfig/../../lib 
+                                       -Wl,-rpath,${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/../../lib
+                          SYSTEM_LIBRARIES pthread)
 
     file(GLOB SDL1_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*")
     foreach (SDL1_TOOL ${SDL1_TOOLS})

diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake
@@ -129,5 +129,5 @@ endif()
 # Windows system libs
 if(VCPKG_TARGET_IS_WINDOWS)
     list(APPEND VCPKG_SYSTEM_LIBRARIES wsock32)
-    list(APPEND VCPKG_SYSTEM_LIBRARIES ws2_32)
+    list(APPEND VCPKG_SYSTEM_LIBRARIES Ws2_32)
 endif()