[cmark][gl3w][libpopt][libraw][libssh][live555] Fixes, mostly around changing download locations.

22 files changed, 234 insertions, 45 deletions

diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake
index be98ce23d..48763bef2 100644
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-c-shared-utility
-    REF 1.1.5
-    SHA512 046dbe7561c7c18cffb7e2fc51160cda754c8a896fdae1399cf7bc3c42def02da12ce780c28b57522831eea5ebf9ef0306644127b94473489fb60734e793b9af
+    REF e7aef25f8012e9e9333c72433a1d21f90f3a28b4
+    SHA512 73b644bc1ea3d87fcdc0916f969fd779a20ed5ae263643dd21cc600265f84cab443f6578ff30f364ddea9e91ca4488615b78898e9c06f15cbc5d0af725ebfa00
     HEAD_REF master
 )
 
diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake
index a08916831..396a06656 100644
--- a/ports/azure-umqtt-c/portfile.cmake
+++ b/ports/azure-umqtt-c/portfile.cmake
@@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-umqtt-c
-    REF 1.1.5
-    SHA512 c72c32f3dcacd5e39094ca244b140dee5da92f85212cece1a7f14e5af05fa6b0af3ba649218aa38b2911f4bda120789fe419f303ad29b7543e039bb5410b58d3
+    REF 244f1478dbc426b62cc42f1ef24ba4b6c6333540
+    SHA512 74381d35c0ab967f2d2addcba1ff796633b790b1a7ee173ceee91922c14402043fc5472131b9e486728d360ffe6adc4d3779db1698ef7a1dd7e85202f2d142f4
     HEAD_REF master
 )
 
diff --git a/ports/blaze/no-generate-to-source-dir.patch b/ports/blaze/no-generate-to-source-dir.patch
new file mode 100644
index 000000000..2ef7cc76f
--- /dev/null
+++ b/ports/blaze/no-generate-to-source-dir.patch
@@ -0,0 +1,105 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index fcb79e6..c04a3f0 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -151,7 +151,7 @@ endif ()

+ set(BLAZE_CACHE_SIZE ${BLAZE_CACHE_SIZE} CACHE STRING "Cache size of the CPU in bytes." FORCE)

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/CacheSize.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/CacheSize.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/CacheSize.h")

+ 

+ 

+ #==================================================================================================

+@@ -204,7 +204,7 @@ else ()

+ endif ()

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/BLAS.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/BLAS.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/BLAS.h")

+ 

+ 

+ #==================================================================================================

