Date: Fri, 17 Jan 2025 12:47:53 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: a8b21719df9f - 2025Q1 - www/lagrange: fix build on armv7, touch up Message-ID: <202501171247.50HClrVs093600@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2025Q1 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=a8b21719df9faf7c4530428bc54df1ee58b06d0e commit a8b21719df9faf7c4530428bc54df1ee58b06d0e Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2025-01-01 16:32:57 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2025-01-17 12:45:33 +0000 www/lagrange: fix build on armv7, touch up - unbundle devel/stb; this fixes the build on armv7 - define option SSE41 only on x86 platforms Approved by: lcook (maintainer timeout) PR: 283773 MFH: 2025Q1 (cherry picked from commit c48a3954186d2bcc77aef1586533227c9252dd28) --- www/lagrange/Makefile | 13 +++++++++++-- www/lagrange/files/patch-CMakeLists.txt | 12 ++++++++++++ www/lagrange/files/patch-src_ui_text__stb.c | 11 +++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/www/lagrange/Makefile b/www/lagrange/Makefile index 4fc6a162c51f..e669252e583b 100644 --- a/www/lagrange/Makefile +++ b/www/lagrange/Makefile @@ -1,5 +1,6 @@ PORTNAME= lagrange DISTVERSION= 1.17.6 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://git.skyjake.fi/gemini/${PORTNAME}/releases/download/v${DISTVERSION}/ @@ -10,7 +11,8 @@ WWW= https://gmi.skyjake.fi/lagrange/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md -BUILD_DEPENDS= zip>0:archivers/zip +BUILD_DEPENDS= zip>0:archivers/zip \ + stb>0:devel/stb LIB_DEPENDS= libfribidi.so:converters/fribidi \ libharfbuzz.so:print/harfbuzz \ libmpg123.so:audio/mpg123 \ @@ -24,11 +26,18 @@ BROKEN_SSL_REASON_libressl= needs features only available in OpenSSL USE_SDL= sdl2 USE_XORG= ice sm x11 xext +CFLAGS+= -I${LOCALBASE}/include/stb + CMAKE_ARGS+= -DTFDN_ENABLE_WARN_ERROR=OFF -OPTIONS_DEFINE= SSE41 +OPTIONS_DEFINE_amd64= SSE41 +OPTIONS_DEFINE_i386= SSE41 +OPTIONS_DEFINE= ${OPTIONS_DEFINE_${ARCH}} SSE41_DESC= Enable SSE4.1 support SSE41_CMAKE_ON= -DTFDN_ENABLE_SSE41:BOOL=ON +post-extract: + ${RM} ${WRKSRC}/src/stb_*.h + .include <bsd.port.mk> diff --git a/www/lagrange/files/patch-CMakeLists.txt b/www/lagrange/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..2a5b0e59cff0 --- /dev/null +++ b/www/lagrange/files/patch-CMakeLists.txt @@ -0,0 +1,12 @@ +--- CMakeLists.txt.orig 2025-01-01 16:28:12 UTC ++++ CMakeLists.txt +@@ -209,9 +209,6 @@ set (SOURCES + src/sitespec.h + src/snippets.c + src/snippets.h +- src/stb_image.h +- src/stb_image_resize2.h +- src/stb_truetype.h + src/updater.h + src/visited.c + src/visited.h diff --git a/www/lagrange/files/patch-src_ui_text__stb.c b/www/lagrange/files/patch-src_ui_text__stb.c new file mode 100644 index 000000000000..e3bc30dc6b01 --- /dev/null +++ b/www/lagrange/files/patch-src_ui_text__stb.c @@ -0,0 +1,11 @@ +--- src/ui/text_stb.c.orig 2025-01-01 16:30:13 UTC ++++ src/ui/text_stb.c +@@ -82,7 +82,7 @@ - Caching FontRuns is quite effective, but there is st + #endif + + #define STB_TRUETYPE_IMPLEMENTATION +-#include "../stb_truetype.h" ++#include "stb_truetype.h" + + iDeclareType(Font) + iDeclareType(Glyph)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501171247.50HClrVs093600>