From 1f88f2098bed988792bd10fd9fffc82c3a1e9069 Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Mon, 6 Jan 2020 11:53:55 -0800 Subject: [PATCH] [basisu] update from upstream repository, add support for pvrtc2 (#9425) * [basisu] update from upstream repository, add support for pvrtc2 * [basisu] tweaks to portfile --- ports/basisu/CONTROL | 2 +- ports/basisu/portfile.cmake | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ports/basisu/CONTROL b/ports/basisu/CONTROL index e8b19db221..81e17c2de6 100644 --- a/ports/basisu/CONTROL +++ b/ports/basisu/CONTROL @@ -1,5 +1,5 @@ Source: basisu -Version: 1.11-2 +Version: 1.11-3 Homepage: https://github.com/BinomialLLC/basis_universal Description: Basis Universal is a supercompressed GPU texture and video compression format that outputs a highly compressed intermediate file format (.basis) that can be quickly transcoded to a wide variety of GPU texture compression formats. Build-Depends: lodepng diff --git a/ports/basisu/portfile.cmake b/ports/basisu/portfile.cmake index 892026cbda..c78b80188b 100644 --- a/ports/basisu/portfile.cmake +++ b/ports/basisu/portfile.cmake @@ -1,10 +1,8 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jherico/basis_universal - REF b0ec54562c215b2f9ed6d54dcaaca9d762d4aff3 - SHA512 27ceb6076c79991639c16bd56a1f81f03fad6d6b4b0184f3f3b594bb163509525e03a7d5f1ba068d186f9cbba677e52972e0b364f4369eadf507fca6e6c60820 + REF 497875f756ed0e3eb62e0ff08d55c62242f4be74 + SHA512 2293b78620a7ed510dbecf48bcae5f4b8524fe9020f864c8e79cf94ea9d95d51dddf83a5b4ea29cc95db19f87137bfef1cb68b7fbc6387e08bb42898d81c9303 HEAD_REF master ) @@ -24,9 +22,8 @@ else() set(TOOL_NAME basisu_tool) endif() -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/basisu) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(COPY ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/basisu) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/basisu/LICENSE ${CURRENT_PACKAGES_DIR}/share/basisu/copyright) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/basisu)