+@@ -215,7 +215,7 @@ set(BLAZE_TRANSPOSE_FLAG "columnVector" CACHE STRING "Specify the default transp

+ set_property(CACHE BLAZE_TRANSPOSE_FLAG PROPERTY STRINGS "columnVector;rowVector")

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/TransposeFlag.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/TransposeFlag.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/TransposeFlag.h")

+ 

+ 

+ #==================================================================================================

+@@ -226,7 +226,7 @@ set(BLAZE_STORAGE_ORDER "rowMajor" CACHE STRING "Specify the default storage ord

+ set_property(CACHE BLAZE_STORAGE_ORDER PROPERTY STRINGS "rowMajor;columnMajor")

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/StorageOrder.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/StorageOrder.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/StorageOrder.h")

+ 

+ 

+ #==================================================================================================

+@@ -242,7 +242,7 @@ else ()

+ endif ()

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Vectorization.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Vectorization.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Vectorization.h")

+ 

+ 

+ #==================================================================================================

+@@ -288,7 +288,7 @@ elseif (BLAZE_SMP_THREADS STREQUAL "HPX")

+ endif ()

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/SMP.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/SMP.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/SMP.h")

+ 

+ 

+ #==================================================================================================

+@@ -304,7 +304,7 @@ else ()

+ endif ()

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Restrict.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Restrict.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Restrict.h")

+ 

+ 

+ #==================================================================================================

+@@ -334,7 +334,7 @@ else ()

+ endif ()

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Optimizations.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Optimizations.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Optimizations.h")

+ 

+ 

+ #==================================================================================================

+@@ -352,7 +352,7 @@ else ()

+ endif ()

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Inline.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Inline.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Inline.h")

+ 

+ 

+ #==================================================================================================

+@@ -360,6 +360,19 @@ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Inline.h.in"

+ #==================================================================================================

+ 

+ install(DIRECTORY blaze DESTINATION include)

++install(

++    FILES

++        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/BLAS.h"

++        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/CacheSize.h"

++        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Inline.h"

++        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Optimizations.h"

++        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Restrict.h"

++        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/SMP.h"

++        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/StorageOrder.h"

++        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/TransposeFlag.h"

++        "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Vectorization.h"

++    DESTINATION include/blaze/config

++)

+ install(TARGETS blaze EXPORT blazeTargets)

+ 

+ configure_file(

diff --git a/ports/blaze/portfile.cmake b/ports/blaze/portfile.cmake
index 6de95aeb5..f82179a0c 100644
--- a/ports/blaze/portfile.cmake
+++ b/ports/blaze/portfile.cmake
@@ -10,7 +10,9 @@ vcpkg_from_bitbucket(
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/no-absolute-paths-in-install.patch"
+    PATCHES
+        "${CMAKE_CURRENT_LIST_DIR}/no-absolute-paths-in-install.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/no-generate-to-source-dir.patch"
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/cmark/CONTROL b/ports/cmark/CONTROL
index 4211c9bbc..6f756e824 100644
--- a/ports/cmark/CONTROL
+++ b/ports/cmark/CONTROL
@@ -1,3 +1,3 @@
 Source: cmark
-Version: 0.28.3-1
+Version: 0.28.3-2
 Description: CommonMark parsing and rendering library
diff --git a/ports/cmark/portfile.cmake b/ports/cmark/portfile.cmake
index b452a4488..97324b4bf 100644
--- a/ports/cmark/portfile.cmake
+++ b/ports/cmark/portfile.cmake
@@ -11,6 +11,8 @@ vcpkg_from_github(
     REF 0.28.3
     SHA512 409105a3228a8ae22ba6acf95cd99bc9a2c20f8603aa0e803a33172eb6ef53f80f8f0262d2258b77f9fd6e1f2e9017a6c906b88f761e053c09ef88c9ffab7d29
     HEAD_REF master
+    PATCHES
+        "${CMAKE_CURRENT_LIST_DIR}/rename-shared-lib.patch"
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CMARK_STATIC)
@@ -33,7 +35,12 @@ file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/cm
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/cmark.exe)
+    file(COPY ${CURRENT_PACKAGES_DIR}/bin/cmark.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/cmark/)
+    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cmark)
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT EXISTS ${CURRENT_PACKAGES_DIR}/bin/cmark)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 else()
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/cmark.exe ${CURRENT_PACKAGES_DIR}/debug/bin/cmark.exe)
diff --git a/ports/cmark/rename-shared-lib.patch b/ports/cmark/rename-shared-lib.patch
new file mode 100644
index 000000000..79439aae1
--- /dev/null
+++ b/ports/cmark/rename-shared-lib.patch
@@ -0,0 +1,12 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

+index d5a1936..acff569 100644

+--- a/src/CMakeLists.txt

++++ b/src/CMakeLists.txt

+@@ -83,7 +83,6 @@ if (CMARK_SHARED)

+   add_library(${LIBRARY} SHARED ${LIBRARY_SOURCES})

+   # Include minor version and patch level in soname for now.

+   set_target_properties(${LIBRARY} PROPERTIES

+-    OUTPUT_NAME "cmark"

+     SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}

+     VERSION ${PROJECT_VERSION})

+ 

diff --git a/ports/egl-registry/CONTROL b/ports/egl-registry/CONTROL
new file mode 100644
index 000000000..c1187a6bf
--- /dev/null
+++ b/ports/egl-registry/CONTROL
@@ -0,0 +1,3 @@
+Source: egl-registry

+Version: 2018-06-30

+Description: the EGL API and Extension Registry

diff --git a/ports/egl-registry/portfile.cmake b/ports/egl-registry/portfile.cmake
new file mode 100644
index 000000000..1278e2c92
--- /dev/null
+++ b/ports/egl-registry/portfile.cmake
@@ -0,0 +1,22 @@
+include(vcpkg_common_functions)

+

