From 8a20fe9e274144502ee2bb09e01d53249e4e5b66 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 8 Nov 2024 02:36:09 +0000 Subject: [PATCH 1/6] add config --- ports/libwebm/fix-export-config.patch | 24 ++++++++++++++++++++++ ports/libwebm/portfile.cmake | 4 +++- ports/libwebm/unofficial-webm-config.cmake | 1 + ports/libwebm/vcpkg.json | 1 + 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 ports/libwebm/fix-export-config.patch create mode 100644 ports/libwebm/unofficial-webm-config.cmake diff --git a/ports/libwebm/fix-export-config.patch b/ports/libwebm/fix-export-config.patch new file mode 100644 index 00000000000000..f121200e50a9ac --- /dev/null +++ b/ports/libwebm/fix-export-config.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ebb3333..516f4ac 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -459,13 +459,17 @@ endif() + # webm_parser headers are rooted at webm/. + set_target_properties(webm PROPERTIES PUBLIC_HEADER + "${webm_parser_public_headers}") ++target_include_directories(webm PUBLIC $) + install( +- TARGETS webm ++ TARGETS webm EXPORT unofficial-webm-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webm) +- ++install(EXPORT unofficial-webm-targets ++ FILE unofficial-webm-targets.cmake ++ NAMESPACE unofficial::webm:: ++ DESTINATION share/unofficial-webm) + # Install common headers into a subdirectory to avoid breaking nested includes. + install(FILES ${libwebm_common_public_headers} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webm/common) diff --git a/ports/libwebm/portfile.cmake b/ports/libwebm/portfile.cmake index 46ab340533061d..9edf7bd2cd3552 100644 --- a/ports/libwebm/portfile.cmake +++ b/ports/libwebm/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES Fix-cmake.patch + fix-export-config.patch ) vcpkg_cmake_configure( @@ -21,7 +22,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() - +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-webm-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-webm") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-webm) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.TXT") diff --git a/ports/libwebm/unofficial-webm-config.cmake b/ports/libwebm/unofficial-webm-config.cmake new file mode 100644 index 00000000000000..87c3a3f441d958 --- /dev/null +++ b/ports/libwebm/unofficial-webm-config.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-webm-targets.cmake") diff --git a/ports/libwebm/vcpkg.json b/ports/libwebm/vcpkg.json index 702d46d7f7fc14..7d5925a17455c0 100644 --- a/ports/libwebm/vcpkg.json +++ b/ports/libwebm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libwebm", "version": "1.0.0.31", + "port-version": 1, "description": "WebM File Parser", "homepage": "https://github.com/webmproject/libwebm", "license": "BSD-3-Clause", From 2ceabe83bb4ff84f2f5e71545f26b994891e7bce Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 8 Nov 2024 02:36:33 +0000 Subject: [PATCH 2/6] update version --- versions/baseline.json | 2 +- versions/l-/libwebm.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index de0168fbfb087b..51c285f6164f70 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5322,7 +5322,7 @@ }, "libwebm": { "baseline": "1.0.0.31", - "port-version": 0 + "port-version": 1 }, "libwebp": { "baseline": "1.4.0", diff --git a/versions/l-/libwebm.json b/versions/l-/libwebm.json index 203ce71b783961..8cd6e6f43e6403 100644 --- a/versions/l-/libwebm.json +++ b/versions/l-/libwebm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "332ff9896c6a508150d1c09b01a714aaf7580ced", + "version": "1.0.0.31", + "port-version": 1 + }, { "git-tree": "a1c52d996474cadfc08a913ec80155b1693c7af5", "version": "1.0.0.31", From bcc04e9b950c10fa4141080500f9c3b474fdd93c Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 12 Nov 2024 02:47:06 +0000 Subject: [PATCH 3/6] rename config --- ports/libwebm/fix-export-config.patch | 17 +++++++++-------- ports/libwebm/portfile.cmake | 4 ++-- ports/libwebm/unofficial-libwebm-config.cmake | 1 + ports/libwebm/unofficial-webm-config.cmake | 1 - 4 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 ports/libwebm/unofficial-libwebm-config.cmake delete mode 100644 ports/libwebm/unofficial-webm-config.cmake diff --git a/ports/libwebm/fix-export-config.patch b/ports/libwebm/fix-export-config.patch index f121200e50a9ac..1bd379e7e1eda8 100644 --- a/ports/libwebm/fix-export-config.patch +++ b/ports/libwebm/fix-export-config.patch @@ -1,24 +1,25 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ebb3333..516f4ac 100644 +index ebb3333..8fd53ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -459,13 +459,17 @@ endif() +@@ -459,13 +459,19 @@ endif() # webm_parser headers are rooted at webm/. set_target_properties(webm PROPERTIES PUBLIC_HEADER "${webm_parser_public_headers}") ++set_target_properties(webm PROPERTIES EXPORT_NAME libwebm) +target_include_directories(webm PUBLIC $) install( - TARGETS webm -+ TARGETS webm EXPORT unofficial-webm-targets ++ TARGETS webm EXPORT unofficial-libwebm-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webm) -- -+install(EXPORT unofficial-webm-targets -+ FILE unofficial-webm-targets.cmake -+ NAMESPACE unofficial::webm:: -+ DESTINATION share/unofficial-webm) + ++install(EXPORT unofficial-libwebm-targets ++ FILE unofficial-libwebm-targets.cmake ++ NAMESPACE unofficial::libwebm:: ++ DESTINATION share/unofficial-libwebm) # Install common headers into a subdirectory to avoid breaking nested includes. install(FILES ${libwebm_common_public_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webm/common) diff --git a/ports/libwebm/portfile.cmake b/ports/libwebm/portfile.cmake index 9edf7bd2cd3552..0a961fdff190d3 100644 --- a/ports/libwebm/portfile.cmake +++ b/ports/libwebm/portfile.cmake @@ -22,8 +22,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-webm-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-webm") -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-webm) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-libwebm-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-libwebm") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libwebm) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.TXT") diff --git a/ports/libwebm/unofficial-libwebm-config.cmake b/ports/libwebm/unofficial-libwebm-config.cmake new file mode 100644 index 00000000000000..33b3720bbe01e3 --- /dev/null +++ b/ports/libwebm/unofficial-libwebm-config.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libwebm-targets.cmake") diff --git a/ports/libwebm/unofficial-webm-config.cmake b/ports/libwebm/unofficial-webm-config.cmake deleted file mode 100644 index 87c3a3f441d958..00000000000000 --- a/ports/libwebm/unofficial-webm-config.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/unofficial-webm-targets.cmake") From 1e98f339ecbea40475bb523b2986486dc918651b Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 12 Nov 2024 02:47:52 +0000 Subject: [PATCH 4/6] update version --- versions/l-/libwebm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libwebm.json b/versions/l-/libwebm.json index 8cd6e6f43e6403..2b9a38e36a651c 100644 --- a/versions/l-/libwebm.json +++ b/versions/l-/libwebm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "332ff9896c6a508150d1c09b01a714aaf7580ced", + "git-tree": "401d533e04366f5b75d9f8fb947ebab990255c85", "version": "1.0.0.31", "port-version": 1 }, From 765830a99e02f979005a65fece2d2b3386a51712 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 18 Nov 2024 02:15:34 +0000 Subject: [PATCH 5/6] udpate version --- ports/libwebm/fix-export-config.patch | 2 +- ports/libwebm/portfile.cmake | 3 +-- ports/libwebm/unofficial-libwebm-config.cmake | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 ports/libwebm/unofficial-libwebm-config.cmake diff --git a/ports/libwebm/fix-export-config.patch b/ports/libwebm/fix-export-config.patch index 1bd379e7e1eda8..161b6bec7c4b54 100644 --- a/ports/libwebm/fix-export-config.patch +++ b/ports/libwebm/fix-export-config.patch @@ -17,7 +17,7 @@ index ebb3333..8fd53ef 100644 PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webm) +install(EXPORT unofficial-libwebm-targets -+ FILE unofficial-libwebm-targets.cmake ++ FILE unofficial-libwebm-config.cmake + NAMESPACE unofficial::libwebm:: + DESTINATION share/unofficial-libwebm) # Install common headers into a subdirectory to avoid breaking nested includes. diff --git a/ports/libwebm/portfile.cmake b/ports/libwebm/portfile.cmake index 0a961fdff190d3..de67ba446bfbb9 100644 --- a/ports/libwebm/portfile.cmake +++ b/ports/libwebm/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES Fix-cmake.patch - fix-export-config.patch + fix-export-config.patch ) vcpkg_cmake_configure( @@ -22,7 +22,6 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-libwebm-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-libwebm") vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libwebm) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libwebm/unofficial-libwebm-config.cmake b/ports/libwebm/unofficial-libwebm-config.cmake deleted file mode 100644 index 33b3720bbe01e3..00000000000000 --- a/ports/libwebm/unofficial-libwebm-config.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libwebm-targets.cmake") From 94768da297a0d4cc739dfca819bd6c8ca31bcce1 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 18 Nov 2024 02:16:04 +0000 Subject: [PATCH 6/6] update version --- versions/l-/libwebm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libwebm.json b/versions/l-/libwebm.json index 2b9a38e36a651c..0aae20744bd1fd 100644 --- a/versions/l-/libwebm.json +++ b/versions/l-/libwebm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "401d533e04366f5b75d9f8fb947ebab990255c85", + "git-tree": "1cfbac17267892f7a391ad56353f624a80451f88", "version": "1.0.0.31", "port-version": 1 },