<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3332414de7a17e6457a49733a396bb2a0f5bc9b5">https://github.com/macports/macports-ports/commit/3332414de7a17e6457a49733a396bb2a0f5bc9b5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3332414de7a Pangolin: update to 0.8
</span>3332414de7a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3332414de7a17e6457a49733a396bb2a0f5bc9b5
</span>Author: contextnerror <contextnerror@outlook.com>
AuthorDate: Sat Oct 7 17:11:25 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> Pangolin: update to 0.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove patches that were merged upstream
</span><span style='display:block; white-space:pre;color:#404040;'> - Add eigen3 as build dep
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67644
</span>---
graphics/Pangolin/Portfile | 15 +++--
graphics/Pangolin/files/CMakeLists.txt.patch | 12 ----
graphics/Pangolin/files/ffmpeg-4.0.patch | 87 ----------------------------
3 files changed, 7 insertions(+), 107 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Pangolin/Portfile b/graphics/Pangolin/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f3696183b35..f00bd8191d2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Pangolin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/Pangolin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,10 +4,9 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup stevenlovegrove Pangolin 0.5 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup stevenlovegrove Pangolin 0.8 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license MIT
maintainers {@ierofant gmail.com:aw.kornilov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +19,8 @@ long_description Pangolin is a lightweight portable rapid development library
</span> and ui integration, and has a flexible real-time plotter for visualising graphical data.
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:eigen3
</span>
depends_lib-append port:glew \
port:openexr2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +31,10 @@ depends_lib-append port:glew \
</span> port:tiff \
path:lib/libavcodec.dylib:ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5b31d14e8cb1d78cde3f48b9f2576e77e8a5f717 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7d9ac216ae4ef86150a3ced1cfb0bb23572493aae4f7403b1552be4314b766df
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fb486f558f007312c9201a5c327f35690cd7cbb3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 efe6cc84897dc835fde7467fd09d6f309b152b2a46ca310c6a76e8201bb38824 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 694228
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append CMakeLists.txt.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ffmpeg-4.0.patch
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Pangolin/files/CMakeLists.txt.patch b/graphics/Pangolin/files/CMakeLists.txt.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 30b5680057f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Pangolin/files/CMakeLists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2016-10-10 17:16:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2018-03-01 10:21:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,9 +40,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set( CMAKE_CXX_FLAGS "-std=c++0x -Wall -Wextra ${CMAKE_CXX_FLAGS}" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(_CLANG_)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ANDROID)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Pangolin/files/ffmpeg-4.0.patch b/graphics/Pangolin/files/ffmpeg-4.0.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 019e8d3e8ae..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Pangolin/files/ffmpeg-4.0.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,87 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit b56a041ca1586ebaac0659892e5ba381e0a4288d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: ericb <eric.bachard@free.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed Jan 3 18:46:31 2018 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Proposed fix for the Linux (maybe other OSs) issue, because of deprecated CONSTANTS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CMakeModules/FindFFMPEG.cmake b/CMakeModules/FindFFMPEG.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4f77e5a..0f3b6cb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeModules/FindFFMPEG.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeModules/FindFFMPEG.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,8 +60,8 @@ IF(AVCODEC_INCLUDE_DIR AND AVFORMAT_INCLUDE_DIR AND AVUTIL_INCLUDE_DIR AND SWSCA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CHECK_CXX_SOURCE_COMPILES(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#include \"${AVCODEC_INCLUDE_DIR}/libavformat/avformat.h\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sizeof(AVFormatContext::max_analyze_duration2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }" HAVE_FFMPEG_MAX_ANALYZE_DURATION2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sizeof(AVFormatContext::max_analyze_duration);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }" HAVE_FFMPEG_MAX_ANALYZE_DURATION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CHECK_CXX_SOURCE_COMPILES(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#include \"${AVCODEC_INCLUDE_DIR}/libavformat/avformat.h\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/video/drivers/ffmpeg.cpp b/src/video/drivers/ffmpeg.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f0aa6ad..efd48dd 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/video/drivers/ffmpeg.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/video/drivers/ffmpeg.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,6 +34,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <libavutil/mathematics.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace pangolin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,8 +76,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(YUVJ420P);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(YUVJ422P);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(YUVJ444P);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef FF_API_XVMC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(XVMC_MPEG2_MC);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(XVMC_MPEG2_IDCT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(UYVY422);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(UYYVYY411);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(BGR8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,11 +99,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(YUV440P);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(YUVJ440P);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(YUVA420P);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef FF_API_VDPAU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(VDPAU_H264);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(VDPAU_MPEG1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(VDPAU_MPEG2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(VDPAU_WMV3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(VDPAU_VC1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(RGB48BE );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(RGB48LE );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(RGB565BE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -119,7 +125,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(YUV422P16BE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(YUV444P16LE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(YUV444P16BE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef FF_API_VDPAU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(VDPAU_MPEG4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(DXVA2_VLD);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(RGB444BE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_PIX_FMT_RETURN(RGB444LE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -560,6 +568,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int got_packet = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if FF_API_LAVF_FMT_RAWPICTURE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Setup AVPacket
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (recorder.oc->oformat->flags & AVFMT_RAWPICTURE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Raw video case - directly store the picture in the packet */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -569,6 +578,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pkt.pts = frame->pts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* encode the image */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (LIBAVFORMAT_VERSION_MAJOR >= 54)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = avcodec_encode_video2(stream->codec, &pkt, frame, &got_packet);
</span></pre><pre style='margin:0'>
</pre>