From nobody Wed Mar 22 20:17:18 2023 X-Original-To: dev-commits-ports-main@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 4PhfsB43shz41FZ0; Wed, 22 Mar 2023 20:17:18 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhfsB3Zhrz4N80; Wed, 22 Mar 2023 20:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679516238; 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=9EAByuFNXIO2UwBaJDYKCF1nCNnCjWc171c3zZaNI8Q=; b=syUqYECx1OLqxqnGJtXfQBcZhITQ09t0Lem/HrFUlL7jXiHHeAimUOFOLMpJ5HPTaeaBY9 wmMu1amvODui8AeRbODTP+ojTTHbtxqYGuV7emHJ7/cQzVo/VbxPcAiR1QcDh5nltNnyv/ h4Xj3TFIK3O66BcD5TIu2GJu8k+CtxpD46W96Ig9yoOtHVtr7ra3cTHoiAjSQewuTJo49b gOSGZYtkLl/COeuVcCK/J4SR85ZOrIfbJnhg+bZh6Hnqq+NrG2U8rlb0mwze6yElV+2hfa Ky1Re54q6MJ306ZN9gOltBsSgcH6dznjYNp3P8SClPt/0XswSOGvBs/ucu1iWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679516238; 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=9EAByuFNXIO2UwBaJDYKCF1nCNnCjWc171c3zZaNI8Q=; b=qNreBVimmBQXuxxEb8mEhyxKS/uQVHWNsMTwUL7mjgtxF2rVzjl3ERkkPmURKCx5w1d6nB u1JB7bqQRQsDTzshSa5zxzmMcUwncC4HkvEDjxzhd9fFUg56VFxZ/IBBcGuXpSdJeCUqpf YCh5/KScYVAWzAXPDeo971QSq8ohgYCWn8wVGUvyaWnaQor+NQ5g+B6HmH9hFxuAI5VJ6R NmP8rb/B9rDF4tHK+AQJtK/uPcYC6UugW2AnZ54t60ItUFAQtHUfbE7OunQh7BJs5z7TIM QjOOiUzB3NHVStsX72eom85SEX+HwdaiSdQ7ocZBb6N7Y0YmUAxs9gbQIYJhrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679516238; a=rsa-sha256; cv=none; b=KtKNNEaDOmJ3dsNVBgI7IMGJSj5E9ywNSBa7tHcxYngLPcIiuE5gl3WExvP9RXeRoLPWjn KVwg/nBSCmCV64z7UFzej+iLMeRKJYOTtTNcwzNv2EPb4TYWaqDwLbIAu3tBX9b5yRYpHE +dve0CfWPTRH/BhUX6+gDSkaxkWZnZ9oVj5N4BKDTGwNq3EIgyFg9+1jJXg/pWnnT3Pj+h EyXirEI5CwlPZJ3LKfnGcTBfK2+R0DhUqegiZ1KJ9IslGVTjQ7BDS317FHw4VqPPKEJ+0n MFvApnyUW1Qe75QJVn+JwSJBJLAGisngH2U4xTKTwJloOC0Slc0mQL+teSiMsg== 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 4PhfsB2LKmz16yr; Wed, 22 Mar 2023 20:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MKHI9F087163; Wed, 22 Mar 2023 20:17:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MKHIT5087162; Wed, 22 Mar 2023 20:17:18 GMT (envelope-from git) Date: Wed, 22 Mar 2023 20:17:18 GMT Message-Id: <202303222017.32MKHIT5087162@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 7e90d9bac7fd - main - graphics/cfdg: update to 3.4.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 7e90d9bac7fd81a6f3719baf8065f1257b0f37db Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e90d9bac7fd81a6f3719baf8065f1257b0f37db commit 7e90d9bac7fd81a6f3719baf8065f1257b0f37db Author: Robert Clausecker AuthorDate: 2023-03-21 16:19:57 +0000 Commit: Robert Clausecker CommitDate: 2023-03-22 20:15:28 +0000 graphics/cfdg: update to 3.4.1 Changelog: https://www.contextfreeart.org/downloads.html Reported by: diizzy PR: 270205 --- graphics/cfdg/Makefile | 15 ++++++---- graphics/cfdg/distinfo | 6 ++-- graphics/cfdg/files/patch-Makefile | 42 ++++++++++++++++++++------- graphics/cfdg/files/patch-src-common_cfdg.ypp | 2 +- 4 files changed, 46 insertions(+), 19 deletions(-) diff --git a/graphics/cfdg/Makefile b/graphics/cfdg/Makefile index 54359b5f05d1..0bce0cead324 100644 --- a/graphics/cfdg/Makefile +++ b/graphics/cfdg/Makefile @@ -1,10 +1,9 @@ PORTNAME= cfdg -PORTVERSION= 3.3 -PORTREVISION= 4 +DISTVERSION= 3.4.1 CATEGORIES= graphics math MASTER_SITES= http://www.contextfreeart.org/download/ \ http://glyphic.s3.amazonaws.com/cfa/download/ -DISTNAME= ContextFreeSource${PORTVERSION} +DISTNAME= ContextFreeSource${DISTVERSION} MAINTAINER= fuz@FreeBSD.org COMMENT= Context Free Design Grammar compiler @@ -20,7 +19,13 @@ USES= bison gmake tar:xz MAKE_ARGS= prefix=${PREFIX} \ DESTDIR=${STAGEDIR} TEST_TARGET= check -NO_WRKSUBDIR= yes +CXXFLAGS+= -Wno-register + +# graphics/agg cannot be unbundled: version in ports too outdated +# furthermore, its header files conflict with the headers bundled by cfdg +CONFLICTS_BUILD= agg + +WRKSRC= ${WRKDIR}/context-free${DISTVERSION} PLIST_FILES= bin/cfdg \ share/man/man1/cfdg.1.gz @@ -33,7 +38,7 @@ FFMPEG_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ FFMPEG_MAKE_ARGS= WANT_FFMPEG=yes post-patch: - ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/Makefile do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/graphics/cfdg/distinfo b/graphics/cfdg/distinfo index 1b64578873fd..37f3f78c735d 100644 --- a/graphics/cfdg/distinfo +++ b/graphics/cfdg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633352475 -SHA256 (ContextFreeSource3.3.tar.xz) = f0b9b3622d7e729d867a5e5a9f8d1e9a134f019215fdde553c11b523416291c8 -SIZE (ContextFreeSource3.3.tar.xz) = 2684008 +TIMESTAMP = 1679405487 +SHA256 (ContextFreeSource3.4.1.tar.xz) = d8a496a61a5de970a29214c161dd59ed2fc6ddcecc631bc50bf773131f76d698 +SIZE (ContextFreeSource3.4.1.tar.xz) = 3097376 diff --git a/graphics/cfdg/files/patch-Makefile b/graphics/cfdg/files/patch-Makefile index 15e6c8f49045..8e9f7710ae11 100644 --- a/graphics/cfdg/files/patch-Makefile +++ b/graphics/cfdg/files/patch-Makefile @@ -1,15 +1,24 @@ ---- Makefile.orig 2020-04-10 19:38:18 UTC +--- Makefile.orig 2023-02-04 00:34:00 UTC +++ Makefile +@@ -19,7 +19,7 @@ vpath %.cpp $(SRC_DIRS) + vpath %.cfdg input + + INC_DIRS = $(COMMON_DIR) $(UNIX_DIR) $(DERIVED_DIR) $(COMMON_DIR)/agg-extras +-INC_DIRS += /usr/local/include ++INC_DIRS += %%LOCALBASE%%/include + + # + # Installation directories @@ -34,7 +34,7 @@ MAN_DIR = $(DESTDIR)$(prefix)/share/man # Library directories for FFmpeg and libpng # -LIB_DIRS = /usr/local/lib -+LIB_DIRS = /usr/local/lib $(shell libpng-config --libdir) ++LIB_DIRS := %%LOCALBASE%%/lib $(shell libpng-config --libdir) # # Sources and Objects -@@ -69,30 +69,20 @@ INPUT_SRCS = ciliasun_v2.cfdg demo1_v2.cfdg demo2_v2.c +@@ -69,43 +69,35 @@ INPUT_SRCS = ciliasun_v2.cfdg demo1_v2.cfdg demo2_v2.c welcome.cfdg ziggy.cfdg @@ -27,8 +36,8 @@ # # FFmpeg support # --# Uncomment these lines to enable FFmpeg support --# + # Uncomment these lines to enable FFmpeg support + # +ifeq ($(WANT_FFMPEG), yes) + COMMON_SRCS += ffCanvas.cpp + LIBS += avformat avcodec swscale swresample avutil z m x264 pthread dl @@ -48,7 +57,20 @@ SRCS = $(DERIVED_SRCS) $(COMMON_SRCS) $(UNIX_SRCS) # -@@ -113,6 +103,7 @@ DEPS = $(patsubst %.o,%.d,$(OBJS)) + # Configuration for local AGG + # + SRCS += $(AGG_SRCS) + INC_DIRS += $(AGG_DIR) $(AGG_DIR)/agg2 + + + # + # Configuration for system AGG + # + #LIBS += agg + + + OBJS = $(patsubst %.cpp,$(OBJ_DIR)/%.o,$(SRCS)) +@@ -113,6 +105,7 @@ DEPS = $(patsubst %.o,%.d,$(OBJS)) LINKFLAGS += $(patsubst %,-L%,$(LIB_DIRS)) LINKFLAGS += $(patsubst %,-l%,$(LIBS)) @@ -56,7 +78,7 @@ LINKFLAGS += -fexceptions deps: $(OBJ_DIR) $(DEPS) -@@ -133,7 +124,7 @@ $(OBJS): $(OBJ_DIR)/Sentry +@@ -133,7 +126,7 @@ $(OBJS): $(OBJ_DIR)/Sentry # Under Cygwin replace strip $@ with strip $@.exe cfdg: $(OBJS) @@ -65,12 +87,12 @@ strip $@ -@@ -196,7 +187,7 @@ check: cfdg +@@ -196,7 +189,7 @@ check: cfdg # CXXFLAGS += $(patsubst %,-I%,$(INC_DIRS)) --CXXFLAGS += -O2 -Wall -Wextra -march=native -Wno-parentheses -std=c++14 -+CXXFLAGS += -Wall -Wextra -Wno-parentheses -std=c++14 +-CXXFLAGS += -O2 -Wall -Wextra -Wno-parentheses -std=c++17 ++CXXFLAGS += -Wall -Wextra -Wno-parentheses -std=c++17 CXXFLAGS += -g -D_GLIBCXX_USE_C99_MATH=1 CPPFLAGS += -DNDEBUG diff --git a/graphics/cfdg/files/patch-src-common_cfdg.ypp b/graphics/cfdg/files/patch-src-common_cfdg.ypp index f94bb67debde..f88ed7e89019 100644 --- a/graphics/cfdg/files/patch-src-common_cfdg.ypp +++ b/graphics/cfdg/files/patch-src-common_cfdg.ypp @@ -1,4 +1,4 @@ ---- src-common/cfdg.ypp.orig 2021-10-04 13:54:54 UTC +--- src-common/cfdg.ypp.orig 2023-02-04 00:34:00 UTC +++ src-common/cfdg.ypp @@ -31,7 +31,7 @@ %skeleton "lalr1.cc" /* -*- C++ -*- */