commit: b9cd505e28c74974055727512f06713a23659da2 Author: Jesse De Haan <me <AT> jdeh <DOT> ca> AuthorDate: Sun Nov 23 22:22:25 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jan 10 13:08:15 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9cd505e
media-gfx/jp2a: add 1.3.2, fix ncurses support Signed-off-by: Jesse De Haan <me <AT> jdeh.ca> Part-of: https://github.com/gentoo/gentoo/pull/44753 Closes: https://github.com/gentoo/gentoo/pull/44753 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/jp2a/Manifest | 1 + media-gfx/jp2a/files/jp2a-1.3.2-tinfo.patch | 13 +++++++++++ .../{jp2a-1.2.0.ebuild => jp2a-1.2.0-r1.ebuild} | 19 ++++++++++++---- .../jp2a/{jp2a-1.2.0.ebuild => jp2a-1.3.2.ebuild} | 25 ++++++++++++++++------ 4 files changed, 48 insertions(+), 10 deletions(-) diff --git a/media-gfx/jp2a/Manifest b/media-gfx/jp2a/Manifest index ff6f5553c4b9..5486b2b68395 100644 --- a/media-gfx/jp2a/Manifest +++ b/media-gfx/jp2a/Manifest @@ -1 +1,2 @@ DIST jp2a-1.2.0.tar.bz2 444270 BLAKE2B 819101f7df242b869de0e91b6b6fd6c7d6f7d4bfb1f69a5b0477c9d34a08a46d9f05ad79926b66c2b0fe2ad785a340250bf1493ea8832bf7e40a621cb6b6afa2 SHA512 3f523e0c369b77323d512ff14944c70011280bf75b99e9b1abc0dcfefa706bf56bf0b6bed46c78194bd22c2b98dded65c551777dc75f5f217ebb6513d0a56d60 +DIST jp2a-1.3.2.tar.bz2 514083 BLAKE2B 1807b402159eb0ff8ce698bd615f50e232929948d9606e44cd8d5aa9944a590cd2efae9d28417af061d7067689e0009c7768fe5ee1cf157e09dad7aa1a558a0d SHA512 9c420f2b1ac3097679c97db2e7ebcab9c37651e76b07de4c286c583889180e878d2be0e3615d574f1b18bd761de7e4ec03a0fb5c51530cf270926f09b6e9d92f diff --git a/media-gfx/jp2a/files/jp2a-1.3.2-tinfo.patch b/media-gfx/jp2a/files/jp2a-1.3.2-tinfo.patch new file mode 100644 index 000000000000..218d67fd944c --- /dev/null +++ b/media-gfx/jp2a/files/jp2a-1.3.2-tinfo.patch @@ -0,0 +1,13 @@ +Fix linking against ncurses with tinfo +https://github.com/gentoo/gentoo/pull/24218#issuecomment-1043795319 +--- a/configure.ac ++++ b/configure.ac +@@ -112,7 +112,7 @@ if test "$enable_termlib" = "yes" ; then + # rather ncurses. So we check for it. + TERMLIBS= + # Check for termlib before termcap because Solaris termcap needs libucb. +- TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo" ++ TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo tinfo" + for termlib in ${TERMLIB_VARIANTS}; do + AC_CHECK_LIB(${termlib}, tgetent, + [TERMLIBS="${TERMLIBS} -l${termlib}"; break]) diff --git a/media-gfx/jp2a/jp2a-1.2.0.ebuild b/media-gfx/jp2a/jp2a-1.2.0-r1.ebuild similarity index 71% copy from media-gfx/jp2a/jp2a-1.2.0.ebuild copy to media-gfx/jp2a/jp2a-1.2.0-r1.ebuild index d2ba1d187923..bd667b639f4d 100644 --- a/media-gfx/jp2a/jp2a-1.2.0.ebuild +++ b/media-gfx/jp2a/jp2a-1.2.0-r1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit autotools + DESCRIPTION="JPEG/PNG image to ASCII art converter" HOMEPAGE="https://github.com/Talinx/jp2a/"; SRC_URI="https://github.com/Talinx/jp2a/releases/download/v${PV}/${P}.tar.bz2"; @@ -12,13 +14,22 @@ SLOT="0" KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" IUSE="curl" -# TODO: restore ncurses support? -# See https://github.com/gentoo/gentoo/pull/24218#issuecomment-1043795319 RDEPEND="media-libs/libjpeg-turbo:= media-libs/libpng - curl? ( net-misc/curl )" + curl? ( net-misc/curl ) + sys-libs/ncurses:=" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-1.3.2-tinfo.patch" +) + src_configure() { econf $(use_enable curl) } + +src_prepare() { + default + + eautoreconf +} diff --git a/media-gfx/jp2a/jp2a-1.2.0.ebuild b/media-gfx/jp2a/jp2a-1.3.2.ebuild similarity index 51% rename from media-gfx/jp2a/jp2a-1.2.0.ebuild rename to media-gfx/jp2a/jp2a-1.3.2.ebuild index d2ba1d187923..2c42e883c3f6 100644 --- a/media-gfx/jp2a/jp2a-1.2.0.ebuild +++ b/media-gfx/jp2a/jp2a-1.3.2.ebuild @@ -1,24 +1,37 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit autotools + DESCRIPTION="JPEG/PNG image to ASCII art converter" HOMEPAGE="https://github.com/Talinx/jp2a/"; SRC_URI="https://github.com/Talinx/jp2a/releases/download/v${PV}/${P}.tar.bz2"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" IUSE="curl" -# TODO: restore ncurses support? -# See https://github.com/gentoo/gentoo/pull/24218#issuecomment-1043795319 -RDEPEND="media-libs/libjpeg-turbo:= +RDEPEND="media-libs/libexif + media-libs/libjpeg-turbo:= media-libs/libpng - curl? ( net-misc/curl )" + media-libs/libwebp + curl? ( net-misc/curl ) + sys-libs/ncurses:=" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-1.3.2-tinfo.patch" +) + src_configure() { econf $(use_enable curl) } + +src_prepare() { + default + + eautoreconf +}
