commit: 2a2d8d026d6ae11d8d3b48cce8b8e04cd174950e Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sun Oct 6 23:58:29 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Mon Oct 7 00:35:22 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a2d8d02
media-libs/jbig2dec: bump to v0.17 Tests re-enabled. Closes: https://bugs.gentoo.org/324275 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> media-libs/jbig2dec/Manifest | 1 + .../files/jbig2dec-0.17-fix-test_jbig2dec.py.patch | 39 +++++++++++++ media-libs/jbig2dec/jbig2dec-0.17.ebuild | 67 ++++++++++++++++++++++ 3 files changed, 107 insertions(+) diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest index 1dd7dc929e2..51b053cc0e1 100644 --- a/media-libs/jbig2dec/Manifest +++ b/media-libs/jbig2dec/Manifest @@ -1,2 +1,3 @@ DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f831288b27df09bb19dec2f84854cf7fea50b5b041d331e925145f37f2f89848058ecdc074e7d6c238033f SHA512 382890b36345b8aaebb3554e776a53f3276c6d835335ce41f3f41829ff62bba7ae646602544103ba8541a7a824dca92d682b682c254ab2918c7fe45b3e358b45 DIST jbig2dec-0.14.tar.gz 463572 BLAKE2B 91351a3879bd1906fabe2620cf5379fbbc32eaae808a8c2754c661d6dc592d3c9da13c558c8f7ced30c48b73fbd9ed4631f2817298f959b59ad4dff5fce9ac1a SHA512 066bd880ac0665fc1e42b0ae0e481008b125aab6e173b7f82d61a2a30e72c90085cbded9b2a68c6836f92dea3d8d8d5c2228dba76e0d99c79c922197d215705b +DIST jbig2dec-0.17.tar.gz 141195 BLAKE2B 858befb59c0b943cddbc4ae2e9ffc6cdb7e1dd2185cedbffb577f0152f27a548f565548b4b0a4867e3973692b8b019a565eabe2cf672334a6b2994fd7988dcaf SHA512 79b3957186a30fc304ecd571d31c5cc421364921eb4eba242c3ea941ea111f461773f86c975657fa2ce91f2f79ff9abf760ef9bed404c7a4f35c036e5642ba0f diff --git a/media-libs/jbig2dec/files/jbig2dec-0.17-fix-test_jbig2dec.py.patch b/media-libs/jbig2dec/files/jbig2dec-0.17-fix-test_jbig2dec.py.patch new file mode 100644 index 00000000000..e99a298f5de --- /dev/null +++ b/media-libs/jbig2dec/files/jbig2dec-0.17-fix-test_jbig2dec.py.patch @@ -0,0 +1,39 @@ +From c48d802aa6f65cc0284c8aa9824b6ae4e7dd5aa1 Mon Sep 17 00:00:00 2001 +From: Sebastian Rasmussen <seb...@gmail.com> +Date: Fri, 14 Jun 2019 22:18:14 +0200 +Subject: [PATCH] jbig2dec: Make tests expect that some test files return white + image. + +Previously these tests would just error out and jbig2dec would not +return any output file at all. Now, jbig2dec parses as much as +possible, while emitting warning/error messages. In the case of a +few of the test files the end result is a white image. +--- + test_jbig2dec.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/test_jbig2dec.py b/test_jbig2dec.py +index a841438..33008e5 100755 +--- a/test_jbig2dec.py ++++ b/test_jbig2dec.py +@@ -60,6 +60,7 @@ class KnownFileHash(SelfTest): + + # hashes of known test inputs + known_NOTHING_DECODED = "da39a3ee5e6b4b0d3255bfef95601890afd80709" ++ known_WHITE_PAGE_DECODED = "28a6bd83a8a3a36910fbc1f5ce06c962e4332911" + known_042_DECODED = "ebfdf6e2fc5ff3ee2271c2fa19de0e52712046e8" + known_amb_DECODED = "3d4b7992d506894662b53415bd3d0d2a2f8b7953" + +@@ -103,10 +104,10 @@ class KnownFileHash(SelfTest): + known_042_DECODED), + ('../ubc/042_13.jb2', + "7d428bd542f58591b254d9827f554b0552c950a7", +- known_NOTHING_DECODED), ++ known_WHITE_PAGE_DECODED), + ('../ubc/042_14.jb2', + "c40fe3a02acb6359baf9b40fc9c49bc0800be589", +- known_NOTHING_DECODED), ++ known_WHITE_PAGE_DECODED), + ('../ubc/042_15.jb2', + "a9e39fc1ecb178aec9f05039514d75ea3246246c", + known_042_DECODED), diff --git a/media-libs/jbig2dec/jbig2dec-0.17.ebuild b/media-libs/jbig2dec/jbig2dec-0.17.ebuild new file mode 100644 index 00000000000..508755fcedc --- /dev/null +++ b/media-libs/jbig2dec/jbig2dec-0.17.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} ) + +inherit autotools python-any-r1 + +DESCRIPTION="A decoder implementation of the JBIG2 image compression format" +HOMEPAGE="https://jbig2dec.com/"; +SRC_URI="https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="png static-libs test" + +BDEPEND=" + test? ( + app-arch/unzip + ${PYTHON_DEPS} + )" + +RDEPEND="png? ( media-libs/libpng:0= )" +DEPEND="${RDEPEND}" + +DOCS=( CHANGES README ) + +PATCHES=( "${FILESDIR}"/${PN}-0.17-fix-test_jbig2dec.py.patch ) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + if use test; then + mkdir "${WORKDIR}/ubc" || die + mv -v "${WORKDIR}"/*.jb2 "${WORKDIR}/ubc/" || die + mv -v "${WORKDIR}"/*.bmp "${WORKDIR}/ubc/" || die + fi + + # We only need configure.ac and config_types.h.in + sed -i \ + -e '/^# do we need automake?/,/^autoheader/d' \ + -e '/echo " $AUTOM.*/,$d' \ + autogen.sh \ + || die "failed to modify autogen.sh" + + ./autogen.sh || die + + eautoreconf +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_with png libpng) +} + +src_install() { + default + find "${ED}" -name '*.la' -exec rm {} + || die +}
