Attachment #223286 for bug #254304

View | Details | Raw Unified | Return to bug 254304
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	timg
PORTVERSION=	1.2.0
DISTVERSIONPREFIX=	v
CATEGORIES=	graphics

MAINTAINER=	uzsolt@uzsolt.hu
COMMENT=	Terminal Image and Video Viewer

LICENSE=	GPLv2

BUILD_DEPENDS=	pkgconf>0:devel/pkgconf \
		ffmpeg>0:multimedia/ffmpeg
LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg \
		libexif.so:graphics/libexif \
		libGraphicsMagick.so:graphics/GraphicsMagick \
		libpng16.so:graphics/png \
		libturbojpeg.so:graphics/libjpeg-turbo

USES=		cmake compiler:c++11-lang
USE_GITHUB=	yes
GH_ACCOUNT=	hzeller

CMAKE_OFF+=	TIMG_VERSION_FROM_GIT
# timg requires libavutil, contained in multimedia/ffmpeg
# isn't splitted libavcodec, libavutil, etc.
CMAKE_ON+=	WITH_VIDEO_DECODING WITH_VIDEO_DEVICE

PLIST_FILES=	bin/timg man/man1/timg.1.gz

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)graphics/timg/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1593323068	1	TIMESTAMP = 1615796137
2	SHA256 (hzeller-timg-v0.9.8_GH0.tar.gz) = 436e2c3b5f43e906786ca150d11e521281d558329a7bc00198fe30d6907ee8c4	2	SHA256 (hzeller-timg-v1.2.0_GH0.tar.gz) = b0fa8b4571247833167b73d6fe5aab733160c09f56389b97c9e516d0f0f2a5de
3	SIZE (hzeller-timg-v0.9.8_GH0.tar.gz) = 92611	3	SIZE (hzeller-timg-v1.2.0_GH0.tar.gz) = 1024378




--- Makefile.orig	2020-04-30 05:40:03 UTC
+++ Makefile
@@ -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
 	$(CXX) -o $@ $^ $(MAGICK_LDFLAGS)
 
 install: timg
-	install $^ $(PREFIX)/bin
+	install $^ $(DESTDIR)$(PREFIX)/bin
 
 uninstall:
 	rm -f $(PREFIX)/bin/timg




--- timg.cc.orig	2020-04-30 05:40:03 UTC
+++ timg.cc
@@ -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()));
         }
     }
 }
@@ -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());
         }
     }
 

Lines 1-9 Link Here

(-)graphics/timg/pkg-descr (-5 / +6 lines)
1	timg - Terminal Image Viewer	1	timg - Terminal Image and Video Viewer
2		2
3	A viewer that uses 24-Bit color capabilities and unicode	3	A user-friendly viewer that uses 24-Bit color capabilities
4	character blocks to display images in the terminal.	4	and unicode character blocks to display images, animations
5	Displays regular images, plays animated gifs or allows to	5	and videos in the terminal.
6	scroll static images.	6	Displays regular images, plays animated gifs, scrolls
		7	static images and plays videos.
7		8
8	Very useful for if you want to have a quick visual check	9	Very useful for if you want to have a quick visual check
9	without starting a bulky image viewer or in an SSH session.	10	without starting a bulky image viewer or in an SSH session.

Return to bug 254304

Lines 1-27 Link Here

