From nobody Fri Feb 07 06:56:37 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 4Yq4Wp0NGYz5msjd; Fri, 07 Feb 2025 06:56:38 +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 4Yq4Wn2xLFz3rSc; Fri, 07 Feb 2025 06:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738911397; 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=LP0P81Tdd/9UUC2D97fmE5Ns+UNTmIE7SjV2tLih/7c=; b=WIUOkCZBelCVtn1WTHgtfH00Fu1cYfHivLha8yNt7wd+NPRfMtf6Y9OHRa2+s0TLRVZJY0 o9IqVW1e1A6gjNwS5oHeKQzbg7g3wooc6xrXDQfxXxHmjyxo0/vpUA5qSBMobkg6E9h/Gy dQ48fFJsA/o0bsOQjXVLPR2ss0FPz0AA08gDsBYEQbckX8/VrB5MUS1+GnlLmp+LkGcsUb Ao2DBYCyXreYSrTRhxgJ7cTL3p52LzYFm4xswSYmEtvNs9CyCAL7vLrjCWIClSzspgkJSR cMJZZr2aa5DRR0hxFObD2iwBxy4SQaZqLiqaWRs6u3SiBQ3d6dCPMgh8lcScfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738911397; 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=LP0P81Tdd/9UUC2D97fmE5Ns+UNTmIE7SjV2tLih/7c=; b=KvJum34aRON0aTmd1HZktLR2xn5xpFJKV1rkw+g7gYlXYqQDAZz2XNzilLxjOoe3rwl+95 p3+UzoVLapgEeLfF4b/CaNqXa/FAS43tq4G7+OIPIRFzAyLNZFVaNWt9VsrdQ3A7WMBylp fM9iiqpVdTnrQncuSobM7bAMRMuenSWD6Mfjj70zFqKp0bb9/gkM3xzohiQn0NETE5oMlD 61m9lAR5s7JxSciejUJ2v4OoqvWVhECH6Zu2xgrsob1f90Tv+HblrFZCnAalxXmLkSCVdS Q7ssStQ+G0thBKRRgvwc70uL8I9JocGT3IspZ9aXWKGu6BWPBp1QzJT7am2FBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738911397; a=rsa-sha256; cv=none; b=F2J4jz+4ENIper03BOtWQ3phvgWdiigM2gfljl23gHbSRhM5ApmL12RoyK4OtMO9Ga5IAb KP13Wjqff2FVr2dxn2d62eIawFYiKUbuYY3XAmORkMy1wRWr8NylMQP0vT+oIZT3hwAaYH sEkxMSCyecKiPqEpkM3bx9h7IuNZFH1baM1cg9PFnDwEJ5F3UlkKb4WG0ZZmy5mzqRNM6e 3fbMprU7FOWgd4yEqBBO8o3J+UToHmfijRdOOTzQX1sBbiw1G4vKg3nrpta/bA45B6A0QU zEboLCLggIcen6XsiYURp0y24f0yl9jJTO4lZ8azumMiGWW0tqr4qZFX5pYdBw== 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 4Yq4Wn1jTXz1Ctq; Fri, 07 Feb 2025 06:56:37 +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 5176ubPk024492; Fri, 7 Feb 2025 06:56:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5176ub93024489; Fri, 7 Feb 2025 06:56:37 GMT (envelope-from git) Date: Fri, 7 Feb 2025 06:56:37 GMT Message-Id: <202502070656.5176ub93024489@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 8b43babb49ae - main - graphics/libcaca: Update to 0.99.beta20 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: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b43babb49aed88e0c011a3d52f2363f1b0fa107 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b43babb49aed88e0c011a3d52f2363f1b0fa107 commit 8b43babb49aed88e0c011a3d52f2363f1b0fa107 Author: Jason E. Hale AuthorDate: 2025-02-07 06:24:57 +0000 Commit: Jason E. Hale CommitDate: 2025-02-07 06:51:01 +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 --- 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