From 0fd62365fc104d7e6d5f3ef67800df09225a4019 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 9 Mar 2023 12:02:14 +0000 Subject: gentoo auto-resync : 09:03:2023 - 12:02:14 --- media-libs/Manifest.gz | Bin 68087 -> 68077 bytes media-libs/jbig2dec/Manifest | 4 +- media-libs/jbig2dec/jbig2dec-0.19.ebuild | 13 ++-- media-libs/jbig2dec/metadata.xml | 1 + media-libs/jbig2enc/Manifest | 5 +- .../files/jbig2enc-0.29-leptonica-1.83.patch | 81 +++++++++++++++++++++ media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild | 40 ---------- media-libs/jbig2enc/jbig2enc-0.29-r1.ebuild | 41 +++++++++++ media-libs/jbig2enc/jbig2enc-0.29.ebuild | 37 ---------- 9 files changed, 133 insertions(+), 89 deletions(-) create mode 100644 media-libs/jbig2enc/files/jbig2enc-0.29-leptonica-1.83.patch delete mode 100644 media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild create mode 100644 media-libs/jbig2enc/jbig2enc-0.29-r1.ebuild delete mode 100644 media-libs/jbig2enc/jbig2enc-0.29.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index fd43c96aa70d..9bfeabc9b903 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest index c63f2c9088dd..aafe67d4708f 100644 --- a/media-libs/jbig2dec/Manifest +++ b/media-libs/jbig2dec/Manifest @@ -1,4 +1,4 @@ DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f831288b27df09bb19dec2f84854cf7fea50b5b041d331e925145f37f2f89848058ecdc074e7d6c238033f SHA512 382890b36345b8aaebb3554e776a53f3276c6d835335ce41f3f41829ff62bba7ae646602544103ba8541a7a824dca92d682b682c254ab2918c7fe45b3e358b45 DIST jbig2dec-0.19.tar.gz 149134 BLAKE2B 576f3a516499b6291d25dfdefe5af62899665167526dca11435bc07e04a3feb707f82d3a8bdda774f5cfe0d792c3147e77aa94fa57feac25ba1c0a7805c5fc58 SHA512 d5a27951cc9c06c184f454e258e81b6e4d5aa2742a4da821522b9a42ecc78e7e1b78058dabc23821618e62d62d8832011f16b5ef2d66beac463da6b809fd02af -EBUILD jbig2dec-0.19.ebuild 1547 BLAKE2B e570643378df4e2f6d9878a06d3e279fa7e1ea4c8b0c82bd3c2124d75fe2699deebd019e84651f9a4536e2bc03b79d484fbaa20a95cf9f076ea4876f6fa701a2 SHA512 7b5abc97b6c73039d805181e060bd64b6418d2377442974674fd3dbfdcfbdbb975b071a2770d1c711f01f0b8698d409082cf59ab1f8f6577a07ad83dd0850ad9 -MISC metadata.xml 348 BLAKE2B 69c50a21635cd4c1697946908019f36e70d5da9f33c6e19daf4cdec1f2a45c4db67997adefae53dde729a3fe9f937a4d8d9c7cb82005d806158c97d703560cc3 SHA512 b28d9f8ef1020c066786501141665c32752bd5b281ddf609dcefd23366aff157b7dcb38e1b3ed1507cf6e44f077dbdbaadc8072230645cd4d67176e03ab44b63 +EBUILD jbig2dec-0.19.ebuild 1546 BLAKE2B 656e6410bb044db7473282ca07a36086fff1992005c367eb47b4570c030df32e86f8a39c96c8486b2be82c0f9db22758ee0eaaef510d8402ab6a8665dde2311f SHA512 24e8197852b7043cf581e3b8f4a396776e75a003666715acd4b6be3e9737891b8e0ada7795dbde0dceccf548103e774b1c8ed4994aebc38da7c9c92691923952 +MISC metadata.xml 414 BLAKE2B cae9b25dd53d68c263a4afe3c1a18c02923fd665b60791df7d0b9b55d82184159c5c1ced1786bd443d38668b1f12b083191cb1da4e9a576c5da5e4d36828d56c SHA512 1e5bcded3676b4d336781551dcd875e1d7cc5532eaf13cbf013799c225f94967c8f592707492cf8908a65d76e473452fa5b0419fbaea73f1c718660e65ffdcba diff --git a/media-libs/jbig2dec/jbig2dec-0.19.ebuild b/media-libs/jbig2dec/jbig2dec-0.19.ebuild index 72981df9aafa..4279502e8dfc 100644 --- a/media-libs/jbig2dec/jbig2dec-0.19.ebuild +++ b/media-libs/jbig2dec/jbig2dec-0.19.ebuild @@ -3,14 +3,15 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..10} ) - +PYTHON_COMPAT=( python3_{9..11} ) 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 )" +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/$(ver_cut 1-2)" #698428 @@ -24,8 +25,7 @@ BDEPEND=" ${PYTHON_DEPS} ) " - -RDEPEND="png? ( media-libs/libpng:0= )" +RDEPEND="png? ( media-libs/libpng:= )" DEPEND="${RDEPEND}" DOCS=( CHANGES README ) @@ -51,7 +51,6 @@ src_prepare() { || die "failed to modify autogen.sh" ./autogen.sh || die - eautoreconf } diff --git a/media-libs/jbig2dec/metadata.xml b/media-libs/jbig2dec/metadata.xml index f22e80b0fd93..72a1ba67bc0c 100644 --- a/media-libs/jbig2dec/metadata.xml +++ b/media-libs/jbig2dec/metadata.xml @@ -7,5 +7,6 @@ jbig2dec + ArtifexSoftware/jbig2dec diff --git a/media-libs/jbig2enc/Manifest b/media-libs/jbig2enc/Manifest index 7bdb5052bf25..63b75eb2e7e7 100644 --- a/media-libs/jbig2enc/Manifest +++ b/media-libs/jbig2enc/Manifest @@ -1,6 +1,5 @@ AUX jbig2enc-0.28-leptonica-1.70.patch 1681 BLAKE2B 78de2dd85258d277114c9fdd60e587bdf833211cb8cbcf12856ad3a26647e20c9b713f77a9dc84f983f0d19e38b59a086bf514a0ee81df186b7bad4760ea669c SHA512 2c9999dde1156df91616e42e051b5e0b81339cb818a9c0fd0592c0d77c4b741c80ac876576a7bc87b990e09af587df5e095c87d8893308100b37188e9640d738 -DIST jbig2enc-0.28.tar.gz 39879 BLAKE2B 08cbb2f2a5277085a592d18a8db529d2e5f79f69eaa5392f2b06b920f7d1651c3c73795ba2e43ae843fd5720a1406633b5429ab0b1fe260a6308da4cf10868b9 SHA512 81d194fb648fe7a866302796fd5e2adbb213d52193a279a94dbc5918ce3480561ea204e8497125eed5d6c6e4c6d089f7f35a89ef98bc484ca753ffde23e444c6 +AUX jbig2enc-0.29-leptonica-1.83.patch 2790 BLAKE2B 54f920c19e0644c8927c725eeaae839267254894d608cdbfbee054438fdc417051c7ac6f1c0a261abe0ae59d0706c57a984c005c03b35c8a6e1964d37f203233 SHA512 fab93d41438dc7b5f25b9522941ab4d234d66a7cf6665038ff4b42992bee6830b7a81d2303de6eaa939c5357a97dae770049162a3ab76d06db346a65c7c4d6c1 DIST jbig2enc-0.29.tar.gz 1108212 BLAKE2B 44efc2afecb2ca581711c58e9abfed7ae790053e6a725012cb6e68c5c52b6d89d071a115bf1fb9ea2c15de64e03e889dd47d9d36a0e707f039de55029d33633a SHA512 aa50cdaf61ef0ae473c8139d8da2a4c374450f8d0d31e2260031e8086dab9201c303c86d50cd51427135bef500718cbc3a53baabf2bf505f8908c22a3d361c51 -EBUILD jbig2enc-0.28-r1.ebuild 929 BLAKE2B 9b6a77d22c87b1a8f8ab12cb9eb13944c878497fe0f0c7dfaf1cf793f8fa4a8d8a94f2f3a1faa27fcb1207846be51e0eb3219e26d82ac4a9877c4b50875cdd24 SHA512 1daa8bec55140e1213b8be8dce06095bfac67ff01a9377846b07997547c7a9a6cd4008b64c235ebc974544bce6ab23307a7d951de60f21707e413d43eb8c3217 -EBUILD jbig2enc-0.29.ebuild 922 BLAKE2B 1cf3c6329e6e0522908a2ae9fbcdf30c61d6db28d99c91ec994d8b99ff323ddef97a2dcc09d00094c56cc4dd70592b21391878d2f578dceb9796a90a668a3f11 SHA512 bbaf7bf191612f99ba11da3999c4b5566ded2052aa30603a0309b8d32037f12c44182abb5a70c8d092cfcc5b2b4732f84c87c79fed992773d23b2ae13243b4e0 +EBUILD jbig2enc-0.29-r1.ebuild 976 BLAKE2B fa65322747c8c885c43811f354e3f94db59ce952233f6a6516928235fc6d7acbcc551232abf2b6a94c46d282fd0cd6b8d4c5a32629c6c71b8aca163c96b46efb SHA512 be9a0fdc828136db3205058e7c1c6d5f419f52b0c2220dc72b96d8e65b80828280b3a7bd2b5a813795d0c259962258ad9e4993be43db6d163e9bce6aff369a0e MISC metadata.xml 245 BLAKE2B 610b4070634181afcaf9ff4e6e76a3f76abdc5583740df7fc381acaf4ce83f9515c0c8eb911d8cbed2c51a29196afe6a6f94ede1fd5ed40dfa3bc89928028db0 SHA512 311dc67cac54ddf7d07475d51d04bf1d053004b526d03d4a86f8327e4830abb53b49e8a3ab2a2c108ea78083b728f80270b9f57bc94f64a8fe08a34ff0d99a3e diff --git a/media-libs/jbig2enc/files/jbig2enc-0.29-leptonica-1.83.patch b/media-libs/jbig2enc/files/jbig2enc-0.29-leptonica-1.83.patch new file mode 100644 index 000000000000..dfa43a6214af --- /dev/null +++ b/media-libs/jbig2enc/files/jbig2enc-0.29-leptonica-1.83.patch @@ -0,0 +1,81 @@ +https://github.com/agl/jbig2enc/commit/a614bdb580d65653dbfe5c9925940797a065deac +https://github.com/agl/jbig2enc/commit/d211d8c9c65fbc103594580484a3b7fa0249e160 + +From a614bdb580d65653dbfe5c9925940797a065deac Mon Sep 17 00:00:00 2001 +From: Federico <19206300+quaqo@users.noreply.github.com> +Date: Sun, 8 Jan 2023 14:12:51 +0100 +Subject: [PATCH] Fix build with Leptonica >=1.83 + +From leptonica 1.83 release notes: + * Use stdatomic.h to make cloning string safe. Remove all *GetRefcount() and *ChangeRefcount() accessors. + * Remove information about fields in many structs from the public interface allheaders.h, instead putting them in internal files pix_internal.h, array_internal.h and ccbord_internal.h. +--- a/src/jbig2.cc ++++ b/src/jbig2.cc +@@ -29,6 +29,9 @@ + #endif + + #include ++#if (LIBLEPT_MAJOR_VERSION == 1 && LIBLEPT_MINOR_VERSION >= 83) || LIBLEPT_MAJOR_VERSION > 1 ++#include "leptonica/pix_internal.h" ++#endif + + #include "jbig2enc.h" + +--- a/src/jbig2enc.cc ++++ b/src/jbig2enc.cc +@@ -24,6 +24,10 @@ + #include + + #include ++#if (LIBLEPT_MAJOR_VERSION == 1 && LIBLEPT_MINOR_VERSION >= 83) || LIBLEPT_MAJOR_VERSION > 1 ++#include "leptonica/pix_internal.h" ++#include "leptonica/array_internal.h" ++#endif + + #include + #if defined(sun) +@@ -206,7 +210,11 @@ unite_templates(struct jbig2ctx *ctx, + numaSetValue(ctx->classer->naclass, i, new_representant); + } + } ++#if (LIBLEPT_MAJOR_VERSION == 1 && LIBLEPT_MINOR_VERSION >= 83) || LIBLEPT_MAJOR_VERSION > 1 ++ ctx->classer->pixat->pix[new_representant]->refcount += ctx->classer->pixat->pix[second_template]->refcount; ++#else + pixChangeRefcount(ctx->classer->pixat->pix[new_representant],pixGetRefcount(ctx->classer->pixat->pix[second_template])); ++#endif + } + return 0; + } +--- a/src/jbig2sym.cc ++++ b/src/jbig2sym.cc +@@ -29,6 +29,10 @@ + #include + + #include ++#if (LIBLEPT_MAJOR_VERSION == 1 && LIBLEPT_MINOR_VERSION >= 83) || LIBLEPT_MAJOR_VERSION > 1 ++#include "leptonica/pix_internal.h" ++#include "leptonica/array_internal.h" ++#endif + + #include + + +From d211d8c9c65fbc103594580484a3b7fa0249e160 Mon Sep 17 00:00:00 2001 +From: Federico <19206300+quaqo@users.noreply.github.com> +Date: Sun, 8 Jan 2023 20:15:45 +0100 +Subject: [PATCH] Fix autotools with leptonica >= 1.83 + +From leptonica 1.83 release notes: +* Rename the autotools generated libraries from liblept to libleptonica +--- a/configure.ac ++++ b/configure.ac +@@ -73,7 +73,7 @@ AC_CONFIG_COMMANDS([libtool-rpath-patch], + fi], + [libtool_patch_use_rpath=$enable_rpath]) + +-AC_CHECK_LIB([lept], [findFileFormatStream], [], [ ++AC_CHECK_LIB([leptonica], [findFileFormatStream], [], [ + echo "Error! Leptonica not detected." + exit -1 + ]) + diff --git a/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild b/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild deleted file mode 100644 index f6949b5e887e..000000000000 --- a/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="JBIG2 Encoder and libs" -HOMEPAGE="https://github.com/agl/jbig2enc" -SRC_URI="https://github.com/agl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86 ~ppc-macos" -IUSE="gif jpeg png tiff webp" - -RDEPEND="media-libs/leptonica[gif?,jpeg?,png?,tiff?,webp?]" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-leptonica-1.70.patch" -) - -src_prepare() { - default - - # remove -Werror - sed -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac || die 'sed on configure.ac failed' - # prevent static linking and QA notice about insecure RUNPATHs - sed -i -e '/jbig2_LDFLAGS/d' src/Makefile.am || die 'sed on src/Makefile.am failed' - - eautoreconf -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die - find "${ED}" -name '*.a' -delete || die -} diff --git a/media-libs/jbig2enc/jbig2enc-0.29-r1.ebuild b/media-libs/jbig2enc/jbig2enc-0.29-r1.ebuild new file mode 100644 index 000000000000..44791b8f43cf --- /dev/null +++ b/media-libs/jbig2enc/jbig2enc-0.29-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="JBIG2 Encoder and libs" +HOMEPAGE="https://github.com/agl/jbig2enc" +SRC_URI="https://github.com/agl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~loong x86 ~ppc-macos" +IUSE="gif jpeg png tiff webp" + +RDEPEND="media-libs/leptonica[gif?,jpeg?,png?,tiff?,webp?]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-leptonica-1.83.patch +) + +src_prepare() { + default + + # remove -Werror + sed -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac || die 'sed on configure.ac failed' + # prevent static linking and QA notice about insecure RUNPATHs + # TODO: --disable-rpath (new in 0.29)? + sed -i -e '/jbig2_LDFLAGS/d' src/Makefile.am || die 'sed on src/Makefile.am failed' + + eautoreconf +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die + find "${ED}" -name '*.a' -delete || die +} diff --git a/media-libs/jbig2enc/jbig2enc-0.29.ebuild b/media-libs/jbig2enc/jbig2enc-0.29.ebuild deleted file mode 100644 index fa9f4ee5a609..000000000000 --- a/media-libs/jbig2enc/jbig2enc-0.29.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="JBIG2 Encoder and libs" -HOMEPAGE="https://github.com/agl/jbig2enc" -SRC_URI="https://github.com/agl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~loong x86 ~ppc-macos" -IUSE="gif jpeg png tiff webp" - -RDEPEND="media-libs/leptonica[gif?,jpeg?,png?,tiff?,webp?]" -DEPEND="${RDEPEND}" - -src_prepare() { - default - - # remove -Werror - sed -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac || die 'sed on configure.ac failed' - # prevent static linking and QA notice about insecure RUNPATHs - # TODO: --disable-rpath (new in 0.29)? - sed -i -e '/jbig2_LDFLAGS/d' src/Makefile.am || die 'sed on src/Makefile.am failed' - - eautoreconf -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die - find "${ED}" -name '*.a' -delete || die -} -- cgit v1.2.3