[libmediainfo/glslang] Update to the latest version (#19917)

* [libmediainfo/glslang] Update to the latest version * Update version files Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2024-12-27 10:21:07 +08:00 · 2021-09-08 12:06:30 +08:00 · 2021-09-08 12:06:30 +08:00 · e5b6ec234b
commit e5b6ec234b
parent 503d17d534
10 changed files with 80 additions and 75 deletions
--- a/ports/glslang/copyright
+++ b/ports/glslang/copyright
@ -1,35 +0,0 @@
-//
-//Copyright (C) 2002-2005 3Dlabs Inc. Ltd.
-//Copyright (C) 2012-2013 LunarG, Inc.
-//
-//All rights reserved.
-//
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions
-//are met:
-//
-// Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//
-// Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following
-// disclaimer in the documentation and/or other materials provided
-// with the distribution.
-//
-// Neither the name of 3Dlabs Inc. Ltd. nor the names of its
-// contributors may be used to endorse or promote products derived
-// from this software without specific prior written permission.
-//
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//POSSIBILITY OF SUCH DAMAGE.
-//
--- a/ports/glslang/portfile.cmake
+++ b/ports/glslang/portfile.cmake
@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO KhronosGroup/glslang
-  REF ae2a562936cc8504c9ef2757cceaff163147834f
-  SHA512 1c5a91e60c1809c6c26f11649659090a75501b0570f3147e5b27ac65c539b591967f258d14c399d33019317864ede823353ea44e0015bc3f7afc5a787f046cc7
+  REF 2fb89a0072ae7316af1c856f22663fde4928128a #11.6.0
+  SHA512 e22b85bb0c98d35c80f06dd6352d98c34ea0b965c5bec077d122d9aa346293672a11aec4964b410db8a6050c70dbc0a46fbbb599e178424d78234608075c110e
  HEAD_REF master
  PATCHES
    ignore-crt.patch
@ -22,36 +22,34 @@ else()
  set(BUILD_BINARIES ON)  
 endif()

-vcpkg_configure_cmake(
-  SOURCE_PATH ${SOURCE_PATH}
-  PREFER_NINJA
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
  OPTIONS
    -DSKIP_GLSLANG_INSTALL=OFF
    -DBUILD_EXTERNAL=OFF
    -DENABLE_GLSLANG_BINARIES=${BUILD_BINARIES}
 )

-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/glslang)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)

 vcpkg_copy_pdbs()

 if(NOT BUILD_BINARIES)
-  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
 else()
-  file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/glslang)
+  vcpkg_copy_tools(TOOL_NAMES glslangValidator spirv-remap AUTO_CLEAN)
 endif()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include
-                    ${CURRENT_PACKAGES_DIR}/debug/bin)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
+                    "${CURRENT_PACKAGES_DIR}/debug/bin")

-if(EXISTS ${CURRENT_PACKAGES_DIR}/share/glslang/glslang-config.cmake OR EXISTS ${CURRENT_PACKAGES_DIR}/share/glslang/glslangConfig.cmake)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/share/glslang/glslang-config.cmake" OR EXISTS "${CURRENT_PACKAGES_DIR}/share/glslang/glslangConfig.cmake")
  message(FATAL_ERROR "glslang has been updated to provide a -config file -- please remove the vcpkg provided version from the portfile")
 endif()

 file(COPY
-  ${CMAKE_CURRENT_LIST_DIR}/copyright
-  ${CMAKE_CURRENT_LIST_DIR}/glslang-config.cmake
-  DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+  "${CMAKE_CURRENT_LIST_DIR}/glslang-config.cmake"
+  DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
 )

+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/ports/glslang/vcpkg.json
+++ b/ports/glslang/vcpkg.json
@ -1,6 +1,16 @@
 {
  "name": "glslang",
-  "version": "11.5.0",
+  "version": "11.6.0",
  "description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator",
-  "homepage": "https://github.com/KhronosGroup/glslang"
+  "homepage": "https://github.com/KhronosGroup/glslang",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
--- a/ports/libmediainfo/CONTROL
+++ b/ports/libmediainfo/CONTROL
@ -1,5 +0,0 @@
-Source: libmediainfo
-Version: 20.09
-Homepage: https://github.com/MediaArea/MediaInfoLib
-Description: Get most relevant technical and tag data from video and audio files
-Build-Depends: libzen, curl, zlib
--- a/ports/libmediainfo/portfile.cmake
+++ b/ports/libmediainfo/portfile.cmake
@ -1,23 +1,30 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO MediaArea/MediaInfoLib
-    REF v20.09
-    SHA512 0e9407d0a430c396b98f8e911e606bc4fa14914881540552bc81d78a57908aa4a54666f415474dda176527ed88148629660e3f2c090f648db8b75a92fec2449f
+    REF d5fb067e1539aa7a74c491e8262c81214f9c8bcb #v21.03
+    SHA512 6d49c8187dca264b4d9fb1f93a82cb65435e81a2540cfb84f885d53737560f7e8e60c8209e7d184cb191f298495db90ffb3185481e3ed44bf5a1f5131f671d89
    HEAD_REF master
    PATCHES vcpkg_support_in_cmakelists.patch
 )

