ports/graphics/cfdg/files/patch-Makefile
Robert Clausecker 7e90d9bac7 graphics/cfdg: update to 3.4.1
Changelog: https://www.contextfreeart.org/downloads.html

Reported by:	diizzy
PR:		270205
2023-03-22 21:15:28 +01:00

98 lines
2.2 KiB
Text

--- 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 := %%LOCALBASE%%/lib $(shell libpng-config --libdir)
#
# Sources and Objects
@@ -69,43 +69,35 @@ 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
- LIBS += stdc++ atomic icui18n icuuc icudata
-endif
+LIBS += stdc++ icui18n icuuc icudata
#
# 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
#
# 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))
+LINKFLAGS += $(shell libpng-config --libs)
LINKFLAGS += -fexceptions
deps: $(OBJ_DIR) $(DEPS)
@@ -133,7 +126,7 @@ $(OBJS): $(OBJ_DIR)/Sentry
# Under Cygwin replace strip $@ with strip $@.exe
cfdg: $(OBJS)
- $(LINK.o) $^ $(LINKFLAGS) -o $@
+ $(CXX) $^ $(LINKFLAGS) -o $@
strip $@
@@ -196,7 +189,7 @@ check: cfdg
#
CXXFLAGS += $(patsubst %,-I%,$(INC_DIRS))
-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