(-)graphics/timg/Makefile (-10 / +15 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= timg	3	PORTNAME= timg
4	PORTVERSION= 0.9.8	4	PORTVERSION= 1.2.0
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	CATEGORIES= graphics	6	CATEGORIES= graphics
7		7
8	MAINTAINER= uzsolt@uzsolt.hu	8	MAINTAINER= uzsolt@uzsolt.hu
9	COMMENT= Terminal Image Viewer	9	COMMENT= Terminal Image and Video Viewer
10		10
11	LICENSE= GPLv2	11	LICENSE= GPLv2
12		12
13	LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6	13	BUILD_DEPENDS= pkgconf>0:devel/pkgconf \
		14	ffmpeg>0:multimedia/ffmpeg
		15	LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \
		16	libexif.so:graphics/libexif \
		17	libGraphicsMagick.so:graphics/GraphicsMagick \
		18	libpng16.so:graphics/png \
		19	libturbojpeg.so:graphics/libjpeg-turbo
14		20
15	USES= compiler:c++11-lang gmake	21	USES= cmake compiler:c++11-lang
16	USE_GITHUB= yes	22	USE_GITHUB= yes
17	GH_ACCOUNT= hzeller	23	GH_ACCOUNT= hzeller
18		24
19	ALL_TARGET= ${PORTNAME}	25	CMAKE_OFF+= TIMG_VERSION_FROM_GIT
20	WRKSRC_SUBDIR= src	26	# timg requires libavutil, contained in multimedia/ffmpeg
		27	# isn't splitted libavcodec, libavutil, etc.
		28	CMAKE_ON+= WITH_VIDEO_DECODING WITH_VIDEO_DEVICE
21		29
22	PLIST_FILES= bin/timg	30	PLIST_FILES= bin/timg man/man1/timg.1.gz
23		31
24	post-install:
25	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
26
27	.include <bsd.port.mk>	32	.include <bsd.port.mk>

Lines 1-21 Link Here

(-)graphics/timg/files/patch-Makefile (-21 lines)
1	--- Makefile.orig 2020-04-30 05:40:03 UTC
2	+++ Makefile
3	@@ -1,13 +1,14 @@
4	-MAGICK_CXXFLAGS=$(shell GraphicsMagick++-config --cppflags)
5	-MAGICK_LDFLAGS=$(shell GraphicsMagick++-config --ldflags --libs)
6	-CXXFLAGS=$(MAGICK_CXXFLAGS) -Wall -O3 -fPIC
7	+MAGICK_CXXFLAGS=$(shell Magick++-config --cppflags)
8	+MAGICK_LDFLAGS=$(shell Magick++-config --ldflags --libs)
9	+CXXFLAGS?=-Wall -O3 -fPIC
10	+CXXFLAGS+=$(MAGICK_CXXFLAGS)
11	PREFIX?=/usr/local
12
13	timg : timg.o terminal-canvas.o
14	$(CXX) -o $@ $^ $(MAGICK_LDFLAGS)
15
16	install: timg
17	- install $^ $(PREFIX)/bin
18	+ install $^ $(DESTDIR)$(PREFIX)/bin
19
20	uninstall:
21	rm -f $(PREFIX)/bin/timg

Lines 1-28 Link Here

(-)graphics/timg/files/patch-timg.cc (-28 lines)
1	--- timg.cc.orig 2020-04-30 05:40:03 UTC
2	+++ timg.cc
3	@@ -66,9 +66,9 @@ void CopyToCanvas(const Magick::Image &img, TerminalCa
4	if (c.alphaQuantum() >= 255)
5	continue;
6	result->SetPixel(x, y,
7	- ScaleQuantumToChar(c.redQuantum()),
8	- ScaleQuantumToChar(c.greenQuantum()),
9	- ScaleQuantumToChar(c.blueQuantum()));
10	+ MagickCore::ScaleQuantumToChar(c.redQuantum()),
11	+ MagickCore::ScaleQuantumToChar(c.greenQuantum()),
12	+ MagickCore::ScaleQuantumToChar(c.blueQuantum()));
13	}
14	}
15	}
16	@@ -271,9 +271,9 @@ void DisplayScrolling(const Magick::Image &img, int sc
17	if (src.alphaQuantum() >= 255)
18	continue;
19	RGBCol &dest = fast_image[y * img_width + x];
20	- dest.r = ScaleQuantumToChar(src.redQuantum());
21	- dest.g = ScaleQuantumToChar(src.greenQuantum());
22	- dest.b = ScaleQuantumToChar(src.blueQuantum());
23	+ dest.r = MagickCore::ScaleQuantumToChar(src.redQuantum());
24	+ dest.g = MagickCore::ScaleQuantumToChar(src.greenQuantum());
25	+ dest.b = MagickCore::ScaleQuantumToChar(src.blueQuantum());
26	}
27	}
28