git: 438402561a87 - main - graphics/hdr_tools: Fix against ImageMagicks-6.9.13
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 30 Mar 2025 06:00:15 UTC
The branch main has been updated by lbartoletti:
URL: https://cgit.FreeBSD.org/ports/commit/?id=438402561a878e42fdf34525087277704efe54ec
commit 438402561a878e42fdf34525087277704efe54ec
Author: Loïc Bartoletti <lbartoletti@FreeBSD.org>
AuthorDate: 2025-03-30 05:33:36 +0000
Commit: Loïc Bartoletti <lbartoletti@FreeBSD.org>
CommitDate: 2025-03-30 06:00:01 +0000
graphics/hdr_tools: Fix against ImageMagicks-6.9.13
---
graphics/hdr_tools/Makefile | 2 +-
graphics/hdr_tools/files/patch-Makefile | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/graphics/hdr_tools/Makefile b/graphics/hdr_tools/Makefile
index 9415af13f543..322e80373701 100644
--- a/graphics/hdr_tools/Makefile
+++ b/graphics/hdr_tools/Makefile
@@ -1,6 +1,6 @@
PORTNAME= hdr_tools
PORTVERSION= 0.0.2010.11.23 # unspecified by the author, so use the date
-PORTREVISION= 22
+PORTREVISION= 23
CATEGORIES= graphics
MASTER_SITES= http://ttic.uchicago.edu/~cotter/projects/hdr_tools/archives/ \
http://freebsd.nsu.ru/distfiles/
diff --git a/graphics/hdr_tools/files/patch-Makefile b/graphics/hdr_tools/files/patch-Makefile
index cefbf82256e5..c00bb47d8134 100644
--- a/graphics/hdr_tools/files/patch-Makefile
+++ b/graphics/hdr_tools/files/patch-Makefile
@@ -1,6 +1,6 @@
--- Makefile.orig 2010-11-23 21:27:55 UTC
+++ Makefile
-@@ -31,8 +31,12 @@ DEPENDENCY_HEADERS = \
+@@ -31,8 +31,12 @@ ifeq (${PLATFORM},linux)
ifeq (${PLATFORM},linux)
@@ -9,13 +9,13 @@
+CXX?= c++
+CXXFLAGS+= -Wall
+CPPFLAGS+= `pkg-config --cflags popt` `pkg-config --cflags OpenEXR` \
-+ `Magick++-config --cppflags`
++ `pkg-config --cflags Magick++`
+LDFLAGS+= `pkg-config --libs popt` `pkg-config --libs libtiff-4` \
-+ `pkg-config --libs OpenEXR` `Magick++-config --libs`
++ `pkg-config --libs OpenEXR` `pkg-config --libs Magick++`
EXECUTABLES = ${TARGET_SOURCES:%.cc=%}
endif
-@@ -64,14 +68,24 @@ CFLAGS := -O3 -funroll-loops -fomit-fram
+@@ -64,14 +68,24 @@ endif
endif
@@ -33,13 +33,13 @@
+$(TARGET_OBJS) $(DEPENDENCY_OBJS) : $(DEPENDENCY_HEADERS)
+$(EXECUTABLES) : $(DEPENDENCY_OBJS)
+$(foreach prog,$(EXECUTABLES),$(eval $$prog : $$prog.o))
-+
+
+%.o : %.cc
+# Clang cannot compile image.cc and squish_luminance.cc with -O2 and above
+ $(CXX) $(if $(and $(shell $(CXX) -v 2>&1 | grep clang),$(filter \
+ image.cc squish_luminance.cc,$<)),$(CXXFLAGS:-O%=-O1), \
+ $(CXXFLAGS)) $(CPPFLAGS) -o $@ -c $<
-
++
+% : %.o
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@