-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/Project/CMake
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/Project/CMake"
    OPTIONS
        -DBUILD_ZENLIB=0
        -DBUILD_ZLIB=0
 )

-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/mediainfolib TARGET_PATH share/mediainfolib)
+vcpkg_cmake_install()
+
+if(EXISTS "${CURRENT_PACKAGES_DIR}/share/mediainfolib")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/share/mediainfolib" "${CURRENT_PACKAGES_DIR}/share/MediaInfoLib")
+endif()
+
+if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib" "${CURRENT_PACKAGES_DIR}/debug/share/MediaInfoLib")
+endif()
+vcpkg_cmake_config_fixup(PACKAGE_NAME MediaInfoLib CONFIG_PATH share/MediaInfoLib)

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
--- a/ports/libmediainfo/vcpkg.json
+++ b/ports/libmediainfo/vcpkg.json
@ -0,0 +1,19 @@
+{
+  "name": "libmediainfo",
+  "version-string": "21.03",
+  "description": "Get most relevant technical and tag data from video and audio files",
+  "homepage": "https://github.com/MediaArea/MediaInfoLib",
+  "dependencies": [
+    "curl",
+    "libzen",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ]
+}
--- a/ports/libmediainfo/vcpkg_support_in_cmakelists.patch
+++ b/ports/libmediainfo/vcpkg_support_in_cmakelists.patch
@ -1,5 +1,5 @@
 diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt
-index 47c4ed13..f13ff531 100644
+index f983343..c6ba5ea 100644
 --- a/Project/CMake/CMakeLists.txt
 +++ b/Project/CMake/CMakeLists.txt
@@ -88,7 +88,7 @@ endif()
@ -11,7 +11,7 @@ index 47c4ed13..f13ff531 100644
 
 include_directories(${MediaInfoLib_SOURCES_PATH})
 include_directories(${MediaInfoLib_SOURCES_PATH}/ThirdParty/md5/)
-@@ -398,13 +398,7 @@ endif()
+@@ -400,13 +400,7 @@ endif()
 target_link_libraries(mediainfo ${ZenLib_LIBRARY} ${ZLIB_LIBRARIES})
 
 if(MSVC AND BUILD_SHARED_LIBS)
@ -27,19 +27,20 @@ index 47c4ed13..f13ff531 100644
 
 if (APPLE)
 diff --git a/Source/ThirdParty/aes-gladman/aesopt.h b/Source/ThirdParty/aes-gladman/aesopt.h
-index 6ad9ca1e..a858396f 100644
+index d3ac0f9..eeefa40 100644
 --- a/Source/ThirdParty/aes-gladman/aesopt.h
 +++ b/Source/ThirdParty/aes-gladman/aesopt.h
-@@ -183,6 +183,6 @@ Issue Date: 20/12/2007
-        AES_REV_DKS must NOT be defined when such assembler files are
-        built
+@@ -183,7 +183,7 @@ Issue Date: 20/12/2007
+ 	AES_REV_DKS must NOT be defined when such assembler files are
+ 	built
 */
 -#if 1 && defined( _WIN64 ) && defined( _MSC_VER )
 +#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) && defined( _M_AMD64 )
 #  define INTEL_AES_POSSIBLE
 #endif
+ 
 diff --git a/Source/ThirdParty/aes-gladman/brg_endian.h b/Source/ThirdParty/aes-gladman/brg_endian.h
-index 4c34f2b5..fae471b9 100644
+index b44c5cb..8c34364 100644
 --- a/Source/ThirdParty/aes-gladman/brg_endian.h
 +++ b/Source/ThirdParty/aes-gladman/brg_endian.h
@@ -110,7 +110,8 @@ Issue Date: 20/12/2007
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -2381,7 +2381,7 @@
      "port-version": 0
    },
    "glslang": {
-      "baseline": "11.5.0",
+      "baseline": "11.6.0",
      "port-version": 0
    },
    "glui": {
@ -3421,7 +3421,7 @@
      "port-version": 0
    },
    "libmediainfo": {
-      "baseline": "20.09",
+      "baseline": "21.03",
      "port-version": 0
    },
    "libmesh": {
--- a/versions/g-/glslang.json
+++ b/versions/g-/glslang.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "0e89013d81f909760cdc3ce9015f84ce74621eec",
+      "version": "11.6.0",
+      "port-version": 0
+    },
    {
      "git-tree": "e1d95a78d1dee917b157cbdef0896ab7256ea637",
      "version": "11.5.0",
--- a/versions/l-/libmediainfo.json
+++ b/versions/l-/libmediainfo.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "a24db679914e335ba6235de799467dfcb8842fc6",
+      "version-string": "21.03",
+      "port-version": 0
+    },
    {
      "git-tree": "e23c8e758ec10752765cf5fd0c4f86ff4fc0515c",
      "version-string": "20.09",