From 8c22813aea114c38ef0a6401023f48c7c270229d Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Thu, 17 Oct 2024 16:08:18 +0800 Subject: [PATCH] [pangolin] update to 0.9.2 (#41599) --- ports/pangolin/devendor-palsigslot.patch | 6 +++--- ports/pangolin/ffmpeg-vxmc.patch | 13 ------------- ports/pangolin/portfile.cmake | 5 ++--- ports/pangolin/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/p-/pangolin.json | 5 +++++ 6 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 ports/pangolin/ffmpeg-vxmc.patch diff --git a/ports/pangolin/devendor-palsigslot.patch b/ports/pangolin/devendor-palsigslot.patch index 4259172d0a..4a858e0d8c 100644 --- a/ports/pangolin/devendor-palsigslot.patch +++ b/ports/pangolin/devendor-palsigslot.patch @@ -1,5 +1,5 @@ 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 +++ b/cmake/PangolinConfig.cmake.in @@ -12,6 +12,7 @@ SET( Pangolin_LIBRARY "${Pangolin_LIBRARIES}" ) @@ -11,10 +11,10 @@ index f891e34..6fbfc7d 100644 if (UNIX) find_dependency(Threads) 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 +++ 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} ) diff --git a/ports/pangolin/ffmpeg-vxmc.patch b/ports/pangolin/ffmpeg-vxmc.patch deleted file mode 100644 index bccc9f16f1..0000000000 --- a/ports/pangolin/ffmpeg-vxmc.patch +++ /dev/null @@ -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); diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake index 991f49cd49..74a1f530d0 100644 --- a/ports/pangolin/portfile.cmake +++ b/ports/pangolin/portfile.cmake @@ -6,12 +6,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevenlovegrove/Pangolin - REF v0.8 - SHA512 d4ca405097e8c439a4f74495f374bc5d5e4febafcf59ee88d985a8764ed36da1753ca4a3a73476dfb74c7d92df31a99242df6e1b47c648e860eee835a6f4f434 + REF "v${VERSION}" + SHA512 ef2461770def3b0752d23df0c9a0090b733943249404528d0b2ba985d08c9083aabe685e3fd00be08318ea7b90dc38e9735ab004124643619e6cf369d64f6321 HEAD_REF master PATCHES devendor-palsigslot.patch - ffmpeg-vxmc.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/pangolin/vcpkg.json b/ports/pangolin/vcpkg.json index 49438dbecf..5d0880c8c2 100644 --- a/ports/pangolin/vcpkg.json +++ b/ports/pangolin/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pangolin", - "version": "0.8", - "port-version": 3, + "version": "0.9.2", "description": "Lightweight GUI Library", "homepage": "https://github.com/stevenlovegrove/Pangolin", "license": "MIT", @@ -9,6 +8,7 @@ "dependencies": [ "eigen3", "glew", + "libepoxy", "palsigslot", { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index de1f68bb97..148ecd1de8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6837,8 +6837,8 @@ "port-version": 4 }, "pangolin": { - "baseline": "0.8", - "port-version": 3 + "baseline": "0.9.2", + "port-version": 0 }, "pangomm": { "baseline": "2.50.1", diff --git a/versions/p-/pangolin.json b/versions/p-/pangolin.json index df3febd519..9554049627 100644 --- a/versions/p-/pangolin.json +++ b/versions/p-/pangolin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71d44252a59ed3737ec204b4789bcd2d30d5e621", + "version": "0.9.2", + "port-version": 0 + }, { "git-tree": "92ce228116d887cc4f381fadcc85ac3fccdea5ef", "version": "0.8",