diff options
| -rw-r--r-- | ports/charls/0001_cmake.patch | 12 | ||||
| -rw-r--r-- | ports/charls/CONTROL | 4 | ||||
| -rw-r--r-- | ports/charls/portfile.cmake | 11 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 |
4 files changed, 7 insertions, 22 deletions
diff --git a/ports/charls/0001_cmake.patch b/ports/charls/0001_cmake.patch deleted file mode 100644 index 7f50a98e6..000000000 --- a/ports/charls/0001_cmake.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1aa40a8..1051997 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,6 +33,7 @@ option (BUILD_TESTING "Build tests" ON) - if (WIN32) - if (BUILD_SHARED_LIBS) - add_definitions(-D CHARLS_DLL) -+ set_source_files_properties(src/interface.cpp PROPERTIES COMPILE_FLAGS -DCHARLS_DLL_BUILD) - else() - add_definitions(-D CHARLS_STATIC) - endif() diff --git a/ports/charls/CONTROL b/ports/charls/CONTROL index f68ecdccf..f266fe998 100644 --- a/ports/charls/CONTROL +++ b/ports/charls/CONTROL @@ -1,4 +1,4 @@ Source: charls -Version: 2.0.0-3 +Version: 2.1.0-1 Homepage: https://github.com/team-charls/charls -Description: CharLS, a C++ JPEG-LS library implementation. +Description: CharLS, a C++ JPEG-LS library implementation.
\ No newline at end of file diff --git a/ports/charls/portfile.cmake b/ports/charls/portfile.cmake index c303c42bc..805d7b087 100644 --- a/ports/charls/portfile.cmake +++ b/ports/charls/portfile.cmake @@ -3,24 +3,23 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO team-charls/charls - REF 2.0.0 - SHA512 0a2862fad6d65b941c81f5f838db1fdc6a4625887281ddbf27e21be9084f607d27c8a27d246d6252e08358b2ed4aa0c2b7407048ca559fb40e94313ca72487dd + REF 2.1.0 + SHA512 456539243d984ebe6afe1bbb7c9422e642cf0346d25d220126ad8a6d04e945c6c340ab3c2b73a7db4ec390ed6a52236e5c6e9ad6d14e8b78b701937810fb327d HEAD_REF master - PATCHES - 0001_cmake.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DBUILD_TESTING=OFF + -DCHARLS_BUILD_TESTS=OFF + -DCHARLS_BUILD_SAMPLES=OFF ) vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 62fcb4e52..f2b1d797a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -213,8 +213,6 @@ chakracore:x64-linux=fail chakracore:x64-osx=fail
chakracore:x64-uwp=fail
chakracore:x64-windows-static=fail
-charls:arm-uwp=fail
-charls:x64-uwp=fail
chartdir:arm64-windows=fail
chartdir:arm-uwp=fail
chartdir:x64-uwp=fail
|