From nobody Sat Mar 9 14:18:58 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TsQBp5xR9z5DJ45; Sat, 9 Mar 2024 14:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TsQBp50DTz49Qm; Sat, 9 Mar 2024 14:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709993938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SPYAnE/gK66WaVmlSSfHgubeN3a7drcp1v/Rcv6nbfc=; b=hHlmMMPn9MIsu8gm3I0QdK9QwVpgOuezLoMDHhC1DTXjTTTrDjLt09sdOrAcL9uyCIRP0R wIUhTCbJcqpNlgXENyvc8/6GUnsNmKpHmdntWriNEK5uMZmw+NZr0dODJ/M7+31GVXVKAf spA7kmw5XElDr2+QL2/RyQx0yHnq2Iyfrj8Dj1wLp5WfELkaUaOsJPXN4RGpHAUvts5lk6 RZ2otp8iLORJK/HTUwuiQQ2lh7TOljVn45bTwvdCkjwmaQ+XuQ01HHUwIrzYtw5Iq4bbsI r1qpQbjpJyhzf1DC9k2B7kvqusP3DInzksPARJPQGb7AR2ZQquAdUP+/jnHJ4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709993938; a=rsa-sha256; cv=none; b=xKuUhD68/pBqYND2z2RCthyew9iImdg3l/Q+F35ciH0cDYk8wQIwod4nqZjplyKzDwfjoB oSgRhiko65S//QSzJeRzfFD/xTl3trwxgNI9PaoNFtHN2n3MpEgqZs+wf3wri4Cq/B89Re AvLAjL+gP065f4vVWbll/M7MMIXXz6tJjG7hzlSmh+dQwYJPRUZn2KfLyFAqzqKJuy09pQ KAC0A0wxGANfVYCs+xXN0jE9AUMNUGxitzVzj7PIuVUgLcXz5ON8a8jo2KZKeIjoDmmNCW FV+tLQ4z23OOhepLdpREd0cpkIsbyfZiZFeLQE6iPJKMU6VQ64om4e3Vp7xm3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709993938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SPYAnE/gK66WaVmlSSfHgubeN3a7drcp1v/Rcv6nbfc=; b=tDsarJxP3Ib8fjYchygrwSW61NdfVHmP3ICYUtyvDjYWnGQun5TqpU7g2s3pNAfpcpKVfr 7JW8felH+E2f2cFTGnC0aOmfHhtdR5DZ1y3+2VZE/nD12ZZZQ2I6x+TYD/hB2QZQy4IY5j IWFwckIxKGaQGsIjAZh1NW0LDHwBaKFZDHR6w3bse+K+hfv+JSsNVIVAo9BONSr8qE/2l/ lyJI1RDHX31lDZ9Vt8MV9UlZfjE7OoWF8fq61UHRQ+3JA3RRbZxzkAYNevXW4JDuWmmByW rtOgddAm9NanfwROPJUu84RULpShUUb8eddEzOxImpy7pv/ZNxgX0/xnc5gE7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TsQBp4c8nz15J3; Sat, 9 Mar 2024 14:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 429EIwmM028779; Sat, 9 Mar 2024 14:18:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 429EIwJ5028776; Sat, 9 Mar 2024 14:18:58 GMT (envelope-from git) Date: Sat, 9 Mar 2024 14:18:58 GMT Message-Id: <202403091418.429EIwJ5028776@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 9e1564bdc210 - main - graphics/hiptext: Fix LICENSE List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e1564bdc210ee3f240983c50712665057420165 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e1564bdc210ee3f240983c50712665057420165 commit 9e1564bdc210ee3f240983c50712665057420165 Author: Po-Chuan Hsieh AuthorDate: 2024-03-09 13:57:23 +0000 Commit: Po-Chuan Hsieh 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 + #include + #include ++#include + #include + #include + +@@ -166,7 +167,7 @@ void Artiste::PrintMovie(Movie movie) { ComputeDimensions(RatioOf(movie.width(), movie.height())); movie.PrepareRGB(width_, height_); HideCursor();