Merge master

2 files changed, 42 insertions, 45 deletions

diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL
index 8fd8e8523..8bc53822e 100644
--- a/ports/angle/CONTROL
+++ b/ports/angle/CONTROL
@@ -1,5 +1,5 @@
 Source: angle

-Version: 2019-03-13-c2ee2cc-2

+Version: 2019-03-13-c2ee2cc-3

 Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.

   The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.

 Build-Depends: egl-registry

diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake
index 2ad6a7553..f0bda4a3d 100644
--- a/ports/angle/portfile.cmake
+++ b/ports/angle/portfile.cmake
@@ -1,44 +1,41 @@
-include(vcpkg_common_functions)

-

-if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")

-    set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU)

-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")

-    set(ANGLE_CPU_BITNESS ANGLE_IS_64_BIT_CPU)

-elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")

-    set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU)

-else()

-    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")

-endif()

-

-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)

-    message(STATUS "ANGLE currently only supports being built as a dynamic library")

-    set(VCPKG_LIBRARY_LINKAGE dynamic)

-endif()

-

-vcpkg_from_github(

-    OUT_SOURCE_PATH SOURCE_PATH

-    REPO google/angle

-    REF chromium/3672

-    SHA512 dd6a05f0f1f4544b8646c41ffcb4d5e3b41f5261771ada47889345a24d4e55e6370df55a26c354a7073efcde307644cec6c6064ea6fe498ed6b52c3017249f81

-    PATCHES

-        001-fix-uwp.patch

-)

-

-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

-file(COPY ${CMAKE_CURRENT_LIST_DIR}/commit.h DESTINATION ${SOURCE_PATH})

-

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

-    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1

-    OPTIONS

-        -D${ANGLE_CPU_BITNESS}=1

-)

-

-vcpkg_install_cmake()

-

-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-angle TARGET_PATH share/unofficial-angle)

-

-vcpkg_copy_pdbs()

-

-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/angle RENAME copyright)

+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
+if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+    set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU)
+elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+    set(ANGLE_CPU_BITNESS ANGLE_IS_64_BIT_CPU)
+elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+    set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU)
+else()
+    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/angle
+    REF chromium/3672
+    SHA512 dd6a05f0f1f4544b8646c41ffcb4d5e3b41f5261771ada47889345a24d4e55e6370df55a26c354a7073efcde307644cec6c6064ea6fe498ed6b52c3017249f81
+    PATCHES 
+        001-fix-uwp.patch
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/commit.h DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1
+    OPTIONS
+        -D${ANGLE_CPU_BITNESS}=1
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-angle TARGET_PATH share/unofficial-angle)
+
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/angle RENAME copyright)