+vcpkg_from_github(

+  OUT_SOURCE_PATH SOURCE_PATH

+  REPO KhronosGroup/EGL-Registry

+  REF e2562a9e7f567b837cdf96cf8b12e7fc0d88cc30

+  SHA512 8c380c26f6afc0ce2ab2dd2fe834daae0d0dbe9e2bd55ab30c80f8dfa5e234f1902e5735c4d8acf016f03924a46431b9bb794bb77f1f091c56905a98c38f5d04

+  HEAD_REF master

+)

+

+file(

+  COPY

+    ${SOURCE_PATH}/api/KHR

+    ${SOURCE_PATH}/api/EGL

+  DESTINATION ${CURRENT_PACKAGES_DIR}/include

+)

+

+file(

+  INSTALL ${SOURCE_PATH}/sdk/docs/man/copyright.xml

+  DESTINATION ${CURRENT_PACKAGES_DIR}/share/egl-registry

+  RENAME copyright

+)

diff --git a/ports/gl3w/CMakeLists.txt b/ports/gl3w/CMakeLists.txt
index 30a94eddb..41f75b21b 100644
--- a/ports/gl3w/CMakeLists.txt
+++ b/ports/gl3w/CMakeLists.txt
@@ -1,25 +1,24 @@
 cmake_minimum_required(VERSION 3.9)
 project(gl3w C)
 
-set(HEADER_FILES
-    "include/GL/gl3w.h"
-    "include/GL/glcorearb.h"
-)
-
 find_package(OpenGL REQUIRED)
+find_path(GLCOREARB_H NAMES GL/glcorearb.h)
 
 add_library(gl3w src/gl3w.c)
 
