sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 01:26:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

graphics/hdr_tools: Fix against ImageMagicks-6.9.13

Browse source
This commit is contained in:
Loïc Bartoletti 2025-03-30 07:33:36 +02:00
parent 2e94a04c97
commit 438402561a
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
graphics/hdr_tools/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= hdr_tools PORTNAME= hdr_tools
PORTVERSION= 0.0.2010.11.23 # unspecified by the author, so use the date PORTVERSION= 0.0.2010.11.23 # unspecified by the author, so use the date
PORTREVISION= 22 PORTREVISION= 23
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= http://ttic.uchicago.edu/~cotter/projects/hdr_tools/archives/ \ MASTER_SITES= http://ttic.uchicago.edu/~cotter/projects/hdr_tools/archives/ \
http://freebsd.nsu.ru/distfiles/ http://freebsd.nsu.ru/distfiles/

12
graphics/hdr_tools/files/patch-Makefile
View file

@ -1,6 +1,6 @@
--- Makefile.orig 2010-11-23 21:27:55 UTC --- Makefile.orig 2010-11-23 21:27:55 UTC
+++ Makefile +++ Makefile
@@ -31,8 +31,12 @@ DEPENDENCY_HEADERS = \ @@ -31,8 +31,12 @@ ifeq (${PLATFORM},linux)
ifeq (${PLATFORM},linux) ifeq (${PLATFORM},linux)
@ -9,13 +9,13 @@
+CXX?= c++ +CXX?= c++
+CXXFLAGS+= -Wall +CXXFLAGS+= -Wall
+CPPFLAGS+= `pkg-config --cflags popt` `pkg-config --cflags OpenEXR` \ +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` \ +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=%} EXECUTABLES = ${TARGET_SOURCES:%.cc=%}
endif endif
@@ -64,14 +68,24 @@ CFLAGS := -O3 -funroll-loops -fomit-fram @@ -64,14 +68,24 @@ endif
endif endif
@ -33,13 +33,13 @@
+$(TARGET_OBJS) $(DEPENDENCY_OBJS) : $(DEPENDENCY_HEADERS) +$(TARGET_OBJS) $(DEPENDENCY_OBJS) : $(DEPENDENCY_HEADERS)
+$(EXECUTABLES) : $(DEPENDENCY_OBJS) +$(EXECUTABLES) : $(DEPENDENCY_OBJS)
+$(foreach prog,$(EXECUTABLES),$(eval $$prog : $$prog.o)) +$(foreach prog,$(EXECUTABLES),$(eval $$prog : $$prog.o))
+
+%.o : %.cc +%.o : %.cc
+# Clang cannot compile image.cc and squish_luminance.cc with -O2 and above +# Clang cannot compile image.cc and squish_luminance.cc with -O2 and above
+ $(CXX) $(if $(and $(shell $(CXX) -v 2>&1 | grep clang),$(filter \ + $(CXX) $(if $(and $(shell $(CXX) -v 2>&1 | grep clang),$(filter \
+ image.cc squish_luminance.cc,$<)),$(CXXFLAGS:-O%=-O1), \ + image.cc squish_luminance.cc,$<)),$(CXXFLAGS:-O%=-O1), \
+ $(CXXFLAGS)) $(CPPFLAGS) -o $@ -c $< + $(CXXFLAGS)) $(CPPFLAGS) -o $@ -c $<
+
+% : %.o +% : %.o
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ + $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@