From nobody Fri Jan 17 12:47:53 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YZKJp1yrfz5kx7J; Fri, 17 Jan 2025 12:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YZKJp0yt9z3hVs; Fri, 17 Jan 2025 12:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737118074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eZJ29l1WeV2V3G/gSLgQqSzDlkK2hG8mCFju3esZez0=; b=ZX5GgVoaXUpFcNNKFGIXWtbbD7mCxgcsdhVw9uhh4zUwSrrR5PMXTzjhgc0MTPq1JLMTSF VY0loGVpCN1L6EMOca54WYlQjPQI2mgjzNFcvqpHXorHN0vyizDVp0lu6CCIdFbeFeW1BD XmV5fY2Clr3lT9GPGluxpeUXxMeDx1XJJpw0CXA2nq/dcaAR/rPne1UxPebK0YfZNBJUwy nYO1jftkLG0YZWoEZt6wq032eCTMepgc7UOf92Fr1/TE9SK7POHI6dG2Pb9xbBox5cFyjm vcwpC0qfCC4GSNsuXwp7Jneq80LfHivULDby8CVNSon4ewwIXua53hOJoejyTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737118074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eZJ29l1WeV2V3G/gSLgQqSzDlkK2hG8mCFju3esZez0=; b=WamA9XEj+4EO+H1rvTgL/an25KEZkpIqz05qXJ/GYzc2D3vd00C022j5dt+ye2PCDDsNNu 3Wrraf17OXHcGUnJwMIPzJk0vm1PgTYDtiWORJCFNFVnkRy550kPLAOl1W/vb27j3tR/hA iegN2pzMiUmSTlxC7V+nneXm9VJUWAoKIJ8c/vvE6d6Akq26e0j0dl6g+7M0YbooztYtM/ +24y72NVOvpktCk3X85WrfiCrLkxCKretDG1oq3cUmwCcfP8S0/M6lF+hlj72Zr1JaonNP DYEQc9xcsLkKqBQLiZ8iX98x89dvb5+lSSMqrPSTq3sz1ruRsMMDQlsINA7oMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737118074; a=rsa-sha256; cv=none; b=c92cvdh9npi+xpckJ156wAw943N4SKFwzN6tMZQ32IjYn5iczdWss2Xq65p1GCzGO6FYeR wFejWwm5P7RbEd9AGqv3kgji8/LJUC/ut9nQw4zrxQhGPGTgTM1AYOM6wBYX9ST5u2OQGH SFNlihk+3eAcBx4Ff6AfiSD6zVamnWALIxT2E/0C/BQrhDNkLBi8ayvs0e9ZhowmlY4j4h palJkLLhbEqzkeRVXnnexV8AVLRN50G16+/tG9AnWjoUBuDQ10HLhrBLYSrq+qm0vH1mHX wyyF0ZpuRifl6KkTIQXykUuG54Zys7MAm/wismWVToCoog1eSm/WAcNFeLLcmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YZKJp0GfZz3GZ; Fri, 17 Jan 2025 12:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50HClrWv093603; Fri, 17 Jan 2025 12:47:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HClrVs093600; Fri, 17 Jan 2025 12:47:53 GMT (envelope-from git) Date: Fri, 17 Jan 2025 12:47:53 GMT Message-Id: <202501171247.50HClrVs093600@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: a8b21719df9f - 2025Q1 - www/lagrange: fix build on armv7, touch up List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: a8b21719df9faf7c4530428bc54df1ee58b06d0e Auto-Submitted: auto-generated The branch 2025Q1 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=a8b21719df9faf7c4530428bc54df1ee58b06d0e commit a8b21719df9faf7c4530428bc54df1ee58b06d0e Author: Robert Clausecker AuthorDate: 2025-01-01 16:32:57 +0000 Commit: Robert Clausecker 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 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)