-target_include_directories(gl3w PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+target_include_directories(gl3w
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:include>
+    PRIVATE
+        ${GLCOREARB_H}
+        ${OPENGL_INCLUDE_DIR}
 )
 
 if(BUILD_SHARED_LIBS)
     target_compile_definitions(gl3w PRIVATE "-DGL3W_API=__declspec(dllexport)")
 endif()
 
-target_include_directories(gl3w PRIVATE ${OPENGL_INCLUDE_DIR})
 target_link_libraries(gl3w PRIVATE ${OPENGL_LIBRARIES})
 
 install(TARGETS gl3w
@@ -37,5 +36,5 @@ install(
 )
 
 if(NOT DISABLE_INSTALL_HEADERS)
-    install(DIRECTORY include/GL DESTINATION include)
+    install(FILES include/GL/gl3w.h DESTINATION include/GL)
 endif()
diff --git a/ports/gl3w/CONTROL b/ports/gl3w/CONTROL
index 10a2c2b76..e8f6fdae1 100644
--- a/ports/gl3w/CONTROL
+++ b/ports/gl3w/CONTROL
@@ -1,3 +1,4 @@
 Source: gl3w
 Version: 8f7f459d
 Description: Simple OpenGL core profile loading
+Build-Depends: opengl-registry
diff --git a/ports/gl3w/portfile.cmake b/ports/gl3w/portfile.cmake
index bb3f245c9..a5a7825b7 100644
--- a/ports/gl3w/portfile.cmake
+++ b/ports/gl3w/portfile.cmake
@@ -9,15 +9,7 @@ vcpkg_from_github(
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-vcpkg_download_distfile(
-  GLCOREARB_H
-  URLS "http://www.opengl.org/registry/api/GL/glcorearb.h"
-  FILENAME "glcorearb-2018-02-27.h"
-  SHA512 02c3672606e6360f2e1e8335fe581bc2d2b3d518b0f24b0c327006a70de07261dace4b53b13e93029a8eb2af43bcba904c4392f2c35ac512c7f278534ef8eb5d
-)
-
-file(INSTALL ${GLCOREARB_H} DESTINATION ${SOURCE_PATH}/include/GL RENAME glcorearb.h)
+file(COPY ${CURRENT_INSTALLED_DIR}/include/GL/glcorearb.h DESTINATION ${SOURCE_PATH}/include/GL)
 
 vcpkg_apply_patches(
   SOURCE_PATH ${SOURCE_PATH}
diff --git a/ports/libarchive/no-werror.patch b/ports/libarchive/no-werror.patch
new file mode 100644
index 000000000..fbd3be8c6
--- /dev/null
+++ b/ports/libarchive/no-werror.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 745dc29..820c56f 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -96,7 +96,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")

+   #################################################################

+   # Set compile flags for debug build.

+   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"

+-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")

++  #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")

+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")

+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")

+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")

+@@ -112,7 +112,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^Clang$")

+   # Set compile flags for debug build.

+   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"

+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")

+-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")

++  #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")

+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")

+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")

+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")

diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake
index d361b7da8..1e36af1bb 100644
--- a/ports/libarchive/portfile.cmake
+++ b/ports/libarchive/portfile.cmake
@@ -9,14 +9,13 @@ vcpkg_from_github(
     REPO libarchive/libarchive

     REF v3.3.2

     SHA512 7bc17d6f742080278e35f86b0233d70045df0ca1578cd427126e0acce183709bf33ecca689db65e2e67bdfaf687c04d36cae1202a926beeebc88076648aa40bc

-    HEAD_REF master)

-

-vcpkg_apply_patches(

-    SOURCE_PATH ${SOURCE_PATH}

+    HEAD_REF master

     PATCHES

         ${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch

         ${CMAKE_CURRENT_LIST_DIR}/fix-dependencies.patch

-        ${CMAKE_CURRENT_LIST_DIR}/fix-lz4.patch)

+        ${CMAKE_CURRENT_LIST_DIR}/fix-lz4.patch

+        ${CMAKE_CURRENT_LIST_DIR}/no-werror.patch

+)

 

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

diff --git a/ports/libpopt/portfile.cmake b/ports/libpopt/portfile.cmake
index 404a93499..ba50135d6 100644
--- a/ports/libpopt/portfile.cmake
+++ b/ports/libpopt/portfile.cmake
@@ -5,7 +5,9 @@ set(LIBPOPT_HASH bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/popt-${LIBPOPT_VERSION})
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://rpm5.org/files/popt/popt-${LIBPOPT_VERSION}.tar.gz"
+    URLS
+        "http://rpm5.org/files/popt/popt-${LIBPOPT_VERSION}.tar.gz"
+        "https://ftp.openbsd.org/pub/OpenBSD/distfiles/popt-${LIBPOPT_VERSION}.tar.gz"
     FILENAME "popt-${LIBPOPT_VERSION}.tar.gz"
     SHA512 ${LIBPOPT_HASH}
 )
diff --git a/ports/libraw/CONTROL b/ports/libraw/CONTROL
index e49e79f66..5345138f8 100644
--- a/ports/libraw/CONTROL
+++ b/ports/libraw/CONTROL
@@ -1,4 +1,4 @@
 Source: libraw
-Version: 0.18.2-5
+Version: 0.19.0
 Build-Depends: lcms, jasper
 Description: raw image decoder library
diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake
index ee3c1ae26..6c61f2b87 100644
--- a/ports/libraw/portfile.cmake
+++ b/ports/libraw/portfile.cmake
@@ -1,11 +1,13 @@
 include(vcpkg_common_functions)
-set(LIBRAW_VERSION 0.18.2)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/LibRaw-${LIBRAW_VERSION})
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://www.libraw.org/data/LibRaw-${LIBRAW_VERSION}.zip"
-    FILENAME "LibRaw-${LIBRAW_VERSION}.zip"
-    SHA512 e557dc47e8c2f79cdb55fafe7e668b823ecd7afe2537c8b7cd6e3f299110efa4ba1696ce8aa01bdba06a5570eec53a4a04f1af32974f98a1521ab5cd174effd3
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO LibRaw/LibRaw
+    REF 0.19.0
+    SHA512 4fbcce6567463cff1784d0ab9e908906acf79ad3d5af3d52d231f99941b3c3e5daf9049ce2d32a56ba7ec523138ad0c1ff8b61d38fe33abcf1aa6deafd4927f2
+    HEAD_REF master
 )
+
 set(LIBRAW_CMAKE_COMMIT "a71f3b83ee3dccd7be32f9a2f410df4d9bdbde0a")
 set(LIBRAW_CMAKE_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/LibRaw-cmake-${LIBRAW_CMAKE_COMMIT})
 vcpkg_download_distfile(CMAKE_BUILD_ARCHIVE
@@ -14,7 +16,6 @@ vcpkg_download_distfile(CMAKE_BUILD_ARCHIVE
     SHA512 54216e6760e2339dc3bf4b4be533a13160047cabfc033a06da31f2226c43fc93eaea9672af83589e346ce9231c1a57910ac5e800759e692fe2cd9d53b7fba0c6
 )
 
-vcpkg_extract_source_archive(${ARCHIVE})
 vcpkg_extract_source_archive(${CMAKE_BUILD_ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src)
 
 # Copy the CMake build system from the external repo
@@ -64,4 +65,4 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/libraw/FindLibRaw.cmake ${CURRENT_PACK
 file(COPY ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/libraw)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libraw/COPYRIGHT ${CURRENT_PACKAGES_DIR}/share/libraw/copyright)
 
-vcpkg_copy_pdbs()
\ No newline at end of file
+vcpkg_copy_pdbs()
diff --git a/ports/libssh/portfile.cmake b/ports/libssh/portfile.cmake
index 49c927c22..97d270619 100644
--- a/ports/libssh/portfile.cmake
+++ b/ports/libssh/portfile.cmake
@@ -5,7 +5,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
 endif()
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libssh-0.7.5)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://red.libssh.org/attachments/download/218/libssh-0.7.5.tar.xz"
+    URLS "https://www.libssh.org/files/0.7/libssh-0.7.5.tar.xz"
     FILENAME "libssh-0.7.5.tar.xz"
     SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775
 )
diff --git a/ports/live555/CONTROL b/ports/live555/CONTROL
index 07b93da6b..557693dfa 100644
--- a/ports/live555/CONTROL
+++ b/ports/live555/CONTROL
@@ -1,3 +1,3 @@
 Source: live555
-Version: 2018.02.28
+Version: 2018.07.01
 Description: A complete RTSP server application
diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake
index d3ac4f51d..a3cbee546 100644
--- a/ports/live555/portfile.cmake
+++ b/ports/live555/portfile.cmake
@@ -4,12 +4,12 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
 endif()
 
 include(vcpkg_common_functions)
-set(LIVE_VERSION 2018.02.28)
+set(LIVE_VERSION 2018.07.01)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION}/live)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://www.live555.com/liveMedia/public/live.${LIVE_VERSION}.tar.gz"
     FILENAME "live.${LIVE_VERSION}.tar.gz"
