diff options
Diffstat (limited to 'media-gfx')
29 files changed, 1049 insertions, 60 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex b94414ed257e..f05c1992fd06 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest index 2ccd55ad3e3c..757d9395fd49 100644 --- a/media-gfx/asymptote/Manifest +++ b/media-gfx/asymptote/Manifest @@ -6,5 +6,5 @@ AUX asymptote-2.70-xdg-utils.patch 791 BLAKE2B 971b2f1c6a4db7e39cc2d4bac0e3e6cc9 DIST asymptote-2.69.src.tgz 4673601 BLAKE2B 9734ffec10c9c0b8053598402a4eb81a3ed8a48f8ce8e58d1720442be26e25fe7778d6d47cd2d29dae61183d15aaa456bca430ab98e951844c8210484226e67f SHA512 a1b746600b4e6880350e57adeb3a3228d10b1b0c1db11ee0e750545cf8023716eec92253c0cd0980747f72c16fd0097f25ee688657168f24a0def106260e0791 DIST asymptote-2.70.src.tgz 4674495 BLAKE2B 126b2e99222e6ae438aaef89df00b8eae19118c3ef42d2fab0b0117f343911939e680d22e903b784213186a5d2eeeecb112afba1467562e7127c34de4bc66773 SHA512 24d60af361e3f0309a896ce8163da6fc0a9d6587efe726c5acf874dcb74f4d51b4bad8146a615ff54173ef06dac53117fd1cc09c77940271adc9f64cac6bcfe6 EBUILD asymptote-2.69-r2.ebuild 5398 BLAKE2B 0c393d1865b2c73bcc746bcb42cb5b6d821bfd15d66383544094d6f06d14b8d9d0fe69cb698edaa389aa16c77017b35f08ee6eeaf88fcdb7bf519604a8c9be96 SHA512 3085e7f9649ea366885282f1467da7a4a5725300700c7f429ac7439387073a3459db96234d29e49f117132c4ae538ecc71f2335fb31a4a5f4a302b75c9176a5b -EBUILD asymptote-2.70-r1.ebuild 5396 BLAKE2B a0ddbc6ab5c2df0ed2c484d3f98ef137057da13b2e5ab7122ae6e004ac38fd7299b552a505891042282998b31783038b505099bd04aa0783d96871ffd8d025a1 SHA512 96573f6fed8b5bb97ccd8cb3577a759f09a2318fbf1f762f25a69382db05cfd318de353b73c4a19295b643cb2b1616c7c192f138a5a636170b2b251a44f403e9 +EBUILD asymptote-2.70-r1.ebuild 5403 BLAKE2B 0f0b33d281fb4c971ecd93b87ed42089892f070de136dc433b368eb9e0602844e09618b2290b112c16392668f5ae8724aa81bf0ab2115a38e79dda2e64098ea4 SHA512 9a6037b44a252dab2c24f0febd6089e87b4a023819485ba9506fd129d24c86b95a93fb82b007c8ce6f0ee4ca08194115ca6bce2295f8e86ae94ec1e98c10b13b MISC metadata.xml 1363 BLAKE2B d1ff4a713593a568879201c3d7165a633af6446844bc2128396a8f2cfc4ebc0764aef67b61bd0b0c2bcc9cad5ae442dd35b4c1610239f047f4baf3de225cda3f SHA512 e3c7c10ca9c129e0f988235a2f4ad7c8d306517e7a1966e1f4cb734d1c4d30bb143f9178bc744a85012ccc031fa453177d18452ed7991c8ae18a86bbb88283fc diff --git a/media-gfx/asymptote/asymptote-2.70-r1.ebuild b/media-gfx/asymptote/asymptote-2.70-r1.ebuild index e69b83cc7bae..f4fbcf92ed4e 100644 --- a/media-gfx/asymptote/asymptote-2.70-r1.ebuild +++ b/media-gfx/asymptote/asymptote-2.70-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X" RESTRICT="!test? ( test )" diff --git a/media-gfx/ebdftopcf/Manifest b/media-gfx/ebdftopcf/Manifest index ca64094dee21..f1003fef7296 100644 --- a/media-gfx/ebdftopcf/Manifest +++ b/media-gfx/ebdftopcf/Manifest @@ -1,3 +1,3 @@ DIST ebdftopcf-2.tar.bz2 7774 BLAKE2B 4dc1bde62b796f441332511e1b9206f9eadd216ab66dc1a6858dc467f9dfbbaaeb4a7de494eaae4584d8a57d59a0eb96f69047d1a57bd007cbb8e2f7aaccd1c6 SHA512 4631f1591290e0ddc778d5c557aff1e698d8dd7e5ac7e659fda7752642034fbabb091c840dcfad5695e9fc19909203a7fdc0b7a69d57a162ce6bb8fe710ef0f4 -EBUILD ebdftopcf-2.ebuild 623 BLAKE2B 0aea2a7592a851b68d6d4503a4dfc92343101ae1a80ea1e39fc7363a4c043ef7741a67d0ce27ab1cb10bd7b183320e48b7d472116c41fd74c7e3c97365efb327 SHA512 849c5cd295edd0ac5f3493ebf1a4904e735ab52c3c51bb4481ed7f942d0e0efc4293553eacc96b1194e1f6eacf2fa6762561ef9b55ca9d5d1cc3371c9c17b2f2 -MISC metadata.xml 310 BLAKE2B d6b0416573d232c5715df5dcb05139b22609ce8ffb46530c2fd7a0cecc87b37ce2ce286310a80244b1911d5750eb29b55eef6b8c01f6d62c8d007ad2a9b5aae2 SHA512 1923349dde66e8078b37566097a21ead2555a73fdfd97b89beb44a714958dc80f4387ceb642d238419ce0ec388c335ba5db1db5f23b380131f0fbbd51ecd8f22 +EBUILD ebdftopcf-2-r1.ebuild 606 BLAKE2B b16cf3764bd96a083e2db2170d968397db5136ea1965d6b85c902feebb240348c6ee4b631428a28c3fd28f53f5773efc59a59b2123b016974253acd46314c460 SHA512 6fbbc6f48f430c35d4c1f18f8eb602a36c5d4e8a90a85f4a02b4fe9cb5c445e84792dd1b8dd8631bbb248006c154706f9351184cf760d86e19ae830e58f2c6b6 +MISC metadata.xml 317 BLAKE2B f8edb28344231cfa8df007113abb723efe499672ffc5dddfdc7854fe1bfa72440ab237b7a2339288dfb68a1998e06838a36ee5d06d8fa2a81f6e4f1c38d3165b SHA512 802c3fa50ccd7b85133eddd16cebac2f6edc4cc00c251f3aa50e638ddff3b9f78d93f711969b4d4ac98d6f8932daa736d63a1c1d70bb34bd7e66f0bbadb6ca0f diff --git a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild index 6db2d76e9187..de2466859643 100644 --- a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild +++ b/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild @@ -10,15 +10,14 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="" # these apps are used at runtime by ebdftopcf -RDEPEND="x11-apps/bdftopcf - app-arch/gzip" +RDEPEND=" + app-arch/gzip + x11-apps/bdftopcf" src_install() { insinto /usr/share/ebdftopcf doins Makefile.ebdftopcf dodoc README - doman *.5 } diff --git a/media-gfx/ebdftopcf/metadata.xml b/media-gfx/ebdftopcf/metadata.xml index 4ade55bae664..f9dae48d94aa 100644 --- a/media-gfx/ebdftopcf/metadata.xml +++ b/media-gfx/ebdftopcf/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>robbat2@gentoo.org</email> -</maintainer> -<maintainer type="project"> - <email>fonts@gentoo.org</email> - <name>Fonts</name> -</maintainer> + <maintainer type="person"> + <email>robbat2@gentoo.org</email> + </maintainer> + <maintainer type="project"> + <email>fonts@gentoo.org</email> + <name>Fonts</name> + </maintainer> </pkgmetadata> diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 3f9016382b8a..945f00f08b35 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -2,5 +2,5 @@ AUX exiv2-0.27.4-gtest-1.11.patch 1489 BLAKE2B b20cee53dfd712389f553402779d839dc DIST exiv2-0.27.3-Source.tar.gz 26447901 BLAKE2B ac13e6d8fce83923278cfeb628f143310a3c62b42936c8ed8b302a2c3df4c36f5666fa749adfb1d745e42da8f519762532e6fc281993aa55bcd7ce56e08c6e3e SHA512 3f5758ee862b811eeb89cc75fc2bbd8bf10329efa2ce1e68555cdc7729faa6cfd1603e0cc859fbdbe6d8fd5e53bd9b9e6d869d8a20ed17497bf87ce78c005de9 DIST exiv2-0.27.4-Source.tar.gz 32055837 BLAKE2B 9c31c08fafb38895fa7812a8c7a195335e80a6b9c15f7b5f3750f5ab30903c4c3bbf9aee5a7293a7d437d15a49a9cb7b45a3133cbb36ee62081efae0dd67b61a SHA512 f6798baafb36a54ba5bc65c2d28d4f4469e298582c90b417eb437b5dbda8e11963fb3314e8419717b3815ee8c3a68955cddc79e45351d9f2c165a0b73eb7b7be EBUILD exiv2-0.27.3.ebuild 2452 BLAKE2B a0e2c3a195f3dc70ae61d4ee17726fb41b2f1fa0446e156062fdda693dc9ffe0ff3bf3ae27dbe234d468cfb16d79ca16b4b7aadd81234f07af6af64a8a4ac57c SHA512 092f563cd4486ccacfae803cb00400e5e6609ad8505d9eff41de6e63a469b5359c0567985f78c0b16f77ee1cc1982aa541159971a189a6a15755aeab43d26b82 -EBUILD exiv2-0.27.4.ebuild 2751 BLAKE2B 8ef658cb004d33c665b691a59b73f3746126f3e5fa0ab1059c709a46ad6e349c72ab5c339de305c3bd6701fea0c2adba2d147b57e90ee6233cf972d2074053f7 SHA512 454804b54e3e7cde2f1bcabaf8d793ba8614c4e57b5afbac65ea45ee72f95cdca1c7a2a7ad2ed4e9d1b6f5d8c66f4d9746cb145fbdc53cc1df24d1492a5eff8c +EBUILD exiv2-0.27.4.ebuild 2758 BLAKE2B f251cd9ba4a9047965a6baad060501032b8b3d7ecb203ebab1a29c2c69ad46ce6d0be51fcaf1aa31f0528bde5661a6ffe02f853e6ffb823e4c4b298864705098 SHA512 aff71e67ca3b77a9b5345455f6252e1e0eb3323f5a0f9883ed152452b25520c6ad86d2d8c18043664026aaea3da0346b33a92c859e328ed2f7b9f8e21113a783 MISC metadata.xml 492 BLAKE2B 06b2f7b1d7b50e853ae116ad18f254103116c88c7d6957c1c9323083f0f87d7ed268ee188e91edf8b42b02a996e5c85017fffc12b0680f7522a0eda07ecbf74a SHA512 d0e56dd6585c3f10b14043764313de11545380fb15b18ca1627bbd92db357219aef801af050cbf3466b0b4e97fce25a55293068d21db93c1b6003a802944886f diff --git a/media-gfx/exiv2/exiv2-0.27.4.ebuild b/media-gfx/exiv2/exiv2-0.27.4.ebuild index 14190ea43cdd..f5b0d3396892 100644 --- a/media-gfx/exiv2/exiv2-0.27.4.ebuild +++ b/media-gfx/exiv2/exiv2-0.27.4.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} = *9999 ]]; then inherit git-r3 else SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" S="${WORKDIR}/${P}-Source" fi diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 99569e14262c..dbf8a519e422 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -5,6 +5,6 @@ DIST gimp-2.10.24.tar.bz2 31546295 BLAKE2B e2b873313b41799cb9461f6cd2ec45dcb0d3f DIST gimp-2.99.6.tar.bz2 30663040 BLAKE2B ccbdc2baa9e99a94e85345ce90bcba6ca56c0f264d3248d198009b730a5c810997b76c7d7a3cf131374316298d719a3e70c81ee7bc0a5e34beda1b112921807a SHA512 51ada696693ac51624ba222d1fff54d39bdc72a06de54f7c244b89740b77f7205aab44f1cec90785ca4196cab32f817e7390b4287a30f5024606163f24222961 EBUILD gimp-2.10.22-r2.ebuild 5636 BLAKE2B ab208d7b8c28b52eee77ed8ba150264e7939308474a6adffa7372589f5b4d1347b1d25145d1f91aae4a05731d1a050e99cfe7700ae2ff455a67eca1cb61dfe8d SHA512 d9646bd07e014e6efa79782665b0d095b95476ede9ce15222428c53c91609b5837d925923aae8f3cad92b20043f0db98993a4b037e6bd866cd467753c49f20be EBUILD gimp-2.10.24.ebuild 5581 BLAKE2B 7639817275bc53b7e08b8f190aa11b2be6d62f2c12f46474fe67c74409fdbb0a4cc2bcaa8c7bdd04721f111ea52d3c8a950efb9d85ee1d22cbaab687207fcbe7 SHA512 c22ff9efa6044e6f0fba4094b0bd9debfb9752464357dbbe7c760ba9901ad36d479c1bbecfcae8c7c6b0bfecb8084cab970d8ee1d458122b2eb9f0b40a0b8054 -EBUILD gimp-2.99.6.ebuild 6831 BLAKE2B a1cfcbf93e7d9b63c5679c39f6ca3a45cc08f09907e710db327e86e6a366d36a5f21e21ca725e5ec846fac5a6ba87a222fcf2aa233c7a754df50d8b84979178f SHA512 81fa90363f67f232b5e552b91810ae8dc2a180fe8c508b46f977a69afe6c9d895ed8340acf48d503fe8db9a5d2c6eb9a37d39a1d0cbc894c97a846655dc9afc8 +EBUILD gimp-2.99.6.ebuild 6837 BLAKE2B b2ee57e4aa815251a2b94a33b7b89b7ad50a04e059442192d7afb77f7abc7dc695b8d9af562b01a5048bdcd34140026e8f4bccde9a513cebbb863ad09c194084 SHA512 698d06b3fd74ad9cac9347e1c6ece9f1e32f9427716ec2b860e07332d56e3618fbd059e98137804b7a134c493364949133918e37458b014d75566457f714ced0 EBUILD gimp-9999.ebuild 7005 BLAKE2B fe9ced0b17ab49bc548e8164ca79725d436b85a34b0200bcba5e35c94ff0999119190b24291869821cb6a6c4350c1db12e6f04c50f224ba5b843cb4974a4e9ba SHA512 88a9a45a3486c7e578de7fde22a300248f8f8658c3c01ad13e5b5f7c3f9d356900cd12c3485fd98b21c60d7e8b76c06cc5efd40ca8a449dbbfc46efe5fad697a MISC metadata.xml 576 BLAKE2B cf4bbbe0b8610a1e1b0190c58bb578cb5c0d2bc7b1350ce98b1ce091af2e6052554bad53a96e729f4de30acb231cebc5ba3bc10b92302405bb2a791bbe897024 SHA512 82fcdb57a699ab887f9b0d0a9edb33d7e7d26e3aaa88727986820cf6053a9f9d275e1227ce82bd5e0291fc9c0d9362e014c08ca0822229d717ee851970dc6c8a diff --git a/media-gfx/gimp/gimp-2.99.6.ebuild b/media-gfx/gimp/gimp-2.99.6.ebuild index ba698e284a38..6dfba5b7d0c9 100644 --- a/media-gfx/gimp/gimp-2.99.6.ebuild +++ b/media-gfx/gimp/gimp-2.99.6.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://www.gimp.org/" SRC_URI="mirror://gimp/v2.99/${P}.tar.bz2" LICENSE="GPL-3 LGPL-3" SLOT="0/3" -KEYWORDS="" +KEYWORDS="~riscv" IUSE="aalib alsa aqua doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" REQUIRED_USE=" diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index 5f10b070770c..59dbf74afd21 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -1,6 +1,6 @@ AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865 AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274ec22e3cb2c65d62e3095f2bb3da8f817ae52fdd6fe70e5da30bb8110202ec8c8268ffef7069c34d55ef7f7ccc3e53785418 SHA512 205694ea04e7b65c5519c564bbfa1ebd33ef4fa7800aec1a91439ed90794629dd54ab42c1c7f4f2f5ce3b7b078b3fffe76ce37c61643087f5cca244931b5bd3a DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4 -EBUILD graphicsmagick-1.3.36.ebuild 3167 BLAKE2B e8e55b5bd93bbe242e62a8fd9106d0d807ca4c613a710e7d8ba762d7a7a8a3f849a36ccccb07217fefc8fed9e68c7ef38ea692052693ebd32dca41d63ef1d02b SHA512 d1920edbe0c83e20baab70dcd682d0260e8008cba86fce5c87320b7724caa8129fe17f9977c724165ee83668196087e142ddf1b06ddf291952947a3fd38c4b02 -EBUILD graphicsmagick-9999.ebuild 3175 BLAKE2B 9b39a8d32a89f5fc9cff2d287fa1a050b24d15b9c221a831d17fca73818b00144788da809527592c43fd1285084ddf32e3560cadaa7a654a68465aa215fd2e57 SHA512 a3cfb09b529178980f5c54005cd9ba82e1a4284df6345600be7ddce9567bbb262babe15a1d8a5080905a53ef917a55b22db3d653b7de97b9017bd2a1656c5e1d +EBUILD graphicsmagick-1.3.36.ebuild 3174 BLAKE2B aeac2a0e04366dfa39a68e8eeab9de249e099361181f2e38dc23f3150e9abc4a7b7b47eee1aa6f92c32f253cff845f21ca99b7ccbfd2e8ef07182e8bfdab1611 SHA512 f1262f3b6e2c8f73afbf8bed38edf03b2a885150a88d3fbe54e2d7cdde7668f0cbc43c6c28962903a11be938a7e8bbcc2951074af6c2417c0ed10be0b59bb5c5 +EBUILD graphicsmagick-9999.ebuild 3182 BLAKE2B 95963ce267c90bc2b5b367a854b26c2b408c9d434c83dad5bd2138ad2dce0cb60478579f23f37585d2cb392233666a8efff912bfb71da2e7bfd87cc0426d00f8 SHA512 8a91d847e6cb7358141eeff10cbc723145362a620d5460e97d0b3b3f582b5da292d44662327eef7e1c8e1561a0e357b7b4194c31a6b9f049e38acf71921b6fcf MISC metadata.xml 1276 BLAKE2B 4784c9dbeb0760b1b0b8f83672a85dc318d2829dcfbe547b0e25da66128194db0662efc77bdced2c12e0219df3f6a660273d7966c8b2f320b320cbb3c210b814 SHA512 17efe89b6dcc8e93b7b4849af215210faf64e95ec34f39accf58bc2c9397818389126fe7de7ea0f2091a9e24cf282dc33b4c65b69545e8a8c19b2de57280325f diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild index 86d06b0b9862..877d40264358 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then else SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild index 71a6c9e5bbc5..900a55abda11 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then else SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest index 1077e72e5d9d..317d95e37756 100644 --- a/media-gfx/gscan2pdf/Manifest +++ b/media-gfx/gscan2pdf/Manifest @@ -1,5 +1,5 @@ -DIST gscan2pdf-2.11.1.tar.xz 494704 BLAKE2B c6773b3fadd7765074c5401ee22b46c7056a51a77b10bb769149428b6dbf4503c4fb8df96d9820c8f24a49b20e28c5e0796e835dfbd64272b364a83e64fd0ff1 SHA512 79ce0a3e032286bc1365e4355fdde57e321645a375a6310c1c59588a0d2cca0a9ea9a1e0462a2df3936e96a69fc0a6e32eb09f0c4207fca102d0f06cd5e50ac7 +DIST gscan2pdf-2.12.2.tar.xz 503148 BLAKE2B ed4729207f8b6ae50bc594cc2ad124c6a5e6e3eba83a36649a60c0293687678d2dce2d8e683d50c18cc28ebce8da771e441e6b454cd1d857cd6c776594a641d9 SHA512 7861b22ec3c3011ea6ddb92ccc46661ceda75e1a2c56df2695115a26e7b747de70b97f70ba54751780310930485a8026f2adf4878a05ad2d95328d29f2e454e0 DIST gscan2pdf-2.9.1.tar.xz 484740 BLAKE2B e75ac6a5296ba2f89838ae9c95dc0ceb592ea8ffaf8d89a0635043e07fedbdcf97df26ac810556da7d0e0306eb7aaff76dc18162c6a5f89cb1953bd623a594a3 SHA512 4fc3107c871a7915ebdc023476b1159c0fe03934f1a52a417a5bc285be46f7db0ed38ec4cf015b15953c728ef19d1f4f30207d418b655c950bfb64ddc5d23237 -EBUILD gscan2pdf-2.11.1.ebuild 2953 BLAKE2B 8d00bdc4e43d93e79702322277b82d951c2ccf63a9a6fa43614c9e3a218af3661f22665ae442e3996a84388df98817084355225642ef5bc5c8b11f44d85cc47f SHA512 0d3e90cc07b9ace473ae6758236ac867a562be3e6092342d8abcc97c61781a7cc1f1ab70ae3f21c1adfacc1925a43342ce2aa8b137e3eaf65bad1736e9bf0c94 +EBUILD gscan2pdf-2.12.2.ebuild 2972 BLAKE2B 77d46e0238475bd58fc353feb4f0cb664551babb2635fd993efdefc427258bfbad725d343b38d632ccc8489fb31df493a8da9600ae43a33152bf190fa668af2c SHA512 27231c05ae155aab037a1c95969a0205fbc28e95948fc78fa53405bb9449ad8970fdd61377412c51ba03dd751d7da99c67cea0fb5b6940c53b0ea6ab60dbd641 EBUILD gscan2pdf-2.9.1.ebuild 2801 BLAKE2B 5ec319fceae00a20a15caae9cf019691523680bfa734bae36c8cac7117455438beed4c56fc79a570e87b2d4860b12a62c0fe6fdb49e1e26b24c7a58b493cfa91 SHA512 9f7b98317da72d4abeb6cd64719ddb9de39fa5505d955c6543b7ab76ba0db18c0a7e20261c6c0b7e025272d336c98126bc87c2a32f84a811d6d11649a7dd0aec MISC metadata.xml 469 BLAKE2B 6d8cb7adfd43d79b53f341b8e2082d595e0bd3558f16d392f5ed1c3f546a35d756b50e5703d86bc4fddd3be76ed4155e6d67136102cdfafb987e43f85d370808 SHA512 63a285046bafa848d3bd50327266afcc8eec08d9c2130c6b07faee85457878e1348f9d1b22c4ef7c4578a759eda024315005051827af57266adfb8b5cb9c3492 diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.11.1.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.12.2.ebuild index 412081e98a73..fa622d27bfda 100644 --- a/media-gfx/gscan2pdf/gscan2pdf-2.11.1.ebuild +++ b/media-gfx/gscan2pdf/gscan2pdf-2.12.2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DIST_TEST="do" @@ -33,7 +33,7 @@ RDEPEND=" dev-perl/Locale-Codes dev-perl/Locale-gettext dev-perl/Log-Log4perl - dev-perl/PDF-Builder + >=dev-perl/PDF-Builder-3.23.0 dev-perl/Proc-ProcessTable dev-perl/Readonly dev-perl/Set-IntSpan @@ -69,6 +69,29 @@ PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod}.t ) mydoc="History" +src_test() { + einfo "Using:" + einfo " $(best_version app-text/djvu)" + einfo " $(best_version app-text/poppler)" + einfo " $(best_version app-text/tesseract)" + einfo " $(best_version dev-perl/Gtk3-ImageView)" + einfo " $(best_version dev-perl/Image-Sane)" + einfo " $(best_version dev-perl/PDF-Builder)" + einfo " $(best_version media-gfx/imagemagick)" + einfo " $(best_version media-gfx/sane-backends)" + einfo " $(best_version media-libs/tiff)" + + local confdir="${HOME}/.config/ImageMagick" + mkdir -p "${confdir}" || die + cat > "${confdir}/policy.xml" <<-EOT || die + <policymap> + <policy domain="coder" rights="read|write" pattern="PDF" /> + <policy domain="coder" rights="read" pattern="PS" /> + </policymap> + EOT + NO_AT_BRIDGE=1 virtx perl-module_src_test +} + pkg_postinst() { xdg_desktop_database_update @@ -85,26 +108,3 @@ pkg_postinst() { pkg_postrm() { xdg_desktop_database_update } - -src_test() { - echo "Using:" - echo " $(best_version app-text/djvu)" - echo " $(best_version app-text/poppler)" - echo " $(best_version app-text/tesseract)" - echo " $(best_version dev-perl/Gtk3-ImageView)" - echo " $(best_version dev-perl/Image-Sane)" - echo " $(best_version dev-perl/PDF-Builder)" - echo " $(best_version media-gfx/imagemagick)" - echo " $(best_version media-gfx/sane-backends)" - echo " $(best_version media-libs/tiff)" - - local confdir="${HOME}/.config/ImageMagick" - mkdir -p "${confdir}" || die - cat > "${confdir}/policy.xml" <<-EOT || die - <policymap> - <policy domain="coder" rights="read|write" pattern="PDF" /> - <policy domain="coder" rights="read" pattern="PS" /> - </policymap> - EOT - NO_AT_BRIDGE=1 virtx perl-module_src_test -} diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 38a4111306ca..4da3aeccc7ff 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,5 +1,5 @@ AUX glib-2.67.3.patch 1945 BLAKE2B 8093eb444a360481e0f6fd89334f4ca6a693c6df0d0cdc5bee0bfcc308fc9e8b8090c3ca8c7c772ad7ac074d56e81ff3202f1bfd4ee526e0927b28118d27d53c SHA512 c355c7e67acb29fe41c50af4ac8724c636516394c33e9d529eed23eb6d7bbf014bb0f2f9981ccea9e1b3b98a3f87dc256dc385099eb218353e2b220a3d130172 DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d -EBUILD inkscape-1.0.2-r1.ebuild 4132 BLAKE2B 262017e955a6f2df6d81618d4b1f7c2ac1ecd2756a7cfb08508d9a9b4f3b86cae13acb9977c38b0603d27a49be5db6f6b04cd4c4e12aeb72be95911cbdc03922 SHA512 94ea15b42ca8dae2f9879cd7881dec93990411d5513049881580432f2ba34651e4753d021b7818007df4266d5be6e2b6562224d5ec5018770ddb320005824bcd +EBUILD inkscape-1.0.2-r1.ebuild 4139 BLAKE2B 54de9394120df674c65531a4d8a0d3be771a136960d9a5367fe696e3090d40fb494a6a7e54ff04992b646d14050bf630b82b0743ccf7db9a1229573f08454cf7 SHA512 8a2790a5f1f328346fe3e252e5e199ade7d2713937d57b7dd6b0c6e204668a5eeefe969c7170570e3442c6e17302c32870c1ce12d6debf68d7319b91390da657 EBUILD inkscape-9999.ebuild 4044 BLAKE2B 84c522e414e89885ed195bd6f12de31a4557a30cc5d1f1a331ee63de238830a96095c797bdec5bc7beb9e8b37ddc1797d2b292e5b1e62ff2c18261d4d78dbbcf SHA512 9e05e5dbb98f7dedf2e7ca17778955d0b37fbc8b462b22f807a0f0cb7d08b4b1dd2a6962f68b32474e5d04ed7338ce043afebadbbef3fbb4e0da43102499284b MISC metadata.xml 983 BLAKE2B 5b149700a92f0f4e8a07a643eb004ee6669a668a8a04dd74f13883c858bd2457f8a7f193f64313bf3203fa628484e502a0252272ae8f665a9ebe661589f3637d SHA512 7ab0de464a4dece17f9421bf44a660590c4d453447603a57568a092f90a0005e751cd599ca0923152fc101558c46c479dc65c13a8727b6071a43b1703b459b1e diff --git a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild index 975ed9f12d42..ddee14946262 100644 --- a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild +++ b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms openmp postscript spell static-libs svg2 visio wpg" diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest index 8388de9f9013..343696841983 100644 --- a/media-gfx/mypaint-brushes/Manifest +++ b/media-gfx/mypaint-brushes/Manifest @@ -1,3 +1,3 @@ DIST mypaint-brushes-2.0.2.tar.gz 1564926 BLAKE2B 68a244f42cd5d9b1f96466f5409f0c7ebae257f6dbbfdc5139cb9fda86ee4898ce8fda2a35e96f3a65f41333f7f689edb85445bcd88dc0fc4b428d05ba2870fe SHA512 89cecd9d78f4de84ada97a3e33fd67b86dfd259880da15c0ecbfad0fceb8c3b0e93790f3c0bff0cc375959bdf6921b01d1f3646e27c3f961715219a349017556 -EBUILD mypaint-brushes-2.0.2.ebuild 551 BLAKE2B c84ea71fb2fb4f158643c0c22f74eb3d5c306373d8ab423c01cad479c6149c6e46fb8fb954548796c307520d5439e84b817160941032717722d3f7036e2f4751 SHA512 44dd8836a69eee5840abdccb33d5b471199779e233f3c37a02b21648177beae4e3fecb33ce0d9c6a13f842fde1d1c10d80d185f8f33308fb48bf9202b15ddb1c +EBUILD mypaint-brushes-2.0.2.ebuild 558 BLAKE2B 47683a0c50db95c393d7e0a3e98dc9f81ae80089fb0ae943479cac4b22d5dddfcfed2e17f4e8c488fa51e96c846190390dbbf9f18b8edf9d60f7d92ba0f0a8b8 SHA512 2a7a27e1fe9bd2a31a9e9634163626ef186bb237926e2c534d3f0ffc9c915df51877a0744460006c98a6a4da31ddfdee697e94035f8b52560d9a59a1e897649b MISC metadata.xml 263 BLAKE2B 3674e5c7d5dedc501574b523bf09a9f2d8f2e066edffa5649d59afba65ef3d9c36f3fd909f196f676b5b1266e5edce6ba6c44cf11fdca73b02b30cebcb662a3e SHA512 2f82b95119eb592f8edd7468010dbdc6863b235a0827586114fca02d01d45ce32a2be24077edfa497b0692f2f14447ad070c15b8a951b87091806750b8b0b862 diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild index c4f8c08f0726..51718d70c079 100644 --- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild +++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="CC0-1.0" SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86" # Chosen to exclude README symlink DOCS=( AUTHORS NEWS README.md ) diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest index d8cda2007479..8267ae8cd89f 100644 --- a/media-gfx/rawtherapee/Manifest +++ b/media-gfx/rawtherapee/Manifest @@ -1,3 +1,6 @@ +AUX RT_5.8_fix_crop.patch 9040 BLAKE2B 740d181229fc5677735870d5b4f1b1887ae63aeb7242a038de15c726ee00b3e7b975ba099c2cb3d0e874790fcb8813cf7ab0418e2dddba17227afb6d7ab37d19 SHA512 0d62164d24a87318c7eac65003ede4b05845286dc1d39395239ee713d66011e3aba5caf18bc9e3240caacfa5cebd00b329e4e82fe9a8dccc5643538de0aa0538 +AUX RT_5.8_glibc234.patch 20080 BLAKE2B b6712195ba1d44c7c01d86b8d67c3649d13d3bb74077d2bb78741a99b1f9ee4a0aa1bbfe36488127a8982d50e36de09e26419cb02c979e7aa6362c3232232af1 SHA512 330ee4b1ef29dc6ec3e58dd3f5686f0ee935a2efbfb3ba55a9eeeac4ece7ff5594b7adfe7a9272d342fa5cbbe0387869a234e20baff25e4263963778015f4a4d DIST rawtherapee-5.8.tar.xz 12653148 BLAKE2B f6d4b9b177ad3b6a32b460ecfc7caf5d42a01b5dd4f24da29739f5a2e5936a8d36f9857c0e24bca11f077ab0626f08bbad59ef756792d12f93ef9516427cd2c4 SHA512 bc79586cd937dcaefc053e65faa2162de887d514e44980956d937c157c6d55c4f6e6a7a9b8f91f2d657ed2054814737b96d5d741674c1e5a961d7177433efe4e +EBUILD rawtherapee-5.8-r1.ebuild 1882 BLAKE2B 43b86daa429381bf0f8fc5ee556a86acef6f7668d64a97ebdd05b93114c8f1d4400e866ca98268c6f2cd6a38f4f5187f64ed36b4fb34fc5e3e75f0e28b2a151c SHA512 17fc8d43418c808104b026dd0aa71780cd844c5e7fa76ae3be35f2d44e74876d0ebeafdef1379958dda2229da714c3f5ae9b42033712825618b2b71bed1d8fb1 EBUILD rawtherapee-5.8.ebuild 1697 BLAKE2B f2eb2c24f9cfdf7444026bf750c0fe68e13054f4d2926addbc8d41a02d0e6277a9099f28eae53ad35087e1ca7351225a8cd20005996e6464b9162fe516b92d56 SHA512 181b057cf7a23818a0756416e67cbb8ecc5d4c5951342237a8e5f13d7f72b1488b42ed9c2ae20dd76c77a62347a5220b68394fbe5b0726e19994629a0be14158 MISC metadata.xml 395 BLAKE2B e0084b1d83ad44a411b1d9e8af1502f1e316bb54de76b4bfd985320b701bec7a25ee0edee70da14f4e5aace94ec437c8a8918ebadb1b79e6c77658924d270f96 SHA512 3a80a8d6a966d11806f07eddb29cdc1407c1925addb7952a6f1734c446818c79acfcb0777db6e114b5765d39cbb4d380907a4c4cf477ae77217452bb2c75994f diff --git a/media-gfx/rawtherapee/files/RT_5.8_fix_crop.patch b/media-gfx/rawtherapee/files/RT_5.8_fix_crop.patch new file mode 100644 index 000000000000..24cbfdcb41db --- /dev/null +++ b/media-gfx/rawtherapee/files/RT_5.8_fix_crop.patch @@ -0,0 +1,221 @@ +From 15db8cdb57161d57af8307bf85aeda02ea69ddde Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fl=C3=B6ssie?= <floessie.mail@gmail.com> +Date: Sun, 5 Apr 2020 11:26:47 +0200 +Subject: [PATCH] Guard accesses to `Crop::crop_ratios` (#5701) + +--- + rtgui/crop.cc | 125 +++++++++++++++++++++++++++++++++++--------------- + rtgui/crop.h | 11 ++--- + 2 files changed, 92 insertions(+), 44 deletions(-) + +diff --git a/rtgui/crop.cc b/rtgui/crop.cc +index d9d496523..f092f07a5 100644 +--- a/rtgui/crop.cc ++++ b/rtgui/crop.cc +@@ -16,6 +16,8 @@ + * You should have received a copy of the GNU General Public License + * along with RawTherapee. If not, see <https://www.gnu.org/licenses/>. + */ ++#include <vector> ++ + #include "crop.h" + + #include "options.h" +@@ -46,39 +48,82 @@ inline void get_custom_ratio(int w, int h, double &rw, double &rh) + + } // namespace + ++class Crop::CropRatios final ++{ ++public: ++ CropRatios() : ++ ratios{ ++ {M("GENERAL_ASIMAGE"), 0.0}, ++ {M("GENERAL_CURRENT"), -1.0}, ++ {"3:2", 3.0 / 2.0}, // L1.5, P0.666... ++ {"4:3", 4.0 / 3.0}, // L1.333..., P0.75 ++ {"16:9", 16.0 / 9.0}, // L1.777..., P0.5625 ++ {"16:10", 16.0 / 10.0}, // L1.6, P0.625 ++ {"1:1", 1.0 / 1.0}, // L1, P1 ++ {"2:1", 2.0 / 1.0}, // L2, P0.5 ++ {"3:1", 3.0 / 1.0}, // L3, P0.333... ++ {"4:1", 4.0 / 1.0}, // L4, P0.25 ++ {"5:1", 5.0 / 1.0}, // L5, P0.2 ++ {"6:1", 6.0 / 1.0}, // L6, P0.1666... ++ {"7:1", 7.0 / 1.0}, // L7, P0.142... ++ {"4:5", 4.0 / 5.0}, // L1.25, P0.8 ++ {"5:7", 5.0 / 7.0}, // L1.4, P0.714... ++ {"6:7", 6.0 / 7.0}, // L1.166..., P0.857... ++ {"6:17", 6.0 / 17.0}, // L2.833..., P0.352... ++ {"24:65 - XPAN", 24.0 / 65.0}, // L2.708..., P0.369... ++ {"1.414 - DIN EN ISO 216", 1.414}, // L1.414, P0.707... ++ {"3.5:5", 3.5 / 5.0}, // L1.428..., P0.7 ++ {"8.5:11 - US Letter", 8.5 / 11.0}, // L1.294..., P0.772... ++ {"9.5:12", 9.5 / 12.0}, // L1.263..., P0.791... ++ {"10:12", 10.0 / 12.0}, // L1.2, P0.833... ++ {"11:14", 11.0 / 14.0}, // L1.272..., P0.785... ++ {"11:17 - Tabloid", 11.0 / 17.0}, // L1.545..., P0.647... ++ {"13:19", 13.0 / 19.0}, // L1.461..., P0.684... ++ {"17:22", 17.0 / 22.0}, // L1.294..., P0.772... ++ {"45:35 - ePassport", 45.0 / 35.0}, // L1.285,... P0.777... ++ {"64:27", 64.0 / 27.0}, // L2.370..., P0.421... ++ } ++ { ++ } ++ ++ std::vector<Glib::ustring> getLabels() const ++ { ++ std::vector<Glib::ustring> res; ++ ++ res.reserve(ratios.size()); ++ ++ for (const auto& ratio : ratios) { ++ res.push_back(ratio.label); ++ } ++ ++ return res; ++ } ++ ++ double getValue(std::size_t index) const ++ { ++ return ++ index < ratios.size() ++ ? ratios[index].value ++ : ratios[0].value; ++ } ++ ++ void updateCurrentRatio(double value) ++ { ++ ratios[1].value = value; ++ } ++ ++private: ++ struct CropRatio { ++ Glib::ustring label; ++ double value; ++ }; ++ ++ std::vector<CropRatio> ratios; ++}; ++ + Crop::Crop(): + FoldableToolPanel(this, "crop", M("TP_CROP_LABEL"), false, true), +- crop_ratios{ +- {M("GENERAL_ASIMAGE"), 0.0}, +- {M("GENERAL_CURRENT"), -1.0}, +- {"3:2", 3.0 / 2.0}, // L1.5, P0.666... +- {"4:3", 4.0 / 3.0}, // L1.333..., P0.75 +- {"16:9", 16.0 / 9.0}, // L1.777..., P0.5625 +- {"16:10", 16.0 / 10.0}, // L1.6, P0.625 +- {"1:1", 1.0 / 1.0}, // L1, P1 +- {"2:1", 2.0 / 1.0}, // L2, P0.5 +- {"3:1", 3.0 / 1.0}, // L3, P0.333... +- {"4:1", 4.0 / 1.0}, // L4, P0.25 +- {"5:1", 5.0 / 1.0}, // L5, P0.2 +- {"6:1", 6.0 / 1.0}, // L6, P0.1666... +- {"7:1", 7.0 / 1.0}, // L7, P0.142... +- {"4:5", 4.0 / 5.0}, // L1.25, P0.8 +- {"5:7", 5.0 / 7.0}, // L1.4, P0.714... +- {"6:7", 6.0 / 7.0}, // L1.166..., P0.857... +- {"6:17", 6.0 / 17.0}, // L2.833..., P0.352... +- {"24:65 - XPAN", 24.0 / 65.0}, // L2.708..., P0.369... +- {"1.414 - DIN EN ISO 216", 1.414}, // L1.414, P0.707... +- {"3.5:5", 3.5 / 5.0}, // L1.428..., P0.7 +- {"8.5:11 - US Letter", 8.5 / 11.0}, // L1.294..., P0.772... +- {"9.5:12", 9.5 / 12.0}, // L1.263..., P0.791... +- {"10:12", 10.0 / 12.0}, // L1.2, P0.833... +- {"11:14", 11.0 / 14.0}, // L1.272..., P0.785... +- {"11:17 - Tabloid", 11.0 / 17.0}, // L1.545..., P0.647... +- {"13:19", 13.0 / 19.0}, // L1.461..., P0.684... +- {"17:22", 17.0 / 22.0}, // L1.294..., P0.772... +- {"45:35 - ePassport", 45.0 / 35.0}, // L1.285,... P0.777... +- {"64:27", 64.0 / 27.0}, // L2.370..., P0.421... +- }, ++ crop_ratios(new CropRatios), + opt(0), + wDirty(true), + hDirty(true), +@@ -229,8 +274,8 @@ Crop::Crop(): + // ppigrid END + + // Populate the combobox +- for (const auto& crop_ratio : crop_ratios) { +- ratio->append (crop_ratio.label); ++ for (const auto& label : crop_ratios->getLabels()) { ++ ratio->append (label); + } + + ratio->set_active (0); +@@ -354,7 +399,10 @@ void Crop::read (const ProcParams* pp, const ParamsEdited* pedited) + setDimensions (pp->crop.x + pp->crop.w, pp->crop.y + pp->crop.h); + } + +- const bool flip_orientation = pp->crop.fixratio && crop_ratios[ratio->get_active_row_number()].value > 0 && crop_ratios[ratio->get_active_row_number()].value < 1.0; ++ const bool flip_orientation = ++ pp->crop.fixratio ++ && crop_ratios->getValue(ratio->get_active_row_number()) > 0 ++ && crop_ratios->getValue(ratio->get_active_row_number()) < 1.0; + + if (pp->crop.orientation == "Landscape") { + orientation->set_active (flip_orientation ? 1 : 0); +@@ -469,7 +517,10 @@ void Crop::write (ProcParams* pp, ParamsEdited* pedited) + } + + // for historical reasons we store orientation different if ratio is written as 2:3 instead of 3:2, but in GUI 'landscape' is always long side horizontal regardless of the ratio is written short or long side first. +- const bool flip_orientation = fixr->get_active() && crop_ratios[ratio->get_active_row_number()].value > 0 && crop_ratios[ratio->get_active_row_number()].value < 1.0; ++ const bool flip_orientation = ++ fixr->get_active() ++ && crop_ratios->getValue(ratio->get_active_row_number()) > 0 ++ && crop_ratios->getValue(ratio->get_active_row_number()) < 1.0; + + if (orientation->get_active_row_number() == 0) { + pp->crop.orientation = flip_orientation ? "Portrait" : "Landscape"; +@@ -1501,7 +1552,7 @@ double Crop::getRatio () const + return r; + } + +- r = crop_ratios[ratio->get_active_row_number()].value; ++ r = crop_ratios->getValue(ratio->get_active_row_number()); + if (!r) { + r = maxh <= maxw ? float(maxh)/float(maxw) : float(maxw)/float(maxh); + } +@@ -1539,5 +1590,5 @@ void Crop::updateCurrentRatio() + double rw, rh; + get_custom_ratio(w->get_value(), h->get_value(), rw, rh); + customRatioLabel->set_text(Glib::ustring::compose("%1:%2", rw, rh)); +- crop_ratios[1].value = double(w->get_value())/double(h->get_value()); ++ crop_ratios->updateCurrentRatio(static_cast<double>(w->get_value()) / static_cast<double>(h->get_value())); + } +diff --git a/rtgui/crop.h b/rtgui/crop.h +index b9221a803..c6636b917 100644 +--- a/rtgui/crop.h ++++ b/rtgui/crop.h +@@ -18,7 +18,7 @@ + */ + #pragma once + +-#include <vector> ++#include <memory> + + #include <gtkmm.h> + +@@ -91,16 +91,13 @@ class Crop final : + void rotateCrop (int deg, bool hflip, bool vflip); + + private: +- struct CropRatio { +- Glib::ustring label; +- double value; +- }; +- +- std::vector<CropRatio> crop_ratios; ++ class CropRatios; + + void adjustCropToRatio(); + void updateCurrentRatio(); + ++ const std::unique_ptr<CropRatios> crop_ratios; ++ + Gtk::CheckButton* fixr; + MyComboBoxText* ratio; + MyComboBoxText* orientation; diff --git a/media-gfx/rawtherapee/files/RT_5.8_glibc234.patch b/media-gfx/rawtherapee/files/RT_5.8_glibc234.patch new file mode 100644 index 000000000000..791183e20d52 --- /dev/null +++ b/media-gfx/rawtherapee/files/RT_5.8_glibc234.patch @@ -0,0 +1,683 @@ +diff -udHrN -- a/RT_5.8_glibc234.patch b/RT_5.8_glibc234.patch +--- a/RT_5.8_glibc234.patch 1970-01-01 01:00:00.000000000 +0100 ++++ b/RT_5.8_glibc234.patch 2021-08-04 18:50:22.142646367 +0200 +@@ -0,0 +1,334 @@ ++diff --git a/rtengine/canon_cr3_decoder.cc b/rtengine/canon_cr3_decoder.cc ++index ddd4b6172..1132b4e01 100644 ++--- a/rtengine/canon_cr3_decoder.cc +++++ b/rtengine/canon_cr3_decoder.cc ++@@ -670,7 +670,7 @@ std::uint32_t _byteswap_ulong(std::uint32_t x) ++ #endif ++ ++ struct LibRaw_abstract_datastream { ++- IMFILE* ifp; +++ rtengine::IMFILE* ifp; ++ ++ void lock() ++ { ++diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc ++index ef0b4e8dc..13a6b054a 100644 ++--- a/rtengine/dcraw.cc +++++ b/rtengine/dcraw.cc ++@@ -1963,7 +1963,7 @@ void CLASS phase_one_load_raw_c() ++ #endif ++ { ++ int len[2], pred[2]; ++- IMFILE ifpthr = *ifp; +++ rtengine::IMFILE ifpthr = *ifp; ++ ifpthr.plistener = nullptr; ++ ++ #ifdef _OPENMP ++@@ -3317,7 +3317,7 @@ void CLASS sony_arw2_load_raw() ++ { ++ uchar *data = new (std::nothrow) uchar[raw_width + 1]; ++ merror(data, "sony_arw2_load_raw()"); ++- IMFILE ifpthr = *ifp; +++ rtengine::IMFILE ifpthr = *ifp; ++ int pos = ifpthr.pos; ++ ushort pix[16]; ++ ++@@ -6331,7 +6331,7 @@ int CLASS parse_tiff_ifd (int base) ++ unsigned sony_curve[] = { 0,0,0,0,0,4095 }; ++ unsigned *buf, sony_offset=0, sony_length=0, sony_key=0; ++ struct jhead jh; ++-/*RT*/ IMFILE *sfp; +++/*RT*/ rtengine::IMFILE *sfp; ++ /*RT*/ int pana_raw = 0; ++ ++ if (tiff_nifds >= sizeof tiff_ifd / sizeof tiff_ifd[0]) ++@@ -6895,7 +6895,7 @@ it under the terms of the one of two licenses as you choose: ++ fread (buf, sony_length, 1, ifp); ++ sony_decrypt (buf, sony_length/4, 1, sony_key); ++ sfp = ifp; ++-/*RT*/ ifp = fopen (buf, sony_length); +++/*RT*/ ifp = rtengine::fopen (buf, sony_length); ++ // if ((ifp = tmpfile())) { ++ // fwrite (buf, sony_length, 1, ifp); ++ // fseek (ifp, 0, SEEK_SET); ++@@ -7203,7 +7203,7 @@ void CLASS parse_external_jpeg() ++ { ++ const char *file, *ext; ++ char *jname, *jfile, *jext; ++-/*RT*/ IMFILE *save=ifp; +++/*RT*/ rtengine::IMFILE *save=ifp; ++ ++ ext = strrchr (ifname, '.'); ++ file = strrchr (ifname, '/'); ++@@ -7231,7 +7231,7 @@ void CLASS parse_external_jpeg() ++ *jext = '0'; ++ } ++ if (strcmp (jname, ifname)) { ++-/*RT*/ if ((ifp = fopen (jname))) { +++/*RT*/ if ((ifp = rtengine::fopen (jname))) { ++ // if ((ifp = fopen (jname, "rb"))) { ++ if (verbose) ++ fprintf (stderr,_("Reading metadata from %s ...\n"), jname); ++diff --git a/rtengine/dcraw.h b/rtengine/dcraw.h ++index 10c7b9ba6..bc009e67c 100644 ++--- a/rtengine/dcraw.h +++++ b/rtengine/dcraw.h ++@@ -73,7 +73,7 @@ public: ++ ++ protected: ++ int exif_base, ciff_base, ciff_len; ++- IMFILE *ifp; +++ rtengine::IMFILE *ifp; ++ FILE *ofp; ++ short order; ++ const char *ifname; ++@@ -125,7 +125,7 @@ protected: ++ int cur_buf_size; // buffer size ++ uchar *cur_buf; // currently read block ++ int fillbytes; // Counter to add extra byte for block size N*16 ++- IMFILE *input; +++ rtengine::IMFILE *input; ++ struct int_pair grad_even[3][41]; // tables of gradients ++ struct int_pair grad_odd[3][41]; ++ ushort *linealloc; ++@@ -278,7 +278,7 @@ void parse_redcine(); ++ class getbithuff_t ++ { ++ public: ++- getbithuff_t(DCraw *p,IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){} +++ getbithuff_t(DCraw *p,rtengine::IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){} ++ unsigned operator()(int nbits, ushort *huff); ++ ++ private: ++@@ -288,7 +288,7 @@ private: ++ DCraw *parent; ++ unsigned bitbuf; ++ int vbits, reset; ++- IMFILE *&ifp; +++ rtengine::IMFILE *&ifp; ++ unsigned &zero_after_ff; ++ }; ++ getbithuff_t getbithuff; ++@@ -296,7 +296,7 @@ getbithuff_t getbithuff; ++ class nikbithuff_t ++ { ++ public: ++- explicit nikbithuff_t(IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){} +++ explicit nikbithuff_t(rtengine::IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){} ++ void operator()() {bitbuf = vbits = 0;}; ++ unsigned operator()(int nbits, ushort *huff); ++ unsigned errorCount() { return errors; } ++@@ -309,7 +309,7 @@ private: ++ } ++ unsigned bitbuf, errors; ++ int vbits; ++- IMFILE *&ifp; +++ rtengine::IMFILE *&ifp; ++ }; ++ nikbithuff_t nikbithuff; ++ ++@@ -377,7 +377,7 @@ void parse_qt (int end); ++ // ph1_bithuff(int nbits, ushort *huff); ++ class ph1_bithuff_t { ++ public: ++- ph1_bithuff_t(DCraw *p, IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){} +++ ph1_bithuff_t(DCraw *p, rtengine::IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){} ++ unsigned operator()(int nbits, ushort *huff); ++ unsigned operator()(int nbits); ++ unsigned operator()(); ++@@ -411,7 +411,7 @@ private: ++ } ++ ++ short ℴ ++- IMFILE* const ifp; +++ rtengine::IMFILE* const ifp; ++ UINT64 bitbuf; ++ int vbits; ++ }; ++@@ -429,11 +429,11 @@ void nokia_load_raw(); ++ ++ class pana_bits_t{ ++ public: ++- pana_bits_t(IMFILE *i, unsigned &u, unsigned enc): +++ pana_bits_t(rtengine::IMFILE *i, unsigned &u, unsigned enc): ++ ifp(i), load_flags(u), vbits(0), encoding(enc) {} ++ unsigned operator()(int nbits, unsigned *bytes=nullptr); ++ private: ++- IMFILE *ifp; +++ rtengine::IMFILE *ifp; ++ unsigned &load_flags; ++ uchar buf[0x4000]; ++ int vbits; ++diff --git a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc ++index 7dde668eb..e551c9aad 100644 ++--- a/rtengine/dfmanager.cc +++++ b/rtengine/dfmanager.cc ++@@ -540,7 +540,7 @@ std::vector<badPix> *DFManager::getHotPixels ( const std::string &mak, const std ++ ++ int DFManager::scanBadPixelsFile( Glib::ustring filename ) ++ { ++- FILE *file = fopen( filename.c_str(), "r" ); +++ FILE *file = ::fopen( filename.c_str(), "r" ); ++ ++ if( !file ) { ++ return false; ++diff --git a/rtengine/myfile.cc b/rtengine/myfile.cc ++index 842766dcf..2321d18bb 100644 ++--- a/rtengine/myfile.cc +++++ b/rtengine/myfile.cc ++@@ -70,7 +70,7 @@ int munmap(void *start, size_t length) ++ ++ #ifdef MYFILE_MMAP ++ ++-IMFILE* fopen (const char* fname) +++rtengine::IMFILE* rtengine::fopen (const char* fname) ++ { ++ int fd; ++ ++@@ -123,13 +123,13 @@ IMFILE* fopen (const char* fname) ++ return mf; ++ } ++ ++-IMFILE* gfopen (const char* fname) +++rtengine::IMFILE* rtengine::gfopen (const char* fname) ++ { ++ return fopen(fname); ++ } ++ #else ++ ++-IMFILE* fopen (const char* fname) +++rtengine::IMFILE* rtengine::fopen (const char* fname) ++ { ++ ++ FILE* f = g_fopen (fname, "rb"); ++@@ -152,7 +152,7 @@ IMFILE* fopen (const char* fname) ++ return mf; ++ } ++ ++-IMFILE* gfopen (const char* fname) +++rtengine::IMFILE* rtengine::gfopen (const char* fname) ++ { ++ ++ FILE* f = g_fopen (fname, "rb"); ++@@ -176,7 +176,7 @@ IMFILE* gfopen (const char* fname) ++ } ++ #endif //MYFILE_MMAP ++ ++-IMFILE* fopen (unsigned* buf, int size) +++rtengine::IMFILE* rtengine::fopen (unsigned* buf, int size) ++ { ++ ++ IMFILE* mf = new IMFILE; ++@@ -190,7 +190,7 @@ IMFILE* fopen (unsigned* buf, int size) ++ return mf; ++ } ++ ++-void fclose (IMFILE* f) +++void rtengine::fclose (IMFILE* f) ++ { ++ #ifdef MYFILE_MMAP ++ ++@@ -207,7 +207,7 @@ void fclose (IMFILE* f) ++ delete f; ++ } ++ ++-int fscanf (IMFILE* f, const char* s ...) +++int rtengine::fscanf (IMFILE* f, const char* s ...) ++ { ++ // fscanf not easily wrapped since we have no terminating \0 at end ++ // of file data and vsscanf() won't tell us how many characters that ++@@ -253,7 +253,7 @@ int fscanf (IMFILE* f, const char* s ...) ++ } ++ ++ ++-char* fgets (char* s, int n, IMFILE* f) +++char* rtengine::fgets (char* s, int n, IMFILE* f) ++ { ++ ++ if (f->pos >= f->size) { ++@@ -270,7 +270,7 @@ char* fgets (char* s, int n, IMFILE* f) ++ return s; ++ } ++ ++-void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range) +++void rtengine::imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range) ++ { ++ f->plistener = plistener; ++ f->progress_range = progress_range; ++@@ -278,7 +278,7 @@ void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, doub ++ f->progress_current = 0; ++ } ++ ++-void imfile_update_progress(IMFILE *f) +++void rtengine::imfile_update_progress(IMFILE *f) ++ { ++ if (!f->plistener || f->progress_current < f->progress_next) { ++ return; ++diff --git a/rtengine/myfile.h b/rtengine/myfile.h ++index 34b90c525..ae14ce31a 100644 ++--- a/rtengine/myfile.h +++++ b/rtengine/myfile.h ++@@ -30,8 +30,6 @@ namespace rtengine ++ ++ class ProgressListener; ++ ++-} ++- ++ struct IMFILE { ++ int fd; ++ ssize_t pos; ++@@ -141,3 +139,5 @@ inline unsigned char* fdata(int offset, IMFILE* f) ++ ++ int fscanf (IMFILE* f, const char* s ...); ++ char* fgets (char* s, int n, IMFILE* f); +++ +++} ++diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc ++index 8dc998862..cf500474f 100644 ++--- a/rtengine/rtthumbnail.cc +++++ b/rtengine/rtthumbnail.cc ++@@ -1965,7 +1965,7 @@ bool Thumbnail::writeImage (const Glib::ustring& fname) ++ ++ Glib::ustring fullFName = fname + ".rtti"; ++ ++- FILE* f = g_fopen (fullFName.c_str (), "wb"); +++ FILE* f = ::g_fopen (fullFName.c_str (), "wb"); ++ ++ if (!f) { ++ return false; ++@@ -2008,7 +2008,7 @@ bool Thumbnail::readImage (const Glib::ustring& fname) ++ return false; ++ } ++ ++- FILE* f = g_fopen(fullFName.c_str (), "rb"); +++ FILE* f = ::g_fopen(fullFName.c_str (), "rb"); ++ ++ if (!f) { ++ return false; ++@@ -2239,7 +2239,7 @@ bool Thumbnail::writeData (const Glib::ustring& fname) ++ return false; ++ } ++ ++- FILE *f = g_fopen (fname.c_str (), "wt"); +++ FILE *f = ::g_fopen (fname.c_str (), "wt"); ++ ++ if (!f) { ++ if (settings->verbose) { ++@@ -2262,7 +2262,7 @@ bool Thumbnail::readEmbProfile (const Glib::ustring& fname) ++ embProfile = nullptr; ++ embProfileLength = 0; ++ ++- FILE* f = g_fopen (fname.c_str (), "rb"); +++ FILE* f = ::g_fopen (fname.c_str (), "rb"); ++ ++ if (f) { ++ if (!fseek (f, 0, SEEK_END)) { ++@@ -2290,7 +2290,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname) ++ { ++ ++ if (embProfileData) { ++- FILE* f = g_fopen (fname.c_str (), "wb"); +++ FILE* f = ::g_fopen (fname.c_str (), "wb"); ++ ++ if (f) { ++ fwrite (embProfileData, 1, embProfileLength, f); +diff -udHrN -- a/rtengine/canon_cr3_decoder.cc b/rtengine/canon_cr3_decoder.cc +--- a/rtengine/canon_cr3_decoder.cc 2020-02-04 07:39:52.000000000 +0100 ++++ b/rtengine/canon_cr3_decoder.cc 2021-08-07 11:43:50.725202017 +0200 +@@ -662,7 +662,7 @@ + #endif + + struct LibRaw_abstract_datastream { +- IMFILE* ifp; ++ rtengine::IMFILE* ifp; + + void lock() + { +diff -udHrN -- a/rtengine/dcraw.cc b/rtengine/dcraw.cc +--- a/rtengine/dcraw.cc 2020-02-04 07:39:52.000000000 +0100 ++++ b/rtengine/dcraw.cc 2021-08-07 11:43:50.736202141 +0200 +@@ -2025,7 +2025,7 @@ + #endif + { + int len[2], pred[2]; +- IMFILE ifpthr = *ifp; ++ rtengine::IMFILE ifpthr = *ifp; + ifpthr.plistener = nullptr; + + #ifdef _OPENMP +@@ -3380,7 +3380,7 @@ + { + uchar *data = new (std::nothrow) uchar[raw_width + 1]; + merror(data, "sony_arw2_load_raw()"); +- IMFILE ifpthr = *ifp; ++ rtengine::IMFILE ifpthr = *ifp; + int pos = ifpthr.pos; + ushort pix[16]; + +@@ -6394,7 +6394,7 @@ + unsigned sony_curve[] = { 0,0,0,0,0,4095 }; + unsigned *buf, sony_offset=0, sony_length=0, sony_key=0; + struct jhead jh; +-/*RT*/ IMFILE *sfp; ++/*RT*/ rtengine::IMFILE *sfp; + /*RT*/ int pana_raw = 0; + + if (tiff_nifds >= sizeof tiff_ifd / sizeof tiff_ifd[0]) +@@ -6958,7 +6958,7 @@ + fread (buf, sony_length, 1, ifp); + sony_decrypt (buf, sony_length/4, 1, sony_key); + sfp = ifp; +-/*RT*/ ifp = fopen (buf, sony_length); ++/*RT*/ ifp = rtengine::fopen (buf, sony_length); + // if ((ifp = tmpfile())) { + // fwrite (buf, sony_length, 1, ifp); + // fseek (ifp, 0, SEEK_SET); +@@ -7264,7 +7264,7 @@ + { + const char *file, *ext; + char *jname, *jfile, *jext; +-/*RT*/ IMFILE *save=ifp; ++/*RT*/ rtengine::IMFILE *save=ifp; + + ext = strrchr (ifname, '.'); + file = strrchr (ifname, '/'); +@@ -7292,7 +7292,7 @@ + *jext = '0'; + } + if (strcmp (jname, ifname)) { +-/*RT*/ if ((ifp = fopen (jname))) { ++/*RT*/ if ((ifp = rtengine::fopen (jname))) { + // if ((ifp = fopen (jname, "rb"))) { + if (verbose) + fprintf (stderr,_("Reading metadata from %s ...\n"), jname); +diff -udHrN -- a/rtengine/dcraw.h b/rtengine/dcraw.h +--- a/rtengine/dcraw.h 2020-02-04 07:39:52.000000000 +0100 ++++ b/rtengine/dcraw.h 2021-08-07 11:43:50.737202152 +0200 +@@ -73,7 +73,7 @@ + + protected: + int exif_base, ciff_base, ciff_len; +- IMFILE *ifp; ++ rtengine::IMFILE *ifp; + FILE *ofp; + short order; + const char *ifname; +@@ -125,7 +125,7 @@ + int cur_buf_size; // buffer size + uchar *cur_buf; // currently read block + int fillbytes; // Counter to add extra byte for block size N*16 +- IMFILE *input; ++ rtengine::IMFILE *input; + struct int_pair grad_even[3][41]; // tables of gradients + struct int_pair grad_odd[3][41]; + ushort *linealloc; +@@ -278,7 +278,7 @@ + class getbithuff_t + { + public: +- getbithuff_t(DCraw *p,IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){} ++ getbithuff_t(DCraw *p,rtengine::IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){} + unsigned operator()(int nbits, ushort *huff); + + private: +@@ -288,7 +288,7 @@ + DCraw *parent; + unsigned bitbuf; + int vbits, reset; +- IMFILE *&ifp; ++ rtengine::IMFILE *&ifp; + unsigned &zero_after_ff; + }; + getbithuff_t getbithuff; +@@ -296,7 +296,7 @@ + class nikbithuff_t + { + public: +- explicit nikbithuff_t(IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){} ++ explicit nikbithuff_t(rtengine::IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){} + void operator()() {bitbuf = vbits = 0;}; + unsigned operator()(int nbits, ushort *huff); + unsigned errorCount() { return errors; } +@@ -309,7 +309,7 @@ + } + unsigned bitbuf, errors; + int vbits; +- IMFILE *&ifp; ++ rtengine::IMFILE *&ifp; + }; + nikbithuff_t nikbithuff; + +@@ -378,7 +378,7 @@ + // ph1_bithuff(int nbits, ushort *huff); + class ph1_bithuff_t { + public: +- ph1_bithuff_t(DCraw *p, IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){} ++ ph1_bithuff_t(DCraw *p, rtengine::IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){} + unsigned operator()(int nbits, ushort *huff); + unsigned operator()(int nbits); + unsigned operator()(); +@@ -412,7 +412,7 @@ + } + + short ℴ +- IMFILE* const ifp; ++ rtengine::IMFILE* const ifp; + UINT64 bitbuf; + int vbits; + }; +@@ -430,11 +430,11 @@ + + class pana_bits_t{ + public: +- pana_bits_t(IMFILE *i, unsigned &u, unsigned enc): ++ pana_bits_t(rtengine::IMFILE *i, unsigned &u, unsigned enc): + ifp(i), load_flags(u), vbits(0), encoding(enc) {} + unsigned operator()(int nbits, unsigned *bytes=nullptr); + private: +- IMFILE *ifp; ++ rtengine::IMFILE *ifp; + unsigned &load_flags; + uchar buf[0x4000]; + int vbits; +diff -udHrN -- a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc +--- a/rtengine/dfmanager.cc 2020-02-04 07:39:52.000000000 +0100 ++++ b/rtengine/dfmanager.cc 2021-08-07 11:43:50.738202163 +0200 +@@ -540,7 +540,7 @@ + + int DFManager::scanBadPixelsFile( Glib::ustring filename ) + { +- FILE *file = fopen( filename.c_str(), "r" ); ++ FILE *file = ::fopen( filename.c_str(), "r" ); + + if( !file ) { + return false; +diff -udHrN -- a/rtengine/myfile.cc b/rtengine/myfile.cc +--- a/rtengine/myfile.cc 2020-02-04 07:39:52.000000000 +0100 ++++ b/rtengine/myfile.cc 2021-08-07 11:43:50.738202163 +0200 +@@ -70,7 +70,7 @@ + + #ifdef MYFILE_MMAP + +-IMFILE* fopen (const char* fname) ++rtengine::IMFILE* rtengine::fopen (const char* fname) + { + int fd; + +@@ -123,13 +123,13 @@ + return mf; + } + +-IMFILE* gfopen (const char* fname) ++rtengine::IMFILE* rtengine::gfopen (const char* fname) + { + return fopen(fname); + } + #else + +-IMFILE* fopen (const char* fname) ++rtengine::IMFILE* rtengine::fopen (const char* fname) + { + + FILE* f = g_fopen (fname, "rb"); +@@ -152,7 +152,7 @@ + return mf; + } + +-IMFILE* gfopen (const char* fname) ++rtengine::IMFILE* rtengine::gfopen (const char* fname) + { + + FILE* f = g_fopen (fname, "rb"); +@@ -176,7 +176,7 @@ + } + #endif //MYFILE_MMAP + +-IMFILE* fopen (unsigned* buf, int size) ++rtengine::IMFILE* rtengine::fopen (unsigned* buf, int size) + { + + IMFILE* mf = new IMFILE; +@@ -190,7 +190,7 @@ + return mf; + } + +-void fclose (IMFILE* f) ++void rtengine::fclose (IMFILE* f) + { + #ifdef MYFILE_MMAP + +@@ -207,7 +207,7 @@ + delete f; + } + +-int fscanf (IMFILE* f, const char* s ...) ++int rtengine::fscanf (IMFILE* f, const char* s ...) + { + // fscanf not easily wrapped since we have no terminating \0 at end + // of file data and vsscanf() won't tell us how many characters that +@@ -253,7 +253,7 @@ + } + + +-char* fgets (char* s, int n, IMFILE* f) ++char* rtengine::fgets (char* s, int n, IMFILE* f) + { + + if (f->pos >= f->size) { +@@ -270,7 +270,7 @@ + return s; + } + +-void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range) ++void rtengine::imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range) + { + f->plistener = plistener; + f->progress_range = progress_range; +@@ -278,7 +278,7 @@ + f->progress_current = 0; + } + +-void imfile_update_progress(IMFILE *f) ++void rtengine::imfile_update_progress(IMFILE *f) + { + if (!f->plistener || f->progress_current < f->progress_next) { + return; +diff -udHrN -- a/rtengine/myfile.h b/rtengine/myfile.h +--- a/rtengine/myfile.h 2020-02-04 07:39:52.000000000 +0100 ++++ b/rtengine/myfile.h 2021-08-07 11:43:50.739202175 +0200 +@@ -30,8 +30,6 @@ + + class ProgressListener; + +-} +- + struct IMFILE { + int fd; + ssize_t pos; +@@ -141,3 +139,5 @@ + + int fscanf (IMFILE* f, const char* s ...); + char* fgets (char* s, int n, IMFILE* f); ++ ++} +diff -udHrN -- a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc +--- a/rtengine/rtthumbnail.cc 2020-02-04 07:39:52.000000000 +0100 ++++ b/rtengine/rtthumbnail.cc 2021-08-07 12:02:02.091503230 +0200 +@@ -1922,7 +1922,7 @@ + + Glib::ustring fullFName = fname + ".rtti"; + +- FILE* f = g_fopen (fullFName.c_str (), "wb"); ++ FILE* f = ::g_fopen (fullFName.c_str (), "wb"); + + if (!f) { + return false; +@@ -1965,7 +1965,7 @@ + return false; + } + +- FILE* f = g_fopen(fullFName.c_str (), "rb"); ++ FILE* f = ::g_fopen(fullFName.c_str (), "rb"); + + if (!f) { + return false; +@@ -2191,7 +2191,7 @@ + return false; + } + +- FILE *f = g_fopen (fname.c_str (), "wt"); ++ FILE *f = ::g_fopen (fname.c_str (), "wt"); + + if (!f) { + if (settings->verbose) { +@@ -2214,7 +2214,7 @@ + embProfile = nullptr; + embProfileLength = 0; + +- FILE* f = g_fopen (fname.c_str (), "rb"); ++ FILE* f = ::g_fopen (fname.c_str (), "rb"); + + if (f) { + if (!fseek (f, 0, SEEK_END)) { +@@ -2242,7 +2242,7 @@ + { + + if (embProfileData) { +- FILE* f = g_fopen (fname.c_str (), "wb"); ++ FILE* f = ::g_fopen (fname.c_str (), "wb"); + + if (f) { + fwrite (embProfileData, 1, embProfileLength, f); +@@ -2257,7 +2257,7 @@ + bool Thumbnail::readAEHistogram (const Glib::ustring& fname) + { + +- FILE* f = g_fopen(fname.c_str(), "rb"); ++ FILE* f = ::g_fopen(fname.c_str(), "rb"); + + if (!f) { + aeHistogram.reset(); +@@ -2280,7 +2280,7 @@ + { + + if (aeHistogram) { +- FILE* f = g_fopen (fname.c_str (), "wb"); ++ FILE* f = ::g_fopen (fname.c_str (), "wb"); + + if (f) { + fwrite (&aeHistogram[0], 1, (65536 >> aeHistCompression)*sizeof (aeHistogram[0]), f); diff --git a/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild b/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild new file mode 100644 index 000000000000..9986f490f4b0 --- /dev/null +++ b/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P=${P/_rc/-rc} +inherit cmake flag-o-matic toolchain-funcs xdg-utils + +DESCRIPTION="A powerful cross-platform raw image processing program" +HOMEPAGE="https://www.rawtherapee.com/" +SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="openmp tcmalloc" + +RDEPEND=" + dev-cpp/atkmm:= + dev-cpp/cairomm:= + dev-cpp/glibmm:= + dev-cpp/pangomm:= + dev-libs/expat + dev-libs/glib:= + dev-libs/libsigc++:2 + media-libs/lcms:2 + media-libs/lensfun + media-libs/libcanberra[gtk3] + media-libs/libiptcdata + media-libs/libpng:0= + media-libs/tiff:0 + sci-libs/fftw:3.0= + sys-libs/zlib + virtual/jpeg:0 + x11-libs/gtk+:3 + tcmalloc? ( dev-util/google-perftools )" +DEPEND="${RDEPEND} + dev-cpp/gtkmm:3.0 + gnome-base/librsvg" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/RT_5.8_fix_crop.patch" + "${FILESDIR}/RT_5.8_glibc234.patch" +) + +pkg_pretend() { + if use openmp ; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi +} + +src_configure() { + # upstream tested that "fast-math" give wrong results, so filter it + # https://bugs.gentoo.org/show_bug.cgi?id=606896#c2 + filter-flags -ffast-math + # -Ofast enable "fast-math" both in gcc and clang + replace-flags -Ofast -O3 + # In case we add an ebuild for klt we can (i)use that one, + # see http://cecas.clemson.edu/~stb/klt/ + local mycmakeargs=( + -DOPTION_OMP=$(usex openmp) + -DDOCDIR=/usr/share/doc/${PF} + -DCREDITSDIR=/usr/share/${PN} + -DLICENCEDIR=/usr/share/${PN} + -DCACHE_NAME_SUFFIX="" + -DWITH_SYSTEM_KLT="off" + -DENABLE_TCMALLOC=$(usex tcmalloc) + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest index 1aaa8e5ef1cb..f6eda18cb23d 100644 --- a/media-gfx/scour/Manifest +++ b/media-gfx/scour/Manifest @@ -1,3 +1,3 @@ DIST scour-0.38.2.tar.gz 99910 BLAKE2B 4273287b201ecea64cb2be666bb7de4fbadc3483935515de92ec8dfb39f3b856584e35ac877958efd798bb5840baba4fc4d40a376d2c9f3b0c52a679d7ded6df SHA512 a2c418e25283af399be032322b3af0c336c2392ba361681d4b133b64ebc441ac5beeed2b920f42316cef376c971b230681e306687786a875162d33b659d3fdeb -EBUILD scour-0.38.2.ebuild 715 BLAKE2B a774b0e84b580c9662521a8006ccbf242b86c9f948249a4c9af36d17a24fce9ff3286a0eb6b4d457eaef88ed642212ce7582e7109bb97d931e509c189a3638b5 SHA512 570b328744316789daf592262e1718c390ff4549b5b8ddf7a176361239a25e67ea53c3e0601d3ba4917026be7a26efa239897822ded2c3b6d628c7ac357314e8 +EBUILD scour-0.38.2.ebuild 722 BLAKE2B 03409f6b1eb636c2e91332a9381b9910005a94f1faf1ee347f3b24c9a7a685d0f51e87ae0df0067e2bef7fc2a800fc3e6bcea6f495cd810bb471c7a5c9997f50 SHA512 bc76ea87a3b2e4fab6884c8b59c981214464eb9f89693a31b7f1c72c848f62e3c2d30145444503309fa5c1d2f8c5524f0e38a780ca5cd8b2368f485d2f1c3b9c MISC metadata.xml 193 BLAKE2B 7acb137a1e8618cd92414ef5f9b789a55acfd26c37e7cf00181c62dd8471e217e97670719fd5d6c00834cadb75a5ad8c8cac7fd06c87ea61551d77eb8af1e6e2 SHA512 e34d92e02e423c37397982d7865e381b6eacd66dec5dd4e360697cb8ea326638ca3b2b88c23277f7fa6248ed31081e2938fbe6fc5178ffc52bdc4798c027341b diff --git a/media-gfx/scour/scour-0.38.2.ebuild b/media-gfx/scour/scour-0.38.2.ebuild index 434b45dc49da..79258e63799e 100644 --- a/media-gfx/scour/scour-0.38.2.ebuild +++ b/media-gfx/scour/scour-0.38.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest index 7560c08c9093..e9e066d49513 100644 --- a/media-gfx/transfig/Manifest +++ b/media-gfx/transfig/Manifest @@ -3,5 +3,5 @@ AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980 DIST transfig-3.2.5e-gentoo-patchset-r1.tar.bz2 21160 BLAKE2B 093020827fc0636f7549c3b325e4f148aa52407d8e288038dd02012875737523e83e0717662d04e463a01e8cfacfabffaaa4362b5bb1276c4f2052f6653fa26f SHA512 dbef1ca464929de45f3c706e76eb9f324ea9e692cc8c924893926e07ef7d4e0dbe597bcf465a9c7fc9fca22abe0acc6784ab09658a18aeff4ba44921b52b02ff DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e -EBUILD transfig-3.2.5e-r1.ebuild 3436 BLAKE2B 0e09a34f42b70c66dd94c9295250fcab9bae35bcec9869eae363a1b4aadd566e1171c55620027304ddeb8a637129a6695db80dde72641e1a17d0461a75d05316 SHA512 b8989f461feb24e3d31e721e561a3d28581b88ba107aac7db1fa5a15c77d94966786b080bd47af9c5325353906966e2b0bf32cb153531f0c1ce52041cc216995 +EBUILD transfig-3.2.5e-r1.ebuild 3443 BLAKE2B 40eb4b45f45ed98f13e5e99d90657d430f126712b6de1872861fc167f7979e3fefdd8443bb6b0de07ef74c9dffb46e682bfd3895885373aee02894159cb14a69 SHA512 3c49a8fd93dd6b6c2c3cd1ae02d5806804916bbe06ff7a07c80456badf03f51b03649aa7679d9344061d0723e636f457b1e985f98e21ef2db05addf56811f6ce MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c diff --git a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild index 39ce8231f7e8..eba86b40a63e 100644 --- a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild +++ b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" RDEPEND=" media-libs/libpng diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest index 26b38fe0db2a..54fd1ac47f99 100644 --- a/media-gfx/xfig/Manifest +++ b/media-gfx/xfig/Manifest @@ -3,5 +3,5 @@ AUX xfig-3.2.6a-solaris.patch 523 BLAKE2B eeae0cc11ae6e3fd6e8c157648d8663131d0d1 AUX xfig-3.2.6a-urwfonts.patch 4933 BLAKE2B eb1edf6b30966864dbdf3e932f2cde231ff5777cdc0dff34cf047a169335ba78e493b10817e39aac72221d17d491138c3c28a3b293582d3808255140d5df6762 SHA512 29fea111b6c07f6ea28bc46259c0dc8d20b1bbf86e33d550037744b93d4f4de7ec9c4ea7fa14c5f91a4278848216d183ac841970c798140359e1fc317baac468 AUX xfig-3.2.7b-ghostscript.patch 615 BLAKE2B 374bf50e43980ce3de7e60bdc0ddad5ded9306dfff137e2b644ed21dd201c34ab5b2c3ae57eaf102585333321e217a9d09936db247592b0d559f6bc5744235ad SHA512 7343433ce589495dcf653df678bf364d190dad28bd49d4608d589ab9fe6e385ac0c1e3ca040dacf75503dce9441fb741500cbb1143e248fe1893542c970e7d86 DIST xfig-3.2.7b.tar.xz 5059984 BLAKE2B a22465e16019e9887e302ea308e250ad5d7ba0c49aec8f554a73d3b4489d803a05041cb7d267c543a7c0d3b78eac25077c628283f82767932afcc9d9750ce883 SHA512 f3396ebf8a5961909e58b05b60117fd7bbc8c24fabbd47f108eaea9586f4180af572faffe077b1a5dcbf669ebd69b1c2791f302c126dea62a44aa1592de66f73 -EBUILD xfig-3.2.7b.ebuild 1260 BLAKE2B d813028c80532f5fcdad3405a538d966c12efab1a93213edc7ab5cca1c61f809cbee02bc16c8038cbfb9709c344f0b9cb43bc33d6033305359b4dcce5fc917ed SHA512 054fae9245ca570bd89d6b9b7c7820f0e6a8b49af3f2b5f9789a2222efaaa7591e7e1744c335d52daa9fc24a4036e11bd86bd4a2dcf0dd481fa3036fb35680bf +EBUILD xfig-3.2.7b.ebuild 1267 BLAKE2B 6b70670f3c179b7168b65dc97dd2e798b9e1f86a84a4d8dd30c0a8218436637789103cc26ab974cac6391b730df825aeac71d743a57b1b7e7026fa64a7a0a5d1 SHA512 3d6efc8fe4c814f8bfdf27fe27c6bcaa97ac74e79d1b2c8fd89bbc651db18663fddd847877a82eef91a3b897c06f1daa9db1574b34bd6ca0930db3c46d2eb1f7 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c diff --git a/media-gfx/xfig/xfig-3.2.7b.ebuild b/media-gfx/xfig/xfig-3.2.7b.ebuild index eb2f63a239cb..1a13e62e0058 100644 --- a/media-gfx/xfig/xfig-3.2.7b.ebuild +++ b/media-gfx/xfig/xfig-3.2.7b.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/mcj/${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" IUSE="jpeg nls postscript" RDEPEND=" |