From nobody Fri Feb 07 06:57:30 2025 X-Original-To: dev-commits-ports-branches@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 4Yq4Xp4Q1zz5mstc; Fri, 07 Feb 2025 06:57:30 +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 4Yq4Xp3DzWz3rwr; Fri, 07 Feb 2025 06:57:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738911450; 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=kD8sEmaOG7yr2v9eMWTRY0p+ntOdqRXmFpT8K931w5U=; b=ydlM9qXp1gfS7+DWk79edy3kVVz8NxUuRsB6iIgURqtRh//y2guJ8hLSD8fzYfaMjyMjme ojMq77JuDL4t5vqLs7HIq3TK1eT9vaUO0iWQqvUw97Oytg4XHBSw9OyPsSlaN6p0310tlk ay1ajlO3vWNWjatxAB9ZIAy/Naahw2B4eck0PaMRnDQIN2ZlHe5FPj6g92ex8RVcNvDVrA hne+JcWvS3uLymZYYVoHDjBHWrCETv4UtFj0CyFu70PNyi9V34J8EpDYnd/GunzTnC35mx mNgZ/YenF6HfFLYryxEEQYorhiT5va8kJsP3JZW4PsEIHAQ0CkLiUA9Unl2P/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738911450; 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=kD8sEmaOG7yr2v9eMWTRY0p+ntOdqRXmFpT8K931w5U=; b=A4E89jeRfhPK7SmXEYUx2Iy+Axnm1UuzTI+RIWMq9hK3W8vsfSThzyvAUqUDuFIqZUBzc1 ajAHHek08mLGCWpKcE1d1UQKhh+zaYrnyg4WMCScZTd1lmizG78Ya3HGsZw73j7XcNyzYQ /sUvfb8so3v4HR/fDaStVpzW0j2HBQNC3S/UJjWJs27CU/oZvW3CjNm4gUbx4yU2B0iXs4 XotzVQjoso03qXjh9KkMLax0iiPTqkqKX5QyOHm7hlIZkNu3SmhCcXFxSh1DlCupcHKQIV WR5GIXchRTYZx9bDPsRlbQpzhb03+rTZo8n2fZj2u47p/78fxNo+3s0x7f+4Pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738911450; a=rsa-sha256; cv=none; b=iYosudQfmhQEzSeYOscbbrwDhM9N2zsYGbkdbwbCsvH97Kg5ciegXNgv9DgbfzzkP7vnQz 2XeCUBBmRqnD4Ed6Ki0tp3/R52nUuP4XQ7br2G0tyd85zC+qZ9zwF6O3kS/25kn7CuMpdt oftaNRvLKv+1DJLXtd0zfi6befUMcAywzkbJOpGp/c5Xz0dhby2LFjRMjQh0wVIbHpXKb+ injYtw9vRaJfcfTxaMVT71n1P7KltcxBD97z7EbWkvUuBSvdFTBLTkPkP7yjCRrRp78b3J LxPvEgpxow0E8qvFclQs68AiQLAspW5C89lsh7YY1RDM/nVIhKcsoWc1h9NXqw== 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 4Yq4Xp2Rnzz1Chs; Fri, 07 Feb 2025 06:57:30 +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 5176vUkJ024942; Fri, 7 Feb 2025 06:57:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5176vUZb024939; Fri, 7 Feb 2025 06:57:30 GMT (envelope-from git) Date: Fri, 7 Feb 2025 06:57:30 GMT Message-Id: <202502070657.5176vUZb024939@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Jason E. Hale" Subject: git: 7b6c71778830 - 2025Q1 - graphics/libcaca: Update to 0.99.beta20 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: 7b6c7177883086680fd159989853854eb848a820 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b6c7177883086680fd159989853854eb848a820 commit 7b6c7177883086680fd159989853854eb848a820 Author: Jason E. Hale AuthorDate: 2025-02-07 06:24:57 +0000 Commit: Jason E. Hale CommitDate: 2025-02-07 06:57:19 +0000 graphics/libcaca: Update to 0.99.beta20 https://github.com/cacalabs/libcaca/releases/tag/v0.99.beta20 MFH: 2025Q1 Security: c10b639c-e51c-11ef-9e76-4ccc6adda413 (cherry picked from commit 8b43babb49aed88e0c011a3d52f2363f1b0fa107) --- graphics/libcaca/Makefile | 61 +++++++++++++------------ graphics/libcaca/distinfo | 5 +- graphics/libcaca/files/patch-src_common-image.c | 16 +++++++ graphics/libcaca/pkg-plist | 13 +----- 4 files changed, 54 insertions(+), 41 deletions(-) diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile index b0f45c9db484..41582a985bb7 100644 --- a/graphics/libcaca/Makefile +++ b/graphics/libcaca/Makefile @@ -1,17 +1,21 @@ PORTNAME= libcaca -DISTVERSION= 0.99.beta19 -PORTREVISION= 5 +DISTVERSION= 0.99.beta20 CATEGORIES= graphics -MASTER_SITES= http://caca.zoy.org/raw-attachment/wiki/libcaca/ +MASTER_SITES= https://github.com/cacalabs/${PORTNAME}/releases/download/v${DISTVERSION}/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Graphics library that outputs text instead of pixels -WWW= http://caca.zoy.org/ +WWW= http://caca.zoy.org/wiki/libcaca \ + https://github.com/cacalabs/libcaca -USES= cpe libtool ncurses pathfix pkgconfig -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +LICENSE= WTFPL +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= cpe libtool localbase ncurses pathfix pkgconfig tar:bz2 +CPE_VENDOR= libcaca_project USE_LDCONFIG= yes + +GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-doc \ --enable-ncurses \ --disable-java \ @@ -22,41 +26,42 @@ CONFIGURE_ARGS= --disable-doc \ --disable-zzuf MAKE_ENV= V=1 INSTALL_TARGET= install-strip -CPE_VENDOR= libcaca_project +TEST_TARGET= check -DOCS= AUTHORS COPYING COPYING.GPL COPYING.LGPL ChangeLog NEWS \ - NOTES README THANKS +PLIST_SUB= SOVERSION=${DISTVERSION:S|beta||} -OPTIONS_DEFINE= X11 IMLIB2 FTGL SLANG DOCS -OPTIONS_DEFAULT= X11 IMLIB2 -X11_DESC= X11 and OpenGL support -FTGL_DESC= Freetype font rendering in OpenGL +PORTDOCS= AUTHORS NEWS NOTES README THANKS + +OPTIONS_DEFINE= DOCS FTGL IMLIB2 SLANG X11 +OPTIONS_DEFAULT= IMLIB2 X11 + +FTGL_DESC= Freetype font rendering in OpenGL +X11_DESC= X11 and OpenGL support + +FTGL_IMPLIES= X11 +FTGL_LIB_DEPENDS= libftgl.so:graphics/ftgl -X11_USES= gl xorg -X11_USE= XORG=x11 GL=glut -X11_CONFIGURE_OFF= --disable-x11 --disable-gl IMLIB2_LIB_DEPENDS= libImlib2.so:graphics/imlib2 -IMLIB2_CONFIGURE_ENABLE= imlib2 +IMLIB2_CONFIGURE_ENABLE=imlib2 + SLANG_LIB_DEPENDS= libslang.so.2:devel/libslang2 SLANG_CONFIGURE_ENABLE= slang=${LOCALBASE} -.include - -.if ${PORT_OPTIONS:MFTGL} && ${PORT_OPTIONS:MX11} -LIB_DEPENDS+= libftgl.so:graphics/ftgl -.endif +X11_USES= gl xorg +X11_USE= GL=gl,glu,glut XORG=x11 +X11_CONFIGURE_ENABLE= gl x11 post-patch: @${REINPLACE_CMD} -e 's|-g -O2 ||g ; s| -fomit-frame-pointer||g ; \ - s|arpa\/inet.h ||g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|: install-docDATA|:|g ; s| csharp||g' \ - ${WRKSRC}/Makefile.in + s| -fno-strength-reduce||g ; s|arpa\/inet.h ||g' \ + ${WRKSRC}/configure post-patch-FTGL-off: - @${REINPLACE_CMD} -e '/PKG_CONFIG.*ftgl/ s|ftgl|no-&|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e '/PKG_CONFIG.*ftgl/ s|ftgl|no-&|' \ + ${WRKSRC}/configure post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include diff --git a/graphics/libcaca/distinfo b/graphics/libcaca/distinfo index 08ce80ac30c8..423b99cbcb87 100644 --- a/graphics/libcaca/distinfo +++ b/graphics/libcaca/distinfo @@ -1,2 +1,3 @@ -SHA256 (libcaca-0.99.beta19.tar.gz) = 128b467c4ed03264c187405172a4e83049342cc8cc2f655f53a2d0ee9d3772f4 -SIZE (libcaca-0.99.beta19.tar.gz) = 1203495 +TIMESTAMP = 1738825012 +SHA256 (libcaca-0.99.beta20.tar.bz2) = ff9aa641af180a59acedc7fc9e663543fb397ff758b5122093158fd628125ac1 +SIZE (libcaca-0.99.beta20.tar.bz2) = 893319 diff --git a/graphics/libcaca/files/patch-src_common-image.c b/graphics/libcaca/files/patch-src_common-image.c new file mode 100644 index 000000000000..df6ecefdd9f6 --- /dev/null +++ b/graphics/libcaca/files/patch-src_common-image.c @@ -0,0 +1,16 @@ +Fix build when the IMLIB2 option is disabled. The _caca_alloc2d symbol +is not exported. + +https://github.com/cacalabs/libcaca/issues/59 + +--- src/common-image.c.orig 2021-10-19 13:49:20 UTC ++++ src/common-image.c +@@ -161,7 +161,7 @@ struct image * load_image(char const * name) + uint32_t depth = (bpp + 7) / 8; + + /* Allocate the pixel buffer */ +- im->pixels = _caca_alloc2d(im->w, im->h, depth); ++ im->pixels = malloc(im->w * im->h * depth); + if (!im->pixels) + { + caca_file_close(f); diff --git a/graphics/libcaca/pkg-plist b/graphics/libcaca/pkg-plist index 3ec180d5c8d9..1db0ba9a1836 100644 --- a/graphics/libcaca/pkg-plist +++ b/graphics/libcaca/pkg-plist @@ -14,11 +14,11 @@ include/caca_types.h lib/libcaca++.a lib/libcaca++.so lib/libcaca++.so.0 -lib/libcaca++.so.0.99.19 +lib/libcaca++.so.%%SOVERSION%% lib/libcaca.a lib/libcaca.so lib/libcaca.so.0 -lib/libcaca.so.0.99.19 +lib/libcaca.so.%%SOVERSION%% libdata/pkgconfig/caca++.pc libdata/pkgconfig/caca.pc share/man/man1/caca-config.1.gz @@ -28,13 +28,4 @@ share/man/man1/cacaplay.1.gz share/man/man1/cacaserver.1.gz share/man/man1/cacaview.1.gz share/man/man1/img2txt.1.gz -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL -%%PORTDOCS%%%%DOCSDIR%%/COPYING.LGPL -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/NOTES -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/THANKS %%DATADIR%%/caca.txt