Attachment #247602 for bug #276266

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




PORTNAME=	img2xterm
PORTVERSION=	1.0.0
DISTVERSIONPREFIX=	v
PORTREVISION=	5
CATEGORIES=	misc

MAINTAINER=	laurent.chardon@gmail.com
COMMENT=	Display images on 256 color xterms
WWW=		https://github.com/kfei/img2xterm

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		gmake magick ncurses
USE_GITHUB=	yes
GH_ACCOUNT=	kfei
USES=		gmake magick:6 ncurses
PLIST_FILES=	bin/img2xterm

.include <bsd.port.pre.mk>




--- Makefile.orig	2017-05-08 16:25:31.094039000 +0200
+++ Makefile	2017-05-08 16:25:49.406674000 +0200
@@ -1,19 +1,3 @@
-PREFIX = /usr/local
-INSTALL = install
-LN = ln -fs
-
-ifeq ($(shell sh -c 'which gcc>/dev/null 2>/dev/null && echo y'), y)
-	CC = gcc
-	CFLAGS = -O2 -Wall
-	LDFLAGS = -s
-endif
-
-ifeq ($(shell sh -c 'uname'), Darwin)
-	CC = clang
-	CFLAGS = -O2 -Wall
-	LDFLAGS =
-endif
-
 ifeq ($(shell sh -c 'which ncurses5-config>/dev/null 2>/dev/null && echo y'), y)
 	DEFS =
 	CFLAGS += $(shell ncurses5-config --cflags)




--- img2xterm.c.orig	2024-01-11 14:08:58 UTC
+++ img2xterm.c
@@ -7,7 +7,7 @@
 #include <sys/ioctl.h>
 #include <limits.h>
 #include <math.h>
-#include <wand/MagickWand.h>
+#include <MagickWand/MagickWand.h>
 #include <unistd.h>
 
 #ifndef NO_CURSES
@@ -288,7 +288,7 @@ void xtermfit(MagickWand* wand)
 	int scaled_width = (int)floor(rs > ri ? wi * hs / hi : ws);
 	int scaled_height = (int)floor(rs > ri ? hs : hi * ws / wi);
 
-	MagickResizeImage(wand, scaled_width, scaled_height, LanczosFilter, 1);
+	MagickResizeImage(wand, scaled_width, scaled_height, LanczosFilter);
 }
 
 void usage(int ret, const char* binname)

Line 1 Link Here

(-)b/misc/img2xterm/pkg-descr (-2 / +3 lines)
1	Display images in terminal	1	img2xterm is a program that can display bitmap images on 256-colour terminals
		2	by converting them into Unicode block characters and xterm compatible control
		3	sequences.
2	-

Return to bug 276266

Lines 1-19 Link Here

(-)b/misc/img2xterm/Makefile (-3 / +3 lines)
1	PORTNAME= img2xterm	1	PORTNAME= img2xterm
2	PORTVERSION= 1.0.0	2	PORTVERSION= 1.0.0
3	DISTVERSIONPREFIX= v	3	DISTVERSIONPREFIX= v
4	PORTREVISION= 4	4	PORTREVISION= 5
5	CATEGORIES= misc	5	CATEGORIES= misc
6		6
7	MAINTAINER= ports@FreeBSD.org	7	MAINTAINER= laurent.chardon@gmail.com
8	COMMENT= Display images on 256 color xterms	8	COMMENT= Display images on 256 color xterms
9	WWW= https://github.com/kfei/img2xterm	9	WWW= https://github.com/kfei/img2xterm
10		10
11	LICENSE= MIT	11	LICENSE= MIT
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
		14	USES= gmake magick ncurses
14	USE_GITHUB= yes	15	USE_GITHUB= yes
15	GH_ACCOUNT= kfei	16	GH_ACCOUNT= kfei
16	USES= gmake magick:6 ncurses
17	PLIST_FILES= bin/img2xterm	17	PLIST_FILES= bin/img2xterm
18		18
19	.include <bsd.port.pre.mk>	19	.include <bsd.port.pre.mk>

Removed Link Here

(-)a/misc/img2xterm/files/patch-Makefile (-22 lines)
1	--- Makefile.orig 2017-05-08 16:25:31.094039000 +0200
2	+++ Makefile 2017-05-08 16:25:49.406674000 +0200
3	@@ -1,19 +1,3 @@
4	-PREFIX = /usr/local
5	-INSTALL = install
6	-LN = ln -fs
7	-
8	-ifeq ($(shell sh -c 'which gcc>/dev/null 2>/dev/null && echo y'), y)
9	- CC = gcc
10	- CFLAGS = -O2 -Wall
11	- LDFLAGS = -s
12	-endif
13	-
14	-ifeq ($(shell sh -c 'uname'), Darwin)
15	- CC = clang
16	- CFLAGS = -O2 -Wall
17	- LDFLAGS =
18	-endif
19	-
20	ifeq ($(shell sh -c 'which ncurses5-config>/dev/null 2>/dev/null && echo y'), y)
21	DEFS =
22	CFLAGS += $(shell ncurses5-config --cflags)

Added Link Here

(-)b/misc/img2xterm/files/patch-img2xterm.c (+20 lines)
1	--- img2xterm.c.orig 2024-01-11 14:08:58 UTC
2	+++ img2xterm.c
3	@@ -7,7 +7,7 @@
4	#include <sys/ioctl.h>
5	#include <limits.h>
6	#include <math.h>
7	-#include <wand/MagickWand.h>
8	+#include <MagickWand/MagickWand.h>
9	#include <unistd.h>
10
11	#ifndef NO_CURSES
12	@@ -288,7 +288,7 @@ void xtermfit(MagickWand* wand)
13	int scaled_width = (int)floor(rs > ri ? wi * hs / hi : ws);
14	int scaled_height = (int)floor(rs > ri ? hs : hi * ws / wi);
15
16	- MagickResizeImage(wand, scaled_width, scaled_height, LanczosFilter, 1);
17	+ MagickResizeImage(wand, scaled_width, scaled_height, LanczosFilter);
18	}
19
20	void usage(int ret, const char* binname)