[pangolin] update to 0.9.2 (#41599)

This commit is contained in:
Jia Yue Hua 2024-10-17 16:08:18 +08:00 committed by GitHub
parent 3b38ef0dcb
commit 8c22813aea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 14 additions and 23 deletions

View File

@ -1,5 +1,5 @@
diff --git a/cmake/PangolinConfig.cmake.in b/cmake/PangolinConfig.cmake.in diff --git a/cmake/PangolinConfig.cmake.in b/cmake/PangolinConfig.cmake.in
index f891e34..6fbfc7d 100644 index 3ceea9d..e5bf9f0 100644
--- a/cmake/PangolinConfig.cmake.in --- a/cmake/PangolinConfig.cmake.in
+++ b/cmake/PangolinConfig.cmake.in +++ b/cmake/PangolinConfig.cmake.in
@@ -12,6 +12,7 @@ SET( Pangolin_LIBRARY "${Pangolin_LIBRARIES}" ) @@ -12,6 +12,7 @@ SET( Pangolin_LIBRARY "${Pangolin_LIBRARIES}" )
@ -11,10 +11,10 @@ index f891e34..6fbfc7d 100644
if (UNIX) if (UNIX)
find_dependency(Threads) find_dependency(Threads)
diff --git a/components/pango_core/CMakeLists.txt b/components/pango_core/CMakeLists.txt diff --git a/components/pango_core/CMakeLists.txt b/components/pango_core/CMakeLists.txt
index 315913d..1d1a1d0 100644 index e1d931b..6c6ad4d 100644
--- a/components/pango_core/CMakeLists.txt --- a/components/pango_core/CMakeLists.txt
+++ b/components/pango_core/CMakeLists.txt +++ b/components/pango_core/CMakeLists.txt
@@ -44,6 +44,9 @@ install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include" @@ -49,6 +49,9 @@ install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include"
DESTINATION ${CMAKE_INSTALL_PREFIX} DESTINATION ${CMAKE_INSTALL_PREFIX}
) )

View File

@ -1,13 +0,0 @@
--- a/components/pango_video/include/pangolin/video/drivers/ffmpeg_common.h
+++ b/components/pango_video/include/pangolin/video/drivers/ffmpeg_common.h
@@ -55,10 +55,6 @@ inline std::string FfmpegFmtToString(const AVPixelFormat fmt)
TEST_PIX_FMT_RETURN(YUVJ420P);
TEST_PIX_FMT_RETURN(YUVJ422P);
TEST_PIX_FMT_RETURN(YUVJ444P);
-#ifdef FF_API_XVMC
- TEST_PIX_FMT_RETURN(XVMC_MPEG2_MC);
- TEST_PIX_FMT_RETURN(XVMC_MPEG2_IDCT);
-#endif
TEST_PIX_FMT_RETURN(UYVY422);
TEST_PIX_FMT_RETURN(UYYVYY411);
TEST_PIX_FMT_RETURN(BGR8);

View File

@ -6,12 +6,11 @@ endif()
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO stevenlovegrove/Pangolin REPO stevenlovegrove/Pangolin
REF v0.8 REF "v${VERSION}"
SHA512 d4ca405097e8c439a4f74495f374bc5d5e4febafcf59ee88d985a8764ed36da1753ca4a3a73476dfb74c7d92df31a99242df6e1b47c648e860eee835a6f4f434 SHA512 ef2461770def3b0752d23df0c9a0090b733943249404528d0b2ba985d08c9083aabe685e3fd00be08318ea7b90dc38e9735ab004124643619e6cf369d64f6321
HEAD_REF master HEAD_REF master
PATCHES PATCHES
devendor-palsigslot.patch devendor-palsigslot.patch
ffmpeg-vxmc.patch
) )
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

View File

@ -1,7 +1,6 @@
{ {
"name": "pangolin", "name": "pangolin",
"version": "0.8", "version": "0.9.2",
"port-version": 3,
"description": "Lightweight GUI Library", "description": "Lightweight GUI Library",
"homepage": "https://github.com/stevenlovegrove/Pangolin", "homepage": "https://github.com/stevenlovegrove/Pangolin",
"license": "MIT", "license": "MIT",
@ -9,6 +8,7 @@
"dependencies": [ "dependencies": [
"eigen3", "eigen3",
"glew", "glew",
"libepoxy",
"palsigslot", "palsigslot",
{ {
"name": "vcpkg-cmake", "name": "vcpkg-cmake",

View File

@ -6837,8 +6837,8 @@
"port-version": 4 "port-version": 4
}, },
"pangolin": { "pangolin": {
"baseline": "0.8", "baseline": "0.9.2",
"port-version": 3 "port-version": 0
}, },
"pangomm": { "pangomm": {
"baseline": "2.50.1", "baseline": "2.50.1",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "71d44252a59ed3737ec204b4789bcd2d30d5e621",
"version": "0.9.2",
"port-version": 0
},
{ {
"git-tree": "92ce228116d887cc4f381fadcc85ac3fccdea5ef", "git-tree": "92ce228116d887cc4f381fadcc85ac3fccdea5ef",
"version": "0.8", "version": "0.8",