1 |
commit: bcf80a84c69f026b3e7df8bec1b0732c2dc7b658 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 21 00:07:26 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 21 00:09:23 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcf80a84 |
7 |
|
8 |
media-libs/tiff: add 4.4.0_rc1 (unkeyworded) |
9 |
|
10 |
Bug: https://bugs.gentoo.org/821925 |
11 |
Bug: https://bugs.gentoo.org/830981 |
12 |
Bug: https://bugs.gentoo.org/837560 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
media-libs/tiff/Manifest | 2 + |
16 |
.../files/tiff-4.4.0_rc1-skip-thumbnail-test.patch | 32 ++++++++ |
17 |
media-libs/tiff/tiff-4.4.0_rc1.ebuild | 91 ++++++++++++++++++++++ |
18 |
3 files changed, 125 insertions(+) |
19 |
|
20 |
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest |
21 |
index 45849b27483d..a5238360727a 100644 |
22 |
--- a/media-libs/tiff/Manifest |
23 |
+++ b/media-libs/tiff/Manifest |
24 |
@@ -1 +1,3 @@ |
25 |
DIST tiff-4.3.0.tar.gz 2808254 BLAKE2B 433a087249541f6142dd25b6dc807018639908175b0d73b4af3aa301af2dee3d76184e4689e7b2f1f9b73567ac78d50456ee94fffe00bad6da05375cf2d94d92 SHA512 e04a4a6c542e58a174c1e9516af3908acf1d3d3e1096648c5514f4963f73e7af27387a76b0fbabe43cf867a18874088f963796a7cd6e45deb998692e3e235493 |
26 |
+DIST tiff-4.4.0rc1.tar.xz 1929292 BLAKE2B d05a2fb293557d1e7cdec116c65c8338d7714af7b6abd8dd3bb2b476d62e044adc7d6c298843649d63c6bc09f6ce4660ee23638f9beb716937ccf236c2829dcf SHA512 c9611faadc9b1199f3aba9a43bfa160c77c11558d1fa358b42115ed78db73c8387531c0668cc9021842c58f1c02f8d84264d3600e1039dfe6f866822ad91cff9 |
27 |
+DIST tiff-4.4.0rc1.tar.xz.sig 310 BLAKE2B 00dc8ff9c232ec4cca8b294659e6379b9bb512b58cd3d2f9231e7c10111510ac56aff3c6fc133a47f9fafc27595e099297c25940414495d8ea7f5a75aa43e9d2 SHA512 4ffdcbf5a8ce4a3be543d0ad43101ddcdb6ef22c3da5768c86660a40cc0cab48032a65c5e7bb0667f43d55dad5aa09dc0df302e2f9dbc9f24b8ccac643a0408c |
28 |
|
29 |
diff --git a/media-libs/tiff/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch b/media-libs/tiff/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch |
30 |
new file mode 100644 |
31 |
index 000000000000..574a02dd3487 |
32 |
--- /dev/null |
33 |
+++ b/media-libs/tiff/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch |
34 |
@@ -0,0 +1,32 @@ |
35 |
+https://gitlab.com/libtiff/libtiff/-/merge_requests/334 |
36 |
+ |
37 |
+From 62a49eeb3f0c986c5fcbfc53cd3d7ef2a3fab9b3 Mon Sep 17 00:00:00 2001 |
38 |
+From: Sam James <sam@g.o> |
39 |
+Date: Sat, 21 May 2022 01:01:35 +0100 |
40 |
+Subject: [PATCH] test/tiffcp-thumbnail.sh: skip test if tools aren't built |
41 |
+ |
42 |
+In Gentoo, we avoid building the tools for multilib (32-bit, x86) builds on |
43 |
+amd64/x86_64 because we only need the library to keep binary applications working. |
44 |
+ |
45 |
+This causes a test failure in just tiffcp-thumbnail.sh as the 'thumbnail' |
46 |
+binary isn't built. Skip it if unavailable as it's only a single test. |
47 |
+ |
48 |
+Fixes: https://gitlab.com/libtiff/libtiff/-/issues/421 |
49 |
+--- a/test/tiffcp-thumbnail.sh |
50 |
++++ b/test/tiffcp-thumbnail.sh |
51 |
+@@ -4,7 +4,12 @@ |
52 |
+ # |
53 |
+ . ${srcdir:-.}/common.sh |
54 |
+ |
55 |
++if [ ! -x "${TIFFCP}" ] || [ ! -x "${THUMBNAIL}" ] ; then |
56 |
++ # https://gitlab.com/libtiff/libtiff/-/issues/421 |
57 |
++ exit 77 |
58 |
++fi |
59 |
++ |
60 |
+ outfile1=o-tiffcp-thumbnail-in.tif |
61 |
+ outfile2=o-tiffcp-thumbnail-out.tif |
62 |
+ f_test_convert "${TIFFCP} -c g3:1d" "${IMG_MINISWHITE_1C_1B}" "${outfile1}" |
63 |
+-f_test_convert "${THUMBNAIL}" "${outfile1}" "${outfile2}" |
64 |
+\ No newline at end of file |
65 |
++f_test_convert "${THUMBNAIL}" "${outfile1}" "${outfile2}" |
66 |
+GitLab |
67 |
|
68 |
diff --git a/media-libs/tiff/tiff-4.4.0_rc1.ebuild b/media-libs/tiff/tiff-4.4.0_rc1.ebuild |
69 |
new file mode 100644 |
70 |
index 000000000000..c0f7bb48982e |
71 |
--- /dev/null |
72 |
+++ b/media-libs/tiff/tiff-4.4.0_rc1.ebuild |
73 |
@@ -0,0 +1,91 @@ |
74 |
+# Copyright 1999-2022 Gentoo Authors |
75 |
+# Distributed under the terms of the GNU General Public License v2 |
76 |
+ |
77 |
+EAPI=7 |
78 |
+ |
79 |
+QA_PKGCONFIG_VERSION="$(ver_cut 1-3)" |
80 |
+ |
81 |
+# Release signer can vary per version but not clear if others will be doing |
82 |
+# them in future, so gone with Even Rouault for now as he does other geosci |
83 |
+# stuff too like PROJ, GDAL. Previous release manager of TIFF was |
84 |
+# GraphicsMagick maintainer Bob Friesenhahn. Please be careful when verifying |
85 |
+# who made releases. |
86 |
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/rouault.asc |
87 |
+inherit multilib-minimal verify-sig |
88 |
+ |
89 |
+MY_P="${P/_rc/rc}" |
90 |
+DESCRIPTION="Tag Image File Format (TIFF) library" |
91 |
+HOMEPAGE="http://libtiff.maptools.org" |
92 |
+SRC_URI="https://download.osgeo.org/libtiff/${MY_P}.tar.xz" |
93 |
+SRC_URI+=" verify-sig? ( https://download.osgeo.org/libtiff/${MY_P}.tar.xz.sig )" |
94 |
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)" |
95 |
+ |
96 |
+LICENSE="libtiff" |
97 |
+SLOT="0" |
98 |
+if [[ ${PV} != *_rc* ]] ; then |
99 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
100 |
+fi |
101 |
+IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd" |
102 |
+RESTRICT="!test? ( test )" |
103 |
+ |
104 |
+# bug #483132 |
105 |
+REQUIRED_USE="test? ( jpeg )" |
106 |
+ |
107 |
+RDEPEND="jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] ) |
108 |
+ jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) |
109 |
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) |
110 |
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) |
111 |
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
112 |
+ zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )" |
113 |
+DEPEND="${RDEPEND}" |
114 |
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-evenrouault )" |
115 |
+ |
116 |
+MULTILIB_WRAPPED_HEADERS=( |
117 |
+ /usr/include/tiffconf.h |
118 |
+) |
119 |
+ |
120 |
+PATCHES=( |
121 |
+ "${FILESDIR}"/${PN}-4.4.0_rc1-skip-thumbnail-test.patch |
122 |
+) |
123 |
+ |
124 |
+multilib_src_configure() { |
125 |
+ local myeconfargs=( |
126 |
+ --without-x |
127 |
+ --with-docdir="${EPREFIX}"/usr/share/doc/${PF} |
128 |
+ $(use_enable cxx) |
129 |
+ $(use_enable jbig) |
130 |
+ $(use_enable jpeg) |
131 |
+ $(use_enable lzma) |
132 |
+ $(use_enable static-libs static) |
133 |
+ $(use_enable webp) |
134 |
+ $(use_enable zlib) |
135 |
+ $(use_enable zstd) |
136 |
+ ) |
137 |
+ |
138 |
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
139 |
+ |
140 |
+ # Remove components (like tools) that are irrelevant for the multilib |
141 |
+ # build which we only want libraries for. |
142 |
+ # TODO: upstream options to disable these properly |
143 |
+ if ! multilib_is_native_abi ; then |
144 |
+ sed -i \ |
145 |
+ -e 's/ tools//' \ |
146 |
+ -e 's/ contrib//' \ |
147 |
+ -e 's/ man//' \ |
148 |
+ -e 's/ html//' \ |
149 |
+ Makefile || die |
150 |
+ fi |
151 |
+} |
152 |
+ |
153 |
+multilib_src_test() { |
154 |
+ if ! multilib_is_native_abi ; then |
155 |
+ emake -C tools |
156 |
+ fi |
157 |
+ |
158 |
+ emake check |
159 |
+} |
160 |
+ |
161 |
+multilib_src_install_all() { |
162 |
+ find "${ED}" -type f -name '*.la' -delete || die |
163 |
+ rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die |
164 |
+} |