From b11941140ce64dd4ccefec44fed6a7719ba3aaf5 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 30 Dec 2021 04:01:35 +0800 Subject: [PATCH] [libwebm] Install the public header files (#22189) * [libwebm] Remove port's internal headers from installed folder * [libwebm] Install public headers * [libwebm] Resetting the file structure of libwebm/include and adding additional headers Co-authored-by: Cheney-Wang --- ports/libwebm/Fix-cmake.patch | 50 ++++++++++++++++++++++++----------- ports/libwebm/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libwebm.json | 5 ++++ 4 files changed, 42 insertions(+), 16 deletions(-) diff --git a/ports/libwebm/Fix-cmake.patch b/ports/libwebm/Fix-cmake.patch index a188c81ae0..79751e6201 100644 --- a/ports/libwebm/Fix-cmake.patch +++ b/ports/libwebm/Fix-cmake.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a83d23b..0f5ede3 100644 +index a83d23b..c5abf83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,8 @@ @@ -11,7 +11,7 @@ index a83d23b..0f5ede3 100644 include(GNUInstallDirs) include("${CMAKE_CURRENT_SOURCE_DIR}/build/cxx_flags.cmake") -@@ -330,6 +332,30 @@ add_library(webm ${libwebm_common_sources} +@@ -330,6 +332,50 @@ add_library(webm ${libwebm_common_sources} $ $) @@ -24,25 +24,45 @@ index a83d23b..0f5ede3 100644 + +install( + FILES -+ mkvmuxer/mkvmuxer.h -+ mkvmuxer/mkvmuxertypes.h -+ mkvmuxer/mkvmuxerutil.h -+ mkvmuxer/mkvwriter.h -+ mkvparser/mkvparser.h -+ mkvparser/mkvreader.h -+ webvtt/vttreader.h -+ webvtt/webvttparser.h -+ common/file_util.h -+ common/hdr_util.h -+ common/webmids.h ++ mkvmuxer.hpp ++ mkvmuxertypes.hpp ++ mkvmuxerutil.hpp ++ mkvparser.hpp ++ mkvreader.hpp ++ mkvwriter.hpp ++ webmids.hpp + DESTINATION -+ "include/libwebm/" ++ include/libwebm ++) ++ ++install( ++ DIRECTORY mkvmuxer/ ++ DESTINATION include/libwebm/mkvmuxer ++ FILES_MATCHING PATTERN "*.h" ++) ++ ++install( ++ DIRECTORY mkvparser/ ++ DESTINATION include/libwebm/mkvparser ++ FILES_MATCHING PATTERN "*.h" ++) ++ ++install( ++ DIRECTORY webvtt/ ++ DESTINATION include/libwebm/webvtt ++ FILES_MATCHING PATTERN "*.h" ++) ++ ++install( ++ DIRECTORY common/ ++ DESTINATION include/libwebm/common ++ FILES_MATCHING PATTERN "*.h" +) + if (WIN32) # Use libwebm and libwebm.lib for project and library name on Windows (instead # webm and webm.lib). -@@ -337,18 +363,22 @@ if (WIN32) +@@ -337,18 +383,22 @@ if (WIN32) set_target_properties(webm PROPERTIES PREFIX lib) endif () diff --git a/ports/libwebm/vcpkg.json b/ports/libwebm/vcpkg.json index 9e0714a8c3..0f98624366 100644 --- a/ports/libwebm/vcpkg.json +++ b/ports/libwebm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libwebm", "version": "1.0.0.28", + "port-version": 1, "description": "WebM File Parser", "homepage": "https://github.com/webmproject/libwebm", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 696f5f6313..d3e9e8a452 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4070,7 +4070,7 @@ }, "libwebm": { "baseline": "1.0.0.28", - "port-version": 0 + "port-version": 1 }, "libwebp": { "baseline": "1.2.1", diff --git a/versions/l-/libwebm.json b/versions/l-/libwebm.json index 3834ffdda2..51c7a5f3b8 100644 --- a/versions/l-/libwebm.json +++ b/versions/l-/libwebm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f210a205882bf4151ab8bec8c9b3a3fc328a280", + "version": "1.0.0.28", + "port-version": 1 + }, { "git-tree": "06a8f301505eb69082e8654f0c01d724b2e403e0", "version": "1.0.0.28",