diff --git a/x11-toolkits/pangolin/Makefile b/x11-toolkits/pangolin/Makefile index 07dd88c4bf08..728db49d153e 100644 --- a/x11-toolkits/pangolin/Makefile +++ b/x11-toolkits/pangolin/Makefile @@ -1,37 +1,38 @@ PORTNAME= pangolin DISTVERSIONPREFIX= v -DISTVERSION= 0.9.2 -PORTREVISION= 1 +DISTVERSION= 0.9.4 CATEGORIES= x11-toolkits MAINTAINER= yuri@FreeBSD.org COMMENT= Lightweight rapid development library for managing OpenGL display WWW= https://github.com/stevenlovegrove/Pangolin LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libdc1394.so:multimedia/libdc1394 \ liblz4.so:archivers/liblz4 \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libzstd.so:archivers/zstd \ libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon +EXTRA_PATCHES= ${FILESDIR}/fix-build-with-clang.patch:-p1 + USES= cmake compiler:c++17-lang eigen:3 gl jpeg localbase:ldflags pkgconfig xorg USE_XORG= ice sm x11 xext USE_GL= gl glew glu USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= stevenlovegrove GH_PROJECT= Pangolin CMAKE_OFF= BUILD_PANGOLIN_PYTHON LDFLAGS+= -pthread .include diff --git a/x11-toolkits/pangolin/distinfo b/x11-toolkits/pangolin/distinfo index a0cda1ad2518..841c61a5aaee 100644 --- a/x11-toolkits/pangolin/distinfo +++ b/x11-toolkits/pangolin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1722667671 -SHA256 (stevenlovegrove-Pangolin-v0.9.2_GH0.tar.gz) = 348f5c082d69afbb74b1af022d193cc0018ef8032a39409eb3f99c4ac2dd4b1e -SIZE (stevenlovegrove-Pangolin-v0.9.2_GH0.tar.gz) = 709956 +TIMESTAMP = 1764073383 +SHA256 (stevenlovegrove-Pangolin-v0.9.4_GH0.tar.gz) = fb95a354dc64bb151881192703db461a59089f7bcdb2c2c9185cfb5393586d97 +SIZE (stevenlovegrove-Pangolin-v0.9.4_GH0.tar.gz) = 711679 diff --git a/x11-toolkits/pangolin/files/fix-build-with-clang.patch b/x11-toolkits/pangolin/files/fix-build-with-clang.patch new file mode 100644 index 000000000000..7967523a614c --- /dev/null +++ b/x11-toolkits/pangolin/files/fix-build-with-clang.patch @@ -0,0 +1,35 @@ +From fb7c757fb51b6241019a36fc153c47ab69dd83c2 Mon Sep 17 00:00:00 2001 +From: Maurizio Monge +Date: Mon, 13 Oct 2025 12:01:22 +0100 +Subject: [PATCH] fix compilation with CLang + +--- + components/pango_windowing/src/display_x11.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/components/pango_windowing/src/display_x11.cpp b/components/pango_windowing/src/display_x11.cpp +index eac1cde04..e73fef669 100644 +--- a/components/pango_windowing/src/display_x11.cpp ++++ b/components/pango_windowing/src/display_x11.cpp +@@ -431,8 +431,8 @@ void X11Window::ProcessEvents() + { + const int button = ev.xbutton.button-1; + MouseSignal(MouseEvent{ +- (float)ev.xbutton.x, (float)ev.xbutton.y, +- GetEventFlagsFromXState(ev.xkey.state), ++ WindowInputEvent{(float)ev.xbutton.x, (float)ev.xbutton.y, ++ GetEventFlagsFromXState(ev.xkey.state)}, + button, ev.xbutton.type == ButtonPress + }); + break; +@@ -499,8 +499,8 @@ void X11Window::ProcessEvents() + + if(key >=0) { + KeyboardSignal(KeyboardEvent{ +- (float)ev.xkey.x, (float)ev.xkey.y, +- GetEventFlagsFromXState(ev.xkey.state), ++ WindowInputEvent{(float)ev.xkey.x, (float)ev.xkey.y, ++ GetEventFlagsFromXState(ev.xkey.state)}, + (unsigned char)key, ev.type == KeyPress + }); + }