Index: head/graphics/timg/Makefile =================================================================== --- head/graphics/timg/Makefile (revision 541087) +++ head/graphics/timg/Makefile (revision 541088) @@ -1,28 +1,27 @@ # $FreeBSD$ PORTNAME= timg -PORTVERSION= 0.9.5 +PORTVERSION= 0.9.8 DISTVERSIONPREFIX= v -PORTREVISION= 5 CATEGORIES= graphics MAINTAINER= uzsolt@uzsolt.hu COMMENT= Terminal Image Viewer LICENSE= GPLv2 LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 +USES= compiler:c++11-lang gmake USE_GITHUB= yes GH_ACCOUNT= hzeller -USES= compiler:c++11-lang gmake ALL_TARGET= ${PORTNAME} WRKSRC_SUBDIR= src PLIST_FILES= bin/timg post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include Index: head/graphics/timg/distinfo =================================================================== --- head/graphics/timg/distinfo (revision 541087) +++ head/graphics/timg/distinfo (revision 541088) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489942207 -SHA256 (hzeller-timg-v0.9.5_GH0.tar.gz) = 285f51e95bed3d477b585db2998ef10b32c230d64d8015748e45f9a6e013ce48 -SIZE (hzeller-timg-v0.9.5_GH0.tar.gz) = 91623 +TIMESTAMP = 1593323068 +SHA256 (hzeller-timg-v0.9.8_GH0.tar.gz) = 436e2c3b5f43e906786ca150d11e521281d558329a7bc00198fe30d6907ee8c4 +SIZE (hzeller-timg-v0.9.8_GH0.tar.gz) = 92611 Index: head/graphics/timg/files/patch-Makefile =================================================================== --- head/graphics/timg/files/patch-Makefile (revision 541087) +++ head/graphics/timg/files/patch-Makefile (revision 541088) @@ -1,20 +1,21 @@ ---- Makefile.orig 2016-06-27 04:44:39 UTC +--- Makefile.orig 2020-04-30 05:40:03 UTC +++ Makefile -@@ -1,6 +1,6 @@ - CXXFLAGS=-Wall -O3 -fPIC --MAGICK_CXXFLAGS=`GraphicsMagick++-config --cppflags --cxxflags` --MAGICK_LDFLAGS=`GraphicsMagick++-config --ldflags --libs` -+MAGICK_CXXFLAGS=`Magick++-config --cppflags --cxxflags` -+MAGICK_LDFLAGS=`Magick++-config --ldflags --libs` +@@ -1,13 +1,14 @@ +-MAGICK_CXXFLAGS=$(shell GraphicsMagick++-config --cppflags) +-MAGICK_LDFLAGS=$(shell GraphicsMagick++-config --ldflags --libs) +-CXXFLAGS=$(MAGICK_CXXFLAGS) -Wall -O3 -fPIC ++MAGICK_CXXFLAGS=$(shell Magick++-config --cppflags) ++MAGICK_LDFLAGS=$(shell Magick++-config --ldflags --libs) ++CXXFLAGS?=-Wall -O3 -fPIC ++CXXFLAGS+=$(MAGICK_CXXFLAGS) PREFIX?=/usr/local timg : timg.o terminal-canvas.o -@@ -10,7 +10,7 @@ timg.o: timg.cc - $(CXX) $(MAGICK_CXXFLAGS) $(CXXFLAGS) -c -o $@ $^ + $(CXX) -o $@ $^ $(MAGICK_LDFLAGS) install: timg - install $^ $(PREFIX)/bin + install $^ $(DESTDIR)$(PREFIX)/bin - clean: - rm -f timg terminal-canvas.o timg.o + uninstall: + rm -f $(PREFIX)/bin/timg Index: head/graphics/timg/files/patch-timg.cc =================================================================== --- head/graphics/timg/files/patch-timg.cc (revision 541087) +++ head/graphics/timg/files/patch-timg.cc (revision 541088) @@ -1,28 +1,28 @@ ---- timg.cc.orig 2016-06-27 04:44:39 UTC +--- timg.cc.orig 2020-04-30 05:40:03 UTC +++ timg.cc -@@ -66,9 +66,9 @@ void CopyToCanvas(const Magick::Image &i +@@ -66,9 +66,9 @@ void CopyToCanvas(const Magick::Image &img, TerminalCa if (c.alphaQuantum() >= 255) continue; result->SetPixel(x, y, - ScaleQuantumToChar(c.redQuantum()), - ScaleQuantumToChar(c.greenQuantum()), - ScaleQuantumToChar(c.blueQuantum())); + MagickCore::ScaleQuantumToChar(c.redQuantum()), + MagickCore::ScaleQuantumToChar(c.greenQuantum()), + MagickCore::ScaleQuantumToChar(c.blueQuantum())); } } } -@@ -222,9 +222,9 @@ void DisplayScrolling(const Magick::Imag +@@ -271,9 +271,9 @@ void DisplayScrolling(const Magick::Image &img, int sc if (src.alphaQuantum() >= 255) continue; RGBCol &dest = fast_image[y * img_width + x]; - dest.r = ScaleQuantumToChar(src.redQuantum()); - dest.g = ScaleQuantumToChar(src.greenQuantum()); - dest.b = ScaleQuantumToChar(src.blueQuantum()); + dest.r = MagickCore::ScaleQuantumToChar(src.redQuantum()); + dest.g = MagickCore::ScaleQuantumToChar(src.greenQuantum()); + dest.b = MagickCore::ScaleQuantumToChar(src.blueQuantum()); } }