Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 Mar 2024 14:18:58 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 9e1564bdc210 - main - graphics/hiptext: Fix LICENSE
Message-ID:  <202403091418.429EIwJ5028776@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9e1564bdc210ee3f240983c50712665057420165

commit 9e1564bdc210ee3f240983c50712665057420165
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-03-09 13:57:23 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-03-09 14:07:22 +0000

    graphics/hiptext: Fix LICENSE
    
    Reference:      https://github.com/jart/hiptext/commit/da18b54c614beb74b7cb8671ea501caae2f8e85f
    Approved by:    portmgr (blanket)
---
 graphics/hiptext/Makefile               | 10 +++++++---
 graphics/hiptext/files/patch-Makefile   |  9 +++++++++
 graphics/hiptext/files/patch-artiste.cc | 10 +++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/graphics/hiptext/Makefile b/graphics/hiptext/Makefile
index 0281a4b25317..9528cfaa240b 100644
--- a/graphics/hiptext/Makefile
+++ b/graphics/hiptext/Makefile
@@ -7,13 +7,13 @@ MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tool for rendering images and videos inside terminals
 WWW=		https://github.com/jart/hiptext
 
-LICENSE=	NONE
+LICENSE=	APACHE20
 
 BUILD_DEPENDS=	ragel:devel/ragel
 LIB_DEPENDS=	libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libpng.so:graphics/png \
-		libswscale.so:multimedia/ffmpeg \
+		libswscale.so:multimedia/ffmpeg4 \
 		libfreetype.so:print/freetype2
 TEST_DEPENDS=	googletest>=1.7.0:devel/googletest
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
@@ -22,8 +22,12 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	jart
 GH_TAGNAME=	f89b44f
 
-USES=		compiler:c++11-lib gmake jpeg localbase
+USES=		compiler:c++14-lang gmake jpeg localbase
 CPPFLAGS+=	-I${LOCALBASE}/include/freetype2
+CPPFLAGS+=	-I${LOCALBASE}/ffmpeg4/include
+CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
+LDFLAGS+=	-L${LOCALBASE}/lib -lfreetype
+LDFLAGS+=	-L${LOCALBASE}/ffmpeg4/lib
 MAKE_ENV=	GTEST_DIR="${LOCALBASE}" \
 		TARGET_ARCH=""
 TEST_TARGET=	check
diff --git a/graphics/hiptext/files/patch-Makefile b/graphics/hiptext/files/patch-Makefile
index 3c5e6b016a7e..986e21681d00 100644
--- a/graphics/hiptext/files/patch-Makefile
+++ b/graphics/hiptext/files/patch-Makefile
@@ -1,5 +1,14 @@
 --- Makefile.orig	2016-06-21 21:09:17 UTC
 +++ Makefile
+@@ -17,7 +17,7 @@ CXXFLAGS    ?= -g -O3
+ PREFIX      ?= /usr/local
+ TARGET_ARCH ?= -march=native
+ CXXFLAGS    ?= -g -O3
+-CXXFLAGS    += -std=c++11 -Wall -Wextra
++CXXFLAGS    += -std=c++14 -Wall -Wextra
+ CXXFLAGS    += -fno-exceptions -fno-rtti
+ LDLIBS      += -lm -lglog -lgflags -lpng -ljpeg
+ LDLIBS      += -lavcodec -lavformat -lavutil -lswscale
 @@ -48,7 +48,7 @@ check: test
  	./test --alsologtostderr --gtest_color=yes
  
diff --git a/graphics/hiptext/files/patch-artiste.cc b/graphics/hiptext/files/patch-artiste.cc
index 7d4da546d785..304fa46c2d03 100644
--- a/graphics/hiptext/files/patch-artiste.cc
+++ b/graphics/hiptext/files/patch-artiste.cc
@@ -1,6 +1,14 @@
 --- artiste.cc.orig	2016-06-21 21:09:17 UTC
 +++ artiste.cc
-@@ -166,7 +166,7 @@ void Artiste::PrintMovie(Movie movie) {
+@@ -9,6 +9,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/termios.h>
+ #include <sys/select.h>
++#include <unistd.h>
+ #include <gflags/gflags.h>
+ #include <glog/logging.h>
+ 
+@@ -166,7 +167,7 @@ void Artiste::PrintMovie(Movie movie) {
    ComputeDimensions(RatioOf(movie.width(), movie.height()));
    movie.PrepareRGB(width_, height_);
    HideCursor();



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403091418.429EIwJ5028776>