-    SHA512 0e445d0b494d82e5826ecea2ec4196472781d3524d2fea95efef83ec5dc0d211334e3ea34dc83b758ed847e2b4290727b299b4118133ca2468911c7cb2053a55
+    SHA512  b24ff9e4debdaf8848220d003627afc3860b9a34c7448f50d993900eb0241c63c9bc622be3e69b68e569607b4f6d174ab897d0e347f49d59842ac4f1b8f9c3ea
 )
 vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION})
 
diff --git a/ports/opengl-registry/CONTROL b/ports/opengl-registry/CONTROL
new file mode 100644
index 000000000..0d9844ed7
--- /dev/null
+++ b/ports/opengl-registry/CONTROL
@@ -0,0 +1,4 @@
+Source: opengl-registry

+Version: 2018-06-30

+Build-Depends: egl-registry

+Description: the API and Extension registries for the OpenGL family APIs

diff --git a/ports/opengl-registry/portfile.cmake b/ports/opengl-registry/portfile.cmake
new file mode 100644
index 000000000..5e997ac23
--- /dev/null
+++ b/ports/opengl-registry/portfile.cmake
@@ -0,0 +1,18 @@
+include(vcpkg_common_functions)

+

+vcpkg_from_github(

+  OUT_SOURCE_PATH SOURCE_PATH

+  REPO KhronosGroup/OpenGL-Registry

+  REF e18e52a14e902a9ee29c5bf87478ac2ca21bb06b

+  SHA512 3b883115e138178984a751ee314b0589a7a20db3bc7cff96fa0b886be1779c24031ce65847386aa2d4f42823b1597edccc5a9afc0aef42fea8611a44d2ca5df6

+  HEAD_REF master

+)

+

+file(COPY ${SOURCE_PATH}/api/GL DESTINATION ${CURRENT_PACKAGES_DIR}/include)

+

+# Using the Makefile because it is the smallest file with a complete copy of the license text

+file(

+  INSTALL ${SOURCE_PATH}/xml/Makefile

+  DESTINATION ${CURRENT_PACKAGES_DIR}/share/opengl-registry

+  RENAME copyright

+)