Date: Fri, 03 Jul 2026 10:25:52 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 09106621f17a - main - graphics/cfdg: update to 3.4.3 Message-ID: <6a478e30.1e52b.26b9927a@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=09106621f17a3c8e00822b7ea46a22140ac78b22 commit 09106621f17a3c8e00822b7ea46a22140ac78b22 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2026-07-02 16:26:48 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-07-03 10:16:18 +0000 graphics/cfdg: update to 3.4.3 A bug fix release. The build scripts now require substantially less patching! Changelog: https://www.contextfreeart.org/downloads.html MFH: 2026Q2 --- graphics/cfdg/Makefile | 8 ++--- graphics/cfdg/distinfo | 6 ++-- graphics/cfdg/files/patch-Makefile | 66 +++++++++----------------------------- 3 files changed, 22 insertions(+), 58 deletions(-) diff --git a/graphics/cfdg/Makefile b/graphics/cfdg/Makefile index 5ce9d6cb65c0..c8fb1e873035 100644 --- a/graphics/cfdg/Makefile +++ b/graphics/cfdg/Makefile @@ -1,6 +1,5 @@ PORTNAME= cfdg -DISTVERSION= 3.4.2 -PORTREVISION= 2 +DISTVERSION= 3.4.3 CATEGORIES= graphics math MASTER_SITES= http://www.contextfreeart.org/download/ \ http://glyphic.s3.amazonaws.com/cfa/download/ @@ -19,7 +18,8 @@ LIB_DEPENDS= libagg.so:graphics/agg \ USES= bison gmake tar:xz MAKE_ARGS= prefix=${PREFIX} \ - DESTDIR=${STAGEDIR} + DESTDIR=${STAGEDIR} \ + CFDG_LIBAGG=yes TEST_TARGET= check CXXFLAGS+= -Wno-register @@ -33,7 +33,7 @@ OPTIONS_DEFINE= EXAMPLES FFMPEG OPTIONS_DEFAULT= FFMPEG FFMPEG_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libx264.so:multimedia/libx264 -FFMPEG_MAKE_ARGS= WANT_FFMPEG=yes +FFMPEG_MAKE_ARGS= CFDG_FFMPEG=yes pre-configure: ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/Makefile diff --git a/graphics/cfdg/distinfo b/graphics/cfdg/distinfo index fdc6757d61da..06ebacfec51a 100644 --- a/graphics/cfdg/distinfo +++ b/graphics/cfdg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1742899725 -SHA256 (ContextFreeSource3.4.2.tar.xz) = af5dd442ea5ca214a87daeca63e338217854922aa1148c443834fcf0a86ebfa3 -SIZE (ContextFreeSource3.4.2.tar.xz) = 3867056 +TIMESTAMP = 1782989265 +SHA256 (ContextFreeSource3.4.3.tar.xz) = 9a279d8cbacb519e316254b0fda57081f5e59fc30d7fa0a438ec5ce638a3beb4 +SIZE (ContextFreeSource3.4.3.tar.xz) = 3868688 diff --git a/graphics/cfdg/files/patch-Makefile b/graphics/cfdg/files/patch-Makefile index e7c2973f5b3e..7fc2ce6b37c7 100644 --- a/graphics/cfdg/files/patch-Makefile +++ b/graphics/cfdg/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2025-03-23 20:30:34 UTC +--- Makefile.orig 2026-06-30 05:32:23 UTC +++ Makefile @@ -19,7 +19,7 @@ INC_DIRS = $(COMMON_DIR) $(UNIX_DIR) $(DERIVED_DIR) $( vpath %.cfdg input @@ -18,62 +18,26 @@ # # Sources and Objects -@@ -69,43 +69,35 @@ INPUT_SRCS = ciliasun_v2.cfdg demo1_v2.cfdg demo2_v2.c +@@ -69,15 +69,16 @@ INPUT_SRCS = ciliasun_v2.cfdg demo1_v2.cfdg demo2_v2.c welcome.cfdg ziggy.cfdg -LIBS = png m +LIBS = m --# Use the first one for clang and the second one for gcc --ifeq ($(shell uname -s), Darwin) -- LIBS += c++ icucore --else + # Use the first one for clang and the second one for gcc + ifeq ($(shell uname -s), Darwin) + LIBS += c++ icucore + else - LIBS += stdc++ atomic icui18n icuuc icudata --endif -+LIBS += stdc++ icui18n icuuc icudata ++ LIBS += stdc++ icuuc icudata + endif ++ # # 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 -+else -+ COMMON_SRCS += ffCanvasDummy.cpp -+endif - --# COMMON_SRCS += ffCanvas.cpp --# LIBS += avformat avcodec swscale swresample avutil z m x264 pthread dl -- --# --# Comment out this line to enable FFmpeg support --# -- --COMMON_SRCS += ffCanvasDummy.cpp -- - SRCS = $(DERIVED_SRCS) $(COMMON_SRCS) $(UNIX_SRCS) - - # - # Configuration for local AGG - # --SRCS += $(AGG_SRCS) --INC_DIRS += $(AGG_DIR) $(AGG_DIR)/agg2 -+#SRCS += $(AGG_SRCS) -+#INC_DIRS += $(AGG_DIR) $(AGG_DIR)/agg2 - - - # - # Configuration for system AGG - # --#LIBS += agg -+LIBS += agg - - - OBJS = $(patsubst %.cpp,$(OBJ_DIR)/%.o,$(SRCS)) -@@ -113,6 +105,7 @@ LINKFLAGS += $(patsubst %,-l%,$(LIBS)) + ifdef CFDG_FFMPEG +@@ -117,6 +118,7 @@ LINKFLAGS += $(patsubst %,-l%,$(LIBS)) LINKFLAGS += $(patsubst %,-L%,$(LIB_DIRS)) LINKFLAGS += $(patsubst %,-l%,$(LIBS)) @@ -81,16 +45,16 @@ LINKFLAGS += -fexceptions deps: $(OBJ_DIR) $(DEPS) -@@ -133,7 +126,7 @@ cfdg: $(OBJS) +@@ -137,7 +139,7 @@ cfdg: $(OBJS) # Under Cygwin replace strip $@ with strip $@.exe cfdg: $(OBJS) - $(LINK.o) $^ $(LINKFLAGS) -o $@ + $(CXX) $^ $(LINKFLAGS) -o $@ + ifndef DEB_BUILD_MAINT_OPTIONS strip $@ - - -@@ -196,7 +189,7 @@ CXXFLAGS += $(patsubst %,-I%,$(INC_DIRS)) + endif +@@ -202,7 +204,7 @@ CXXFLAGS += $(patsubst %,-I%,$(INC_DIRS)) # CXXFLAGS += $(patsubst %,-I%,$(INC_DIRS))home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a478e30.1e52b.26b9927a>