diff options
Diffstat (limited to 'media-gfx')
111 files changed, 1921 insertions, 2336 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 498342956f09..cf2a28ce01cb 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest index a56ffc621916..c36fc79deebd 100644 --- a/media-gfx/ahoviewer/Manifest +++ b/media-gfx/ahoviewer/Manifest @@ -1,3 +1,5 @@ DIST ahoviewer-2.0.0_beta.tar.gz 488564 BLAKE2B 325d9689e13fc2847d00be3e77eb5cd8234c98d0c516d3427d4275beaf6cc08ba8a054dfa047ec5e00e4693f8b14f730694358dc22a15e8d503bf67f232c1772 SHA512 6a38da0810c93886233a41d1fdc3f9779158c54b328c13cb2eea9e921057913fd3bb48370b95526f2bc8635ca4ba0967e7edeb95052ea689b05fb8555d826cf0 +DIST ahoviewer-2.0.0_pre20211126.tar.gz 502643 BLAKE2B fdfb4def35f6f1024ae47c114395f45e86abfb23a54275abf98a16bc8b7bae879e57034401b5effb340a2855af64b66ae09d86bcbbdd50e39f43f4f300232e2f SHA512 4facaa1938308e82b1743cb97186925b18ee843456a75bb2639e303e35e40fbee4b6bdebf1aa977fed03b2a4cf6a2b558c488720156db5f821da30578362303f EBUILD ahoviewer-2.0.0_beta.ebuild 1975 BLAKE2B f4ded42ed2acce53d6d72872e5f108f76bb58be7ac884b8b4db2943c949d2da3c270d956beb290f3fcebaf1e59466a7a2997a25bdb03f2ead3d4e7f1d874b92d SHA512 20eaa9a7b32ace00b176cf197cc2ed6da64268ba4f083512a7753bf32b3305a9922dbdf70e3b97792462830ff40cb1267ac2b496d0958dbc857082c15b895c5e +EBUILD ahoviewer-2.0.0_pre20211126.ebuild 1864 BLAKE2B a337624a8757bbcf3989ab4393baa61c3431128bfc5e2015b266f174d21028926b89296d98ec98bd41b351bfd76e8e23bbf475af45a2a928191e8442ae8faf65 SHA512 1a4646e0e3fbadab015ba4b6193d7551d628335bf05e5dab1557f7f958d77b3efb2ac0481ff333bc6e6d5542dc4b4900b5e45309dc957ee7615c100fece024da MISC metadata.xml 432 BLAKE2B 865f9803f9a469564f6d4fee9bffa7eb94d268db2358281cc8b744f5de2b88dc9abcd69b8610113c797bd0eeb574985d3775f9259884f57cbe9eda47aa051ac7 SHA512 60ecc403ad49d4a774ec98ef8850041f358d1903d345eaf63d7429e6c96e11a34e3dc5ed7e1470fb851fbdef9b3b2d965d9d04303c1b8f61691857354cca5924 diff --git a/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20211126.ebuild b/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20211126.ebuild new file mode 100644 index 000000000000..932f36195930 --- /dev/null +++ b/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20211126.ebuild @@ -0,0 +1,81 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson xdg + +MY_COMMIT="92f2b2f57c8a6ebf0d10cb95bfc9b685bf98be5c" + +DESCRIPTION="A GTK image viewer, manga reader, and booru browser" +HOMEPAGE="https://github.com/ahodesuka/ahoviewer" +SRC_URI="https://github.com/ahodesuka/ahoviewer/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gnome-keyring gnutls +gstreamer plugins +rar +ssl +zip" + +DEPEND="dev-cpp/atkmm:0 + dev-cpp/glibmm:2 + dev-cpp/gtkmm:3.0 + dev-cpp/pangomm:1.4 + dev-libs/glib:2 + dev-libs/libconfig:=[cxx] + dev-libs/libsigc++:2 + dev-libs/libxml2:2 + media-libs/libnsgif + net-misc/curl + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + gnome-keyring? ( app-crypt/libsecret ) + gstreamer? ( + media-libs/gst-plugins-bad:1.0 + media-libs/gstreamer:1.0 + ) + plugins? ( + dev-libs/gobject-introspection + dev-libs/libpeas + ) + rar? ( app-arch/unrar:= ) + ssl? ( + gnutls? ( + dev-libs/libgcrypt:= + net-libs/gnutls:= + net-misc/curl[curl_ssl_gnutls] + ) + !gnutls? ( + dev-libs/openssl:= + net-misc/curl[curl_ssl_openssl] + ) + ) + zip? ( dev-libs/libzip:= ) +" +RDEPEND="${DEPEND} + gstreamer? ( + media-libs/gst-plugins-base:1.0[X] + media-libs/gst-plugins-good:1.0 + || ( + media-plugins/gst-plugins-vpx + media-plugins/gst-plugins-libav + ) + )" + +# In future (-beta), pull https://github.com/ahodesuka/ahoviewer-plugins +# directly via SRC_URI="plugins? ( )", or add as a separate package. It +# depends on how the plugins are handled. +#PDEPEND="plugins? ( x11-misc/ahoviewer-plugins )" + +S="${WORKDIR}/ahoviewer-${MY_COMMIT}" + +src_configure() { + local emesonargs=( + $(meson_feature gnome-keyring libsecret) + $(meson_feature gstreamer) + $(meson_feature plugins libpeas) + $(meson_feature rar libunrar) + $(meson_feature zip libzip) + ) + + meson_src_configure +} diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest index 67400d2ddc71..c6049fa7bec9 100644 --- a/media-gfx/alembic/Manifest +++ b/media-gfx/alembic/Manifest @@ -3,5 +3,5 @@ AUX alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch 4247 BLAKE2B 4c921f4 DIST alembic-1.8.2.tar.gz 861796 BLAKE2B 9ea2dea33b3116331dd02802055e8db7faa736bc2674e6b30209a9e178877523d9f14516b35729eaf6fc348b89367e9830ca1b998a8c7d10766b9b2f265b97d8 SHA512 23fec3d51cfd8ac8bc02749550de53a7b699ebe67654336864a8208a6a1d4f69e8e1a2c8e07832665c203788cbabbb65f346582741bac10ceb0d56c16d6b4217 DIST alembic-1.8.3.tar.gz 862221 BLAKE2B 81639b0968dbcaac0096eac83385b7d6b1dc27b4b1652ede8cf6b6cf3aa3eea3c6f5e53f033708b61f79d99ebfaa766a9cac3345a043d6cc0ba6d6c29dcb9ed0 SHA512 0049c72d93e66e12d704d27e7ba36cd9c718667f2ce4f7baa1bee1613ed88ba53abea98f457e14f7f2144cb353810a4108d26c7dd1a1543ec2af576272f19036 EBUILD alembic-1.8.2.ebuild 1234 BLAKE2B 8fc18141031dcbf54bef2d0323c4a4e7f7315a7f2be9297c2af1683ac073530ae34271c97fb7d2f4961afb05baf5625bdb680caaf64f5da25cdc9dfdbaa55707 SHA512 7d2f20abc3d8d656dfe9b41528bf9ed494accd9678b46fd695637df4baa6bf116b770f21a1494f58370190f2af8ec20876b3e5639e9bd5f67bf15b055fdd9cfb -EBUILD alembic-1.8.3-r1.ebuild 1722 BLAKE2B f0ed2d8cd08d8bb2d5ffa6ad3ebad6b201e0869e9ff894f70e5f252565e0bd8ef0a50c8db06974e509353594d59f259c7435c4859321308a43f7d36eac1a13f0 SHA512 c730dd1ae8dd8ee67a4bf817b1c3fa0d3ef20209c7f26baa790467f50d32eee8ab122f5749c77dbae98cc077df04fef783ac1bbf69959046826dcc7a9069fcf9 +EBUILD alembic-1.8.3-r1.ebuild 1721 BLAKE2B f8855a372c19dbdf6b1724936ecdcbc7ecf81e96391ee9fc48345bf7031a48b54b61cee12931ebbfd338529686b4bb1c0e2731306555bc4de0490c40cc92f404 SHA512 a44895fc2461407198b8108333564d362a0a907d20c6690ad29023c9bb3a6f310fe7e5c312321a4ce84d4eb92f08dd978e238fbe36c54ee6390126676325548b MISC metadata.xml 824 BLAKE2B 55b10435d032292b05af14bde6a69772eaf7993bd1686a0f1489313624d14b3572037d6ba7e9caab7bb69ed36cb61d5f1518d6c945e9e7c3853dcde1e80e3e0d SHA512 55c878337d8297cd8d811443d8821835e4ee5096364014bc43c798a34645076dc47ec405bdfd3c62a03481f8539cca9fadd8f7f15a2bb98471c9f7d0d57450a1 diff --git a/media-gfx/alembic/alembic-1.8.3-r1.ebuild b/media-gfx/alembic/alembic-1.8.3-r1.ebuild index 3ec597c047e8..909f899aa86f 100644 --- a/media-gfx/alembic/alembic-1.8.3-r1.ebuild +++ b/media-gfx/alembic/alembic-1.8.3-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="examples hdf5 python test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" diff --git a/media-gfx/ansilove/Manifest b/media-gfx/ansilove/Manifest new file mode 100644 index 000000000000..2464dd0fed37 --- /dev/null +++ b/media-gfx/ansilove/Manifest @@ -0,0 +1,4 @@ +DIST ansilove-4.1.5.tar.gz 41325 BLAKE2B fa0943406b5a905f30fd114ed9760a37da1bcb7bd8bb7575272d1cffadaf0302650c65af64e97f911cff7b9eb4283bedd6fc0fc13c9aa5be88c582c44925c30b SHA512 a84253b07d82b4d0598cf6936115476933636a978805fe243a671bbdbe15d0e589b45f9e4d7b6137e5f7ab22559b9d1a84a0508db5226ccc17e20687e190e553 +EBUILD ansilove-4.1.5.ebuild 636 BLAKE2B f4c92385468b8511070a7e05efe1a784eb58ebb0d0351a149e2f920c614bd1f34991d83b6838989ed9d2a36114cc452ef6e329b0555d554a206a34a1462d81a9 SHA512 9b213e63bc0c2efd4db33d1de335250b762b1e6d4fd6790bed7b17c208169a3ed317d38cdbe8beb3a5d63f4d1b538201e7e043bf2b8191a81853439ad545271e +EBUILD ansilove-9999.ebuild 636 BLAKE2B f4c92385468b8511070a7e05efe1a784eb58ebb0d0351a149e2f920c614bd1f34991d83b6838989ed9d2a36114cc452ef6e329b0555d554a206a34a1462d81a9 SHA512 9b213e63bc0c2efd4db33d1de335250b762b1e6d4fd6790bed7b17c208169a3ed317d38cdbe8beb3a5d63f4d1b538201e7e043bf2b8191a81853439ad545271e +MISC metadata.xml 1125 BLAKE2B 31e6d5d634610b818cd0bdc5b93f37613499492d7f2366d10f40149a64b7b44806db396d118175e296a3d709f4a283ca8c06bafcbac6901d6fd2176ba5a9b9c1 SHA512 53407cbca0a8fea14265519645230b0baddea348fc4cc2008ab963019c26eb83004e7cacef0415e139049fa5d9316f6d2933628d437aa886954ed2270c8a9be8 diff --git a/media-gfx/ansilove/ansilove-4.1.5.ebuild b/media-gfx/ansilove/ansilove-4.1.5.ebuild new file mode 100644 index 000000000000..747102f7845f --- /dev/null +++ b/media-gfx/ansilove/ansilove-4.1.5.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="ANSI and ASCII art to PNG converter (using libansilove)" +HOMEPAGE="https://github.com/ansilove/ansilove/" + +if [[ "${PV}" == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ansilove/${PN}.git" +else + SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="BSD-2" +SLOT="0" + +RDEPEND="dev-libs/libansilove" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DENABLE_SECCOMP=NO + ) + cmake_src_configure +} diff --git a/media-gfx/ansilove/ansilove-9999.ebuild b/media-gfx/ansilove/ansilove-9999.ebuild new file mode 100644 index 000000000000..747102f7845f --- /dev/null +++ b/media-gfx/ansilove/ansilove-9999.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="ANSI and ASCII art to PNG converter (using libansilove)" +HOMEPAGE="https://github.com/ansilove/ansilove/" + +if [[ "${PV}" == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ansilove/${PN}.git" +else + SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="BSD-2" +SLOT="0" + +RDEPEND="dev-libs/libansilove" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DENABLE_SECCOMP=NO + ) + cmake_src_configure +} diff --git a/media-gfx/ansilove/metadata.xml b/media-gfx/ansilove/metadata.xml new file mode 100644 index 000000000000..30ea50ab6723 --- /dev/null +++ b/media-gfx/ansilove/metadata.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <longdescription lang="en"> + AnsiLove is an ANSI and ASCII art to PNG converter, allowing to convert + ANSI and artscene-related file formats into PNG images, supporting ANSI + (.ANS), PCBoard (.PCB), Binary (.BIN), Artworx (.ADF), iCE Draw (.IDF), + Tundra (.TND) and XBin (.XB) formats. + It creates size optimized 4-bit PNG files and supports SAUCE (Standard + Architecture for Universal Comment Extensions), 80x25 and 80x50 PC fonts + (including all the 14 MS-DOS charsets), Amiga fonts, and iCE colors. + This is a complete rewrite of AnsiLove/PHP in the C programming language. + </longdescription> + <upstream> + <changelog> + https://github.com/ansilove/ansilove/blob/master/ChangeLog + </changelog> + <bugs-to>https://github.com/ansilove/ansilove/issues</bugs-to> + <remote-id type="github">ansilove/ansilove</remote-id> + </upstream> +</pkgmetadata> diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index deabbe10d054..90e7e3977d1b 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,9 +1,15 @@ +AUX blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch 877 BLAKE2B 954cae23023e60ef38847927a8ddfc05a19f86c1b5f95a78227aba2af32707ca3490f815e370aa995944973d3ea44d58895817e3ac1ffbb006468ef33f3223a7 SHA512 f4d4e946ce177c82cbe63ab2beab05748e91786800885432f64c00b3ba93be3fec54f084663617dd1b877776d60c418da12cee9a3f4f59a447a3291d08eeba5e DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513 SHA512 0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe DIST blender-2.93.0.tar.xz 42967016 BLAKE2B 1e7b54f08415de8a8908a285ae35c1e18558bf7cab42c5c135323d10ac9a73ec69aa0addd536355a4d19262438a615e03f09dc123b697cbab484e33350bb5ee3 SHA512 660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d DIST blender-2.93.1.tar.xz 42960100 BLAKE2B eda0a8c0414d1f7c89d21e34ba238b0cbe337ea755d6f10792e7c3bd5e15934184d3bd853ed636764776095ce1e3f081d63386b7c13fb7ac666580bf9eeb43c8 SHA512 b14e8cca248c53e4a93976d7fa1cd1ab92a7d18a3809b2a535881731aad2f68d8d155ad175b27aa1890714b81aa6648604a614cacc90e95b7269569661e393b1 DIST blender-2.93.2.tar.xz 43028440 BLAKE2B 02ffc5be190445c97e3cb14e4635969df7a7aaf0100ee5ba50f2d283b077ffebf1f139aec86034ed2df03d94290d5a8bb369f88c734db5103869ffa1d3f588a6 SHA512 5dac627b0e5f38af1f861d4fddb01f4ba1e992c704337c56e2ebbfdcbd62e6de83195e3541342603a1ae966e89a06ff98764c817e282401edd792857d577b989 +DIST blender-2.93.6.tar.xz 43031980 BLAKE2B 235b9a08d9eb4ba83c30a4de333cc5b56eefe16209a96e2aeadbfb4d99b0add0031bbf3c4e0059833433475f07c03711ca773e19d57849ae83beb52a750fac48 SHA512 0f8e7686a141ba55be29c73f9b2fcd43b03f7551ec91d226f389295f4866926f9a81ddf627aef54f6d762271ca05ccdea1f80efc00cc52315925ad626b283aea +DIST blender-3.0.0-tests.tar.bz2 302064577 BLAKE2B c86a47231bb704124fe5ed59963176ca45ccc7e92bf8b00ce31d432cf6e35b9593ddb0d71f56aab0af6d1922f08eb158f9b7e355b5323d715b2b075ceafe9294 SHA512 e343f5da88aa7d2bc2a0758c01d3849b61c6ff3a0d65ac4d967aa02b701a5a02bfc8e7ed92b8f67af37e08f138987de8a27b8c7faa3cd8cfc3535adb8c624506 +DIST blender-3.0.0.tar.xz 40169212 BLAKE2B 0dd8327cb92d1d5b00ede020fa2fe07fc3f4d02b249e0ed528c330d6423ce28c731055bc623cffa66f2824c3ae667b5b84be2d6c5e2b01baf490468c4b6f42a2 SHA512 727d722e7b750b77b0fe691605a84de58baf15a3cc01af267be0440bd0879772e14dbdfdb16209023df3c28b94d8009b0c389915097cdb0b49bdf42c8de1ef21 EBUILD blender-2.93.0-r1.ebuild 11815 BLAKE2B a7edc0c52fba0b9ebec6852aa84c264b28e4e2984ff47baf9d4117723d6a32634c976f4d80d0bd785a6d07b2fc08e6973d53f062505d3043eb7d56ca777acb73 SHA512 2eeae0099f41d11175502f000eb35a41f0351d358d9248f955168932cbfcfade48953a0c68456d3c75950d009f388ddebd8386368c274d3dc86ca820a1f09a7b EBUILD blender-2.93.1-r1.ebuild 11816 BLAKE2B 1044606914a9aa1f8bd00011addc31f71c3c9bed34e7b5215f4c15182fcfb895e248be3d55cbfc3d49ffea7a6212f38f232c410bf19c1634f3b1ef0c1392dd7a SHA512 b6ffc38f300260a66917c3507762e9830f6fbc0098e3f47c23e9d506ec201511aace83010c6213cc304c3643b63039ec54f3f7cbd9bc076383b0e3d6c1232419 EBUILD blender-2.93.2-r1.ebuild 11833 BLAKE2B 70435289cbde457dc6dd5cf6c8f0ecdaeecd5e44bb9afda6c0f36b75d9cadfb03dc72f2c31a013c34a0fdc7bdb5319a348dd6a9be282821af2479e62dda30a7f SHA512 6deb41bcf414687a2f2243eb24b8a4106c62df8b81c2286f820e95410cf7103b724d959eab43e927a871f77d2a9cfa682cffb41642a9c082f5179f9941baf779 -EBUILD blender-9999.ebuild 11801 BLAKE2B 0ef6f8d4a4caa9119a943d10933bf1866d9c1a7e87fb2f3f3be19551d94ebcf620fcd7a2ed70116a74dcd051fed699cb211629d95ddf826def162596e7f32fb4 SHA512 b978ee878fbe8464d7c837e5d49d0ce8666f9900dc326114f20aabd30d7c797c66b07c250448d6c2b133d778dd26d6eeca210a510394d57b410c662a2f6c70de +EBUILD blender-2.93.6.ebuild 12128 BLAKE2B 7e5b5be14974794daae77b5f23c840ebb209787ef81581c157eb3534d85004ddbe760e899e4be5774fcb87370c2845f3116a59496c967a883b4e37803ad80125 SHA512 434841da2337747ce76ca26ad8cc10384a2a0551d63b6ed27bcf8738f7324e5cd55c8fd867e1d7fbbc523133f7b57ce6f9df35751c700ff2b1552171f9a4037a +EBUILD blender-3.0.0.ebuild 12851 BLAKE2B 3258b9f8b55b0b5c12ff29bb10dc779dbc033975d222d84b19b4eef7c629bc93e905cdf489f8479da4b894c2d1151cc68c981a69b3e09499e03d51bfacb392ff SHA512 460ab53b027bfcf1f233ebaa2ada982ea7b9cd13686532d1d0d3251bb385e46199f4c8ac1725b3537d938ca7f04027a02d1e1f99aac4faec22437a31d970df86 +EBUILD blender-9999.ebuild 12775 BLAKE2B 999cf81184c119a196671441f9ea1ec723ca26566c86c350425d851f1f6c692c86deb58a9000fb2d3b5340d1afb44a971383a9c47fac60d26bbffeda9c588155 SHA512 5c67b239b5169ca5fe3074dee6c79e107b15ae0a5c94dbe169b49be3a6540c497b08a72b7fcf114f166f23e1bda0cebf27bdfaaca58c1923a3eab29569389a48 MISC metadata.xml 3163 BLAKE2B dcebffc7d37a5e2214121c5dbee2f81f3c6e9bafcbf58c6f9d0c38e6ab5fcef25e314fe7ab9d8127bf69cf6bf05b4b8bcff28973229e4587a7b3231f9384f08a SHA512 7ad59b0bc1d3c8ed4cf6528c74eb348b2ede12eda4f012d7961b25a3dfc398a8abf75f033d94c8b7c92684b0769e8fe439b3e85dd082f4ea68f87f1851639dc5 diff --git a/media-gfx/blender/blender-2.93.6.ebuild b/media-gfx/blender/blender-2.93.6.ebuild new file mode 100644 index 000000000000..6d17263b5759 --- /dev/null +++ b/media-gfx/blender/blender-2.93.6.ebuild @@ -0,0 +1,386 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_9 ) + +inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils + +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="https://www.blender.org" + +if [[ ${PV} = *9999* ]] ; then + # Subversion is needed for downloading unit test files + inherit git-r3 subversion + EGIT_REPO_URI="https://git.blender.org/blender.git" +else + SRC_URI="https://download.blender.org/source/${P}.tar.xz" + TEST_TARBALL_VERSION=2.93.0 + SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )" + KEYWORDS="~amd64 ~arm ~arm64" +fi + +SLOT="${PV%.*}" +LICENSE="|| ( GPL-3 BL )" +IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \ + alembic collada +color-management cuda +cycles \ + debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ + man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \ + +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + alembic? ( openexr ) + cuda? ( cycles ) + cycles? ( openexr tiff openimageio ) + fluid? ( tbb ) + opencl? ( cycles ) + openvdb? ( tbb ) + osl? ( cycles ) + standalone? ( cycles ) + test? ( color-management )" + +# Library versions for official builds can be found in the blender source directory in: +# build_files/build_environment/install_deps.sh +RDEPEND="${PYTHON_DEPS} + dev-libs/boost:=[nls?,threads(+)] + dev-libs/lzo:2= + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') + media-libs/freetype:= + media-libs/glew:* + media-libs/libpng:= + media-libs/libsamplerate + sys-libs/zlib:= + virtual/glu + virtual/jpeg + virtual/libintl + virtual/opengl + alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) + collada? ( >=media-libs/opencollada-1.6.68 ) + color-management? ( >=media-libs/opencolorio-2.0.0 ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + embree? ( >=media-libs/embree-3.10.0[raymask] ) + ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] ) + fftw? ( sci-libs/fftw:3.0= ) + gmp? ( dev-libs/gmp ) + !headless? ( + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc:= ) + jpeg2k? ( media-libs/openjpeg:2= ) + ndof? ( + app-misc/spacenavd + dev-libs/libspnav + ) + nls? ( virtual/libiconv ) + openal? ( media-libs/openal ) + opencl? ( virtual/opencl ) + oidn? ( >=media-libs/oidn-1.3.0 ) + openimageio? ( >=media-libs/openimageio-2.2.13.1:= ) + openexr? ( + media-libs/ilmbase:= + media-libs/openexr:= + ) + opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) + openvdb? ( + >=media-gfx/openvdb-7.1.0 + dev-libs/c-blosc:= + ) + osl? ( >=media-libs/osl-1.11.10.0 ) + pdf? ( media-libs/libharu ) + potrace? ( media-gfx/potrace ) + pugixml? ( dev-libs/pugixml ) + pulseaudio? ( media-sound/pulseaudio ) + sdl? ( media-libs/libsdl2[sound,joystick] ) + sndfile? ( media-libs/libsndfile ) + tbb? ( <dev-cpp/tbb-2021.4.0:= ) + tiff? ( media-libs/tiff ) + valgrind? ( dev-util/valgrind ) +" + +DEPEND="${RDEPEND} + dev-cpp/eigen:= +" + +BDEPEND=" + virtual/pkgconfig + doc? ( + app-doc/doxygen[dot] + dev-python/sphinx[latex] + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + nls? ( sys-devel/gettext ) +" + +blender_check_requirements() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + if use doc; then + CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend + fi +} + +blender_get_version() { + # Get blender version from blender itself. + BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert) + if ((${BV:0:1} < 3)) ; then + # Add period (290 -> 2.90). + BV=${BV:0:1}.${BV:1} + else + # Add period and strip last number (300 -> 3.0) + BV=${BV:0:1}.${BV:1:1} + fi +} + +pkg_pretend() { + blender_check_requirements +} + +pkg_setup() { + blender_check_requirements + python-single-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} = *9999* ]] ; then + git-r3_src_unpack + else + default + fi + + if use test; then + mkdir -p lib || die + mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die + fi +} + +src_prepare() { + cmake_src_prepare + + blender_get_version + + # Disable MS Windows help generation. The variable doesn't do what it + # it sounds like. + sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ + -i doc/doxygen/Doxyfile || die + + # Prepare icons and .desktop files for slotting. + sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender-thumbnailer.py|blender-${BV}-thumbnailer.py|" -i source/creator/CMakeLists.txt || die + + sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die + sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die + sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die + + mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die + mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die + mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die + mv release/bin/blender-thumbnailer.py release/bin/blender-${BV}-thumbnailer.py || die + + if use test; then + # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. + sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die + sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die + fi +} + +src_configure() { + append-lfs-flags + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=OFF + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DPYTHON_VERSION="${EPYTHON/python/}" + -DWITH_ALEMBIC=$(usex alembic) + -DWITH_ASSERT_ABORT=$(usex debug) + -DWITH_BOOST=ON + -DWITH_BULLET=$(usex bullet) + -DWITH_CODEC_FFMPEG=$(usex ffmpeg) + -DWITH_CODEC_SNDFILE=$(usex sndfile) + -DWITH_CXX_GUARDEDALLOC=$(usex debug) + -DWITH_CYCLES=$(usex cycles) + -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) + -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl) + -DWITH_CYCLES_EMBREE=$(usex embree) + -DWITH_CYCLES_OSL=$(usex osl) + -DWITH_CYCLES_STANDALONE=$(usex standalone) + -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) + -DWITH_DOC_MANPAGE=$(usex man) + -DWITH_FFTW3=$(usex fftw) + -DWITH_GMP=$(usex gmp) + -DWITH_GTESTS=$(usex test) + -DWITH_HARU=$(usex pdf) + -DWITH_HEADLESS=$(usex headless) + -DWITH_INSTALL_PORTABLE=OFF + -DWITH_IMAGE_DDS=$(usex dds) + -DWITH_IMAGE_OPENEXR=$(usex openexr) + -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) + -DWITH_IMAGE_TIFF=$(usex tiff) + -DWITH_INPUT_NDOF=$(usex ndof) + -DWITH_INTERNATIONAL=$(usex nls) + -DWITH_JACK=$(usex jack) + -DWITH_MEM_JEMALLOC=$(usex jemalloc) + -DWITH_MEM_VALGRIND=$(usex valgrind) + -DWITH_MOD_FLUID=$(usex fluid) + -DWITH_MOD_OCEANSIM=$(usex fftw) + -DWITH_NANOVDB=OFF + -DWITH_OPENAL=$(usex openal) + -DWITH_OPENCOLLADA=$(usex collada) + -DWITH_OPENCOLORIO=$(usex color-management) + -DWITH_OPENIMAGEDENOISE=$(usex oidn) + -DWITH_OPENIMAGEIO=$(usex openimageio) + -DWITH_OPENMP=$(usex openmp) + -DWITH_OPENSUBDIV=$(usex opensubdiv) + -DWITH_OPENVDB=$(usex openvdb) + -DWITH_OPENVDB_BLOSC=$(usex openvdb) + -DWITH_POTRACE=$(usex potrace) + -DWITH_PUGIXML=$(usex pugixml) + -DWITH_PULSEAUDIO=$(usex pulseaudio) + -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) + -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) + -DWITH_SDL=$(usex sdl) + -DWITH_STATIC_LIBS=OFF + -DWITH_SYSTEM_EIGEN3=ON + -DWITH_SYSTEM_GLEW=ON + -DWITH_SYSTEM_LZO=ON + -DWITH_TBB=$(usex tbb) + -DWITH_USD=OFF + -DWITH_XR_OPENXR=OFF + ) + append-flags $(usex debug '-DDEBUG' '-DNDEBUG') + + cmake_src_configure +} + +src_test() { + # A lot of tests needs to have access to the installed data files. + # So install them into the image directory now. + cmake_src_install + + blender_get_version + # Define custom blender data/script file paths not be able to find them otherwise during testing. + # (Because the data is in the image directory and it will default to look in /usr/share) + export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts + export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles + + cmake_src_test + + # Clean up the image directory for src_install + rm -fr ${ED}/* || die +} + +src_install() { + blender_get_version + + # Pax mark blender for hardened support. + pax-mark m "${BUILD_DIR}"/bin/blender + + if use standalone; then + dobin "${BUILD_DIR}"/bin/cycles + fi + + cmake_src_install + + if use man; then + # Slot the man page + mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die + fi + + if use doc; then + # Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building. + # (Because the data is in the image directory and it will default to look in /usr/share) + export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts + export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles + + # Workaround for binary drivers. + addpredict /dev/ati + addpredict /dev/dri + addpredict /dev/nvidiactl + + einfo "Generating Blender C/C++ API docs ..." + cd "${CMAKE_USE_DIR}"/doc/doxygen || die + doxygen -u Doxyfile || die + doxygen || die "doxygen failed to build API docs." + + cd "${CMAKE_USE_DIR}" || die + einfo "Generating (BPY) Blender Python API docs ..." + "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." + + cd "${CMAKE_USE_DIR}"/doc/python_api || die + sphinx-build sphinx-in BPY_API || die "sphinx failed." + + docinto "html/API/python" + dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. + + docinto "html/API/blender" + dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. + fi + + # Fix doc installdir + docinto html + dodoc "${CMAKE_USE_DIR}"/release/text/readme.html + rm -r "${ED}"/usr/share/doc/blender || die + + python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py" + python_optimize "${ED}/usr/share/blender/${BV}/scripts" + + mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die +} + +pkg_postinst() { + elog + elog "Blender uses python integration. As such, may have some" + elog "inherent risks with running unknown python scripts." + elog + elog "It is recommended to change your blender temp directory" + elog "from /tmp to /home/user/tmp or another tmp file under your" + elog "home directory. This can be done by starting blender, then" + elog "changing the 'Temporary Files' directory in Blender preferences." + elog + ewarn + ewarn "This ebuild does not unbundle the massive amount of 3rd party" + ewarn "libraries which are shipped with blender. Note that" + ewarn "these have caused security issues in the past." + ewarn "If you are concerned about security, file a bug upstream:" + ewarn " https://developer.blender.org/" + ewarn + + if ! use python_single_target_python3_9; then + elog "You are building Blender with a newer python version than" + elog "supported by this version upstream." + elog "If you experience breakages with e.g. plugins, please switch to" + elog "python_single_target_python3_9 instead." + elog "Bug: https://bugs.gentoo.org/737388" + elog + fi + + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update + + ewarn "" + ewarn "You may want to remove the following directory." + ewarn "~/.config/${PN}/${SLOT}/cache/" + ewarn "It may contain extra render kernels not tracked by portage" + ewarn "" +} diff --git a/media-gfx/blender/blender-3.0.0.ebuild b/media-gfx/blender/blender-3.0.0.ebuild new file mode 100644 index 000000000000..65bfc2f8e6d4 --- /dev/null +++ b/media-gfx/blender/blender-3.0.0.ebuild @@ -0,0 +1,407 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_9 ) + +inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils + +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="https://www.blender.org" + +if [[ ${PV} = *9999* ]] ; then + # Subversion is needed for downloading unit test files + inherit git-r3 subversion + EGIT_REPO_URI="https://git.blender.org/blender.git" +else + SRC_URI="https://download.blender.org/source/${P}.tar.xz" + # Update these between major releases. + TEST_TARBALL_VERSION="3.0.0" + SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )" + KEYWORDS="~amd64 ~arm ~arm64" +fi + +SLOT="${PV%.*}" +LICENSE="|| ( GPL-3 BL )" +IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \ + alembic collada +color-management cuda +cycles \ + debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ + man ndof nls openal +oidn +openimageio +openmp +opensubdiv \ + +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + alembic? ( openexr ) + cuda? ( cycles ) + cycles? ( openexr tiff openimageio ) + fluid? ( tbb ) + openvdb? ( tbb ) + osl? ( cycles ) + standalone? ( cycles ) + test? ( color-management )" + +# Library versions for official builds can be found in the blender source directory in: +# build_files/build_environment/install_deps.sh +RDEPEND="${PYTHON_DEPS} + dev-libs/boost:=[nls?,threads(+)] + dev-libs/lzo:2= + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/zstandard[${PYTHON_USEDEP}] + ') + media-libs/freetype:= + media-libs/glew:* + media-libs/libpng:= + media-libs/libsamplerate + sys-libs/zlib:= + virtual/glu + virtual/jpeg + virtual/libintl + virtual/opengl + alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) + collada? ( >=media-libs/opencollada-1.6.68 ) + color-management? ( >=media-libs/opencolorio-2.0.0 ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + embree? ( >=media-libs/embree-3.10.0[raymask] ) + ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] ) + fftw? ( sci-libs/fftw:3.0= ) + gmp? ( dev-libs/gmp ) + !headless? ( + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc:= ) + jpeg2k? ( media-libs/openjpeg:2= ) + ndof? ( + app-misc/spacenavd + dev-libs/libspnav + ) + nls? ( virtual/libiconv ) + openal? ( media-libs/openal ) + oidn? ( >=media-libs/oidn-1.4.1 ) + openimageio? ( >=media-libs/openimageio-2.2.13.1:= ) + openexr? ( + media-libs/ilmbase:= + media-libs/openexr:= + ) + opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] ) + openvdb? ( + >=media-gfx/openvdb-7.1.0 + dev-libs/c-blosc:= + ) + osl? ( >=media-libs/osl-1.11.10.0 ) + pdf? ( media-libs/libharu ) + potrace? ( media-gfx/potrace ) + pugixml? ( dev-libs/pugixml ) + pulseaudio? ( media-sound/pulseaudio ) + sdl? ( media-libs/libsdl2[sound,joystick] ) + sndfile? ( media-libs/libsndfile ) + tbb? ( <dev-cpp/tbb-2021.4.0:= ) + tiff? ( media-libs/tiff ) + valgrind? ( dev-util/valgrind ) +" + +DEPEND="${RDEPEND} + dev-cpp/eigen:= +" + +BDEPEND=" + virtual/pkgconfig + doc? ( + app-doc/doxygen[dot] + dev-python/sphinx[latex] + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + nls? ( sys-devel/gettext ) +" + +PATCHES=( + "${FILESDIR}"/${P}-intern-ghost-fix-typo-in-finding-XF86VMODE.patch +) + +blender_check_requirements() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + if use doc; then + CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend + fi +} + +blender_get_version() { + # Get blender version from blender itself. + BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert) + if ((${BV:0:1} < 3)) ; then + # Add period (290 -> 2.90). + BV=${BV:0:1}.${BV:1} + else + # Add period and skip the middle number (301 -> 3.1) + BV=${BV:0:1}.${BV:2} + fi +} + +pkg_pretend() { + blender_check_requirements +} + +pkg_setup() { + blender_check_requirements + python-single-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} = *9999* ]] ; then + git-r3_src_unpack + if use test; then + TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests + subversion_fetch ${TESTS_SVN_URL} ../lib/tests + fi + else + default + if use test; then + #The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests + mkdir -p lib || die + mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die + fi + fi + +} + +src_prepare() { + cmake_src_prepare + + blender_get_version + + # Disable MS Windows help generation. The variable doesn't do what it + # it sounds like. + sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ + -i doc/doxygen/Doxyfile || die + + # Prepare icons and .desktop files for slotting. + sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die + + sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die + sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die + sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die + + mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die + mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die + mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die + + if use test; then + # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. + sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die + sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die + fi +} + +src_configure() { + append-lfs-flags + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=OFF + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DPYTHON_VERSION="${EPYTHON/python/}" + -DWITH_ALEMBIC=$(usex alembic) + -DWITH_ASSERT_ABORT=$(usex debug) + -DWITH_BOOST=ON + -DWITH_BULLET=$(usex bullet) + -DWITH_CODEC_FFMPEG=$(usex ffmpeg) + -DWITH_CODEC_SNDFILE=$(usex sndfile) + -DWITH_CXX_GUARDEDALLOC=$(usex debug) + -DWITH_CYCLES=$(usex cycles) + -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) + -DWITH_CYCLES_EMBREE=$(usex embree) + -DWITH_CYCLES_OSL=$(usex osl) + -DWITH_CYCLES_STANDALONE=$(usex standalone) + -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) + -DWITH_DOC_MANPAGE=$(usex man) + -DWITH_FFTW3=$(usex fftw) + -DWITH_GMP=$(usex gmp) + -DWITH_GTESTS=$(usex test) + -DWITH_HARU=$(usex pdf) + -DWITH_HEADLESS=$(usex headless) + -DWITH_INSTALL_PORTABLE=OFF + -DWITH_IMAGE_DDS=$(usex dds) + -DWITH_IMAGE_OPENEXR=$(usex openexr) + -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) + -DWITH_IMAGE_TIFF=$(usex tiff) + -DWITH_INPUT_NDOF=$(usex ndof) + -DWITH_INTERNATIONAL=$(usex nls) + -DWITH_JACK=$(usex jack) + -DWITH_MEM_JEMALLOC=$(usex jemalloc) + -DWITH_MEM_VALGRIND=$(usex valgrind) + -DWITH_MOD_FLUID=$(usex fluid) + -DWITH_MOD_OCEANSIM=$(usex fftw) + -DWITH_NANOVDB=OFF + -DWITH_OPENAL=$(usex openal) + -DWITH_OPENCOLLADA=$(usex collada) + -DWITH_OPENCOLORIO=$(usex color-management) + -DWITH_OPENIMAGEDENOISE=$(usex oidn) + -DWITH_OPENIMAGEIO=$(usex openimageio) + -DWITH_OPENMP=$(usex openmp) + -DWITH_OPENSUBDIV=$(usex opensubdiv) + -DWITH_OPENVDB=$(usex openvdb) + -DWITH_OPENVDB_BLOSC=$(usex openvdb) + -DWITH_POTRACE=$(usex potrace) + -DWITH_PUGIXML=$(usex pugixml) + -DWITH_PULSEAUDIO=$(usex pulseaudio) + -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) + -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) + -DWITH_SDL=$(usex sdl) + -DWITH_STATIC_LIBS=OFF + -DWITH_SYSTEM_EIGEN3=ON + -DWITH_SYSTEM_GLEW=ON + -DWITH_SYSTEM_LZO=ON + -DWITH_TBB=$(usex tbb) + -DWITH_USD=OFF + -DWITH_XR_OPENXR=OFF + ) + + append-flags $(usex debug '-DDEBUG' '-DNDEBUG') + + if tc-is-gcc ; then + # These options only exist when GCC is detected. + # We disable these to respect the user's choice of linker. + mycmakeargs+=( + -DWITH_LINKER_GOLD=OFF + -DWITH_LINKER_LLD=OFF + ) + fi + + cmake_src_configure +} + +src_test() { + # A lot of tests needs to have access to the installed data files. + # So install them into the image directory now. + cmake_src_install + + blender_get_version + # Define custom blender data/script file paths not be able to find them otherwise during testing. + # (Because the data is in the image directory and it will default to look in /usr/share) + export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts + export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles + + # Sanity check that the script and datafile path is valid. + # If they are not vaild, blender will fallback to the default path which is not what we want. + [ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!" + [ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!" + + cmake_src_test + + # Clean up the image directory for src_install + rm -fr ${ED}/* || die +} + +src_install() { + blender_get_version + + # Pax mark blender for hardened support. + pax-mark m "${BUILD_DIR}"/bin/blender + + if use standalone; then + dobin "${BUILD_DIR}"/bin/cycles + fi + + cmake_src_install + + if use man; then + # Slot the man page + mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die + fi + + if use doc; then + # Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building. + # (Because the data is in the image directory and it will default to look in /usr/share) + export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts + export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles + + # Workaround for binary drivers. + addpredict /dev/ati + addpredict /dev/dri + addpredict /dev/nvidiactl + + einfo "Generating Blender C/C++ API docs ..." + cd "${CMAKE_USE_DIR}"/doc/doxygen || die + doxygen -u Doxyfile || die + doxygen || die "doxygen failed to build API docs." + + cd "${CMAKE_USE_DIR}" || die + einfo "Generating (BPY) Blender Python API docs ..." + "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." + + cd "${CMAKE_USE_DIR}"/doc/python_api || die + sphinx-build sphinx-in BPY_API || die "sphinx failed." + + docinto "html/API/python" + dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. + + docinto "html/API/blender" + dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. + fi + + # Fix doc installdir + docinto html + dodoc "${CMAKE_USE_DIR}"/release/text/readme.html + rm -r "${ED}"/usr/share/doc/blender || die + + python_optimize "${ED}/usr/share/blender/${BV}/scripts" + + mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die + mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die +} + +pkg_postinst() { + elog + elog "Blender uses python integration. As such, may have some" + elog "inherent risks with running unknown python scripts." + elog + elog "It is recommended to change your blender temp directory" + elog "from /tmp to /home/user/tmp or another tmp file under your" + elog "home directory. This can be done by starting blender, then" + elog "changing the 'Temporary Files' directory in Blender preferences." + elog + ewarn + ewarn "This ebuild does not unbundle the massive amount of 3rd party" + ewarn "libraries which are shipped with blender. Note that" + ewarn "these have caused security issues in the past." + ewarn "If you are concerned about security, file a bug upstream:" + ewarn " https://developer.blender.org/" + ewarn + + if ! use python_single_target_python3_9; then + elog "You are building Blender with a newer python version than" + elog "supported by this version upstream." + elog "If you experience breakages with e.g. plugins, please switch to" + elog "python_single_target_python3_9 instead." + elog "Bug: https://bugs.gentoo.org/737388" + elog + fi + + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update + + ewarn "" + ewarn "You may want to remove the following directory." + ewarn "~/.config/${PN}/${SLOT}/cache/" + ewarn "It may contain extra render kernels not tracked by portage" + ewarn "" +} diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index 70d0ff3a695d..1ee78855efed 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -16,7 +16,10 @@ if [[ ${PV} = *9999* ]] ; then EGIT_REPO_URI="https://git.blender.org/blender.git" else SRC_URI="https://download.blender.org/source/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + # Update these between major releases. + #TEST_TARBALL_VERSION=SLOT_NUMBER + #SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )" + KEYWORDS="~amd64 ~arm ~arm64" fi SLOT="${PV%.*}" @@ -24,7 +27,7 @@ LICENSE="|| ( GPL-3 BL )" IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \ alembic collada +color-management cuda +cycles \ debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ - man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \ + man ndof nls openal +oidn +openimageio +openmp +opensubdiv \ +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind" RESTRICT="!test? ( test )" @@ -33,7 +36,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} cuda? ( cycles ) cycles? ( openexr tiff openimageio ) fluid? ( tbb ) - opencl? ( cycles ) openvdb? ( tbb ) osl? ( cycles ) standalone? ( cycles ) @@ -47,6 +49,7 @@ RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] + dev-python/zstandard[${PYTHON_USEDEP}] ') media-libs/freetype:= media-libs/glew:* @@ -79,14 +82,13 @@ RDEPEND="${PYTHON_DEPS} ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) - opencl? ( virtual/opencl ) oidn? ( >=media-libs/oidn-1.4.1 ) openimageio? ( >=media-libs/openimageio-2.2.13.1:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) + opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] ) openvdb? ( >=media-gfx/openvdb-7.1.0 dev-libs/c-blosc:= @@ -136,8 +138,8 @@ blender_get_version() { # Add period (290 -> 2.90). BV=${BV:0:1}.${BV:1} else - # Add period and strip last number (300 -> 3.0) - BV=${BV:0:1}.${BV:1:1} + # Add period and skip the middle number (301 -> 3.1) + BV=${BV:0:1}.${BV:2} fi } @@ -152,16 +154,20 @@ pkg_setup() { src_unpack() { if [[ ${PV} = *9999* ]] ; then - TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests git-r3_src_unpack + if use test; then + TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests + subversion_fetch ${TESTS_SVN_URL} ../lib/tests + fi else default - TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests + if use test; then + #The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests + mkdir -p lib || die + mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die + fi fi - if use test; then - subversion_fetch ${TESTS_SVN_URL} ../lib/tests - fi } src_prepare() { @@ -178,7 +184,6 @@ src_prepare() { sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die - sed -e "s|blender-thumbnailer.py|blender-${BV}-thumbnailer.py|" -i source/creator/CMakeLists.txt || die sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die @@ -187,7 +192,6 @@ src_prepare() { mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die - mv release/bin/blender-thumbnailer.py release/bin/blender-${BV}-thumbnailer.py || die if use test; then # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. @@ -213,7 +217,6 @@ src_configure() { -DWITH_CXX_GUARDEDALLOC=$(usex debug) -DWITH_CYCLES=$(usex cycles) -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) - -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl) -DWITH_CYCLES_EMBREE=$(usex embree) -DWITH_CYCLES_OSL=$(usex osl) -DWITH_CYCLES_STANDALONE=$(usex standalone) @@ -260,32 +263,19 @@ src_configure() { -DWITH_USD=OFF -DWITH_XR_OPENXR=OFF ) - append-flags $(usex debug '-DDEBUG' '-DNDEBUG') - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - # Workaround for binary drivers. - addpredict /dev/ati - addpredict /dev/dri - addpredict /dev/nvidiactl - - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile || die - doxygen || die "doxygen failed to build API docs." - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." + append-flags $(usex debug '-DDEBUG' '-DNDEBUG') - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." + if tc-is-gcc ; then + # These options only exist when GCC is detected. + # We disable these to respect the user's choice of linker. + mycmakeargs+=( + -DWITH_LINKER_GOLD=OFF + -DWITH_LINKER_LLD=OFF + ) fi + + cmake_src_configure } src_test() { @@ -299,6 +289,11 @@ src_test() { export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles + # Sanity check that the script and datafile path is valid. + # If they are not vaild, blender will fallback to the default path which is not what we want. + [ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!" + [ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!" + cmake_src_test # Clean up the image directory for src_install @@ -315,7 +310,36 @@ src_install() { dobin "${BUILD_DIR}"/bin/cycles fi + cmake_src_install + + if use man; then + # Slot the man page + mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die + fi + if use doc; then + # Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building. + # (Because the data is in the image directory and it will default to look in /usr/share) + export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts + export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles + + # Workaround for binary drivers. + addpredict /dev/ati + addpredict /dev/dri + addpredict /dev/nvidiactl + + einfo "Generating Blender C/C++ API docs ..." + cd "${CMAKE_USE_DIR}"/doc/doxygen || die + doxygen -u Doxyfile || die + doxygen || die "doxygen failed to build API docs." + + cd "${CMAKE_USE_DIR}" || die + einfo "Generating (BPY) Blender Python API docs ..." + "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." + + cd "${CMAKE_USE_DIR}"/doc/python_api || die + sphinx-build sphinx-in BPY_API || die "sphinx failed." + docinto "html/API/python" dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. @@ -323,21 +347,14 @@ src_install() { dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. fi - cmake_src_install - - if use man; then - # Slot the man page - mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die - fi - # Fix doc installdir docinto html dodoc "${CMAKE_USE_DIR}"/release/text/readme.html rm -r "${ED}"/usr/share/doc/blender || die - python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py" python_optimize "${ED}/usr/share/blender/${BV}/scripts" + mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die } diff --git a/media-gfx/blender/files/blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch b/media-gfx/blender/files/blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch new file mode 100644 index 000000000000..51d8ded23366 --- /dev/null +++ b/media-gfx/blender/files/blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch @@ -0,0 +1,31 @@ +https://developer.blender.org/D13464 + +From 781c56f054b4c7717739752336427a811f7633eb Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 4 Dec 2021 00:38:59 +0000 +Subject: [PATCH] intern/ghost: fix typo in finding XF86VMODE + +--- + intern/ghost/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt +index 4164231..663598e 100644 +--- a/intern/ghost/CMakeLists.txt ++++ b/intern/ghost/CMakeLists.txt +@@ -245,10 +245,10 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND) + if(WITH_X11_XF86VMODE) + add_definitions(-DWITH_X11_XF86VMODE) + list(APPEND INC_SYS +- ${X11_xf86vmode_INCLUDE_PATH} ++ ${X11_Xxf86vmode_INCLUDE_PATH} + ) + list(APPEND LIB +- ${X11_Xf86vmode_LIB} ++ ${X11_Xxf86vmode_LIB} + ) + endif() + +-- +2.34.1 + diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index 79ef4e15fab2..a9f5fa9f3b51 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -1,14 +1,9 @@ +AUX darktable-3.0.0_find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020 AUX darktable-3.0.2_cmake-march-autodetection.patch 908 BLAKE2B aa1c0cedfe1f267332f11b9a8f38ce368af02b7e4f9751b128b7af91dcdfb066a0529ae126d41a34bc3fc66f336924f3376f270674bcc7e0912d2e23d46ec83b SHA512 da1f10e86b7b9e2a3f317d620a58ebed156a5c6e0f22f429da617cb176d1c18d6d1b6706c1444c9007ccb776bc6b951e3560214e89e95b4050899ec692b74dde AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556daf06f78343deeb781a12b670f3c3d2f8a34ec9877e16991f6a105c90d58f437915b30bd8bddfb995d515bc73563a44f3807258c9fee SHA512 57cdf87586c6382347334577fff71d415be0123ad101c073535e9d4e87e7edac275272e0b3be91bd34965bacf1f6166cfc64af34b4cdedfb27b409e27bc3bdc9 AUX darktable-3.4.1_libxcf-cmake.patch 788 BLAKE2B b6ecb84de804b0bf16f907f825d93d00a62c1d996077514b3e55f370347f47e561707cb8da6a270aa42c3320142437691cc8b132718c485b5b7df40068d41ee5 SHA512 d94247c4f2c3b4894bd6455cd036a62ef5edb90a77bf8f930efc3e540d00712000fe8eeb7d4c937fa826aef1dd129448223c8696ff094e823894b17ef2669a4e AUX darktable-3.6.1_openexr.patch 1806 BLAKE2B 3f05c8fbb4dd5a76e98ef3d9a9432fb2c3d98818b5773d0fc007d5203d32b43fea25ec7286f396b4fcb23e02b32ab911ca0c504e8d01c299899e729b02a81d94 SHA512 a782116aa340bd8fd8c1fd98094bee943100f85c1194010b7a92b3aa532ff658f07cddccacdf06b902b74ac86ef1ab3cd07c694c072312e51ddc058caefcb944 -AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020 -DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68 SHA512 3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f -DIST darktable-3.6.0.tar.xz 4691608 BLAKE2B ecbb6b4b4aba1f499f8d459304f174f348c19304c0efb898260d3037bfb9c82ea51a92e3dd98c8b0d2dc525276a91419b41b3c610f4a18b905cda7ccd1bfc554 SHA512 8e458406c3004a52cde096039358eb044d370e8b9d5cb70a6457fc1ad165f062af073b3f0c8da92b463db5a4df37e7a4ee32eb5ce9dfbfeec3e0c13c70ec5f8a DIST darktable-3.6.1.tar.xz 4685928 BLAKE2B 8ff6224e21b44f9e881adb8f020a2ea5ff5abb2c38da1aeaed312f89e548918c6d3bba210dbb4fb6901fbf0872c6e14c2e12c5b5b27932914a00428a709e8965 SHA512 d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416 -DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829 SHA512 62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd384bbbb2ea8888cba26278510abaab1e0cc335 -EBUILD darktable-3.4.1-r1.ebuild 4460 BLAKE2B cf563871d1445369bf83bacc69ce20df83520e41e3237dcd70c67fc3b2f5b57522d17dbd9730a4462afe82454e81f43a2da73292080b2d12610bbcd506ba26ef SHA512 e76a15203dff51d73c224166b7c0686ff1b27e9aa58582745adc8435402e9f60989744724da19e3232fc0d3ad952ea342a49590c387fac8b1c02f6de68f21209 -EBUILD darktable-3.6.0-r1.ebuild 4429 BLAKE2B d3ab8f9260ae4dcaf751e44d91c28720a80b63f677416d320f5b43082483a611478ac8c2c45d4fd455f797112f471afe09da77b9e73c154ee0b5622faafdfb09 SHA512 563e4a36b0b86768b96faa2c6e67beb0d4a88fd87c0fe0955c7907934e390e6c72c956d7aac81c46e26f7addc251c1ba9ddc31a70ee597204694688f6f7c0926 -EBUILD darktable-3.6.1-r1.ebuild 4472 BLAKE2B f68cd37bc20956276d29dff7195b07055b7a858ca61158010d10c13fc9437ad15205fa4eac7ad312c5278cbe81c4c453ad7f7cb829e7b395840794b98a5d526c SHA512 41b79c3fb838033f6c314a33bf59991e8f69e4409220f6b84d61ead9cb37c604f6a5d5f6e4af160429f03e0cbcf0a9895d2ebe0f90f1c8967c779bf6be213465 +EBUILD darktable-3.6.1-r2.ebuild 4399 BLAKE2B 644124ce8549752a377e4f758a6e78a89e238cebe2deb07f1f214e7b2228d9f827f1bb24fc3a12aac6ce1ad8ae404d5cc183a1780d998cdb9998bde9deaaf53f SHA512 b8e3604d7c6fc288ef00d68e797144e20b9aabfc63202c3ba5aabfbdf891cc03342a60a71b2a2c05c43bc8ccf468b983345eb8524d24660e857012b93c78ff97 MISC metadata.xml 1152 BLAKE2B c43582dd3a0607de751a816c9856738d73b504422d6b21745a8f7948e2238a6be5c178bb224d787eb712aef222a592c6a712239a4a8dada4c66a453e158fc5de SHA512 8a20f53798359fec9eb45c1d2fdbe6cca623b2308f8391ece25c4100161a2056b52c44f3eba91d6d3c083f49843bac8e355982998d2c4217efdc976eb0d1a14c diff --git a/media-gfx/darktable/darktable-3.4.1-r1.ebuild b/media-gfx/darktable/darktable-3.4.1-r1.ebuild deleted file mode 100644 index 26f9c784538d..000000000000 --- a/media-gfx/darktable/darktable-3.4.1-r1.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-3 ) - -inherit cmake flag-o-matic lua-single toolchain-funcs xdg - -DESCRIPTION="A virtual lighttable and darkroom for photographers" -HOMEPAGE="https://www.darktable.org/" -LICENSE="GPL-3 CC-BY-3.0" -SLOT="0" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git" - - LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW" -else - DOC_PV="3.4.0" - MY_PV="${PV/_/}" - MY_P="${P/_/.}" - - SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz - doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )" - - KEYWORDS="amd64 arm64 -x86" - LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl" -fi - -IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet - lto lua nls opencl openmp openexr test tools webp - ${LANGS// / l10n_}" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -BDEPEND="dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( >=dev-python/jsonschema-3.2.0 )" -DEPEND="dev-db/sqlite:3 - dev-libs/json-glib - dev-libs/libxml2:2 - >=dev-libs/pugixml-1.8:0= - gnome-base/librsvg:2 - >=media-gfx/exiv2-0.25-r2:0=[xmp] - media-libs/lcms:2 - >=media-libs/lensfun-0.2.3:0= - media-libs/libpng:0= - media-libs/tiff:0 - net-libs/libsoup:2.4 - net-misc/curl - sys-libs/zlib:= - virtual/jpeg:0 - x11-libs/cairo - >=x11-libs/gtk+-3.22:3 - x11-libs/pango - avif? ( >=media-libs/libavif-0.8.2:= ) - colord? ( x11-libs/colord-gtk:0= ) - cups? ( net-print/cups ) - flickr? ( media-libs/flickcurl ) - geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) - gmic? ( media-gfx/gmic ) - gnome-keyring? ( >=app-crypt/libsecret-0.18 ) - gphoto2? ( media-libs/libgphoto2:= ) - graphicsmagick? ( media-gfx/graphicsmagick ) - jpeg2k? ( media-libs/openjpeg:2= ) - lua? ( ${LUA_DEPS} ) - opencl? ( virtual/opencl ) - openexr? ( <media-libs/openexr-3.0.0:0= ) - webp? ( media-libs/libwebp:0= )" -RDEPEND="${DEPEND} - kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )" - -PATCHES=( - "${FILESDIR}"/${PN}-find-opencl-header.patch - "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch - "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch - "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch -) - -S="${WORKDIR}/${P/_/~}" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - # Bug #695658 - if tc-is-gcc; then - test-flags-CC -floop-block &> /dev/null || \ - die "Please switch to a gcc version built with USE=graphite" - fi - - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi - fi -} - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - use cpu_flags_x86_sse3 && append-flags -msse3 - - sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_CURVE_TOOLS=$(usex tools) - -DBUILD_NOISE_TOOLS=$(usex tools) - -DBUILD_PRINT=$(usex cups) - -DCUSTOM_CFLAGS=ON - -DDONT_USE_INTERNAL_LUA=ON - -DRAWSPEED_ENABLE_LTO=$(usex lto) - -DTESTBUILD_OPENCL_PROGRAMS=OFF - -DUSE_AVIF=$(usex avif) - -DUSE_CAMERA_SUPPORT=$(usex gphoto2) - -DUSE_COLORD=$(usex colord) - -DUSE_FLICKR=$(usex flickr) - -DUSE_GMIC=$(usex gmic) - -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) - -DUSE_KWALLET=$(usex kwallet) - -DUSE_LIBSECRET=$(usex gnome-keyring) - -DUSE_LUA=$(usex lua) - -DUSE_MAP=$(usex geolocation) - -DUSE_NLS=$(usex nls) - -DUSE_OPENCL=$(usex opencl) - -DUSE_OPENEXR=$(usex openexr) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_OPENMP=$(usex openmp) - -DUSE_WEBP=$(usex webp) - -DWANT_JSON_VALIDATION=$(usex test) - ) - CMAKE_BUILD_TYPE="RELWITHDEBINFO" - cmake_src_configure -} - -src_install() { - cmake_src_install - # This USE flag is masked for -9999 - use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf - - if use nls; then - for lang in ${LANGS} ; do - if ! use l10n_${lang}; then - rm -r "${ED}"/usr/share/locale/${lang/-/_} || die - fi - done - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - elog - elog "When updating a major version," - elog "please bear in mind that your edits will be preserved during this process," - elog "but it will not be possible to downgrade any more." - elog - ewarn "It will not be possible to downgrade!" - ewarn -} diff --git a/media-gfx/darktable/darktable-3.6.1-r1.ebuild b/media-gfx/darktable/darktable-3.6.1-r1.ebuild deleted file mode 100644 index ffafc552eddb..000000000000 --- a/media-gfx/darktable/darktable-3.6.1-r1.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-3 ) - -inherit cmake flag-o-matic lua-single toolchain-funcs xdg - -DESCRIPTION="A virtual lighttable and darkroom for photographers" -HOMEPAGE="https://www.darktable.org/" -LICENSE="GPL-3 CC-BY-3.0" -SLOT="0" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git" - - LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW" -else - DOC_PV="3.6" - MY_PV="${PV/_/}" - MY_P="${P/_/.}" - - SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz - doc? ( https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )" - - KEYWORDS="~amd64 ~arm64 -x86" - LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk" -fi - -IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet - lto lua nls opencl openmp openexr test tools webp - ${LANGS// / l10n_}" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -BDEPEND="dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( >=dev-python/jsonschema-3.2.0 )" -DEPEND="dev-db/sqlite:3 - dev-libs/json-glib - dev-libs/libxml2:2 - >=dev-libs/pugixml-1.8:0= - gnome-base/librsvg:2 - >=media-gfx/exiv2-0.25-r2:0=[xmp] - media-libs/lcms:2 - >=media-libs/lensfun-0.2.3:0= - media-libs/libpng:0= - media-libs/tiff:0 - net-libs/libsoup:2.4 - net-misc/curl - sys-libs/zlib:= - virtual/jpeg:0 - x11-libs/cairo - >=x11-libs/gtk+-3.22:3 - x11-libs/pango - avif? ( >=media-libs/libavif-0.8.2:= ) - colord? ( x11-libs/colord-gtk:0= ) - cups? ( net-print/cups ) - flickr? ( media-libs/flickcurl ) - geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) - gmic? ( media-gfx/gmic ) - gnome-keyring? ( >=app-crypt/libsecret-0.18 ) - gphoto2? ( media-libs/libgphoto2:= ) - graphicsmagick? ( media-gfx/graphicsmagick ) - jpeg2k? ( media-libs/openjpeg:2= ) - lua? ( ${LUA_DEPS} ) - opencl? ( virtual/opencl ) - openexr? ( <media-libs/openexr-3.0.0:0= ) - webp? ( media-libs/libwebp:0= )" -RDEPEND="${DEPEND} - kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )" - -PATCHES=( - "${FILESDIR}"/${PN}-find-opencl-header.patch - "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch - "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch - "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch - "${FILESDIR}"/${PN}-3.6.1_openexr.patch -) - -S="${WORKDIR}/${P/_/~}" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - # Bug #695658 - if tc-is-gcc; then - test-flags-CC -floop-block &> /dev/null || \ - die "Please switch to a gcc version built with USE=graphite" - fi - - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi - fi -} - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - use cpu_flags_x86_sse3 && append-flags -msse3 - - sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_CURVE_TOOLS=$(usex tools) - -DBUILD_NOISE_TOOLS=$(usex tools) - -DBUILD_PRINT=$(usex cups) - -DCUSTOM_CFLAGS=ON - -DDONT_USE_INTERNAL_LUA=ON - -DRAWSPEED_ENABLE_LTO=$(usex lto) - -DTESTBUILD_OPENCL_PROGRAMS=OFF - -DUSE_AVIF=$(usex avif) - -DUSE_CAMERA_SUPPORT=$(usex gphoto2) - -DUSE_COLORD=$(usex colord) - -DUSE_FLICKR=$(usex flickr) - -DUSE_GMIC=$(usex gmic) - -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) - -DUSE_KWALLET=$(usex kwallet) - -DUSE_LIBSECRET=$(usex gnome-keyring) - -DUSE_LUA=$(usex lua) - -DUSE_MAP=$(usex geolocation) - -DUSE_NLS=$(usex nls) - -DUSE_OPENCL=$(usex opencl) - -DUSE_OPENEXR=$(usex openexr) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_OPENMP=$(usex openmp) - -DUSE_WEBP=$(usex webp) - -DWANT_JSON_VALIDATION=$(usex test) - ) - CMAKE_BUILD_TYPE="RELWITHDEBINFO" - cmake_src_configure -} - -src_install() { - cmake_src_install - # This USE flag is masked for -9999 - use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf - - if use nls; then - for lang in ${LANGS} ; do - if ! use l10n_${lang}; then - rm -r "${ED}"/usr/share/locale/${lang/-/_} || die - fi - done - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - elog - elog "When updating a major version," - elog "please bear in mind that your edits will be preserved during this process," - elog "but it will not be possible to downgrade any more." - elog - ewarn "It will not be possible to downgrade!" - ewarn -} diff --git a/media-gfx/darktable/darktable-3.6.0-r1.ebuild b/media-gfx/darktable/darktable-3.6.1-r2.ebuild index e5f7802a90a8..68737e363aca 100644 --- a/media-gfx/darktable/darktable-3.6.0-r1.ebuild +++ b/media-gfx/darktable/darktable-3.6.1-r2.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 LUA_COMPAT=( lua5-3 ) @@ -70,16 +70,17 @@ DEPEND="dev-db/sqlite:3 jpeg2k? ( media-libs/openjpeg:2= ) lua? ( ${LUA_DEPS} ) opencl? ( virtual/opencl ) - openexr? ( <media-libs/openexr-3.0.0:0= ) + openexr? ( media-libs/openexr:= ) webp? ( media-libs/libwebp:0= )" RDEPEND="${DEPEND} kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )" PATCHES=( - "${FILESDIR}"/${PN}-find-opencl-header.patch + "${FILESDIR}"/${PN}-3.0.0_find-opencl-header.patch "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch + "${FILESDIR}"/${PN}-3.6.1_openexr.patch ) S="${WORKDIR}/${P/_/~}" @@ -92,9 +93,7 @@ pkg_pretend() { die "Please switch to a gcc version built with USE=graphite" fi - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi + use openmp && tc-check-openmp fi } diff --git a/media-gfx/darktable/files/darktable-find-opencl-header.patch b/media-gfx/darktable/files/darktable-3.0.0_find-opencl-header.patch index 0a692f9341e1..0a692f9341e1 100644 --- a/media-gfx/darktable/files/darktable-find-opencl-header.patch +++ b/media-gfx/darktable/files/darktable-3.0.0_find-opencl-header.patch diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 01fcc35ef984..6f77a346e833 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,6 +1,3 @@ -AUX digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch 1560 BLAKE2B dd2d9995787593f736f406566131af29573df097801f2c9b9eec12947838bf748c697bf6ab75d69f72359a1783d18fde994b4899861065d4d10dab100e0edf44 SHA512 eb1d1c4bff3dcc7e1d03069591ad8d48a3947ee962757baccf70e2e6c7577f6d52a4ae527af20d88aa24b66c0b1705367f67b7e3da70b19825a57def7371420a -DIST digikam-7.2.0.tar.xz 255278796 BLAKE2B 5ccc6c6d1f3ce8d83746a1022dcf22b11b87af354f93f0b872a713f438d1bd2ee3f8e59d6206cd83dbbcaf1a8f2568ad0920d887b11d65864802f7eb2b02ba90 SHA512 2908a802fda84caf6b398a5dc328d2e9c00ab68776bde4620db1cb981995879e89d590520bf855471c968f065951280f863620641ccf945c43704e6cf3c0abd7 DIST digikam-7.3.0.tar.xz 256985340 BLAKE2B 9eb9802340f4d071a8378019eba007a25f1e5eeaf9d6acfa9b062c5ecf308a4e59408e078e53cea4d4ed3624d73181f3bb7973622512167bcc44748e063b13ed SHA512 71cb07de32fb9b07e0f9989a718b2a307618eaaeba6566dc6802b79e48c61f3ab00ca44e12c3971c2efc41448192a2e5a652d2cfd09be058d2bc98f40b5ebaad -EBUILD digikam-7.2.0-r1.ebuild 4065 BLAKE2B 034fc3c95d581820b0df33dd88a98a80dc781d156d339ad0afa360f1add02fe42fb571d45039a0f408a514d128aab0ef2e57dd38e24ca43513146e6dacd2de32 SHA512 b7d9e49414c02e40c9f0c66e74f4a4830653b499e5d29a84018e7a3df1acdbcc3969a79c08c5c00bd1e91c1ca4311408d8e669752accf95874d8a30ba73a71ed -EBUILD digikam-7.3.0.ebuild 4004 BLAKE2B 30c2e400d8963da4038da84ea51485bc4a66c0e465156b9bf1d03870ad0ae5b616735b0f2ea7313e4e2cb6bba7f24001bbc9ab9c67b79ce544d9e87a9439d067 SHA512 d6e9e1ee8b975ab685c4b3494660030b57bf67edad00037ae6cf7c348e80ea48dfd8f5bc5eaa90ac69183dbb480dc4319c6f374710fc664acc07b92564c2e19c +EBUILD digikam-7.3.0.ebuild 4002 BLAKE2B 353ccc6cb8c0576a444c73024c48e091cb4bbaff09fbf5adaa38d452ad88c5c6efdf79c069cdc13a344a84364511712c98d0f360c6818b835390640198a54737 SHA512 d913e9908c8d45d08bce8be3239436fbc4a8fc036f2584cc8f351cc9f8e0b5e33f90889caa42696892fdf37f89b31e31852869b9bb6f05850eabf432b096d9f9 MISC metadata.xml 1166 BLAKE2B 022418e3ce42ac9ec248d5301d20786cd3ddedac61e85b934d9074d9e68fa9511720976620ae84dc2def3961fba307fa9c9d84e5bd90896da7b866b21dfbf7f9 SHA512 1e249e12495dcf72e0eb02f9fa7822112afba627a0b155a2188c382e69a3697cd186757484cd0f559a2985a83ace953a62cbb4e0afb4a6c9551d89053321b3c1 diff --git a/media-gfx/digikam/digikam-7.2.0-r1.ebuild b/media-gfx/digikam/digikam-7.2.0-r1.ebuild deleted file mode 100644 index 93f92877fffe..000000000000 --- a/media-gfx/digikam/digikam-7.2.0-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.74.0 -QTMIN=5.15.2 -inherit ecm kde.org toolchain-funcs - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - MY_P=${PN}-${PV/_/-} - if [[ ${PV} =~ rc[0-9]*$ ]]; then - SRC_URI="mirror://kde/unstable/${PN}/" - else - SRC_URI="mirror://kde/stable/${PN}/${PV}/" - fi - SRC_URI+="${MY_P}.tar.xz" - KEYWORDS="amd64 x86" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Digital photo management application" -HOMEPAGE="https://www.digikam.org/" - -LICENSE="GPL-2" -SLOT="5" -IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X" - -# bug 366505 -RESTRICT+=" test" - -BDEPEND=" - >=dev-util/cmake-3.14.3 - sys-devel/gettext - panorama? ( - sys-devel/bison - sys-devel/flex - ) -" -COMMON_DEPEND=" - dev-libs/expat - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[-gles2-only] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5[mysql?] - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=dev-qt/qtxmlpatterns-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=media-gfx/exiv2-0.27:= - media-libs/lcms:2 - media-libs/liblqr - media-libs/libpng:0= - >=media-libs/opencv-3.3.0:=[contrib,contribdnn] - media-libs/tiff:0 - virtual/jpeg:0 - addressbook? ( - >=kde-apps/akonadi-contacts-19.04.3:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - ) - calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) - gphoto2? ( media-libs/libgphoto2:= ) - heif? ( media-libs/x265:= ) - imagemagick? ( media-gfx/imagemagick:= ) - lensfun? ( media-libs/lensfun ) - marble? ( - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=kde-apps/marble-19.04.3:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - ) - mediaplayer? ( - media-libs/qtav[opengl(+)] - media-video/ffmpeg:= - ) - opengl? ( - >=dev-qt/qtopengl-${QTMIN}:5 - virtual/opengl - ) - panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) - scanner? ( >=kde-apps/libksane-19.04.3:5 ) - semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - dev-libs/boost[threads(+)] -" -RDEPEND="${COMMON_DEPEND} - mysql? ( virtual/mysql[server(+)] ) - panorama? ( media-gfx/hugin ) -" - -PATCHES=( "${FILESDIR}"/${P}-qt-5.15.2-after-f8ad329f.patch ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_pretend -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_setup -} - -# FIXME: Unbundle libraw (libs/rawengine/libraw) -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=OFF # bug 698192 - -DENABLE_APPSTYLES=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON - -DENABLE_QWEBENGINE=ON - -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) - $(cmake_use_find_package calendar KF5CalendarCore) - $(cmake_use_find_package gphoto2 Gphoto2) - $(cmake_use_find_package heif X265) - $(cmake_use_find_package imagemagick ImageMagick) - $(cmake_use_find_package lensfun LensFun) - $(cmake_use_find_package marble Marble) - -DENABLE_MEDIAPLAYER=$(usex mediaplayer) - $(cmake_use_find_package mediaplayer QtAV) - -DENABLE_MYSQLSUPPORT=$(usex mysql) - -DENABLE_INTERNALMYSQL=$(usex mysql) - $(cmake_use_find_package opengl OpenGL) - $(cmake_use_find_package panorama KF5ThreadWeaver) - $(cmake_use_find_package scanner KF5Sane) - $(cmake_use_find_package semantic-desktop KF5FileMetaData) - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} diff --git a/media-gfx/digikam/digikam-7.3.0.ebuild b/media-gfx/digikam/digikam-7.3.0.ebuild index bd4f749f819d..bdb373353664 100644 --- a/media-gfx/digikam/digikam-7.3.0.ebuild +++ b/media-gfx/digikam/digikam-7.3.0.ebuild @@ -15,7 +15,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/" fi SRC_URI+="${MY_P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" S="${WORKDIR}/${MY_P}" fi diff --git a/media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch b/media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch deleted file mode 100644 index 938cd8a990cd..000000000000 --- a/media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7078ffb91c05e6cd436eaf222541044b98265113 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <arojas@archlinux.org> -Date: Fri, 16 Apr 2021 19:45:05 +0200 -Subject: [PATCH] Fix build after Qt commit - f8ad329f7ee01993c388f78851fc4ac88f5093b4 - -Build fails after this commit when using QT_NO_CAST_FROM_ASCII ---- - .../webservices/mediawiki/backend/mediawiki_queryrevision.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp b/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp -index dce0fc9eb5..625d170d5e 100644 ---- a/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp -+++ b/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp -@@ -299,8 +299,8 @@ void QueryRevision::doWorkProcessReply() - while (count < 2) - { - if (replytmp[i] == QLatin1Char('"') && replytmp[i-1] != QLatin1Char('\\')) count++; -- if (replytmp[i] == QLatin1Char('<')) replytmp[i] = char(255); -- if (replytmp[i] == QLatin1Char('>')) replytmp[i] = char(254); -+ if (replytmp[i] == QLatin1Char('<')) replytmp[i] = QLatin1Char(char(255)); -+ if (replytmp[i] == QLatin1Char('>')) replytmp[i] = QLatin1Char(char(254)); - ++i; - } - } --- -GitLab - diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest index a47f9bb354a8..204919c085c2 100644 --- a/media-gfx/eog/Manifest +++ b/media-gfx/eog/Manifest @@ -1,5 +1,5 @@ DIST eog-40.2.tar.xz 3601788 BLAKE2B ab66481d8fa5c076f0e12c3f16ff4a67d3a544b7483a2791833ea7d7f605898b20e8d8ed100a538e7a7f21a1359c74b96fa81aaf8712bfdb419df37fe711f7bf SHA512 e28c2deb320436606ebf0a971d845e536197ea23c2e7869d3d10dfe5174c8177c7977da37bf01178dc87f875cff2c3f0fbdad63c77578c2334dbfd9d354c19ad DIST eog-40.3.tar.xz 3602276 BLAKE2B 56f0fee5677730e032420fbc53c5ae6e6a5e1461d66c2e8dfcc7e7f5055d704223005f6c5329fd3bae11a002f1429729820fa52077c63e2d91a55213200a130f SHA512 5c6af597b35adcc18846e2dbee80eaf4b3c07138826520a9f6c2567df50c20379f804f8b878c7da74dd6cab25249555113d785653c0239353e410506611ffbab EBUILD eog-40.2.ebuild 1591 BLAKE2B b021bdc30c23209e66970052e2a05b295013fd53765e966436cad01af8d33084306accddecca864ed3ea07fb97dd675b74b6e76d15a761f0a1f9fd8eca82d311 SHA512 38158a2a01bae2503b81aa8ed540c7b0f45a138915d1fdf5eb5cf3d4e661769cf2d92d89f743256922436dd2ff1a69a21902dafbcb6de89627d6bfe3d0b6d598 -EBUILD eog-40.3.ebuild 1632 BLAKE2B 84a134a2b9f31f0cbbfed6f3f8c3149d6dc99623c180bca5b30d51f85ee1a1ade7c96b4f0f0be0c0c06ede206e88c17b71c23dbfee13d41515ba23af21ff0c2c SHA512 dd376773672b2a8f1884fd57f173e259b12f2940f2e4caceef113aa4299d5fc0705a178e670aba05d75fe3c9bb26596d9184dfb7e43ecfb569636be10f2b4a01 +EBUILD eog-40.3.ebuild 1639 BLAKE2B 9272d903acbbacfedd2ae50a1cbcaee4a689a52d550b5e23a835e40f4371808ee24ecb6a0442f3e7fb663f90977a3817ea169e1115f4b95d2819662b21eb105f SHA512 e372591952896fa5c450ea38a7c78a6914a3239451cf588edff609946a1c6396accba65d44875bdf37815f805ca5f31a0ddacbf489b631ca32c0bbcf828c1fc7 MISC metadata.xml 482 BLAKE2B 03780ad7b79dd3b35ee6a9b3ee95bceb94ebbd97de711912ba0f5e61ef4e25d9a20a474011cd3c5261c82757105bed5383f16259468dee80bfd6cdcec13b5828 SHA512 0c51ba4ac4859bc5e6361862282a76a98343ad3e46dfac04e088c79ec25683e820ea907991212979b5fffa0b757a66ea33ddfcff7a8012e42e81dba0e943ea39 diff --git a/media-gfx/eog/eog-40.3.ebuild b/media-gfx/eog/eog-40.3.ebuild index af9c70a389b4..44cf8e5d944c 100644 --- a/media-gfx/eog/eog-40.3.ebuild +++ b/media-gfx/eog/eog-40.3.ebuild @@ -14,7 +14,7 @@ SLOT="1" IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff" REQUIRED_USE="exif? ( jpeg )" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" RDEPEND=" >=dev-libs/glib-2.53.4:2 diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest index 487c07d7886c..982b7b98e73e 100644 --- a/media-gfx/eom/Manifest +++ b/media-gfx/eom/Manifest @@ -2,5 +2,5 @@ AUX eom-1.24.0-add-gdk-includes.patch 798 BLAKE2B db2156dadd2458100624a01e0724f7 DIST eom-1.24.1.tar.xz 2408284 BLAKE2B 70d660896dff42d5a91ea651697b50d4c90ced92023d5df48dfbed374c3777676f1f2dc99a0cb071a4eaa13353f31b11346136b963cf723397632cceafa64301 SHA512 70654b99f474d1b214cbbf8e799f82f3c38f47938df34cb5c8227c116b412364c568ae989b96d7082fb0d2fa319b3dba9b8dd499d19140a4d421bd09a46bffc0 DIST eom-1.24.2.tar.xz 2428972 BLAKE2B 871cb98c4a308dbc4821e67bae41522dbebae446e64777d764d30ded2f0637bae33cb9090e813fd7e43206ba1a436f7795684c4c5e850a242e9db96804b08e81 SHA512 38497dc5fc42340ca1b356f40eab8c14c21b1467f82ec64024d633cfb7ebfc598020b35c02eedce4f73f7a5ecb9050b0f0af4ea00279a1a5e7a627e542f34951 EBUILD eom-1.24.1.ebuild 1664 BLAKE2B f69a83f6925e9643f21c2ea2422cb994cbf72d1b7c7150c8df82889333226da23bbece1e3bd0ce6696dfc0ad06d725417e16a67776d8a1a605002431e8725830 SHA512 07bbb77b395b797a7927d74747335c5078f8c48a6ff6ab6abcbd372ebc445a0652d95a79c2a432bb3a8c2ad97f3a104943078d7aab3eef5351e71b99bad936f1 -EBUILD eom-1.24.2.ebuild 1666 BLAKE2B 7b5622c708251e07260badd3eab440c83d185103d02c1df1d5de33fd79540086227341052681ff28201e8141f6ea0e05d9acfe74caf901071c269fc181f81e47 SHA512 bba633b98f4e2a7489ce4541dda1a384afa36c972a86c1ab5f67096286ee8174615ea2b4cc9d73328f4b20a2fc9fe9e57877e5abe2c63712ce29243d9e6441ee +EBUILD eom-1.24.2.ebuild 1673 BLAKE2B 34082962808ff72d9e922f49929d517fa15880c31386204ba787a6dff2559ca67a51c70afb4fc8ff2701efed38916ee471eda88f17ab7fb7f9cf07e795e009e1 SHA512 a0c2ea6125487cc6bda74b4fde2775aca1e8e5de387b4f9c965ec6357d3155130ad4e812722b569a823b81c4ede0f9b0388657a7386c6bd9fbdc868ce5c656ea MISC metadata.xml 468 BLAKE2B 3dfeeca0297db2fc0dde74b8f23d365e6f33d53856bc32b568c2901a803097c69af05ecf881a9fd522a8f5a1e2a01e7aad496a8fd6571a1328746bf3376c541e SHA512 d605718c99007b9fb1b66b97f3078c7497b8bdeb46d3e487831d1b3e04dfe142d788ce83af67830d9f612c9077b69ee7eb197eef720b5da55327d9846d75478c diff --git a/media-gfx/eom/eom-1.24.2.ebuild b/media-gfx/eom/eom-1.24.2.ebuild index dc911dbc38d0..5a08348e2126 100644 --- a/media-gfx/eom/eom-1.24.2.ebuild +++ b/media-gfx/eom/eom-1.24.2.ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit mate if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi DESCRIPTION="The MATE image viewer" diff --git a/media-gfx/esci-interpreter-gt-s80/Manifest b/media-gfx/esci-interpreter-gt-s80/Manifest deleted file mode 100644 index 4a5408aa9962..000000000000 --- a/media-gfx/esci-interpreter-gt-s80/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST esci-interpreter-gt-s80-0.2.1-1.i386.rpm 191157 BLAKE2B 6c028ba8fce8c43c27b9c252e3b205991e2c26d1e803f2bfb167ccaf29c134901e333d0f979dce8dabf9f94d6882a3ed484ad60e73538a20410671d7c8e5a66b SHA512 abcf9228e1265d309f07b3b77081e9c8b21a4f186ef49b857df2e53b1d9e11f11e0975673c02760bd00f96d916fe5108f9218b0bea67bc59ff78ff4c9a09eb69 -DIST esci-interpreter-gt-s80-0.2.1-1.x86_64.rpm 71423 BLAKE2B 423f6745c4c2f7176a3e5d497f16aaf45b966b7d29e640e60599250bbb56504e9a4b7171e180a0d496d16ae49c52c14d4a543e625f92a33f62ab23fe5ddaa818 SHA512 3977255a939630391e35775651094f6c873288c5e2c70ee70c4e19064b78e721372cdd40c7f70ae937e74b572b9a15d9b558fdd6a1dc9905bbd78abce8bd57e5 -EBUILD esci-interpreter-gt-s80-0.2.1.1.ebuild 2127 BLAKE2B 007ab6e4ca273d64c7e5a2c2e754b02aa1dc6f77be609f2c14b812c1745c25a7fa7b868a4482ea1e466c3a5a8c8fe61709f3341d2f1b6fff848b9bab1ce755f1 SHA512 1dfd2c3b2e248cf86dadf8637135d389d2454adadafe51d017fc80ae90428cbc768f9afa8c21f7aac9dbedc26c45a3922944f4ff0369c1b5fe110bcf66703dca -MISC metadata.xml 509 BLAKE2B 0ed485a3ec89591b0bc8eae299cefa7bb00701f60cac3b07ba164464e1df041d1da2545fc093d2f18dfa89b90f05796b07c83598fff35b870178c2726a92e207 SHA512 5ffadfbc4342e3fadec6dace49080e7405c8137e6b8c4c9bf7fff47b6c7f24ed55716c36d8d0b28cd83f77c2a8f5ff254f0599e650805aef36ace2a81d0da106 diff --git a/media-gfx/esci-interpreter-gt-s80/esci-interpreter-gt-s80-0.2.1.1.ebuild b/media-gfx/esci-interpreter-gt-s80/esci-interpreter-gt-s80-0.2.1.1.ebuild deleted file mode 100644 index 496c1201c8d0..000000000000 --- a/media-gfx/esci-interpreter-gt-s80/esci-interpreter-gt-s80-0.2.1.1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit rpm versionator multilib - -MY_PV="$(get_version_component_range 1-3)" -MY_PVR="$(replace_version_separator 3 -)" - -DESCRIPTION="Epson GT-S50 and GT-S80 scanner plugins for SANE 'epkowa' backend" -HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" -SRC_URI="amd64? ( https://dev.gentoo.org/~flameeyes/avasys/${PN}-${MY_PVR}.x86_64.rpm ) - x86? ( https://dev.gentoo.org/~flameeyes/avasys/${PN}-${MY_PVR}.i386.rpm )" - -LICENSE="AVASYS" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" - -IUSE="" - -DEPEND=">=media-gfx/iscan-2.28.0" -RDEPEND="${DEPEND}" - -S="${WORKDIR}" - -QA_PREBUILT="/opt/iscan/*" - -src_configure() { :; } -src_compile() { :; } - -src_install() { - dodoc usr/share/doc/*/* - - # install scanner plugins - exeinto /opt/iscan/esci - doexe "${WORKDIR}/usr/$(get_libdir)/esci/"* -} - -pkg_setup() { - basecmds=( - "iscan-registry --COMMAND interpreter usb 0x04b8 0x0136 /opt/iscan/esci/libesci-interpreter-gt-s80" - "iscan-registry --COMMAND interpreter usb 0x04b8 0x0137 /opt/iscan/esci/libesci-interpreter-gt-s50" - "iscan-registry --COMMAND interpreter usb 0x04b8 0x0144 /opt/iscan/esci/libesci-interpreter-gt-s80" - "iscan-registry --COMMAND interpreter usb 0x04b8 0x0143 /opt/iscan/esci/libesci-interpreter-gt-s50" - ) -} - -pkg_postinst() { - [[ -n ${REPLACING_VERSIONS} ]] && return - - if [[ ${ROOT} == "/" ]]; then - for basecmd in "${basecmds[@]}"; do - eval ${basecmd/COMMAND/add} - done - else - ewarn "Unable to register the plugin and firmware when installing outside of /." - ewarn "execute the following command yourself:" - for basecmd in "${basecmds[@]}"; do - ewarn "${basecmd/COMMAND/add}" - done - fi -} - -pkg_prerm() { - [[ -n ${REPLACED_BY_VERSION} ]] && return - - if [[ ${ROOT} == "/" ]]; then - for basecmd in "${basecmds[@]}"; do - eval ${basecmd/COMMAND/remove} - done - else - ewarn "Unable to register the plugin and firmware when installing outside of /." - ewarn "execute the following command yourself:" - for basecmd in "${basecmds[@]}"; do - ewarn "${basecmd/COMMAND/remove}" - done - fi -} diff --git a/media-gfx/esci-interpreter-gt-s80/metadata.xml b/media-gfx/esci-interpreter-gt-s80/metadata.xml deleted file mode 100644 index 0d6f1efaa264..000000000000 --- a/media-gfx/esci-interpreter-gt-s80/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!--maintainer-needed--> - <longdescription lang="en"> - Proprietary plugin for several EPSON scanner models, to be used - with the epkowa SANE backend (provided by - <pkg>media-gfx/iscan</pkg>). 32-bit and 64-bit. - - Supports the following models: - - EPSON GT-S80 / ES-D400 - EPSON GT-S85 - EPSON GT-S50 / ES-D200 - EPSON GT-S55 - </longdescription> -</pkgmetadata> diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest index 6cc5a4971d59..f9fc49588dc4 100644 --- a/media-gfx/flameshot/Manifest +++ b/media-gfx/flameshot/Manifest @@ -3,9 +3,11 @@ AUX flameshot-0.6.0-unbundle-qtsingleapplication.patch 1505 BLAKE2B 51b8c59945f5 AUX flameshot-0.9.0-dont-force-ccache.patch 385 BLAKE2B 2acfd1410e247c6aec3dc2c9ea886b25de25f5432131baf787d4a9dd5f8db114e08cfa7baaff7f83e3228431fc97ad65664c31d4c72b8eca15bd6f5db18f94c9 SHA512 a0c6cefac528e822b2b65fd693830cb96c2ea1df393ebfc2718324411199ed1b82e9121a6018622d5b4ed8bdbf3b14c06c201925a2fd69fa96ac1f9d297c4f04 AUX flameshot-0.9.0-unbundle-qtsingleapplication.patch 3613 BLAKE2B cc5681081eeb48d3db2e2ab031fbfe4d96d6a52f5078b73b1e6af45b0aa98d078d75e4b4d5f3f50e0d93e7e3be0f8ae515ab096c7513e0f4974f674fc5f16395 SHA512 ce7014b932193650405852957b27c779c567285d46a85e3d3bb89c05449491d15b154efc213bd8f8370660ecadf048adfbf3ce3ade0fcd209fb9e2be9805e8f5 DIST flameshot-0.10.1.tar.gz 7726725 BLAKE2B 7045e7f86fc835a49a814b6fb86c2d413422a323925d358cc37d6263b8a1ca9415f134caf72700ebe138621a5687d9245dc96edf8f0597eb1e974edf5bf699f1 SHA512 dca9c48b284d23b67cb71ff78d79b87887506bf5b30600c5d9ee78f5fadebab6d507674abeeae0c5cdf4a149e71df60666299c7db10168613c03467c7aafa7cf +DIST flameshot-0.10.2.tar.gz 7726687 BLAKE2B c7c7402d0cb6234473018571e67c39aebec3b4afa398fc2ef590f64527980ca218b1ebd8228ea47a3f9fd76e0edc2f8e1662965f79817bf6461bf0fc64d8b692 SHA512 b0eb1decd87dab1d4a375708448dd4c6f85c101d33814b76edbb328150d0e9ee7a588be698fddcb24e70e39cd4331f9aa2ff082525ff6975d52303a6d9c1ab12 DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad SHA512 194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975 DIST flameshot-0.9.0.tar.gz 7659641 BLAKE2B 38151bf333802ccbaa6c2292799958fe4c75f5a978eea9b2314c5eb264fb569cfcce73afac79b80423686d3a10ec54300ad4cacd3be9a6c6e58c72f59c23fb46 SHA512 888422cd66b7c90cd6da0e824a2c12c0ca7e3cfdfd0a0499868acf9609e6c3a0977f816c656690fa101971b98a3f560cf7849b93079c091b25155360cb20ea11 EBUILD flameshot-0.10.1.ebuild 940 BLAKE2B f19894ce33d7f0579cfdf8bb08bafd8572dec7fcb5467cc6e51e7d51aa4490d8f2d1fbcce27691517a5c9a0c15c4fed0cd7ced4ed5edb8481f7307b6a727b45a SHA512 aa72e152dc21996cfc5536517ade866d4fe207d94eef6114b90cbcb52d1d3c40a3a54a8bb1231b4eb0736a992996592d3f3184fd3c1c97096de371319cfbbba4 +EBUILD flameshot-0.10.2.ebuild 940 BLAKE2B 6f12de8ec7174213b918ae8e1abaf2f9d63922a7bf3071969f477b8376097438d336f25f8262e506a98a1486c5ef84dcbf9c824587dcaf7e0ce46b1e56f9ada1 SHA512 195a95660159ded133a5adc2968feda8afc3b6771d02f53d738657e045450e50ceb5930b1ed52bbf6782faf04d9072a9db2f6e43f90c4e0440764ec559350a02 EBUILD flameshot-0.6.0-r1.ebuild 1173 BLAKE2B fe5f8d46a1293784a3ea53ea25dabd50945d541858df36779c05f05d985b14c829ad48bb1233f05864105dd9081373628e779592c8a60740fb2cc4d2ac838dd6 SHA512 eb2061def767077f861bbb00d4ca532e7b5f4b1282c15368fb471b325a1355ad61e0d584c209bd437b9dc947134266636a87b4babcbb75cd1740bebdb1643ca0 EBUILD flameshot-0.9.0-r1.ebuild 1042 BLAKE2B a8ee64f229fc8c78ef88f35f8a3ce3aba82cebde8598ada39cb7f850d95f155c8b4c30eaec8ec1fb6953826b862d4af8f4e3888e21437c084b59d774cb531253 SHA512 f651b282bd68997f7e31a4b8d0a21fefd443a38a36bce136f1a9a11c80c1eb7c903e09aa22c74a4a2d372d0d2a92cd1605b133e6a61227820f285bc71403bb19 MISC metadata.xml 397 BLAKE2B fe5e79c5c48e1fb4feac428380c82f5cb0b2df39bc34aeafbcea452059a86bc4b117629c88212ee713d13dcc5aaabae2aa15c268196b7bdbc05c758dbc2a600a SHA512 5448da564fa737ad66ef33a482e363f2bd94714e84bd20e9e20afcab2a12d84030bd84e17c1d1dc874c1aee9c094b3c19fdc82dec167f4096d945a1df5f4bf3b diff --git a/media-gfx/flameshot/flameshot-0.10.2.ebuild b/media-gfx/flameshot/flameshot-0.10.2.ebuild new file mode 100644 index 000000000000..f7e216a175dc --- /dev/null +++ b/media-gfx/flameshot/flameshot-0.10.2.ebuild @@ -0,0 +1,47 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="Powerful yet simple to use screenshot software" +HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot" +SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + =dev-qt/qtsingleapplication-2.6*[qt5(+),X] + dev-qt/qtwidgets:5 + dev-qt/qtsvg:5 + dev-qt/qtnetwork:5 + dev-qt/qtdbus:5 + sys-apps/dbus + dev-libs/spdlog:= +" +BDEPEND=" + dev-qt/linguist-tools:5 +" +RDEPEND="${DEPEND}" + +src_prepare() { + rm -r external/spdlog || die + rm -r external/singleapplication || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DUSE_EXTERNAL_SPDLOG=1 + -DUSE_EXTERNAL_SINGLEAPPLICATION=1 + -DENABLE_CACHE=0 + ) + + cmake_src_configure +} diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest index dae69a77f22c..5dad218bfa8c 100644 --- a/media-gfx/fontforge/Manifest +++ b/media-gfx/fontforge/Manifest @@ -1,4 +1,4 @@ AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674 DIST fontforge-20201107.tar.xz 14163424 BLAKE2B 8ce9148eef6e5b7206ab5c70310ff36fac67c392117e3c0b28060803a54306bf21c179b62b98734e11253739eac29e2ea8bcf3014c09432bb3a0b2b0f3ec631a SHA512 cf9666395405ab02943f0160959f04251bd2a80e279a8f60431089ad19a4c5a232efd42097050ed9f6c1fb39d01488176262949fd81f5f0960fe853b497437dc -EBUILD fontforge-20201107.ebuild 2863 BLAKE2B dfb1c94fa6923acd6a09efce18244982b5973171e8a24d863aad057292428145c64005bd67622c01c1044a57f3303011328299f4825faafc4d4663448e073f07 SHA512 bc8dac5e321f635416127154805c3b8d86c823f4e1f611477744f553fd9063dddb04ddb2dd9ebf85eef3ea99ba381953f6a83428adedb7dc265540f4f5efa7f9 +EBUILD fontforge-20201107.ebuild 2863 BLAKE2B 1c6ca7f18f00c3f09f145593d391f074d9d76d6aec893fe4f871b554b053bbfa870901c49b182ef4c34176e5a2e793f88369746794ecdd94b0096378722a0ec5 SHA512 8f5baa9a193d1cd047fc33e6d9848f1cb4bb0be16a351c838ad0a0be0cae3a77c534f7638b4e6e93cfb2d7def79692e1222f91fd122f54950a1a07fe0454b645 MISC metadata.xml 862 BLAKE2B bc7359c628af9d645b87f43a50a2f0f0d6ab1d80e3dbb0134f4b0d668990202276e4c66da640b7b63baa53d7ef7bdca90ad097566a995a02ab90efac88553884 SHA512 a6a55768f8e0a81591a44547ca0a135ad24833c0fec1f402348cb17512b8354c6c254f12a4fe62a615f955427a6893e12c9dc34d808e04a9d7065fbcf854a276 diff --git a/media-gfx/fontforge/fontforge-20201107.ebuild b/media-gfx/fontforge/fontforge-20201107.ebuild index abdcda4d71ed..115b5c5540a9 100644 --- a/media-gfx/fontforge/fontforge-20201107.ebuild +++ b/media-gfx/fontforge/fontforge-20201107.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit python-single-r1 xdg cmake diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest index f3c794f26e4b..dc047f1e2030 100644 --- a/media-gfx/fotoxx/Manifest +++ b/media-gfx/fotoxx/Manifest @@ -4,5 +4,5 @@ DIST fotoxx-21.55.tar.gz 8667304 BLAKE2B 9a324883ba29d8847763985ff33d3e7eaf2a734 DIST fotoxx-21.60.tar.gz 8679841 BLAKE2B ec3dcbd0b937d730692e225fec7530ac46390328ae960e8960df7d252bc0cd8630de84bf47dfaf74c1e07855b4b0959e596e5e515ea00a6c430872359b2b4576 SHA512 ac999fcc70acd92c54e85ad276112aaa7f1b7606ea70381d6f833d829fd92c14aacad7a967838e5d28fce80cfa6da8ef05e0ee49b463210cb66a3f8ffc3d22e7 EBUILD fotoxx-21.50.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159 EBUILD fotoxx-21.55.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918 -EBUILD fotoxx-21.60.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918 +EBUILD fotoxx-21.60.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159 MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9 diff --git a/media-gfx/fotoxx/fotoxx-21.60.ebuild b/media-gfx/fotoxx/fotoxx-21.60.ebuild index 12a78336fe75..d9e91deab328 100644 --- a/media-gfx/fotoxx/fotoxx-21.60.ebuild +++ b/media-gfx/fotoxx/fotoxx-21.60.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="" # For required dependencies read doc/README, for required tools read diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index 7fd77f42c8b1..42954a75d0e4 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -6,9 +6,9 @@ AUX freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch 842 BLAKE2B d1eef0 AUX freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch 1959 BLAKE2B 3863f4f311a4fba648d4503c6b3daecb87d233caea4ce7f22dff47f69435995ff422cd2ee97e8a491ddf85527b325d63543e041ccc91e5c844fede750c6764ef SHA512 b9af575349498393ee78e1c75247e736412d331fb872475c180c4828a6007f9a34ccd379eed8fe2551e53b88eee0b400202c63a1365df8b6069ce3b0727b2056 AUX freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch 1054 BLAKE2B d6a67b22390b64ed566c49af6117de2f34e0f57094a069ccae6cd15da5fa3a53a4cd71d94bd65a201c60042893da713a2d397890c7b072b197e101697cd388fd SHA512 beecd51a4b59890cd162eb76b726bd1e82a32da387ed67d886293930175deaf014445afd4db93e262daa06ced5b6c267218e4d777bd32c940fbc8b057b077fa1 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088 -AUX freecad-9999-Add-memory-header-for-std-shared_ptr.patch 687 BLAKE2B e1b1273b5c98f52539d2788469f49e1b5c57ea06ef1b136e82ddd4655f0a585dd5eee0104dfa1539aeaf1c82b673d681337482b4c9b7ae4d4d9a951637f1f16e SHA512 a15b0b2c49057de39a8efe45ee3460681611b6acf0b53e77ed278af58a0c97f296ca6e5ac1e2efdab39d77d06461c71bde9cf146784b094f2941caf1b0a76914 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2 SHA512 66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf SHA512 420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72 -EBUILD freecad-0.19.2-r4.ebuild 12191 BLAKE2B 5b38525d8621a2b95b7f1ab150d2cc21eb26e30aa3c467a869a8cf027ac47c96008e94b3287786c8e3a529d78fad627700135ee82aff948e8dcc68b038e0c66a SHA512 8afe20234ccc6f6b7dc55aa7f0044fbd6ccda1fee6d031c9ff8ca750d87ad93ec038953265775bd305a1cf5c36af4dc3043c66ba3f6765e588d113091322b9d1 -EBUILD freecad-9999.ebuild 11967 BLAKE2B 43ca123f606f45df6026725b4a220aab723631feb95e485902963b4044704d76589f11e4e374a9bd9d8e31fdff58f3f70cb6ecaeb0329940bb2ee200e19af6c9 SHA512 24bde5e135ff1966171964f5ffc9ea8a31a978ad79dece2a33f3099a2899fb52fc741fc9938471f4f155532eb08a29681f4d842ec1b75b14d69ff487b796d91b +DIST freecad-9999-Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch.xz 4136 BLAKE2B 207003dacd7f02bd4782ebb0d5f9a7093d8fd3ef8011301454dab03d7a79bab7b2fd623c7d8e11d1f6557803b40f1d206dc75c41b1520e1dd2467dda72d91868 SHA512 d7d6096c1cfb06e6218673a927c5791ec820dc13a23c89df6233109e288d98f86920141e01a8cb680e7cbb8c83c4c655a7a66d5578d284a144dc3f44c028ceb5 +EBUILD freecad-0.19.2-r5.ebuild 10910 BLAKE2B 837cee24737a432cbe6a1d0415025680e73c09898e859edfe1f8a0a8d36fc7fb454e40c9998f589500a9a5ad366215558a494b4869e18c47de2c3c6d69229c07 SHA512 40686ce7313bd28c0fe5f381e392db650a2adbe1737b63eb1ccbd44cfc90ea6c92ad07a52bb566cb5401e87f8499fb12909db02fd779335ef955b2b338f33845 +EBUILD freecad-9999.ebuild 10822 BLAKE2B 89e8e85ab4e3d80ee7d3d346de53fda3adb07a5ea057324409ca52f91f5542569b7476b602999aca056088b66f6c51f75822ff4668aeff89ba53965ec280d716 SHA512 a92798699ab2349b3b1bd694a787935a4a01df88ca0ba669a45d96b5b9bb395db412ded3ed399607a7479886b9389ce42b27550e186fe2e40ff166d2c4e1383a MISC metadata.xml 3268 BLAKE2B 4e99f8237c96f96500ec15a0e175684f445c9a68e1080f6f61538ae4e99cb2afccc14d50c626c44764ea4362ed82cc2ccf74f8ae53d713d70b21860eeb39650d SHA512 fbc87f4a401c33de8033b54213026631a9f956918cc256eb9a10cec88b316f71fd98959c79f58acc3d4a75d28117097ea0cc4ee33f333923d4387e9d3af43bb5 diff --git a/media-gfx/freecad/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch b/media-gfx/freecad/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch deleted file mode 100644 index 81a8f22d8937..000000000000 --- a/media-gfx/freecad/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sat, 16 Oct 2021 17:02:19 +0200 -Subject: [PATCH] Add memory header for std::shared_ptr - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- - src/App/Metadata.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/App/Metadata.h b/src/App/Metadata.h -index de8be3ea8e..2c5fd8f417 100644 ---- a/src/App/Metadata.h -+++ b/src/App/Metadata.h -@@ -30,6 +30,7 @@ - #include <string> - #include <vector> - #include <map> -+#include <memory> - - #include <xercesc/dom/DOM.hpp> - #include <xercesc/parsers/XercesDOMParser.hpp> -@@ -296,4 +297,4 @@ namespace App { - - } - --#endif -\ No newline at end of file -+#endif --- -2.33.1 - diff --git a/media-gfx/freecad/freecad-0.19.2-r4.ebuild b/media-gfx/freecad/freecad-0.19.2-r5.ebuild index 24dc6a703399..c9287ed91fa5 100644 --- a/media-gfx/freecad/freecad-0.19.2-r4.ebuild +++ b/media-gfx/freecad/freecad-0.19.2-r5.ebuild @@ -47,7 +47,6 @@ unset module RDEPEND=" ${PYTHON_DEPS} - >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c[icu] @@ -79,7 +78,7 @@ RDEPEND=" dev-libs/openssl:= net-misc/curl ) - fem? ( sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] ) + fem? ( sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] ) openscad? ( media-gfx/openscad ) pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] ) $(python_gen_cond_dep ' @@ -94,7 +93,10 @@ RDEPEND=" fem? ( dev-python/ply[${PYTHON_USEDEP}] ) ') " -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + >=dev-cpp/eigen-3.3.1:3 +" BDEPEND="dev-lang/swig" # To get required dependencies: @@ -143,22 +145,6 @@ src_prepare() { # but cmake ships a working one, so we use this. rm "${S}/cMake/FindCoin3D.cmake" || die - # Fix OpenCASCADE lookup - local OCC_P=$(best_version sci-libs/opencascade[vtk]) - OCC_P=${OCC_P#sci-libs/} - local OCC_PV=${OCC_P#opencascade-} - OCC_PV=$(ver_cut 1-2 ${OCC_PV}) - # check for CASROOT needed to ensure occ-7.5 is eselected and profile resourced - if [[ ${OCC_PV} = 7.5 && ${CASROOT} = "/usr" ]]; then - sed -e 's|/usr/include/opencascade|'${CASROOT}'/include/'${OCC_P}'|' \ - -e 's|/usr/lib|'${CASROOT}'/'$(get_libdir)'/'${OCC_P}' NO_DEFAULT_PATH|' \ - -i cMake/FindOpenCasCade.cmake || die - else - sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \ - -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \ - -i cMake/FindOpenCasCade.cmake || die - fi - # Fix desktop file sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die @@ -237,27 +223,8 @@ src_configure() { # Use the version of shiboken2 that matches the selected python version -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" -DPython3_EXECUTABLE=${PYTHON} - - -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo ) - if has_version ">=sci-libs/opencascade-7.5"; then - # bug https://bugs.gentoo.org/788274 - local OCC_P=$(best_version sci-libs/opencascade[vtk]) - OCC_P=${OCC_P#sci-libs/} - OCC_P=${OCC_P%-r*} - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P} - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P} - ) - else - # <occ-7.5 uses different layout - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir) - ) - fi - if use debug; then mycmakeargs+=( -DBUILD_SANDBOX=ON diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index cef63f28477e..2852f295c8e1 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -11,10 +11,12 @@ DESCRIPTION="QT based Computer Aided Design application" HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD" MY_PN=FreeCAD +MY_PATCH="${P}-Gentoo-specific-fix-install-locations-of-Ext-and-Mod" if [[ ${PV} = *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" + SRC_URI="https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${MY_PATCH}.patch.xz" S="${WORKDIR}/freecad-${PV}" else MY_PV=$(ver_cut 1-2) @@ -47,7 +49,6 @@ unset module RDEPEND=" ${PYTHON_DEPS} - >=dev-cpp/eigen-3.3.1:3 dev-libs/OpenNI2[opengl(+)] dev-libs/libspnav[X] dev-libs/xerces-c[icu] @@ -79,7 +80,7 @@ RDEPEND=" dev-libs/openssl:= net-misc/curl ) - fem? ( sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] ) + fem? ( sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2(+),qt5(+),vtk(+)] ) $(python_gen_cond_dep ' @@ -94,8 +95,14 @@ RDEPEND=" fem? ( dev-python/ply[${PYTHON_USEDEP}] ) ') " -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/swig" +DEPEND=" + ${RDEPEND} + >=dev-cpp/eigen-3.3.1:3 +" +BDEPEND=" + app-text/dos2unix + dev-lang/swig +" # To get required dependencies: # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' @@ -120,7 +127,6 @@ REQUIRED_USE=" PATCHES=( "${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch "${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch - "${FILESDIR}"/${P}-Add-memory-header-for-std-shared_ptr.patch ) DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md ) @@ -133,31 +139,27 @@ pkg_setup() { [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade" } +src_unpack() { + git-r3_src_unpack + unpack ${MY_PATCH}.patch.xz +} + src_prepare() { # the upstream provided file doesn't find the coin doc tag file, # but cmake ships a working one, so we use this. rm "${S}/cMake/FindCoin3D.cmake" || die - # Fix OpenCASCADE lookup - local OCC_P=$(best_version sci-libs/opencascade[vtk]) - OCC_P=${OCC_P#sci-libs/} - local OCC_PV=${OCC_P#opencascade-} - OCC_PV=$(ver_cut 1-2 ${OCC_PV}) - # check for CASROOT needed to ensure occ-7.5 is eselected and profile resourced - if [[ ${OCC_PV} = 7.5 && ${CASROOT} = "/usr" ]]; then - sed -e 's|/usr/include/opencascade|'${CASROOT}'/include/'${OCC_P}'|' \ - -e 's|/usr/lib|'${CASROOT}'/'$(get_libdir)'/'${OCC_P}' NO_DEFAULT_PATH|' \ - -i cMake/FindOpenCasCade.cmake || die - else - sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \ - -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \ - -i cMake/FindOpenCasCade.cmake || die - fi - # Fix desktop file sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die cmake_src_prepare + + # Fix line endings on a few files for patching + for f in src/Mod/{Cloud,Inspection,Start/StartPage}/CMakeLists.txt; do + dos2unix -q ${f} + done + + eapply "${WORKDIR}"/${P}-Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch } src_configure() { @@ -208,10 +210,10 @@ src_configure() { -DBUILD_WEB=ON # needed by start workspace -DBUILD_WITH_CONDA=OFF - -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN} - -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN} + -DCMAKE_INSTALL_DATADIR=share/${PN}/data + -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} + -DCMAKE_INSTALL_INCLUDEDIR=include/${PN} + -DCMAKE_INSTALL_LIBDIR=$(get_libdir)/${PN} -DFREECAD_BUILD_DEBIAN=OFF @@ -232,27 +234,8 @@ src_configure() { # Use the version of shiboken2 that matches the selected python version -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" -DPython3_EXECUTABLE=${PYTHON} - - -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo ) - if has_version ">=sci-libs/opencascade-7.5"; then - # bug https://bugs.gentoo.org/788274 - local OCC_P=$(best_version sci-libs/opencascade[vtk]) - OCC_P=${OCC_P#sci-libs/} - OCC_P=${OCC_P%-r*} - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P} - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P} - ) - else - # <occ-7.5 uses different layout - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir) - ) - fi - if use debug; then # BUILD_SANDBOX currently broken, see # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595 @@ -292,12 +275,6 @@ src_install() { dobin src/Tools/freecad-thumbnailer - if ! use headless; then - dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad - mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources" - fi - dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd - python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ # compile main package in python site-packages as well python_optimize diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest index 7810a161e549..664fda2f06be 100644 --- a/media-gfx/frogr/Manifest +++ b/media-gfx/frogr/Manifest @@ -1,5 +1,6 @@ +AUX frogr-1.5-warning-level.patch 752 BLAKE2B b0fd94da39939daa195bd4da03b6701b6336e49a7f60fdfe703853d27a562b8dd29bc923cecf08f13acb3200935dfdb43ff1bcf16cda78d80e6980654da4bde5 SHA512 3aa0522da679eba07f3f32134a19adaa6ffdb25bec46c4202e8caf2c38c93749c565f315d5265fca56a618a60d01fe11ef04f971a6c5168a33a42f0187182fbd DIST frogr-1.3.tar.xz 2552456 BLAKE2B 562f88898fec153c50696dce59b5396b6f9e88bc68cbf264e7954c2d2f402cb44cb2e6bf3c1c786d50285532c66167678f0fde053c317a0d23b6f4b210e69fa1 SHA512 82ca3ff1e97e7ff45bce1915f629809cc9efa6d33735b0e41b17bb8f69a31a2b035dd53045a3e56e7769d379b534a2468e37a684505438cfea70cc141103d1cb DIST frogr-1.5.tar.xz 2233600 BLAKE2B aeb04db0d5d57f470d377986f2e857ee63b47df85e9c3251cdfac8585efa19491650ecede0bfa95c157c2584298dc02173afec624bc439dcd8b52d101c465d54 SHA512 f4af5ec82ad1771e71387c40467fc697c7e3edff9f76ecd0f762e446d136a293477867cb7b6bc6d10bc0fdd95210b25f515eb56bf2d456f79009884019c44dd4 EBUILD frogr-1.3.ebuild 626 BLAKE2B 9e17e2f7206f357020256d796ffc92b2f3bb63d3b5f8b52209289628d8ee76cf6ac18e84d5982ddd4828437275f2cefd039025d9104ce0d0f3ab958b9bf2cb96 SHA512 8b2eaa44c95a0266e1568becdc8fccca0dec6de3e31d9cd71a228fa068a361ea223efdc39b318459abb68c285efb9ef688cf5b44eed79f1d79e4db76b6d7427d -EBUILD frogr-1.5.ebuild 926 BLAKE2B d2922cb892bbb39075cd5bd0639ee5fd9884e7147376fe51854f2fa3db7a2d7908e813c5e2988afc017f1fe1c0c52bb13de6259e707cc1b99550956ec24b171b SHA512 e48d0ce41802dc1f3b44e5b3ad829097fdbecc407ac1e5e2d22b12b23c700cd09f5e6095a587c81eec2c29100f87664a479c8bb6472ac8fb22f4e0acf3c0bb70 +EBUILD frogr-1.5.ebuild 984 BLAKE2B 716e96ad03a810f1f7356d6498fa06a1ec7c2751c10e4181cd9685022a07a8f9c2b7241f29fd3300241cd0cb04a171673e8416f3fbf9c0ea1a95d4f4fa9eaf9d SHA512 17e7fdf4ce73c2310b4568107b15da36006501a00c690908ef4fce99cf53b14e1bfc7f475a2ca9a98384a7b1e0eb9e4f32e0248db7b5595971ecaca2fafc9d40 MISC metadata.xml 387 BLAKE2B b08b71b2565331e07ca5b0c99cd8fcb57f6d0f584eb70798ddf20b6e74bc58f1e3d79f354c4bd0b72d26a85dffda4ca87e44a18345ce497020406ce0958bb092 SHA512 cb8c90665280861d2310256c59783f68126d8a24f994bb011487a3509d3ca418605b5e5c89da520204eb646fb4d920c6e8bc8c868b0faffc764832ff2fcc3d92 diff --git a/media-gfx/frogr/files/frogr-1.5-warning-level.patch b/media-gfx/frogr/files/frogr-1.5-warning-level.patch new file mode 100644 index 000000000000..68020c3e16b8 --- /dev/null +++ b/media-gfx/frogr/files/frogr-1.5-warning-level.patch @@ -0,0 +1,28 @@ +From 623d7e397baff3a8ab1695e190b13bc60153b64c Mon Sep 17 00:00:00 2001 +From: Mario Sanchez Prada <msanchez@gnome.org> +Date: Mon, 7 Dec 2020 22:26:34 +0100 +Subject: [PATCH] Use meson's "warning_level" build option instead of + "warnlevel" + +The correct option's name is "warning_level", so change it for it +to actually be effective while building. +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 37f76d7..87e4de3 100644 +--- a/meson.build ++++ b/meson.build +@@ -2,7 +2,7 @@ project('frogr', 'c', + version: '1.5', + license: 'GPL3', + default_options: [ +- 'warnlevel=2', ++ 'warning_level=2', + 'werror=true' + ]) + +-- +GitLab + diff --git a/media-gfx/frogr/frogr-1.5.ebuild b/media-gfx/frogr/frogr-1.5.ebuild index c10fdc5a79c7..011ea5c4f2b7 100644 --- a/media-gfx/frogr/frogr-1.5.ebuild +++ b/media-gfx/frogr/frogr-1.5.ebuild @@ -29,6 +29,10 @@ DEPEND="${RDEPEND} " # TODO add a useflag for enable-video or header-bar??? +PATCHES=( + "${FILESDIR}/frogr-1.5-warning-level.patch" +) + src_configure() { local emesonargs=( # bug #714132 diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 6761108b1a10..4974e94af36e 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -7,7 +7,7 @@ DIST gimp-2.99.6.tar.bz2 30663040 BLAKE2B ccbdc2baa9e99a94e85345ce90bcba6ca56c0f DIST gimp-2.99.8.tar.bz2 30799403 BLAKE2B a67863f5e7d40beca80f931973759dc4523718ac2740cac4924dae8e1611491e59c43436ca670643be1878e1d9ff1575174a59c919b33103128a812e7eba6042 SHA512 c603d9a315c21c9da716cc1d8c0c784061e7d0eac4b3d28467aabc3c63c950da0a52649e498049e0b8475933ef93d721a2b8423811b47b00c9490485d316345e EBUILD gimp-2.10.22-r3.ebuild 5638 BLAKE2B 1d71a07139f3005de53dce494c3603a7fe84d0b82d52b066e1ca6e7f663ba14d46ce8faed4b31c2bb072202ba2ef28d3004420b5fc637e5cc1f5f0b2cfbf96c3 SHA512 bbb7192ae8f9ddf3ce26f9388e67da042297d8fb42040f49821dae762d6ca16edbabc1b5204de801e857759c032625e39b6945e6a19e674ed6c8dda848216158 EBUILD gimp-2.10.24-r1.ebuild 5583 BLAKE2B 8da764ad95278c60c962e0254b2a839e35e4222e045a3c17cc4387058037d933b5f07d17def0992b1da7fd3c7baafa19700f79c39b7dd8ab673d7ccdb4672cc2 SHA512 4041817e72d868ccf5faf05643691d543aea7e32af241762cd5364397e47827da8a59eaf38db6b2108c12862989a8a36c95911081c09ff4eaeec0f420f522176 -EBUILD gimp-2.10.28-r1.ebuild 5587 BLAKE2B ce6170f7396b456dda676af1109b94619351c6473f229c2d28829cbaf70850237c6d70f7e66d4080c2197f48ee44a1b7e0dda1431e9fba0d5d4e136d0e5ebe26 SHA512 08d19b4c66b4e13a188618eee5664b9367809fcdf03b8022f2c184ab6ed2feca22083f5a9e4fa6db71addf021559c3b635dccc34133397fb9dcc42dc0e3a46af +EBUILD gimp-2.10.28-r1.ebuild 5586 BLAKE2B bf5bb3ecc6777b79dfb56d36feae960d5761e5c8c3eebe5e434d43b3af04e76ed093929ba0935988dae8a25950a7a2233c179074da5583a46db48de7d79de0f3 SHA512 9cdf41e5b695047b8fa5dbb5501ece6b6b1848774d3c594c9bde7fe63bf0afc3724d44657ea533c055785f42ca69372e8d67e8f59f7c2d136a90b76ff90a82c4 EBUILD gimp-2.99.6-r1.ebuild 6811 BLAKE2B 51c8312fe6e6e8f4af8bdf2205e1280137ab32b599aa0c57d00d60eb34ec48f8a52d91b66188bbfd97c376d036d83e5290f6e425613e81041942be9663e96eca SHA512 63ad5d670e04875ac3b32a30d372a1441f4f448054c380f5da3f2c177b5ea1aaec77cb083a44b1a385e77d128d8641f4b22610fb007b881809f8b8c08be37d5a EBUILD gimp-2.99.8.ebuild 6811 BLAKE2B 119710bd74d3f17e144037f9bf3c33ffb6b2937ee93b0883b70693f278081b206e912b51e62851df32b215070af783b54295ac9a840c07aa3dd29069a4a364f5 SHA512 5435a0ab9fee5210d5c225a8f8e7341c50244e5a8867b3585ae0a38f36979c4f9f23845da11dbf818eaf148bf7f424bd2a32706df2f8001fa79e90f6a9692eb3 EBUILD gimp-9999.ebuild 6961 BLAKE2B bc2c263a08e19431941370f256c1158b4d0a0ee355eb89f084dd9f2944b58ecbfdfa98b3187e8f4ad70ab6a141c4ac6eb3aa1a75c3eef1ad41e6201bba8b4da4 SHA512 331f1f2b4a79d977b49594b834192df02a4f9b26a2d2b33907bcae8b01c748280614012ff4b645880e35b160d4857a39fdf4aa222ef8f39cbc4ea5415a237f4c diff --git a/media-gfx/gimp/gimp-2.10.28-r1.ebuild b/media-gfx/gimp/gimp-2.10.28-r1.ebuild index 1965470e2b16..2ea1242163cd 100644 --- a/media-gfx/gimp/gimp-2.10.28-r1.ebuild +++ b/media-gfx/gimp/gimp-2.10.28-r1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/" SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2" LICENSE="GPL-3 LGPL-3" SLOT="0/2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86" IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest index f5aa25fc156d..16fd694e4054 100644 --- a/media-gfx/gmic/Manifest +++ b/media-gfx/gmic/Manifest @@ -1,6 +1,4 @@ AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e -DIST gmic_2.9.8.tar.gz 7311372 BLAKE2B 6438198cbaefe1de712ccd85179887b858ec1f7e039a080f0070e5ed454fd52b9414ecbd7c93dce740261df501f086634ab0bd291b70bb18778979faf2331486 SHA512 588362de60d51b1814cbe08f7402b143b656712bf2b4dc33830196068d7464394fe314d1c0dcee608a7408c7b7507596e88dee588a54f0eff1cad9e826b19bb3 DIST gmic_2.9.9.tar.gz 7325061 BLAKE2B 256b4f1180edfc8ebb3a3e7f7666c7b44d95cd36a52c1b5539a355f022471eeef776c77b820864ca05b2ccc4a58a2e85970994cfdbce9e55aff31112af4e6000 SHA512 fcc129f5acfb32a3154d4c987f574c18ad68dd35e9e357fdc391166211747f5d7eed63a2fcde29c110a79e8665f2a6d1e70b68c81e19bb02be43a84ec7f1cc64 -EBUILD gmic-2.9.8.ebuild 4259 BLAKE2B 7596e851d7ad3b53e29c21a8e65c7f893d30bea57889237b844befe1124c8cdf9d5bf5d8fe8c71f90adbcb44d3809473214e0117877f53b2b2b85218b9756b0a SHA512 a124e2cbc12aa50bdb444114afc9b22ed85cb269c315370f75a5aeeeabb29cb11bbf17bbb8e2104fbca4c67f7b7a9e68324b455fe627c42d9cd6ede70c79b142 -EBUILD gmic-2.9.9.ebuild 4262 BLAKE2B d078b537729da8b811057929f6bd42059a856149a411bbccce306dc43ddf627bac38a9c32be5d5f5ce86c4b15ebbe94e9529afb7c6e20a518ec1c926d6378ecf SHA512 d3a88e07b665108c4618b2b7841d639c070ed2340869f9da9fd7558a9bb0b9d965a5960948fd5b3b3d46611cd6ede7bc6730759fd829a89cd0351af054c7f888 +EBUILD gmic-2.9.9.ebuild 4259 BLAKE2B 5958f96d7bab5481fe3b3800a2f7327e1d4d6fe4b46e318206379ecf3b4b2e6e6a34963568eafe35e9426732a9fe81d6b45be6f80d6f2385a6f44b1fb3210234 SHA512 01867f8b3377db39ffb365033d2545bd2c73a4684bd4e3fd1a3b1b8ad4996f7a2fb036a44096aaee09123e9596ba635f9435a04791b973c40f084bef7c05bdb0 MISC metadata.xml 534 BLAKE2B f229329b6cd7c9a79b7be93c64ce6e84e65391084c7d76b99ada95762c643fc445fe12fa55acc9b355b5f1fb86de7c0845ec34f921494df8cba3d90ca8c2a408 SHA512 e36403a679467cba0b0580810a27076214d676a74deb09a55f13a38bc06f5ff0999560e1ae00629047a682bcbf3b9e73243db8da3eaa24b275c24a0d1995fe3c diff --git a/media-gfx/gmic/gmic-2.9.8.ebuild b/media-gfx/gmic/gmic-2.9.8.ebuild deleted file mode 100644 index 5e85c6f688ac..000000000000 --- a/media-gfx/gmic/gmic-2.9.8.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_BUILD_TYPE=Release - -inherit cmake bash-completion-r1 toolchain-funcs - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/dtschump/gmic.git" - inherit git-r3 -else - SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz" - KEYWORDS="amd64 arm64 x86" -fi - -DESCRIPTION="GREYC's Magic Image Converter" -HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic" - -LICENSE="CeCILL-2 GPL-3" -SLOT="0" -IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib" -REQUIRED_USE=" - gimp? ( png zlib fftw X ) - krita? ( png zlib fftw X ) - qt5? ( png zlib fftw X ) -" - -MIN_QT_VER="5.2.0" -QT_DEPEND=" - >=dev-qt/qtcore-${MIN_QT_VER}:5= - >=dev-qt/qtgui-${MIN_QT_VER}:5= - >=dev-qt/qtnetwork-${MIN_QT_VER}:5= - >=dev-qt/qtwidgets-${MIN_QT_VER}:5= -" -COMMON_DEPEND=" - curl? ( net-misc/curl ) - fftw? ( sci-libs/fftw:3.0=[threads] ) - gimp? ( - media-gfx/gimp:0/2 - ${QT_DEPEND} - ) - graphicsmagick? ( media-gfx/graphicsmagick:0= ) - jpeg? ( virtual/jpeg:0 ) - krita? ( ${QT_DEPEND} ) - opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) - openexr? ( - media-libs/ilmbase:0= - media-libs/openexr:0= - ) - png? ( media-libs/libpng:0= ) - qt5? ( ${QT_DEPEND} ) - tiff? ( media-libs/tiff:0 ) - X? ( - x11-libs/libX11 - x11-libs/libXext - ) - zlib? ( sys-libs/zlib:0= )" -RDEPEND="${COMMON_DEPEND} - ffmpeg? ( media-video/ffmpeg:0= ) -" -DEPEND="${COMMON_DEPEND} - gimp? ( dev-qt/linguist-tools ) - krita? ( dev-qt/linguist-tools ) - qt5? ( dev-qt/linguist-tools ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if use openmp; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi - fi -} - -src_prepare() { - cmake_src_prepare - sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die - - if use gimp || use krita || use qt5; then - # respect user flags - sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \ - -e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \ - -i gmic-qt/CMakeLists.txt || die - local S="${S}/gmic-qt" - # Bug #753377 - local PATCHES=() - cmake_src_prepare - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_LIB=ON - -DBUILD_LIB_STATIC=$(usex static-libs) - -DBUILD_CLI=$(usex cli) - -DBUILD_MAN=$(usex cli) - -DBUILD_BASH_COMPLETION=$(usex cli) - -DCUSTOM_CFLAGS=ON - -DENABLE_CURL=$(usex curl) - -DENABLE_X=$(usex X) - -DENABLE_FFMPEG=$(usex ffmpeg) - -DENABLE_FFTW=$(usex fftw) - -DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick) - -DENABLE_JPEG=$(usex jpeg) - -DENABLE_OPENCV=$(usex opencv) - -DENABLE_OPENEXR=$(usex openexr) - -DENABLE_OPENMP=$(usex openmp) - -DENABLE_PNG=$(usex png) - -DENABLE_TIFF=$(usex tiff) - -DENABLE_ZLIB=$(usex zlib) - -DENABLE_DYNAMIC_LINKING=ON - ) - - cmake_src_configure - - # configure gmic-qt frontends - local CMAKE_USE_DIR="${S}/gmic-qt" - mycmakeargs=( - -DENABLE_DYNAMIC_LINKING=ON - -DENABLE_CURL=$(usex curl) - -DGMIC_LIB_PATH="${BUILD_DIR}" - -DGMIC_PATH="${S}/src" - ) - - if use gimp; then - mycmakeargs+=( -DGMIC_QT_HOST=gimp ) - BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure - fi - - if use krita; then - mycmakeargs+=( -DGMIC_QT_HOST=krita ) - BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure - fi - - if use qt5; then - mycmakeargs+=( -DGMIC_QT_HOST=none ) - BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure - fi -} - -src_compile() { - cmake_src_compile - - # build gmic-qt frontends - local S="${S}/gmic-qt" - use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; } - use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; } - use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; } -} - -src_install() { - cmake_src_install - dodoc README - use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN} - - local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins" - insinto "${PLUGINDIR}" - doins resources/gmic_cluts.gmz - - # install gmic-qt frontends - if use gimp; then - exeinto "${PLUGINDIR}" - doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt - fi - use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt - use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt -} diff --git a/media-gfx/gmic/gmic-2.9.9.ebuild b/media-gfx/gmic/gmic-2.9.9.ebuild index b58559de3751..5591771336db 100644 --- a/media-gfx/gmic/gmic-2.9.9.ebuild +++ b/media-gfx/gmic/gmic-2.9.9.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 arm64 x86" fi DESCRIPTION="GREYC's Magic Image Converter" diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest index 7fdfabc991e1..5a0d6c7f7a61 100644 --- a/media-gfx/gnome-screenshot/Manifest +++ b/media-gfx/gnome-screenshot/Manifest @@ -1,4 +1,4 @@ AUX gnome-screenshot-40.0-fix-hidpi.patch 1351 BLAKE2B a94ce580d6f4af9e7945bdb13b3ba5b13787b564954e0933f9324c9d086e04f6efcb0affafc8775d2b41004f9c501edbe380e869723e038355c6c6ce7cb8b43b SHA512 68e8d178800036025a03786e8842aadfce0eaec61e36405406909ba8055db86d31350bae201226e54e667879da4610d5ea94df05fcf419f6609202a8c00d9c64 DIST gnome-screenshot-40.0.tar.xz 358088 BLAKE2B cad407f471e953667946b741ed59fe210d7ba3d079f2db8101974e565a1d0bfaec0cb1b40791be0e183dd399a82db5f15bbbec741ef16b4b572b043fcaf8ea8e SHA512 0889d7701711f17de68f8a55f512b7764fed087b1b2f86b372d1a38ee956f05ca8c833ca16a1de2396b07c01de79204d988192036780f521b82733436d019cb0 -EBUILD gnome-screenshot-40.0-r1.ebuild 1400 BLAKE2B 3369ae9ba121e89f470806ebe040e690d594c177b84145a2420d22311b870df4c525a0132bfb7bf0c2ad8babf4f78ea05385c61a8fad7c0a6ca946bd8fe62b09 SHA512 3123aa95489a10cc87dcc7c8584aba0b2440fac9c954443c4f8c5cb63fb6d29b06b468f4f97f22953fa5180c4721be0f36444705dfc208dd34e3d6dadfd6f431 +EBUILD gnome-screenshot-40.0-r1.ebuild 1407 BLAKE2B 65192134cdf21457912c0507d1371e83c5b4ab56c8c094c9ac88407ae857fa5fed3edc3dbe1ab0221aed091dcebac93cf77302bcc25e758edf341e4afa8be57e SHA512 6ea3906b0ae1557f10d21918c6162c6a2fca2017f288253ee4c855631fcb5f83d10321cee47547645aa1a401c5e440e68c9189145729341821568cd0e9bf4df1 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild index deff071d1e0a..239f58245e4c 100644 --- a/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild +++ b/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot" LICENSE="GPL-2+" SLOT="0" IUSE="X" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" DEPEND=" X? ( diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest index c8af8d4aa615..8d67acd1ed61 100644 --- a/media-gfx/gscan2pdf/Manifest +++ b/media-gfx/gscan2pdf/Manifest @@ -1,7 +1,7 @@ -DIST gscan2pdf-2.12.2.tar.xz 503148 BLAKE2B ed4729207f8b6ae50bc594cc2ad124c6a5e6e3eba83a36649a60c0293687678d2dce2d8e683d50c18cc28ebce8da771e441e6b454cd1d857cd6c776594a641d9 SHA512 7861b22ec3c3011ea6ddb92ccc46661ceda75e1a2c56df2695115a26e7b747de70b97f70ba54751780310930485a8026f2adf4878a05ad2d95328d29f2e454e0 DIST gscan2pdf-2.12.3.tar.xz 504168 BLAKE2B f3c8b27903db733163114c5c8ea93b10969791fbe04fb2111d1e090e8c627127150cd418eed693d3c61d18e8e6ecf08ddaeebc2ee5b5bc7b49dd633391480f12 SHA512 bb7c9bfd485ae24bbd56a5ca98682455e07fa44d02784a0f3b4b2d3995d704beb0ad146297e92e838dddf8bbdbc37b391e88bf50c98efcd3dfe6b10e761a0693 +DIST gscan2pdf-2.12.4.tar.xz 503792 BLAKE2B e5b54158b5b47bd2f255c3529e132695c1735e9da92d6a426f7f5b9a9e880bd2d1a0655faf065385224892abe992156c667e50aea1f1091ac6d872b8c163c92f SHA512 f904e2fe3ec0ed829eb9166a42c7c10b56e99e1a7558c7d0014efc530d5f4d3873e9097f28372412073cbb6040bd00570f1acbb6582f5ea87485f0a0ace6f486 DIST gscan2pdf-2.9.1.tar.xz 484740 BLAKE2B e75ac6a5296ba2f89838ae9c95dc0ceb592ea8ffaf8d89a0635043e07fedbdcf97df26ac810556da7d0e0306eb7aaff76dc18162c6a5f89cb1953bd623a594a3 SHA512 4fc3107c871a7915ebdc023476b1159c0fe03934f1a52a417a5bc285be46f7db0ed38ec4cf015b15953c728ef19d1f4f30207d418b655c950bfb64ddc5d23237 -EBUILD gscan2pdf-2.12.2.ebuild 2972 BLAKE2B 77d46e0238475bd58fc353feb4f0cb664551babb2635fd993efdefc427258bfbad725d343b38d632ccc8489fb31df493a8da9600ae43a33152bf190fa668af2c SHA512 27231c05ae155aab037a1c95969a0205fbc28e95948fc78fa53405bb9449ad8970fdd61377412c51ba03dd751d7da99c67cea0fb5b6940c53b0ea6ab60dbd641 EBUILD gscan2pdf-2.12.3.ebuild 2981 BLAKE2B 72ddfd255baa1aedfee6a3a51faf8d71d5732f47cc3ec55a3a4c6a2f4688c332064377c9935e097b649ce4326a2dc60c96836af3abf2412590a5ee76318d759a SHA512 2726e25fed0a753a083462540e9e69a221de079fe28adf5bb679ade98d007a34c9766991fdf29a750e6ed933dcbcd0d306d82a98c55caf1c10460ac0b1b69f20 +EBUILD gscan2pdf-2.12.4.ebuild 2990 BLAKE2B 4fb9ae397c7c998961bd91a44b297d971b1e311296cc1eeca9d431b8bd51730e6f2f11a88b5b36b27c4d274ad82a1b7f8e3f44bac8c13a436ce4413b65867fea SHA512 e63a46046f2e036adf1bc5406b72208a1d0a8b248f63345a0022fec3801ec60fc2ca3318cf195e650ea0031ddd0e40bf7d2e30fc245ecd97ad1619dc5980b4b5 EBUILD gscan2pdf-2.9.1.ebuild 2801 BLAKE2B 5ec319fceae00a20a15caae9cf019691523680bfa734bae36c8cac7117455438beed4c56fc79a570e87b2d4860b12a62c0fe6fdb49e1e26b24c7a58b493cfa91 SHA512 9f7b98317da72d4abeb6cd64719ddb9de39fa5505d955c6543b7ab76ba0db18c0a7e20261c6c0b7e025272d336c98126bc87c2a32f84a811d6d11649a7dd0aec MISC metadata.xml 470 BLAKE2B d9a9ad2f443b0bca02e6b8e91c96f22430543ee82fe8a1174739d4ad59225f73b975d31316fecd4dde6f26002ef6ba9fd39bf5d4adfd2bc82540d14e90d623a6 SHA512 ecd2fe9215c3a65760b8c101989772a73a7e9975dc38a1b11b0334cf6e1d001ccebfca1bc6d7631eb3b3e3e03d1736205563b0c836a2aea026fdfe552d72cbe0 diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.12.2.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild index fa622d27bfda..95400d8c0659 100644 --- a/media-gfx/gscan2pdf/gscan2pdf-2.12.2.ebuild +++ b/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild @@ -25,7 +25,7 @@ RDEPEND=" dev-perl/glib-perl dev-perl/GooCanvas2 dev-perl/Gtk3 - dev-perl/Gtk3-ImageView + >=dev-perl/Gtk3-ImageView-10.0.0 dev-perl/Gtk3-SimpleList dev-perl/HTML-Parser dev-perl/Image-Sane @@ -60,7 +60,7 @@ BDEPEND=" app-text/poppler[utils] app-text/tesseract[-opencl,osd(+),png,tiff] app-text/unpaper - media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript] + media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript,truetype] media-gfx/sane-backends[sane_backends_test] media-gfx/sane-frontends )" diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest index 9c6ab26ba9a3..77d3e0454795 100644 --- a/media-gfx/hydrus/Manifest +++ b/media-gfx/hydrus/Manifest @@ -1,13 +1,13 @@ AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467 -DIST hydrus-457.tar.gz 38915780 BLAKE2B 56506ba2098198f42593a061a79f7f6521597f057d87c07eb66b3a213111a46caaf1e167e9f49deaf3d3ffe6259105b6d19cca8fb8fbd0d1c708d796eea63394 SHA512 2a653f69928f4b65cdde332e7be52861527237a284a61ddd0536b6e1db40f91424e78953910dacf494d947a57086cbfbf9588fe638143f386910fb1d7ba1e484 -DIST hydrus-458.tar.gz 38922758 BLAKE2B 3339e44498a606664cd54357cf285f96eb4f146673d9991b9b0fb82bc961b31f4f47c9f27616251b610c4e28664a6b4753aa99713e50d93e79121270796b1408 SHA512 0f2c419012c683c163fd180662eb9d2eb5610a6d87c0cbd42be91dbdf6101e747ba0c6238d1574084a30d1da1c7546a79b0e648fe55420c510d47ab26fad28c3 -DIST hydrus-459.3.tar.gz 38933609 BLAKE2B feb1888d63dc8b6df7f070115c541c2863442ba46d8cd47648ecb35c49cf8181879760197b200f2b968eca5d51a40522d7fdb8434c19b7c6e37d0ae08b0dce74 SHA512 45bcb9b6ad7ae529b980b6759ececaf4175750e775b9f01bae754eb25321d46e0dc4d7fd2723cd43a53aff2d37433a5fdde691f6f7c6e46fb35c8dd216f88157 DIST hydrus-460.tar.gz 38935581 BLAKE2B f4b159f3f45e5f13867cdf163605389722d35616d5235bb64593125b83c7d9177ac590febce4beeb266be1524e106fd41c6badbc11775c6f8921c7647672ea34 SHA512 e01cc54f6906cded7760107d7874ca35f6336b9b3b673f59b5c75facbe63a7374780a92b09e51cf99052bf6149dd4df4cb9b84b768f4dd30411229e585e7a23d -EBUILD hydrus-457.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e -EBUILD hydrus-458.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e -EBUILD hydrus-459.3.ebuild 4098 BLAKE2B a6b0a5817e577b1539d2b3a047f7253ba6bfe0babcf637f583daae1fe67b51da9350a846f27d04ca492e15e6de7a5a7375d0db31267fba89a52e3bba4690a5e7 SHA512 6be825a196983e5c4888e9a5877a48aea7119b300f068ac3961efc919e12bc8da60a413de8db277f7972765a3e32cec78b179fe6f17ac0596e31d97c7cbed53a +DIST hydrus-461.tar.gz 38945276 BLAKE2B 28ffb1ae5de7439cad8dad9dc432fb585e98c23a19a8a47c6f6f26cb53007d81ca07fa5b615546247ff1768f315fe0f5baf81753b71e2c7f593fb7b83d230a43 SHA512 1f9c893cd904ccf288d494fa0a4bd4a125af28cb16d072b4a97e4d1bd1439c83d4ed6e49f374869f34beb23b36613c2173077bfffaaaf0e37c8e1dc6875698cd +DIST hydrus-462.tar.gz 39424447 BLAKE2B 4b7c84c4a8af8d263ebc597b54a535b66598f11d0df31b6e70597f6127dfaf8c7bfd980c1d706d82eadd29c502abb3b95793d3110d588e966ade8d0b73f02d62 SHA512 ff3c8cd94355670e7a6b2712e2c384ff09733b476d9097883f40e9dea8acc2a26b01d944743b7e19e557f20cf9b22e6125813329dae9239783bee18447de3560 +DIST hydrus-463.tar.gz 39435289 BLAKE2B d6e2f97f12b8141019012a0c86e3f99f2c1041cb70aff1e8c4aab3d1a6594d68f415afd8059a91407d151d72820b71dbb10516f5b717b0f7665563c1cd4f302c SHA512 3dcf2fb0107459171ce227edb1031c8478e20919e163d1c5779d524e3fcd66a038d4c278c29fc98ce34884e75a1ee50a22c0211f272afb1a4d1e7a977890202b EBUILD hydrus-460.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e +EBUILD hydrus-461.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e +EBUILD hydrus-462.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e +EBUILD hydrus-463.ebuild 4098 BLAKE2B a6b0a5817e577b1539d2b3a047f7253ba6bfe0babcf637f583daae1fe67b51da9350a846f27d04ca492e15e6de7a5a7375d0db31267fba89a52e3bba4690a5e7 SHA512 6be825a196983e5c4888e9a5877a48aea7119b300f068ac3961efc919e12bc8da60a413de8db277f7972765a3e32cec78b179fe6f17ac0596e31d97c7cbed53a EBUILD hydrus-9999.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e MISC metadata.xml 751 BLAKE2B 05dfcd30440ca7bc1375206469123c5bb93ff7fbb7612191faabee7abe87334bfb4f25db3291cd3a989264516c315eeb489eaac2c83c95b2436446966ba27880 SHA512 f2e7c839e4567355bb6ff1cdbf1355ab7a2fbf166a3f87ac7a8af92fc80efa7833010376317a38e2594a203be66bfcb3e0df9dc7346ac3d37d8466bb0368b50e diff --git a/media-gfx/hydrus/hydrus-457.ebuild b/media-gfx/hydrus/hydrus-461.ebuild index 0915a2ae5436..0915a2ae5436 100644 --- a/media-gfx/hydrus/hydrus-457.ebuild +++ b/media-gfx/hydrus/hydrus-461.ebuild diff --git a/media-gfx/hydrus/hydrus-458.ebuild b/media-gfx/hydrus/hydrus-462.ebuild index 0915a2ae5436..0915a2ae5436 100644 --- a/media-gfx/hydrus/hydrus-458.ebuild +++ b/media-gfx/hydrus/hydrus-462.ebuild diff --git a/media-gfx/hydrus/hydrus-459.3.ebuild b/media-gfx/hydrus/hydrus-463.ebuild index af8a34decb6b..af8a34decb6b 100644 --- a/media-gfx/hydrus/hydrus-459.3.ebuild +++ b/media-gfx/hydrus/hydrus-463.ebuild diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index d324a6941717..911de438ebde 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,20 +1,12 @@ AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57 -DIST ImageMagick-6.9.12-20.tar.xz 9174816 BLAKE2B ccdb4775867224d08871b7147fa20e6b09305f6501a07de85ad53b862c47921c5b6b39eaf62fa86258c1a6fea1abe417817b4a4887a981a6f5a786636fa57946 SHA512 2ba849ef7212b0255f1db6509b718f7dd3825d16e45ea115a77ecf6b8afc41cb823ba0ddddc124aa0afe5605f1aa5e2865daa00da88568bf5874225de6620fe3 -DIST ImageMagick-6.9.12-21.tar.xz 9173096 BLAKE2B 0d8e0a414f2026539be16873ada2d097ce11beb0becf1e132eb6f7d9e4a69063a46eef4834c55268f5af5abbb87e17bb79c5f1182291d144e5155e5f68393070 SHA512 1ec038d555f0e72b79f830602047019819e36ffeb9053317685ac13a84e83d8d694980ff7203139e222568adab812d7f7b113793031e87cafb94aa75737b0b5d -DIST ImageMagick-6.9.12-25.tar.xz 9177972 BLAKE2B d115f6722bdb4122d022182849b7fb40f13320f82909e00675806621511356651f3e9c3f1189fde69276509c0e7916a5127e76b9294da591b8dd963bc8fceec3 SHA512 34b25bb9c46960ffd4258d7476d9111fb2334819dd7bb68e08749c6ac483e0403bd36f8da0ab5ea0fc5838a3cffbd9622649ab95272f9fb56a0092fe0257b8ff DIST ImageMagick-6.9.12-28.tar.xz 9181044 BLAKE2B 2efc03da9e4c53b82479badfcc9a25f05e2d9766031807500a6bb39cba2a800c39a93a16864ca9af3a0b33d0c1c95cb2f33264c7e00149204ca742673c3d07ff SHA512 ec96fca6b385379873ead007b011d87fb3939ed4e3631d2a9401f1467db59d1d1ced072fd4fefe1577d04302a1060dbc324631b420f41a99bf32465b540ec979 -DIST ImageMagick-7.1.0-10.tar.xz 10304648 BLAKE2B 8688c52387c185fd190e98d84d9c285191b9a827058c8e1200a7676399e43b8950a2f8f1cefc99dcfbf967ed3f803d67f2a8677a48932fa7c44ebe5c01ac6993 SHA512 72ef704460473af9c8fbd0d49cb264fc23eaaf24ce3e319916e7f23ad715d45f44f4ecebc02b9edba55a584b59c407f0a777fa9add2e49f7c69341bcac169c4b +DIST ImageMagick-6.9.12-29.tar.xz 9179740 BLAKE2B 9d1e03c309c8c83b872de19c381810a9dcd9b3e9dd2c40dda872786af47d415986f9c73ce317eba84431e3635635d39c86ff5dfa22ee9b616c22c6e4bf113cfb SHA512 2f1c6f102e0893a07bb8d1cdc0acc646acc4a3db9c19bf3bf89e9a23962a8b91bd9deab24256dcb7c9bf7adaf6ed719a9dea96790bea09a028a50b14b2f4b032 DIST ImageMagick-7.1.0-13.tar.xz 10311564 BLAKE2B 7cb3e58f548cbe0b9e1239df47ff4f42af2cd0b6ff4c417a62515ff9bd434ecabed2cc7f7cb7cf8880f20af3f6d7de33d7368f146b9ac7668149959966a463d8 SHA512 dac1fc229599a63703fc3aa1378de313dc94dfbfa71913dc408ef65c88ef33820b5ddab4c9a064a86cc35c0abb0136f0adb626bff9e227b52ed0d90993688044 -DIST ImageMagick-7.1.0-5.tar.xz 10308228 BLAKE2B c65f0bb04133a6390770cb06ed4a102fef58647b6d03c09ad840a0b0abf18a5875c244c5d8fb10492f5ccc62d976c170659ead93ad7b8a8178c88fe3778dfa20 SHA512 1fc66c57e4dbe01c2730508c42cd8a8e94be087751b3ad460318e1d4a7aa2c1af95d22b2f432037590af5e7f4a8e3cdeb276278423ed30d485267a907c7006d6 -DIST ImageMagick-7.1.0-6.tar.xz 10316740 BLAKE2B a0b6591300d48b648004c9701d2cb21afbb652760230384b4711a8d741875ba28d31b0c1b468f93c33338278a01aeef94eed0dbe14a3670ae7207704bb0eda1a SHA512 951541ad24095a2ac03fa26bfb38363795d7e86f1cae90ede9ab5991b28090dd05cc6c5bec62a0c3d664fa5191021fa01b760cfa7ccd94c80d93f24484afa5d3 -EBUILD imagemagick-6.9.12.20.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12 -EBUILD imagemagick-6.9.12.21.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20 -EBUILD imagemagick-6.9.12.25.ebuild 7187 BLAKE2B 0e3e44083e03f09b94d07e4f8012a62ee4b28835855507daf4375397e12b0f3369705df7b3f83048b0307a6849a8451bec62f066dc7449f20950524d3237f8f6 SHA512 2a8cda81018fb6f45b07026efdcf6e64f04ef82c1d11c56fb5948bab6cfc5f1ef46e3a53f9aadb409ab22524706439631ad581d6f023f19271f6f0e78e813325 -EBUILD imagemagick-6.9.12.28.ebuild 7187 BLAKE2B 0e3e44083e03f09b94d07e4f8012a62ee4b28835855507daf4375397e12b0f3369705df7b3f83048b0307a6849a8451bec62f066dc7449f20950524d3237f8f6 SHA512 2a8cda81018fb6f45b07026efdcf6e64f04ef82c1d11c56fb5948bab6cfc5f1ef46e3a53f9aadb409ab22524706439631ad581d6f023f19271f6f0e78e813325 -EBUILD imagemagick-7.1.0.10.ebuild 7401 BLAKE2B 177c88bf09323bc3898bc99c79051f8c73450cc19e063f04f91b079172c22e02d845b94084afd5fd26143aa7f95f670bb7319b80a27dadf83a3650607dc45468 SHA512 4c087fd762f72d88baa8bf8564b3245bd21ca4cf99d009b3537bccba1638ec79623c27cabeec8570f8058e16057ed66b260889db653a949d78c36970796381f0 -EBUILD imagemagick-7.1.0.13.ebuild 7401 BLAKE2B 177c88bf09323bc3898bc99c79051f8c73450cc19e063f04f91b079172c22e02d845b94084afd5fd26143aa7f95f670bb7319b80a27dadf83a3650607dc45468 SHA512 4c087fd762f72d88baa8bf8564b3245bd21ca4cf99d009b3537bccba1638ec79623c27cabeec8570f8058e16057ed66b260889db653a949d78c36970796381f0 -EBUILD imagemagick-7.1.0.5.ebuild 7396 BLAKE2B e824e8d1c9b1b1561bcfe59e6bfa2fd6770508453c1a4246b88cdd671470f35a5576d0c0a76803501d76bb31768d87c5066c92f1f9f786ed6d01e77e5792f96e SHA512 bdfeb146f22e581bcab707407229a31debf6623b7861141d8fec50cea8d134232fe83066a9898a2136553edf946bf727d7a8e5724a7f979c0bac39868356b191 -EBUILD imagemagick-7.1.0.6.ebuild 7404 BLAKE2B 2a92a400e6b41a28bd9ff356ad4a40656c61df367ec298c685b663a22463cbc090fb368f12aae33a75dda7ade766464822d0293bc302ad11db790b7b3c7a4a8d SHA512 758697ee60c9d674ea02c32d1e997466809f515bd7ea361aaa5ef77528b9705eccb16d906cc548c0df9a3d0054e8a7615be665797cb6d9cb3eab6d06510c5dcf +DIST ImageMagick-7.1.0-14.tar.xz 10318332 BLAKE2B ca8db5d53c05099ab8fe0e6d810cebfb3614962e197d4fda7d958f1f7f469e2be461980578049753c5a3f5f0d656ca0d816abae51dd5dab44910e8d82c8d9fb0 SHA512 ca07ec69acee4f82baf3056116f6d1272eabd38acd55c67cab5c15cdd4b5b601f5b060b36943c0ae24f100ea47e0aa0af5862aae3b43e9477163e08dbde32f1d +EBUILD imagemagick-6.9.12.28.ebuild 7179 BLAKE2B c82d248b8debc199150564a6e426a7364f58694581bf2a36e883feb0da9dddbe093e58d51adbb1f2ada5ae1a0e651a8a16820c681097946c3fc63d13870fba04 SHA512 c5a8f6d240e17f2948a8fcf72bc74b2b54975301ebba4273b2f03094e60e975e9b318c633ffc1940cee6da2e2c3be35a3359d2028cf5a25eef4660bc399daf5b +EBUILD imagemagick-6.9.12.29.ebuild 7187 BLAKE2B 0e3e44083e03f09b94d07e4f8012a62ee4b28835855507daf4375397e12b0f3369705df7b3f83048b0307a6849a8451bec62f066dc7449f20950524d3237f8f6 SHA512 2a8cda81018fb6f45b07026efdcf6e64f04ef82c1d11c56fb5948bab6cfc5f1ef46e3a53f9aadb409ab22524706439631ad581d6f023f19271f6f0e78e813325 +EBUILD imagemagick-7.1.0.13.ebuild 7393 BLAKE2B 62c865149f7d907244665fbfa78b0bb2eedfdf124ec59d72a2943bfdf0cc6b7de051965d5b63a8e117709346f70b7ce066736a647238026e054c67fe2d537009 SHA512 3a6523aa2cfdfebbc325ced0db16f48c0e17f586e41140a16fbaf66ad7c8079e33e3f4a31bd774b874f3816aceb6a01ae2be2edf8337e9d89b6b92959a83962b +EBUILD imagemagick-7.1.0.14.ebuild 7401 BLAKE2B 177c88bf09323bc3898bc99c79051f8c73450cc19e063f04f91b079172c22e02d845b94084afd5fd26143aa7f95f670bb7319b80a27dadf83a3650607dc45468 SHA512 4c087fd762f72d88baa8bf8564b3245bd21ca4cf99d009b3537bccba1638ec79623c27cabeec8570f8058e16057ed66b260889db653a949d78c36970796381f0 EBUILD imagemagick-9999.ebuild 7401 BLAKE2B 177c88bf09323bc3898bc99c79051f8c73450cc19e063f04f91b079172c22e02d845b94084afd5fd26143aa7f95f670bb7319b80a27dadf83a3650607dc45468 SHA512 4c087fd762f72d88baa8bf8564b3245bd21ca4cf99d009b3537bccba1638ec79623c27cabeec8570f8058e16057ed66b260889db653a949d78c36970796381f0 MISC metadata.xml 1227 BLAKE2B de893eae7e8f8e299ae10df13d202819b60df3b85858eacbe3455c4f27627689e7790a6fdded32d11d3157c35b5a2e08cab958e84b8f5799bb298deca15a1d4c SHA512 726e0c2cea973806fef1a3f51da11fb525b6a2e75bf2221a0939adbe50d2d8e267c5e627eca571e39769e4c14b134d2b9be3792047523540620c2eac149dd066 diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.20.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.20.ebuild deleted file mode 100644 index 69de151f32bc..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.12.20.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic libtool perl-functions toolchain-funcs multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git" - inherit git-r3 - MY_P="imagemagick-9999" -else - MY_PV="$(ver_rs 3 '-')" - MY_P="ImageMagick-${MY_PV}" - SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" - -LICENSE="imagemagick" -SLOT="0/6.9.11-60" -IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -REQUIRED_USE="corefonts? ( truetype ) - svg? ( xml ) - test? ( corefonts )" - -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - heif? ( media-libs/libheif:= ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( - gnome-base/librsvg - media-gfx/potrace - ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" - -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - X? ( x11-base/xorg-proto )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Apply hardening #664236 - cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die - sed -i -e '/^<policymap>$/ { - r policy-hardening.snippet - d - }' \ - config/policy.xml || \ - die "Failed to apply hardening of policy.xml" - einfo "policy.xml hardened" - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - local ati_cards mesa_cards nvidia_cards render_cards - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - use perl && perl_check_env - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with heif heic) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - - local im_command= IM_COMMANDS=() - IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built - IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used - IM_COMMANDS+=( "emake check" ) # Run tests - - for im_command in "${IM_COMMANDS[@]}"; do - eval "${S}"/magick.sh \ - ${im_command} || \ - die "Failed to run \"${im_command}\"" - done -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - # .la files in parent are not needed, keep plugin .la files - find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} - -pkg_postinst() { - local _show_policy_xml_notice= - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - _show_policy_xml_notice=yes - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "6.9.10.10-r2"; then - # This is an upgrade - _show_policy_xml_notice=yes - - # Show this elog only once - break - fi - done - fi - - if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" - elog "which will prevent the usage of the following coders by default:" - elog "" - elog " - PS" - elog " - PS2" - elog " - PS3" - elog " - EPS" - elog " - PDF" - elog " - XPS" - fi -} diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.21.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.21.ebuild deleted file mode 100644 index d17773f5081b..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.12.21.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic libtool perl-functions toolchain-funcs multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git" - inherit git-r3 - MY_P="imagemagick-9999" -else - MY_PV="$(ver_rs 3 '-')" - MY_P="ImageMagick-${MY_PV}" - SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" - -LICENSE="imagemagick" -SLOT="0/6.9.11-60" -IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -REQUIRED_USE="corefonts? ( truetype ) - svg? ( xml ) - test? ( corefonts )" - -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - heif? ( media-libs/libheif:= ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( - gnome-base/librsvg - media-gfx/potrace - ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" - -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - X? ( x11-base/xorg-proto )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Apply hardening #664236 - cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die - sed -i -e '/^<policymap>$/ { - r policy-hardening.snippet - d - }' \ - config/policy.xml || \ - die "Failed to apply hardening of policy.xml" - einfo "policy.xml hardened" - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - local ati_cards mesa_cards nvidia_cards render_cards - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - use perl && perl_check_env - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with heif heic) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - - local im_command= IM_COMMANDS=() - IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built - IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used - IM_COMMANDS+=( "emake check" ) # Run tests - - for im_command in "${IM_COMMANDS[@]}"; do - eval "${S}"/magick.sh \ - ${im_command} || \ - die "Failed to run \"${im_command}\"" - done -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - # .la files in parent are not needed, keep plugin .la files - find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} - -pkg_postinst() { - local _show_policy_xml_notice= - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - _show_policy_xml_notice=yes - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "6.9.10.10-r2"; then - # This is an upgrade - _show_policy_xml_notice=yes - - # Show this elog only once - break - fi - done - fi - - if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" - elog "which will prevent the usage of the following coders by default:" - elog "" - elog " - PS" - elog " - PS2" - elog " - PS3" - elog " - EPS" - elog " - PDF" - elog " - XPS" - fi -} diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild index 2475294ebb28..8c0ec1fe1979 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild @@ -13,7 +13,7 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="A collection of tools and libraries for many image formats" diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.25.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.29.ebuild index 2475294ebb28..2475294ebb28 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.12.25.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.12.29.ebuild diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild index d47b238fb192..18d26de38e7a 100644 --- a/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild @@ -13,7 +13,7 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="A collection of tools and libraries for many image formats" diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.10.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.14.ebuild index d47b238fb192..d47b238fb192 100644 --- a/media-gfx/imagemagick/imagemagick-7.1.0.10.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.1.0.14.ebuild diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.5.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.5.ebuild deleted file mode 100644 index aee829b4dd8d..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.1.0.5.ebuild +++ /dev/null @@ -1,269 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic libtool perl-functions toolchain-funcs multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" - inherit git-r3 - MY_P="imagemagick-9999" -else - MY_PV="$(ver_rs 3 '-')" - MY_P="ImageMagick-${MY_PV}" - SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" - -LICENSE="imagemagick" -SLOT="0/7.1.0-0" -IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" - -REQUIRED_USE="corefonts? ( truetype ) - svg? ( xml ) - test? ( corefonts )" - -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - heif? ( media-libs/libheif:= ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( - gnome-base/librsvg - media-gfx/potrace - ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zip? ( dev-libs/libzip:= ) - zlib? ( sys-libs/zlib:= )" - -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - X? ( x11-base/xorg-proto )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Apply hardening #664236 - cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die - sed -i -e '/^<policymap>$/ { - r policy-hardening.snippet - d - }' \ - config/policy.xml || \ - die "Failed to apply hardening of policy.xml" - einfo "policy.xml hardened" - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - local ati_cards mesa_cards nvidia_cards render_cards - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - use perl && perl_check_env - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zip) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with heif heic) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - --without-jxl - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - - local im_command= IM_COMMANDS=() - if [[ ${PV} == "9999" ]] ; then - IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild - else - IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built - fi - IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used - IM_COMMANDS+=( "emake check" ) # Run tests - - for im_command in "${IM_COMMANDS[@]}"; do - eval "${S}"/magick.sh \ - ${im_command} || \ - die "Failed to run \"${im_command}\"" - done -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - # .la files in parent are not needed, keep plugin .la files - find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} - -pkg_postinst() { - local _show_policy_xml_notice= - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - _show_policy_xml_notice=yes - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "7.0.8.10-r2"; then - # This is an upgrade - _show_policy_xml_notice=yes - - # Show this elog only once - break - fi - done - fi - - if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" - elog "which will prevent the usage of the following coders by default:" - elog "" - elog " - PS" - elog " - PS2" - elog " - PS3" - elog " - EPS" - elog " - PDF" - elog " - XPS" - fi -} diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.6.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.6.ebuild deleted file mode 100644 index 42e594451118..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.1.0.6.ebuild +++ /dev/null @@ -1,269 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic libtool perl-functions toolchain-funcs multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" - inherit git-r3 - MY_P="imagemagick-9999" -else - MY_PV="$(ver_rs 3 '-')" - MY_P="ImageMagick-${MY_PV}" - SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" - -LICENSE="imagemagick" -SLOT="0/7.1.0-0" -IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" - -REQUIRED_USE="corefonts? ( truetype ) - svg? ( xml ) - test? ( corefonts )" - -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - heif? ( media-libs/libheif:= ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( - gnome-base/librsvg - media-gfx/potrace - ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zip? ( dev-libs/libzip:= ) - zlib? ( sys-libs/zlib:= )" - -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - X? ( x11-base/xorg-proto )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # Apply hardening #664236 - cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die - sed -i -e '/^<policymap>$/ { - r policy-hardening.snippet - d - }' \ - config/policy.xml || \ - die "Failed to apply hardening of policy.xml" - einfo "policy.xml hardened" - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - local ati_cards mesa_cards nvidia_cards render_cards - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - use perl && perl_check_env - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zip) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with heif heic) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - --without-jxl - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - # Install default (unrestricted) policy in $HOME for test suite #664238 - local _im_local_config_home="${HOME}/.config/ImageMagick" - mkdir -p "${_im_local_config_home}" || \ - die "Failed to create IM config dir in '${_im_local_config_home}'" - cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ - die "Failed to install default blank policy.xml in '${_im_local_config_home}'" - - local im_command= IM_COMMANDS=() - if [[ ${PV} == "9999" ]] ; then - IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild - else - IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built - fi - IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used - IM_COMMANDS+=( "emake check" ) # Run tests - - for im_command in "${IM_COMMANDS[@]}"; do - eval "${S}"/magick.sh \ - ${im_command} || \ - die "Failed to run \"${im_command}\"" - done -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - # .la files in parent are not needed, keep plugin .la files - find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} - -pkg_postinst() { - local _show_policy_xml_notice= - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - _show_policy_xml_notice=yes - else - local v - for v in ${REPLACING_VERSIONS}; do - if ! ver_test "${v}" -gt "7.0.8.10-r2"; then - # This is an upgrade - _show_policy_xml_notice=yes - - # Show this elog only once - break - fi - done - fi - - if [[ -n "${_show_policy_xml_notice}" ]]; then - elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" - elog "which will prevent the usage of the following coders by default:" - elog "" - elog " - PS" - elog " - PS2" - elog " - PS3" - elog " - EPS" - elog " - PDF" - elog " - XPS" - fi -} diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest index aff8405e7e21..ec42114844c3 100644 --- a/media-gfx/imv/Manifest +++ b/media-gfx/imv/Manifest @@ -1,4 +1,4 @@ DIST imv-4.3.0.tar.gz 79031 BLAKE2B f620e1d05827f93eae03a01f62cbb1426a623b4ef2e758a5fea2539193292fada0b8bf34276443d787b5a1537e92cd66e94b574a646319c3c37fbf2557bda4eb SHA512 1735c03c48888004b11b3aaf0215a9530c035468a8efdb210d856551ebb75030c906eee2b6ab80e5d3646206e6051a73a8c5e15c010dd09bca7f9e90f9b0e34b -EBUILD imv-4.3.0.ebuild 1878 BLAKE2B 2f77f1bec8b37018ef3c5d6187248568041694230b39ba8ad0b545f10f4ac078beb32144832f10d7fa6f50ff8cab8f34a27cbed79eff3801543cd67442d35956 SHA512 72280fd22dbeb2b315c0013b4faf52a60b0a91107cc4a8780c388abcb9f9ade23ec16243a87ee379c3d1e3e7cb58f508abbcfd818bf169096e7cc365be07a798 -EBUILD imv-9999.ebuild 1878 BLAKE2B 2f77f1bec8b37018ef3c5d6187248568041694230b39ba8ad0b545f10f4ac078beb32144832f10d7fa6f50ff8cab8f34a27cbed79eff3801543cd67442d35956 SHA512 72280fd22dbeb2b315c0013b4faf52a60b0a91107cc4a8780c388abcb9f9ade23ec16243a87ee379c3d1e3e7cb58f508abbcfd818bf169096e7cc365be07a798 -MISC metadata.xml 488 BLAKE2B 4cf24bf2cd34c5c2607e18191ecd91611c85b3ff5acc47fa49af654daa1e7c370f815d30a06c0c4ffcd35ca18e77aa4ef694f153d811cdaf01e2b87e3f8e9da8 SHA512 deb945f9d228cf577db86ad4d06d31d88cd01b79b7f93c4a62dce8ee03397c85f452ad3bd4595689831bc665698918fd7953be6a5413c18c849153643d0a5b2d +EBUILD imv-4.3.0.ebuild 1871 BLAKE2B 2956967880cc581a052436dfa76b36e57e61f7b4c02daba8414f8093f7d87531971eb1b6dfa263e55090ef37d5b137b2b758793f6fc99f269551256c08f8d30a SHA512 11582014cd24f2e6dc378061df0c4cfc580e8dd6b7a1224dde177b6eb0bf5d4876ca8f6caddf565ab736c63707ebc63a9cc4fe6db4098b0a452baa7f8e69c1bf +EBUILD imv-9999.ebuild 1871 BLAKE2B 2956967880cc581a052436dfa76b36e57e61f7b4c02daba8414f8093f7d87531971eb1b6dfa263e55090ef37d5b137b2b758793f6fc99f269551256c08f8d30a SHA512 11582014cd24f2e6dc378061df0c4cfc580e8dd6b7a1224dde177b6eb0bf5d4876ca8f6caddf565ab736c63707ebc63a9cc4fe6db4098b0a452baa7f8e69c1bf +MISC metadata.xml 413 BLAKE2B 308cfef3e62870d9f6536cdc9de04c24ea419e6eb7877f607608fd915840d70cb8f6eb763ef80fa6dcfd6eb583b8f090665c5737e8d7c55663040c8a1dcd18c0 SHA512 f866c12cf896c7b44f04f25123f52a3e86399fd5ba9e4da67233ab5ced4b4ee1453d28a6618935658ba5ecb4523017c84d73d60f5a21975527211c57e8dc4bdf diff --git a/media-gfx/imv/imv-4.3.0.ebuild b/media-gfx/imv/imv-4.3.0.ebuild index 73b075d4566b..992772d5dd6e 100644 --- a/media-gfx/imv/imv-4.3.0.ebuild +++ b/media-gfx/imv/imv-4.3.0.ebuild @@ -7,14 +7,14 @@ inherit meson xdg if [[ ${PV} == 9999 ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/eXeC64/imv.git" + EGIT_REPO_URI="https://git.sr.ht/~exec64/imv/" else SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Minimal image viewer designed for tiling window manager users" -HOMEPAGE="https://github.com/eXeC64/imv/" +HOMEPAGE="https://sr.ht/~exec64/imv/" LICENSE="MIT-with-advertising" SLOT="0" diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild index 73b075d4566b..992772d5dd6e 100644 --- a/media-gfx/imv/imv-9999.ebuild +++ b/media-gfx/imv/imv-9999.ebuild @@ -7,14 +7,14 @@ inherit meson xdg if [[ ${PV} == 9999 ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/eXeC64/imv.git" + EGIT_REPO_URI="https://git.sr.ht/~exec64/imv/" else SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Minimal image viewer designed for tiling window manager users" -HOMEPAGE="https://github.com/eXeC64/imv/" +HOMEPAGE="https://sr.ht/~exec64/imv/" LICENSE="MIT-with-advertising" SLOT="0" diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml index a1e72947f8a6..c813b6cfb8df 100644 --- a/media-gfx/imv/metadata.xml +++ b/media-gfx/imv/metadata.xml @@ -9,7 +9,4 @@ <flag name="freeimage">Use <pkg>media-libs/freeimage</pkg> for additional image support</flag> <flag name="heif">Add HEIF/HEIC image support</flag> </use> - <upstream> - <remote-id type="github">eXeC64/imv</remote-id> - </upstream> </pkgmetadata> diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 435620453714..12f18fa3e212 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -4,6 +4,6 @@ DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e0 DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668 DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80 EBUILD inkscape-1.0.2-r2.ebuild 4143 BLAKE2B 3ed501bf97ae01e72dcd644110f2dab770757eac39f5ec10cb89f7900a55ead460b4f712a9dc0266fdadb297e7a063a245e4a24cf841b9619996886678f6843d SHA512 7c57ca4263c701aa524eb5de03900ca95ad5135a6acd1a5c041f23f8c459efc1086c6e8f74f599ff57ad8a215b0eabebd29e80e54b855a21e818ea5d9e3548dd -EBUILD inkscape-1.1.ebuild 4347 BLAKE2B f5a03371d34e26b31cc77520c6fb683a9a8d6ad77b4eb3e561d3a98b8102b9e3c8de5ec751f0885056426e93e4b97da67e4160de7fe3586cf6ea523ec3c0e076 SHA512 7954f86e87fb472dad59ed28858ee8b8e145ff9d03b4baad3d379f57059dd7f80967a4af8c87318cc8c6c5c5c125d0de69bff05ea63314c1a272a9183d5ea028 +EBUILD inkscape-1.1.ebuild 4345 BLAKE2B 3a5c39b0167d5d65f51f6b3485502877f37ecb39c077ff95d673d8e39cf981180e0128023c1709416c5c7259bf2845be98b0212dd15824cdbfd4c4a041f11016 SHA512 d96c03de624ce12d6d557dfba90a7dd95a6bb439d24dfd8eb1c0f9b465566c9e4e4ea40981587b3d51b091adeda0de03a2733a586a3c43bbecfcc8cfff09d819 EBUILD inkscape-9999.ebuild 4222 BLAKE2B f81dc2dd761939360a098e581fe0ed6eed633b3a93ad8a3898490f04b6213b8d629fa8a32f15c9d1934c393dad8e6f999bf7470e0c3f0167e7066295f6fb6b2d SHA512 147de0d941987a6ff35e1a2fefc07457fd05097150509128cea74a09faf676ae419b41fe0a036e632c68be18a5380b2468c45567c9040eab5374ad56f2dd47ad MISC metadata.xml 984 BLAKE2B 8aee1f973005f9587571770eb14ccf725bf3ba9034d9935b029f776e64e17a9e156ec864e1150b259d2a983aec6e53b10791be4f1a3b67d5aa465ee115d966f0 SHA512 7ee7c7d473ae2120b9f592777b08d77899c6bf7f750f09cc334dc76a997a472e2593442fb281a9984d77e1aa4eca39e389484405e0aa8b5614da0f718c713fc0 diff --git a/media-gfx/inkscape/inkscape-1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.ebuild index e59037214266..a1f3e81bfcda 100644 --- a/media-gfx/inkscape/inkscape-1.1.ebuild +++ b/media-gfx/inkscape/inkscape-1.1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg openmp postscript readline spell static-libs svg2 visio wpg" diff --git a/media-gfx/iscan-plugin-perfection-v370/Manifest b/media-gfx/iscan-plugin-perfection-v370/Manifest deleted file mode 100644 index 3c44f5f17372..000000000000 --- a/media-gfx/iscan-plugin-perfection-v370/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST iscan-plugin-perfection-v370-1.0.0-2.i386.rpm 383681 BLAKE2B 88ea54050150ae2619cf2dc1489200b3b3bbc4d36fbeb91b689a758c4ddea8361af4c64a21fe12919d9ec411d2da237e6192d4cf6488450cf0ab45d27e40dad8 SHA512 ca0d77e614b826529b23e7ccb6f8546143c471757fb9648c30830055764442c44c811d12c61b04e14d6d435c5de67eb20d24653aee23022ed7104ce89074fdf1 -DIST iscan-plugin-perfection-v370-1.0.0-2.x86_64.rpm 172082 BLAKE2B 1cb196052a3f7d53ae5870426425d80b7d9bc4ee62def3acd9b21d321fafe1342e393dd5c05dffd87077bee3e57217300c5f372bfb9e163ad08593d3031f4718 SHA512 d0a942f4dbf51edf773e3bd83749ffc5dc9b1b67daec042fb49b4050ead34c604ce0183b138dd0719c2fe1ba2d610034b8d2d16ba12df4cd8617d1182b66466f -EBUILD iscan-plugin-perfection-v370-1.0.0.2.ebuild 2294 BLAKE2B 1a833c5ef9f4b15edff38c70124a2a15359a72f62d1f0aa75368027765bbce46b1ca22c06a7ec7004eb33d1747a0052bf69bf486187fecd8891b318f15309593 SHA512 53ead17b26b8ca0aec5f8d4a39f959c0db44d9c85cb02c52905eac7bf83a4cbfe6f74cb912bd77d14e8bad8af2f722430049cab6fb5e1c421ef967a30cfc621a -MISC metadata.xml 514 BLAKE2B 9a75ca09f7359e07347fd048e83e1650fa81b8ebe97f1f614b23cd80c9997ed64c473a4baf0d86c736a27cf44ea504f6dad67e8f20cdd9cb23029fcb1b42e619 SHA512 26a28c027789be59248b243877383e4b23e2e8f2197e2d125442f4e17da0b7a5582f395b0620aa47862bb5dc2191c267f08a4fd09cfd91f93951a6a00e7bdd23 diff --git a/media-gfx/iscan-plugin-perfection-v370/iscan-plugin-perfection-v370-1.0.0.2.ebuild b/media-gfx/iscan-plugin-perfection-v370/iscan-plugin-perfection-v370-1.0.0.2.ebuild deleted file mode 100644 index ce0c32ffb21f..000000000000 --- a/media-gfx/iscan-plugin-perfection-v370/iscan-plugin-perfection-v370-1.0.0.2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit rpm versionator multilib - -MY_PV="$(get_version_component_range 1-3)" -MY_PVR="$(replace_version_separator 3 -)" - -SCANNER="Perfection V370" -FIRMWARE="esfwdd.bin" - -DESCRIPTION="Epson ${SCANNER} and similar scanner plugin for SANE 'epkowa' backend" -HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" -SRC_URI="amd64? ( https://dev.gentoo.org/~flameeyes/avasys/${PN}-${MY_PVR}.x86_64.rpm ) - x86? ( https://dev.gentoo.org/~flameeyes/avasys/${PN}-${MY_PVR}.i386.rpm )" - -LICENSE="AVASYS" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" - -IUSE="" - -DEPEND=">=media-gfx/iscan-2.21.0" -RDEPEND="${DEPEND}" - -S="${WORKDIR}" - -QA_PREBUILT="/opt/iscan/lib/*" - -src_configure() { :; } -src_compile() { :; } - -src_install() { - # install scanner firmware - insinto /usr/share/iscan - doins "${WORKDIR}"/usr/share/iscan/* - - dodoc usr/share/doc/*/* - - # install scanner plugins - exeinto /opt/iscan/lib - doexe "${WORKDIR}/usr/$(get_libdir)/iscan/"* -} - -pkg_setup() { - basecmds=( - "iscan-registry --COMMAND interpreter usb 0x04b8 0x014a /opt/iscan/lib/libiscan-plugin-perfection-v370 /usr/share/iscan/${FIRMWARE}" - ) -} - -pkg_postinst() { - elog - elog "Firmware file ${FIRMWARE} for ${SCANNER}" - elog "has been installed in /usr/share/iscan." - elog - - # Only register scanner on new installs - [[ -n ${REPLACING_VERSIONS} ]] && return - - # Needed for scanner to work properly. - if [[ ${ROOT} == "/" ]]; then - for basecmd in "${basecmds[@]}"; do - eval ${basecmd/COMMAND/add} - done - elog "New firmware has been registered automatically." - elog - else - ewarn "Unable to register the plugin and firmware when installing outside of /." - ewarn "execute the following command yourself:" - for basecmd in "${basecmds[@]}"; do - ewarn "${basecmd/COMMAND/add}" - done - fi -} - -pkg_prerm() { - # Only unregister on on uninstall - [[ -n ${REPLACED_BY_VERSION} ]] && return - - if [[ ${ROOT} == "/" ]]; then - for basecmd in "${basecmds[@]}"; do - eval ${basecmd/COMMAND/remove} - done - else - ewarn "Unable to register the plugin and firmware when installing outside of /." - ewarn "execute the following command yourself:" - for basecmd in "${basecmds[@]}"; do - ewarn "${basecmd/COMMAND/remove}" - done - fi -} diff --git a/media-gfx/iscan-plugin-perfection-v370/metadata.xml b/media-gfx/iscan-plugin-perfection-v370/metadata.xml deleted file mode 100644 index f4c7d6fccf3c..000000000000 --- a/media-gfx/iscan-plugin-perfection-v370/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!--maintainer-needed--> - <longdescription lang="en"> - Proprietary plugin for several EPSON scanner models, to be used - with the epkowa SANE backend (provided by - <pkg>media-gfx/iscan</pkg>). 32-bit and 64-bit. - - Supports the following models: - - Epson GT-F740 - Epson GT-S640 - Epson Perfection V37 - Epson Perfection V370 Photo - </longdescription> -</pkgmetadata> diff --git a/media-gfx/kgeotag/Manifest b/media-gfx/kgeotag/Manifest index 13af3dc9f5a3..0d7db39b3ed2 100644 --- a/media-gfx/kgeotag/Manifest +++ b/media-gfx/kgeotag/Manifest @@ -1,3 +1,3 @@ -DIST kgeotag-1.1.0.tar.xz 282436 BLAKE2B 8d59665bc56147f1b1177c15ee5e67823cbff1ede19abcfa2c9c6d8f514a72c5d92a8216920fdfdc58a0880d093b570d61f3ec273868059a1182b9f444affa4c SHA512 b849cd43118f05253352a5059f0c29a9e3db59602455f3413ec5bcbe9c4b72c1e695f077089a2fe048443c04ec31be07540d42ab1f055bb32b3b459da7f7911a -EBUILD kgeotag-1.1.0.ebuild 837 BLAKE2B 07604082a7fce27aa8b1ec5c302aa9e3e823188ea70f86d73ab06b33519b967458ecba533f19aa4c3fde3f57cd71655805a0184546842f12273e0a8fd8aef8f5 SHA512 77df24a4a158919b9c860085d236d2c21b658a0073c67f84c5159949ca3a1227577627643b99228b5a3e702a87ff0034670702d49fa55934c75845344a8e6f4c +DIST kgeotag-1.2.0.tar.xz 284708 BLAKE2B b4d44a9a2210c20ae0caaf51913958c4d0b0e15f622727aacf7c50a6a76f8228bada2c7b2f3c87f97866b8acc5c9abf4fc2e3963e623f7865a13ec1d190d230a SHA512 818a89babe613602b9843109c10632b09dfe0bba5e28d5332eb17c1c3841a30049dbe298a4b3c8123d72751dfa29eb5994d9d4e683a85f9b121161005c4fee65 +EBUILD kgeotag-1.2.0.ebuild 837 BLAKE2B 07604082a7fce27aa8b1ec5c302aa9e3e823188ea70f86d73ab06b33519b967458ecba533f19aa4c3fde3f57cd71655805a0184546842f12273e0a8fd8aef8f5 SHA512 77df24a4a158919b9c860085d236d2c21b658a0073c67f84c5159949ca3a1227577627643b99228b5a3e702a87ff0034670702d49fa55934c75845344a8e6f4c MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/media-gfx/kgeotag/kgeotag-1.1.0.ebuild b/media-gfx/kgeotag/kgeotag-1.2.0.ebuild index 2e4f29ade5e5..2e4f29ade5e5 100644 --- a/media-gfx/kgeotag/kgeotag-1.1.0.ebuild +++ b/media-gfx/kgeotag/kgeotag-1.2.0.ebuild diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index caedb68a9062..f7c184ddeb8f 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,7 +1,8 @@ AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c AUX krita-4.4.2-quazip1.patch 1422 BLAKE2B 917bf30f1dc702276b524713b1ec01a4807f967bc974c0c9896e6972fc56554a4da954c690a0743a4d92d86e57d32028c809418cbf10b30294bf1412a1a08beb SHA512 7c55e371f4c6a5e6d3d275298bf22810b58cb845bf4abcdd3cecdd84cb228499c59e8f7e9902319009dc52ea4dde575de77668ab2d1e9cf076e8ffa6fba582b5 AUX krita-4.4.7-pykrita-crash-on-exit.patch 1583 BLAKE2B 077ebf5108badd615d9bc1086f2890a8f45506ca8cf0b5abf089b68e469200513f9be0a5516bad17b131e4afecc9560c8903ed6b1aaecd7c245a432ac8a2cd02 SHA512 44f023f49a0c5bfd895f65a013787bf2870b06fbba6fe292fb97c791b05965de176184d6a669225748848bc0ae1c7984d0c8dfaf3fd3ccf5ae0dbee953a08f92 +AUX krita-4.4.8-prefer-newer-sip-to-build.patch 2000 BLAKE2B 762d2230e866f7db639802dcf55ba3ff57cd125d115246721e645458376e1a26864f4e0506338300c533f18b8ed52e96374d97d2da161987fc5f8786c59f0edd SHA512 da79a6c457e3b7e04370c5ff527f7ba34e49d0e2493ec747d76af5e728ca72372476dbf85a4b69064ce5cc2f6d20b028883028c0ae59c2c5af6dc2074c8bff9e DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59 DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb SHA512 53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81 -EBUILD krita-4.4.8-r1.ebuild 3538 BLAKE2B 4b86b38f7d895e6700e06e88410493e163d6f1e5e45a14a2cb361a9c6011af962d6772c52c5718f49ed3e315e167e5b9c47492acc54a7e2211e5ad52f110dfc2 SHA512 ea76466a573f895ed98fa42e2b6aaac32ef64cd2b1db7bf169637bd5447f7391768867205e3c31105702325a6b299e8e5e7ffdcfecbfb300a0fedde7d2ecdd67 +EBUILD krita-4.4.8-r1.ebuild 3603 BLAKE2B e3d9d8a9d6060c2b1e621627623668ae29fce652769533ad898064e7f491ee9859fabd9df154bad3346aba37a8a5024061beca045547a87cfb6aa2d8b781ebc1 SHA512 3c3a5b4d98393c6ece66e15b6ca636689da97ce4423855d36d9c02e2fbaa71d51ad91873ae03e47f0fee3c0074307225189b8194a2fa1c4a3472cccb1a6b500d MISC metadata.xml 765 BLAKE2B 9e75410b77b00e7f45ff2bd1a730396c51302380f7c372084975bc763745d7e3c8bb65e8e94bb211872ea398e806f8f423d5ee2dc9c17db9ab7257dbb9e5cf44 SHA512 78524fb64544cefcec05bbf9a8fcf3b175f1aa6ca8377600470096bd2f4b6afae3c00dad4e2c58610cc84501515167e400050bc90de30c11c9fcf3d4b4668579 diff --git a/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch b/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch new file mode 100644 index 000000000000..c60b53ffc64b --- /dev/null +++ b/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch @@ -0,0 +1,56 @@ +From d2f29d77db58b54a8bcabfb68df66e4dd44f0c27 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heiko.becker@kde.org> +Date: Fri, 12 Nov 2021 12:27:07 +0100 +Subject: [PATCH] Try (and thus prefer) sip >=5 first + +If one has sip 4.x and sip 6.x installed sip 4 is picked up +("Found SIP version: 4.19.24") just because it is searched first. + +This matters not only because it is nice to use the "latest and +greatest", but also because software using the latest PyQt5 (including +krita) can't be built with sip 4 at the moment and the maintainer is +apparently in no hurry to fix it [1]. + +[1] https://www.riverbankcomputing.com/pipermail/pyqt/2021-November/044345.html +--- + cmake/modules/FindSIP.py | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/cmake/modules/FindSIP.py b/cmake/modules/FindSIP.py +index 7b92abd36e..600805c329 100644 +--- a/cmake/modules/FindSIP.py ++++ b/cmake/modules/FindSIP.py +@@ -15,6 +15,16 @@ def osAwareSuffix(): + return os.path.join("lib", "python3.8", "site-packages","sipconfig.py") if os.name != 'nt' else os.path.join("lib","krita-python-libs","sipconfig.py") + + try: ++ import sipbuild ++ ++ print("sip_version:%06.0x" % sipbuild.version.SIP_VERSION) ++ print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR) ++ ++ import shutil ++ ++ # sip v5 and higher need to invoke sip-build ++ print("sip_bin:%s" % shutil.which("sip-build")) ++except ImportError: # Code for SIP <5 + import sipconfig + + sipcfg = sipconfig.Configuration() +@@ -41,13 +51,4 @@ try: + print("sip_bin:%s" % sip_bin) + print("default_sip_dir:%s" % default_sip_dir) + print("sip_inc_dir:%s" % sip_inc_dir) +-except ImportError: # Code for SIP v5+ +- import sipbuild +- +- print("sip_version:%06.0x" % sipbuild.version.SIP_VERSION) +- print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR) + +- import shutil +- +- # sip v5 and higher need to invoke sip-build +- print("sip_bin:%s" % shutil.which("sip-build")) +-- +GitLab + diff --git a/media-gfx/krita/krita-4.4.8-r1.ebuild b/media-gfx/krita/krita-4.4.8-r1.ebuild index 614c5a0ad5d4..dedc461115e7 100644 --- a/media-gfx/krita/krita-4.4.8-r1.ebuild +++ b/media-gfx/krita/krita-4.4.8-r1.ebuild @@ -92,6 +92,7 @@ PATCHES=( "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch "${FILESDIR}"/${PN}-4.4.2-quazip1.patch "${FILESDIR}"/${PN}-4.4.7-pykrita-crash-on-exit.patch # KDE-Bug #417465, git master + "${FILESDIR}"/${P}-prefer-newer-sip-to-build.patch # bug 822843 ) pkg_setup() { diff --git a/media-gfx/libredwg/Manifest b/media-gfx/libredwg/Manifest index 293d27c83278..edcfbbbbd20c 100644 --- a/media-gfx/libredwg/Manifest +++ b/media-gfx/libredwg/Manifest @@ -1,3 +1,3 @@ DIST libredwg-0.12.4.tar.gz 18318912 BLAKE2B 21ff443881c19782c747ddf880eba23090295432edf4367161472aeef970e1b93983967e667ca2c3e140bf0b97e7b238bbe4a342815df365cee10bde83a04178 SHA512 df9424f475be512a6e9e02a1156a7d6a966f684f5753f420843593ee9dc236bd33bd10dbd627bab1b9adab9b8e7cb3a6b464c15e643ae755bc7e11974c05cd7a -EBUILD libredwg-0.12.4.ebuild 1976 BLAKE2B 4fd3fd0915a08a3da9c0c79cccb8d89e011218195be7945809dafa62ee2caa77eef55d892e137a388f9cd6f46ed85ff29900cf09720d3863183d21fd7c7e1984 SHA512 7ad49f1abb0a57ac05adc2422e8044fd2f7beac60aeebbd21daf82af561cb03f6d632e1223e3a246961519a8ed2f020a85ad408cff283e5b23ffcb9d9baf5bf8 +EBUILD libredwg-0.12.4.ebuild 1977 BLAKE2B c2bee6ce5a6807cb650689968faf922687e77547a0541d54beab6bd8a8eaf97ec018ba14da08d51508243d68e081f52cf2b85c32a99be429b43d3a01c94e46c2 SHA512 516860beaa723735a67322d52bed2168817a77bac2140cd93d39e8b272c41fa0ec036c50f9810c9df286bb4da805914de744bd9f8cc3be125f5e9dd0838fc709 MISC metadata.xml 406 BLAKE2B c39713a8733c296d7b9c8d87210f1bec2bcebf415d2dcb6e6326fd6a89e9b84b44bffd781cd953de35894220b51277d39c3fd80ad8c9fe8f22cb29fdb920467c SHA512 a474d5abfc3db689b006dad09dc5ab003526141269d30e6acb7c241054be518a21f6a034ed9939a75098386cd01012d460bf70e0c12f0f14023ac48682c44e81 diff --git a/media-gfx/libredwg/libredwg-0.12.4.ebuild b/media-gfx/libredwg/libredwg-0.12.4.ebuild index 6edddbd8e788..27fe56204a7b 100644 --- a/media-gfx/libredwg/libredwg-0.12.4.ebuild +++ b/media-gfx/libredwg/libredwg-0.12.4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) DOCS_BUILDER="doxygen" # File is hardcoded to be run from ../ so we use this instead of DOCS_DIR DOCS_CONFIG_NAME="doc/Doxyfile" diff --git a/media-gfx/mkbold-mkitalic/Manifest b/media-gfx/mkbold-mkitalic/Manifest index 26d174e735f8..5ab9aeae172c 100644 --- a/media-gfx/mkbold-mkitalic/Manifest +++ b/media-gfx/mkbold-mkitalic/Manifest @@ -1,3 +1,3 @@ DIST mkbold-mkitalic-0.11.tar.bz2 21922 BLAKE2B 90473ee9ce751f491a36b18b4adcfc15a64535ca11b7394a2d46b48a144394ae549133635f898b8b16d87eb3271439fc425cee3cb05e4559818ab00a7d054e3d SHA512 fe40693bc5d73aaf45daf1bbd22f8107fb61604cd4ff0ec09e8bd63029be811a2b1bb46a3ce214954841c5d074e9ec23c150006d9a2c8ffe633e93801c2d7345 -EBUILD mkbold-mkitalic-0.11.ebuild 728 BLAKE2B 3531a2515990e6583e3fb472a57c8057fb2e50b1614b17394d7e6a697dd33eff3c04f8501fc55d6d8026baee02762e0b74bf660dd5b6c2863460a686af1525bb SHA512 65760abe3325137b5f28d0889d3551f8e78a4052157d8fd09129cc3edb0bc02eaded07a5f2a4e163f3b2a01bafac41aa4dfc0ac89c6656dd8fc3dabbaed1d75e +EBUILD mkbold-mkitalic-0.11.ebuild 745 BLAKE2B 7577daa8e7c7620367cf2b9036d32d62b3b8b3a22e1626c9124e8d3e3e575ee65e59173388b38655831fca780460b738a3ea5d546917d6de8a593b80e2cf9ae2 SHA512 3321b4f69ca24ad9df50bd5efa76d6b2ac7a79c9c78c801ab8c54d2b53c5138c7dfc79cc3d240d04b54afaddd17d44bf2c4bef75aa30d96d32e130bb73e9a81a MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549 diff --git a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild index 28a205ef994b..26a687302657 100644 --- a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild +++ b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://hp.vector.co.jp/authors/VA013651/lib/${P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86" DEPEND="" RDEPEND="" diff --git a/media-gfx/nvidia-cg-toolkit/Manifest b/media-gfx/nvidia-cg-toolkit/Manifest index ca3e77a2d04c..5d3a399476c0 100644 --- a/media-gfx/nvidia-cg-toolkit/Manifest +++ b/media-gfx/nvidia-cg-toolkit/Manifest @@ -5,4 +5,5 @@ AUX nvidia-cg-toolkit.pc.in 242 BLAKE2B 45f19a2791310975169f8a31bf65d77a86b4e448 DIST Cg-3.1_April2012_x86.tgz 23332348 BLAKE2B e8253cfd1b569e1eb083ca394ae969ca43677641763eb77c24381198914cb1508bd41489224d8cc1afefca2affb485320022bd35e7ffaa48aaadafcf42f89183 SHA512 7b2addad157e151eb42b320aea31ccddfd53ec5640cb97bc86a3d461c1b08a2dff280bfc3f7859d124c311e1710e39d40405c387e5724ebc82d95303b250837a DIST Cg-3.1_April2012_x86_64.tgz 24829131 BLAKE2B f1425f391022aa57fe2b23581786576ab8762a48e9ffc875853d55399d3a996ac85debb099d0b906dcce6c95989a06c3980bfb59dc69edc16d1378ba5dc89c73 SHA512 591b51195193e7e3bbb9f1c2579336d24a179b0a88b955a01f4661bda55543fbccd73cac53033912f2eea8a1068e4c1394c6d286f195963cfb33a0d8b4428e27 EBUILD nvidia-cg-toolkit-3.1.0013-r5.ebuild 2922 BLAKE2B 5af69be5db5e7bde21b3503e0e65703c03e6473eabf7e48539fc035f917564c57c89433d5df153b46553ddb6a75db5d69f6c1c5bb4b0cfa6f86eae86cdc4244f SHA512 0d438981abc65c0e53f758488372059c12c10b466a8b23a136ef482df219452635db7fd59500d43520d05f50584ce5fdc32a4b718dd3079a84864a2f57e8514f +EBUILD nvidia-cg-toolkit-3.1.0013-r6.ebuild 2881 BLAKE2B fe92f0c380d34697fdae0c33a4e5f16f4b66336854ca4df69edba3ff8440919cb038d5e41856b6e974cd0e227374e5561d8ad83e721fc373de5e5d6c06d86b4e SHA512 91f051a0e56a648567bd0c84e3f149a661816325ad4646bd43055981f2e9ce9e129e63a1fcd6f8b7a92691f34f0faa01a827a64c26ed81718422a831d9f2cb48 MISC metadata.xml 556 BLAKE2B a480fdc63faf7dbaf64c54fb70e033e7e32de1c149a89840e1a3a9a345b00dd3586431c3ac9e10f1a649940508ef308a7b5aff326d31f4a18c9b6c97d1d1a7eb SHA512 0ec1f9415029c86117aea79751d1e0bae7057cf6700a4d06a65d84a1a674dbdfdb91d0a7d0a66d5cedf0db033b8059ad65aa3e40d3295d9dae95d031c5179f58 diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r6.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r6.ebuild new file mode 100644 index 000000000000..d480e93dbdbf --- /dev/null +++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r6.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MULTILIB_COMPAT=( abi_x86_{32,64} ) + +inherit prefix multilib-minimal + +MY_PV="$(ver_cut 1-2)" +MY_DATE="April2012" + +DESCRIPTION="NVIDIA's C graphics compiler toolkit" +HOMEPAGE="https://developer.nvidia.com/cg-toolkit" +SRC_URI=" + abi_x86_32? ( + https://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz + ) + abi_x86_64? ( + https://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86_64.tgz + )" + +LICENSE="NVIDIA-r1" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples multilib" + +RESTRICT="strip" + +RDEPEND=" + >=media-libs/glu-9.0.0-r1[${MULTILIB_USEDEP}] + >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] + >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] + >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] + >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] + amd64? ( + abi_x86_32? ( + >=media-libs/freeglut-2.8.1[abi_x86_32(-)] + ) + )" + +S=${WORKDIR} + +DEST=/opt/${PN} + +QA_PREBUILT="${DEST}/.* /usr/share/.*" + +src_unpack() { + multilib_src_unpack() { + mkdir -p "${BUILD_DIR}" || die + cd "${BUILD_DIR}" || die + + local i + for i in ${A}; do + if [[ ${i} == *x86_64* && ${ABI} == amd64 ]]; then + unpack "${i}" + elif [[ ${i} != *x86_64* && ${ABI} != amd64 ]]; then + unpack "${i}" + fi + done + } + + multilib_foreach_abi multilib_src_unpack +} + +install_pkgconfig() { + # One arg: .pc file + insinto /usr/$(get_libdir)/pkgconfig + sed \ + -e "s:GENTOO_LIBDIR:$(get_libdir):g" \ + -e "s:DESCRIPTION:${DESCRIPTION}:g" \ + -e "s:VERSION:${PV}:g" \ + -e "s|HOMEPAGE|${HOMEPAGE}|g" \ + -e "s:SUFFIX::g" \ + "${FILESDIR}/${1}.in" > "${T}/${1}" || die + eprefixify "${T}/${1}" + doins "${T}/${1}" +} + +src_install() { + local LDPATH=() + + multilib-minimal_src_install +} + +multilib_src_install() { + LDPATH+=( "${EPREFIX}${DEST}/$(get_libdir)" ) + into ${DEST} + + if [[ ${ABI} == amd64 ]]; then + dolib.so usr/lib64/*.so + else + dolib.so usr/lib/*.so + fi + install_pkgconfig nvidia-cg-toolkit.pc + install_pkgconfig nvidia-cg-toolkit-gl.pc + + insinto ${DEST}/include + doins -r usr/include/Cg + + if multilib_is_native_abi; then + dobin usr/bin/{cgc,cgfxcat,cginfo} + + insinto ${DEST} + dodoc usr/local/Cg/README + if use doc; then + DOCS=( usr/local/Cg/docs/*.{txt,pdf} ) + HTML_DOCS=( usr/local/Cg/docs/html/. ) + einstalldocs + fi + if use examples; then + dodir /usr/share/${PN} + mv usr/local/Cg/examples "${ED}"/usr/share/${PN}/ + fi + fi +} + +multilib_src_install_all() { + local ldpath=${LDPATH[*]} + + sed \ + -e "s|ELDPATH|${ldpath// /:}|g" \ + "${FILESDIR}"/80cgc-opt-2 > "${T}"/80cgc-opt || die + eprefixify "${T}"/80cgc-opt + doenvd "${T}"/80cgc-opt +} diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest index 15683e6124f1..e45b4cb90d01 100644 --- a/media-gfx/openvdb/Manifest +++ b/media-gfx/openvdb/Manifest @@ -3,15 +3,20 @@ AUX openvdb-7.1.0-0002-Fix-doc-install-dir.patch 1014 BLAKE2B 380c26e69da1847926 AUX openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch 836 BLAKE2B e04fe9f6e3a1a44a7b4274dd328f88c0dffe14493bad68c4e30807f44330a4328776eefe600e2f9b6565ee363f1db4228f36da995e18556e678672925f5f89ec SHA512 0599bc38a4e74ecede3d174ecee0f207dd8edd2a6f99f68fdb46488505ff093e9e1a6842fe58e94e5bee93f7c79a72bd043b3d7ca070b26895919b57a808a784 AUX openvdb-8.0.1-glfw-libdir.patch 495 BLAKE2B 6a47bd300b3cd2186be8b749abd1e1fcbcb50e24d1965a783d8f2cec07ef8737ee6287018f40fed4ea4520c2c6be20b5936bdf0bd95ab07f277e728b6fccbb07 SHA512 29cd8d4dfd24f262c8e03a4d55502839a99bdac8eae1738b99cd667292034ea5cddec60303daf3a0c0d76a68021b3b4d6fc2f0e5be108d94243f5c11308c194d AUX openvdb-8.1.0-glfw-libdir.patch 742 BLAKE2B 2ab1de05da49480584e373dba0f4a8504f6116ee22c46247f72802a9d412df43603b79b9620d0be2efe9745c30d962d1404325f3b09cae4ac9fe1e3bc0052d42 SHA512 beebad98890dc05c7c34594155fcdb163353b3a92c1571c7b017481b1fa167735ec54df019ed5d154e7d0973d3c1d9fd779508d2360f3306eefa6e45d3240d0b -AUX openvdb-9.0.0-numpy.patch 6113 BLAKE2B 1440366ffcc9f62e8c6974aa82b290053c359986789f019e05f718b44c4af60112328283367e92b06cd2a36d3b6ddc6c9cc6fe2cd6360cf43a1f9a33cbcaebe9 SHA512 a8568effcfa0bb10ad23b574a727311f10add7cdb046d94f40842f9a41e8127c8571ae494950730d898c78900917402a793d1433a44eb4eb322edd3ff97133d6 +AUX openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch 1351 BLAKE2B 0a63f9c2c3fd44cfe8013e2c73c3f311d92fee2b6828801175969a0f7123401c21ad11325788ba8b38716a6d21ccf9bd0e685e0c3bb51d6c3f0a0bd3fcdb409b SHA512 5443a3204c9f8b6b8ae9e533ee8c18d6e82463cb3c5be1e3664ab2067a7ba2c9d99f17263204d6be940db3dcd1d8721b359ac0de698f760d23ba05a68e03f1e9 +AUX openvdb-8.2.0-unconditionally-search-Python-interpreter.patch 1390 BLAKE2B 58e1ed82abe0e2a50ba7861188d65baa48e6c6273bcdbacccf92923de88359d6b08fa52eb6bc8d0b4f144b360680f52a94c696abcfcbb3e1c9045ba830c03646 SHA512 ddedfeae9a68c57c4de14ffdf05f952611fe72fd089320fba5f432d5562a09c661750eca4d0e256be1a3f0ac3e141b26db8d738df5b3a2ddb58a747331c90729 +AUX openvdb-9.0.0-numpy.patch 6113 BLAKE2B 4424e930ddaa3863245fc8f32954b5732aaba84792f930cc25f8598cbe0282c68540eaf7f2721959841ec3f40bbe5ed1f770c5c90425389a3a0646ebe3b75c9d SHA512 23b53db3895f1b44605e002e1b3649fe1101844f1ac864cf6083c19fdb4ab40701ee20177d7095c7a8e683e01a3e4fad1fa5087207580dd64e6f5adf4f14fdbc +AUX openvdb-9.0.0-unconditionally-search-Python-interpreter.patch 1558 BLAKE2B eec71d9e4436ff141a85c9fdfd50b4e4883cfda9e8819ff02acf976c5e4e74aa2f44a57353600256b52806be8fe577e705900c2216cbd68945df3175831415cd SHA512 2ea6cbd9d7497ea06e0766c1b311905bb26908df43f1960bb0c3e676257b8793fd024d615c532c38ae53c0fa313a15e4cd214bd1d174f19ba4de31244c0f970a DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7 DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad DIST openvdb-8.0.1.tar.gz 2299276 BLAKE2B e65bd4710ff65e20570013399d1e71a32e8f80c5e3b5527fc17d23c7f86ead7e04483cf7ba5266f26343604677d3a0dcafc01474baf7ef09b98f1f41a66119a2 SHA512 6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2 DIST openvdb-8.1.0.tar.gz 2619432 BLAKE2B ba06e8dc24876da0ed1a2b5560e8793ad1e42b45b2018734c98c9b8f1d43bdb4aa098243a68de90efb18cb0454a9ea2a59c87f411d2c6492c5bce95dc047a6f0 SHA512 081ccedb122ff9bd73e0cd7ff083ad0ff0165e0cf6305187edcbe90ff12f01ec085c91ad5c52c53596035e0c2afd5b8801e6c00374b0fc4b0cc111f5c7f37eb5 +DIST openvdb-8.2.0.tar.gz 2656278 BLAKE2B b381459fb770800bb03bc8a6b3122c6684ab508f11be024e0eb3951bfbcef14e626e2d4468e91ea17fd6792f23810eafe8b05e19d46eb0e6200c73ccf296116a SHA512 aed6b5884a9cfd42f72357ad090c5dcf7829b0e5672ab61e31206e889c085ce5a7bcb89476ceac552a837d394011951528e2b3cffc77baadc491a2e7a31d5e86 DIST openvdb-9.0.0.tar.gz 2945040 BLAKE2B c47a8088ba30d3cbecff04dbfd2d48b39a254e54149d8692c3a7157a99a1c555ef9747b77aeab6f8709b61c348d496765f2cfcbb0975e21f533072871f3fa422 SHA512 1410b7b04b03fb09d6775ebe7b95e7c0a484d5f29c84203530ed30ccb7c061470be1abb93189010617342e57f3fecdd66a115c6d222024e68e2384a7fb196194 EBUILD openvdb-7.0.0-r4.ebuild 2923 BLAKE2B 789ef9fe451697a42848047a72a7dec59ba37959fd92573ff824d92f7768674a231ba4d4e88a81eb3c332deb730fc0fe4c38c383c482f151babb1091752cf062 SHA512 2e268d1892ed9b3c8eaf89d27a7c559327756f26c8f5830d113b404c8c6100536626371b32eb4844da3a7e85c0d9e110cd92dc5dc84957d16c139649fe02f42a EBUILD openvdb-7.1.0-r5.ebuild 2936 BLAKE2B 08764ebb2337dc453144526e5beb5c022eb2bfd2a68f752ccfb847057c53795ea3bd157f1527f6612bfbdc6faf927304f6dcd460901d4aff302c77a4613a24a6 SHA512 bc9bfbbb770fbafe7611d2df5d432db2d738c1f2118e922c921967328191954ed631a590411350ab15f50924b0b2f00d1501969e77a7c89e0f147e163e65d76c EBUILD openvdb-8.0.1-r4.ebuild 3034 BLAKE2B ef40d732555b406d4e81c7ad4500033073c10f5b8d81a0c7032d0c02369879fcadbfcbbb0fa4f344ca251fee47ceebe938acd47c70c2a3db2bca405da9cd2526 SHA512 5df7e6f71b8306ec28278839e7dee2ff09b8a7d1555f88a0c0f6ca7f9b5be20f1e572a0b0df6689817fb5fb378b5fc2d1a9729247aa6caf51c942e06fef1d0c6 EBUILD openvdb-8.1.0.ebuild 3209 BLAKE2B 0db931c94e28135dd1819758f4459588c14498c2bc3121b7d61d223ddb6fb32873f22bf269f1b2afb15a3c1a612cb151b515a54eca2d6e73e56e6406b3df635c SHA512 840c7aac5df4a6cd6edde07c79702cdfb49f70e0b09dd023842884ccd62745202f0e956697ced9fe58cdffc345eba1330c0c006e6b248e60020d5b3193992faf -EBUILD openvdb-9.0.0.ebuild 3307 BLAKE2B 13d77210f9a543719340d622a92d2fb33b0f10c9d5d9c89e4f119a1bef1ce2b420428a8bf9dcd22fa4990481b9673613fa44e7dced0233b4cdd0c43ccebd5371 SHA512 7dd1e5ba218c6be718bf477fcacdb55ddfb0ee7677454f85504ee9643575fbbdce5633b85e2d3f5b4b8594154c04fa738a1d09bd457ee4bb25396e8d9b272c30 +EBUILD openvdb-8.2.0-r1.ebuild 3474 BLAKE2B 650cde4a8f46ef313025bbaba7f7f9698c1f0fa8347fa6aa1e2e3afb05904da49974d695e6578d2ce39c6bb8d2a331a3a7188837d85a3f090690c98797469527 SHA512 be60e550c9a334a05092bc95090ee5044f07d777484cc6efef050237c9b5f337182b4e1b1219b3290bc4d214a37fc83cb9baca3b2bb7872c3a0efe13bc968810 +EBUILD openvdb-9.0.0.ebuild 3382 BLAKE2B a2b5ecaabb519d92d23e2c5a6411f4c0c6ef5f806583f44f938a0cce97763f2bd4987636d6de0bdbe42e4ed27cd5e327910fbb1b2c1b5d207dd58a6e1f39585b SHA512 0e22e8b90ab0fa2a8fee36f16b5d649984b9ea489832c107879876073bd6c884d3cb9a1892171895849e477e5d49a59bd581f31ffb4ba01ecdf1356453257a75 MISC metadata.xml 1646 BLAKE2B 9e25b791388076b419596924e5860d79b1e96503dc8d6e2e6894182919590c9688728636f08162f6cc63a75343c34cab88d62046b573e554d6321444b9ea1be0 SHA512 39c3c0a8f7c94081dba88317ecc11cbdce2fa192373daf2ae62867204d6928ed69687935df05bbd033dc643f01168aec98230909d3c69021eedc489a9f007fbc diff --git a/media-gfx/openvdb/files/openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch b/media-gfx/openvdb/files/openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch new file mode 100644 index 000000000000..88752e9fa0eb --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch @@ -0,0 +1,37 @@ +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Sat, 4 Dec 2021 20:16:42 +0100 +Subject: [PATCH] fix finding ilmbase if imath and ilmbase are installed + +If both, ilmbase-2.5 and imath-3 are installed, the configuration fails +if OPENVDB_BUILD_BINARIES and OPENVDB_BUILD_RENDER are set. +The patch adds an additional guard based on the USE_IMATH_HALF option +being set and thus decide whether to search for and use imath or ilmbase. + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/openvdb/openvdb/cmd/CMakeLists.txt ++++ b/openvdb/openvdb/cmd/CMakeLists.txt +@@ -81,12 +81,17 @@ endif() + #### vdb_render + + if(OPENVDB_BUILD_VDB_RENDER) +- find_package(Imath CONFIG) +- if (NOT TARGET Imath::Imath) ++ if(USE_IMATH_HALF) ++ find_package(Imath CONFIG) ++ if (NOT TARGET Imath::Imath) ++ find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath) ++ find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf) ++ else() ++ find_package(OpenEXR CONFIG) ++ endif() ++ else() + find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath) + find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf) +- else() +- find_package(OpenEXR CONFIG) + endif() + + set(VDB_RENDER_SOURCE_FILES openvdb_render.cc) +-- +2.34.1 + diff --git a/media-gfx/openvdb/files/openvdb-8.2.0-unconditionally-search-Python-interpreter.patch b/media-gfx/openvdb/files/openvdb-8.2.0-unconditionally-search-Python-interpreter.patch new file mode 100644 index 000000000000..933d2965b2bc --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-8.2.0-unconditionally-search-Python-interpreter.patch @@ -0,0 +1,34 @@ +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Sat, 4 Dec 2021 20:45:49 +0100 +Subject: [PATCH] unconditionally search Python interpreter + +When setting PYOPENVDB_INSTALL_DIRECTORY, CMake would fail with: +``` +-- Could NOT find Python (missing: Python_LIBRARIES Development Development.Module Development.Embed) (found version "3.9.9") +CMake Error at openvdb/openvdb/python/CMakeLists.txt:65 (message): + Could NOT find Python::Module (Required is at least version "2.7") +Call Stack (most recent call first): + openvdb/openvdb/python/CMakeLists.txt:112 (openvdb_check_python_version) + ``` + +It seems like we always need to search for the interpreter. + +Bug: https://bugs.gentoo.org/790350 +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- a/openvdb/openvdb/python/CMakeLists.txt ++++ b/openvdb/openvdb/python/CMakeLists.txt +@@ -73,10 +73,7 @@ endfunction() + # target but this was only added in CMake 3.15. See: + # https://github.com/AcademySoftwareFoundation/openvdb/issues/886 + set(OPENVDB_PYTHON_DEPS) +-set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development) +-if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY) +- list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) +-endif() ++set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development Interpreter) + + if(${CMAKE_VERSION} VERSION_LESS 3.14) + find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) +-- +2.34.1 + diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch b/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch index 972db42b3556..5fa90a7b6524 100644 --- a/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch +++ b/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch @@ -1,5 +1,5 @@ Grabbed relevant parts from upstream PR for 9.x; it's a variant -of https://github.com/gentoo/gentoo/pull/22738 which wa sfor earlier versions. +of https://github.com/gentoo/gentoo/pull/22738 which was for earlier versions. https://github.com/AcademySoftwareFoundation/openvdb/pull/1237 diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch b/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch new file mode 100644 index 000000000000..66c50b485d70 --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch @@ -0,0 +1,40 @@ +From e9b193cc3481c4e157aa39e753ce49a0da69bb2b Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 2 Dec 2021 02:16:15 +0000 +Subject: [PATCH] cmake: unconditionally search for Python interpreter + +When setting PYOPENVDB_INSTALL_DIRECTORY, CMake would fail with: +``` +-- Could NOT find Python (missing: Python_LIBRARIES Development Development.Module Development.Embed) (found version "3.9.9") +CMake Error at openvdb/openvdb/python/CMakeLists.txt:65 (message): + Could NOT find Python::Module (Required is at least version "2.7") +Call Stack (most recent call first): + openvdb/openvdb/python/CMakeLists.txt:112 (openvdb_check_python_version) +``` + +It seems like we always need to search for the interpreter. + +Bug: https://bugs.gentoo.org/790350 +Signed-off-by: Sam James <sam@gentoo.org> +--- + openvdb/openvdb/python/CMakeLists.txt | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt +index 2821efb5..af93976a 100644 +--- a/openvdb/openvdb/python/CMakeLists.txt ++++ b/openvdb/openvdb/python/CMakeLists.txt +@@ -98,9 +98,7 @@ endfunction() + # https://github.com/AcademySoftwareFoundation/openvdb/issues/886 + set(OPENVDB_PYTHON_DEPS) + set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development) +-if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY) +- list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) +-endif() ++list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) + + if(USE_NUMPY) + list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS NumPy) +-- +2.34.1 + diff --git a/media-gfx/openvdb/openvdb-8.2.0-r1.ebuild b/media-gfx/openvdb/openvdb-8.2.0-r1.ebuild new file mode 100644 index 000000000000..1a4d9c0e36e9 --- /dev/null +++ b/media-gfx/openvdb/openvdb-8.2.0-r1.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit cmake python-single-r1 + +DESCRIPTION="Library for the efficient manipulation of volumetric data" +HOMEPAGE="https://www.openvdb.org" +SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0/8" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc doc numpy python static-libs test utils zlib abi6-compat abi7-compat +abi8-compat" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + numpy? ( python ) + ^^ ( abi6-compat abi7-compat abi8-compat ) + python? ( ${PYTHON_REQUIRED_USE} ) +" +# 8.2.0 should support OpenEXR 3 / imath but it's going to cause issues with Blender AFAIK +# so let's avoid it for now. +RDEPEND=" + dev-cpp/tbb:= + dev-libs/boost:= + dev-libs/jemalloc:= + dev-libs/log4cplus:= + media-libs/glfw + media-libs/glu + sys-libs/zlib:= + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + blosc? ( dev-libs/c-blosc:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}] + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + ') + ) + utils? ( + media-libs/ilmbase:= + media-libs/openexr:0= + ) + zlib? ( sys-libs/zlib ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + >=dev-util/cmake-3.16.2-r1 + virtual/pkgconfig + doc? ( + app-doc/doxygen + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + test? ( dev-util/cppunit dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch" + "${FILESDIR}/${PN}-8.0.1-add-consistency-for-NumPy-find_package-call.patch" + "${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch" + "${FILESDIR}/${PN}-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch" + "${FILESDIR}/${PN}-8.2.0-unconditionally-search-Python-interpreter.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local myprefix="${EPREFIX}/usr/" + + local version + if use abi6-compat; then + version=6 + elif use abi7-compat; then + version=7 + elif use abi8-compat; then + version=8 + else + die "OpenVDB ABI version is not compatible" + fi + + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/" + -DOPENVDB_ABI_VERSION_NUMBER="${version}" + -DOPENVDB_BUILD_BINARIES=$(usex utils) + -DOPENVDB_BUILD_DOCS=$(usex doc) + -DOPENVDB_BUILD_UNITTESTS=$(usex test) + -DOPENVDB_CORE_SHARED=ON + -DOPENVDB_CORE_STATIC=$(usex static-libs) + -DOPENVDB_ENABLE_RPATH=OFF + -DUSE_BLOSC=$(usex blosc) + -DUSE_ZLIB=$(usex zlib) + -DUSE_CCACHE=OFF + -DUSE_COLORED_OUTPUT=ON + # Off for now until 9.0.0 for OpenEXR 3 support + -DUSE_IMATH_HALF=OFF + -DUSE_LOG4CPLUS=ON + ) + + if use python; then + mycmakeargs+=( + -DOPENVDB_BUILD_PYTHON_MODULE=ON + -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test) + -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" + -DPython_EXECUTABLE="${PYTHON}" + -DPython_INCLUDE_DIR="$(python_get_includedir)" + -DUSE_NUMPY=$(usex numpy) + ) + fi + + if use utils; then + mycmakeargs+=( + -DOPENVDB_BUILD_VDB_LOD=ON + -DOPENVDB_BUILD_VDB_RENDER=ON + -DOPENVDB_BUILD_VDB_VIEW=ON + ) + fi + + if use cpu_flags_x86_avx; then + mycmakeargs+=( -DOPENVDB_SIMD=AVX ) + elif use cpu_flags_x86_sse4_2; then + mycmakeargs+=( -DOPENVDB_SIMD=SSE42 ) + fi + + cmake_src_configure +} diff --git a/media-gfx/openvdb/openvdb-9.0.0.ebuild b/media-gfx/openvdb/openvdb-9.0.0.ebuild index 898e80d496d6..60c18372ac5d 100644 --- a/media-gfx/openvdb/openvdb-9.0.0.ebuild +++ b/media-gfx/openvdb/openvdb-9.0.0.ebuild @@ -65,6 +65,7 @@ PATCHES=( "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch" "${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch" "${FILESDIR}/${PN}-9.0.0-numpy.patch" + "${FILESDIR}/${PN}-9.0.0-unconditionally-search-Python-interpreter.patch" ) pkg_setup() { diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest index 8e9d08fad27f..d9f986aa45ea 100644 --- a/media-gfx/plantuml/Manifest +++ b/media-gfx/plantuml/Manifest @@ -1,7 +1,7 @@ -DIST plantuml-1.2021.12.tar.gz 4730150 BLAKE2B ea3614d1167d00364686ae3a7aa78fd596ed4235d8638bfa8272e9a75102b0f2a1a140fd4a6c5210c200c251a8a0a6f108a44cad5eab98a0e72e2a5a2a44f190 SHA512 bcd0fd84ff0874b09ab65a406487f445884b8b96fa4b9b840f70e232de9717c891fab19bc44bd0e2e9622bef8d0b988997876b04960875699515a6bd31355935 DIST plantuml-1.2021.13.tar.gz 4742792 BLAKE2B 3ad1d593e63472c12f3242ef10a9e3b63fcb2d1dad3c7cf64cad8cc12a15526dab3f88d75d95b030be3aa505bed0464d08f69c00ea509cecb73cae7ba84ed752 SHA512 9bb2da04fc4b1cdbd372edb7a63bef67723456141b47419b692e1da0cc3d28fe61020f8fa03da340a57909e621abca0bac46bfbbc4bc6afe8f0d1cae58577eed DIST plantuml-1.2021.14.tar.gz 4756407 BLAKE2B 86261a79ed24cff626fd4c0a9a64f3912251ea0ef2a5724ceceda1daf93d8c50eebd42e8b6d1b3eb2d67a6ad62496d6b47ef92b50e2bbebb9e39270dee27eac7 SHA512 18abfb402f93a63be0ba02e6fe028bc99d25502714e4a2d92c8b7227088f6af4a10a1a8b63c001a0c2d2f5386385a7e22e1daa787617faf78efe2732cf029f50 -EBUILD plantuml-1.2021.12.ebuild 750 BLAKE2B c6f294d0ebcea2df17681fa103506693d6698b7ab87befaeafd5a67a351faedbaa4241cfbd1a38ef1b42d55bb34d20d09dfda65b18890a32669c868262b1f301 SHA512 5986d587915b3c0d5bf8733311848c78d0c0203a8e4b7d0f9281a7c2717f4275fb3311faad5625c53607fddbf2b8b74b7e5c3368450e6de207f2e07438801aa2 -EBUILD plantuml-1.2021.13.ebuild 751 BLAKE2B 893f8f933be06f96283feb2fa5ed98ec01db76209ad246710d48b83e60de122e6d1e2b32879ff20de051b5789562621b9dff77a27bf1b327410129dfbc150cc4 SHA512 d0f8074c7588849c330c9c5259092348ba4df4ca5d0de4d122ae1123e183b63893d8754419a7fa74faf6ecc42ce66a73ecbdbda307559c0f9d1f94bdeafcdeb7 +DIST plantuml-1.2021.15.tar.gz 4769780 BLAKE2B 7878d71964513e77d1f1412ab2e1e06db6a34863f9bd67868b915d86d38ee6ef6225af6f10b69d36825a768bb7f5a7f1baae0b33d329a385c1751ac4cbdaf58d SHA512 3918d6bb67eb142a9bafd399d2ae7b0b512bb3affcad31135970de5e54e23b7a7c5821f456c0f595958965eb9e957b855fd103e49187ee34b27bd5bd800e6932 +EBUILD plantuml-1.2021.13.ebuild 750 BLAKE2B c6f294d0ebcea2df17681fa103506693d6698b7ab87befaeafd5a67a351faedbaa4241cfbd1a38ef1b42d55bb34d20d09dfda65b18890a32669c868262b1f301 SHA512 5986d587915b3c0d5bf8733311848c78d0c0203a8e4b7d0f9281a7c2717f4275fb3311faad5625c53607fddbf2b8b74b7e5c3368450e6de207f2e07438801aa2 EBUILD plantuml-1.2021.14.ebuild 751 BLAKE2B 893f8f933be06f96283feb2fa5ed98ec01db76209ad246710d48b83e60de122e6d1e2b32879ff20de051b5789562621b9dff77a27bf1b327410129dfbc150cc4 SHA512 d0f8074c7588849c330c9c5259092348ba4df4ca5d0de4d122ae1123e183b63893d8754419a7fa74faf6ecc42ce66a73ecbdbda307559c0f9d1f94bdeafcdeb7 +EBUILD plantuml-1.2021.15.ebuild 751 BLAKE2B 893f8f933be06f96283feb2fa5ed98ec01db76209ad246710d48b83e60de122e6d1e2b32879ff20de051b5789562621b9dff77a27bf1b327410129dfbc150cc4 SHA512 d0f8074c7588849c330c9c5259092348ba4df4ca5d0de4d122ae1123e183b63893d8754419a7fa74faf6ecc42ce66a73ecbdbda307559c0f9d1f94bdeafcdeb7 MISC metadata.xml 822 BLAKE2B 2b2fbd2c5cac001a33c087d4fd4d3e3bd7349ede7af50e08a838a0f395375a627717e80afd658d2ce7211b0adeba2acc88f868eb5e40915c1fe35526c710e79f SHA512 9f3c1d975ce742b95c3be9c049b99a7bdb8e4f1e8eab0da18fa331214c1ef6c66263ed1226554ab0581289bf9d45b5aa7f947ec3bb64e629817d3a2333c13eae diff --git a/media-gfx/plantuml/plantuml-1.2021.13.ebuild b/media-gfx/plantuml/plantuml-1.2021.13.ebuild index 6ff07a08c731..2293ae97609b 100644 --- a/media-gfx/plantuml/plantuml-1.2021.13.ebuild +++ b/media-gfx/plantuml/plantuml-1.2021.13.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://plantuml.com" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" DEPEND=">=virtual/jdk-1.8:*" diff --git a/media-gfx/plantuml/plantuml-1.2021.12.ebuild b/media-gfx/plantuml/plantuml-1.2021.15.ebuild index 2293ae97609b..6ff07a08c731 100644 --- a/media-gfx/plantuml/plantuml-1.2021.12.ebuild +++ b/media-gfx/plantuml/plantuml-1.2021.15.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://plantuml.com" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="~amd64 ~x86" DEPEND=">=virtual/jdk-1.8:*" diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest index b8708104a159..bf7ab2504cd6 100644 --- a/media-gfx/ristretto/Manifest +++ b/media-gfx/ristretto/Manifest @@ -1,5 +1,7 @@ DIST ristretto-0.11.0.tar.bz2 589169 BLAKE2B f1a0a28e7fdf83f05fc3b0a99f0c4ac0e48d07af3f9ff46f849e3768ce7b7978873cef8d028a74f5eff806cc0305d36c57e7ace99d56b61cc7acb3645e501161 SHA512 d38e3c488f106f5a060478e08fbba75fd0420fe1d1af40383118c9674f8acc079da6efdae4f41366d4cc8f34dce61e8eba89342e56747e697fd9c89b2689267f DIST ristretto-0.12.0.tar.bz2 600522 BLAKE2B 3af1c81ee881148b44637262aa45aec071b281be227a29a23d3baae10963e7bc328acd2ba875dd2ff2e3f3eed109e63f0af3d35f727237cd6f3ce54bcaa02495 SHA512 24782959f8560c6b3d78725b7bf99f61c5d4b16abb196d3b9d0fcc542de938ac1a26b0c76f5671149a1f1a9e0925e71b7000b1abc12e658470beb48cc51d5193 +DIST ristretto-0.12.1.tar.bz2 610696 BLAKE2B 60aede252a7817ad1b008e01ce15e371aad13fcb2bea9b61dbca3ceffdae18d5fd2c4c1690bb699648a64769ba9d06b6b9d8eaa3b08ed56cdd15682f6d785f43 SHA512 58e61b7ead3f78770132d1ba3b480f0300279dd42bf78c248d7927c0a6703c75edce051bcaa23acd46d92865c4f5e03fd085bcc6cfdc3fe2bd2b4abd4eb3fa3c EBUILD ristretto-0.11.0.ebuild 874 BLAKE2B 0b4d7463db35d79714c33d1f294d055e0940cdb1a6b65e5c1fee2e6b579c33aa35669616d90e3eac4fc8c2a4a8e2f8db14f2ce9d13927465aae3d2e90b8b7830 SHA512 02a09ed5cac0e73aa4317b2ab61f0fcd3430f0f524f60aa1255d4455e156de4c602d882b5fb708a7399fff9646961605d5a6a64442a574f20c3a21ce4cf5f659 EBUILD ristretto-0.12.0.ebuild 886 BLAKE2B 116a3cb9f8cb99942e8e64f09f7918ed2c080be76a1d3fcb5da4d644368017377c1dcd3c2e4306954017a093e285cef76daf8a7a58b0fcd543399079544e890f SHA512 80e0d3625002b7da7b4f5f7adf815b5b21327740fb5ed57a73fa639083c9e72c1bdb5a9d5529af71c25e8830b5d2e41d63ea2fc8965574b34382f50666ab0a5b +EBUILD ristretto-0.12.1.ebuild 886 BLAKE2B 875719da1f77eb1c88478efafd3201f00a4bd0059f4587a9006d663ba6aac06fe509495abe0d2e9d76f11a7bead759b3e0b3a02f725c6ea81970bcc2ea630242 SHA512 18c50cc52874f26433738fbd27cf6617fd3c1c8f8aebd3704187179aba468b2a87cf34683441fe63d6a0d2581b390f3372804f30c0364d70d8b6261d69929bb9 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5 diff --git a/media-gfx/ristretto/ristretto-0.12.1.ebuild b/media-gfx/ristretto/ristretto-0.12.1.ebuild new file mode 100644 index 000000000000..e28247ce894c --- /dev/null +++ b/media-gfx/ristretto/ristretto-0.12.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit xdg-utils + +DESCRIPTION="A fast and lightweight picture viewer for Xfce" +HOMEPAGE="https://docs.xfce.org/apps/ristretto/start" +SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND=">=dev-libs/glib-2.44:2 + media-libs/libexif:0= + sys-apps/file + x11-libs/cairo:0 + >=x11-libs/gtk+-3.22:3 + x11-libs/libX11:0= + >=xfce-base/libxfce4ui-4.16:0= + >=xfce-base/libxfce4util-4.16:0= + >=xfce-base/xfconf-4.12.1:0=" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig + sys-devel/gettext" + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest index 299bdab65b8e..3d3c8289fb5c 100644 --- a/media-gfx/sam2p/Manifest +++ b/media-gfx/sam2p/Manifest @@ -1,4 +1,5 @@ +AUX sam2p-0.49.4_p20190718-fix-configure-clang.patch 353 BLAKE2B dcb39280fc99bc1d21e9ec9627d976844ed6ec9d14dda61c471766687ae3816c5672dd2b980665252bb22da4a345322e69accec719c86fdd5bfcbbec6d7b8284 SHA512 c351987915fc1b2051f55b9a80478b0ad400aa140e986b3a1dd0d8ae6b55252036f1038236d25456b9fcd604e863169ea5dfa329f5a180eeaccfcf4a58622a0d AUX sam2p-build-fixes.patch 1803 BLAKE2B d9c805da6c46f5457cc6006941a1331f0e46ed8fcadf7c73b9a11debfaa7e2f040beeae42aa9cf316a2df71ffe9d136808a1e9ebeea5c146851057a8addb7bf6 SHA512 fa32011db37a74f746542df82f29e7869412cf8ad93d0b4c3c6e100dda06c254f204671199db0d1abd6134975325cb939f65f0a22457a84a78b6b277411ea2f5 DIST sam2p-0.49.4_p20190718.tar.gz 1816309 BLAKE2B 3d97e00c2bd6b6c292c051d4eb6b73549d1c82a5bd7be3d6b718d8e9d2e96b47657c184af43fa57c0ca4b2b8c26904fb42508d17f7dda715def7d2082affa8b6 SHA512 1c6074fabca6146e51fe0d5a10c912ec679cf122e10aab7bead9e35e3d007e79773aedb1f627572b1b88cacefe0e7edf72efd71d32c47731723b910667220c51 -EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1225 BLAKE2B 1ca1ce4ddafd127b63751bcfb4dc394872e39c8b5135837aae9314f0aff1eaffa61353aa2d79f9a1dfd646b2e051a1947dcf908841f5d17871b2b1772599e632 SHA512 2f92a260ab14351803837361dc559d8a0f4245e1ce3348af60119a1ad3c205e12835583f78e9f5a9e6acd05f7e6e808917035bb676769a7d5d6a6157346fc92e +EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1297 BLAKE2B d04ddf12f9a50d85d386aaace9acd17898b1245d12d983d6ad06c5ef2e22b0a948480a257d6744a43807d19c41b429128776ea4b8005ce0e894916e8356f837d SHA512 eb8f25109b9052ed954512cd59a9570951a1ba1c670e90e877fdcadbcc328b71b380c57cd74a0aafa696124e1bee718c5de88ffe6af1ac2cf5f55d311f547fb3 MISC metadata.xml 374 BLAKE2B d19b7ae3a43094549eb9f02ddbab8077ebdb9b18fd2a608e038de18e1ade6824857899b1f7a19bb835ea2bfa3ae4e2d10c1cd67b38fe0d6d5927150f5b8644dd SHA512 900c1194a51963456c5f22c9eecf95645eda39e189cf72c89b63767c73027ebc152b5e67007047ada223f5b67671490cf75f3caa2989ec645b48bf4c81fdfcba diff --git a/media-gfx/sam2p/files/sam2p-0.49.4_p20190718-fix-configure-clang.patch b/media-gfx/sam2p/files/sam2p-0.49.4_p20190718-fix-configure-clang.patch new file mode 100644 index 000000000000..0d8e769e903d --- /dev/null +++ b/media-gfx/sam2p/files/sam2p-0.49.4_p20190718-fix-configure-clang.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/827925 +--- a/configure.in ++++ b/configure.in +@@ -79,11 +79,11 @@ else + fi + + dnl Checks for programs. + dnl AC_PROG_CC + AC_LANG_CPLUSPLUS +-CXXFLAGS=" " ++CXXFLAGS="-fPIC" + dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g' + CCC="$CCC g++" + dnl ^^^ check g++ before c++ (see acspecific.m4, grep AC_PROG_CXX) + AC_PROG_CXX diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild index 43f217aba10d..3adddb11fdbc 100644 --- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild +++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild @@ -21,7 +21,10 @@ BDEPEND="dev-lang/perl" S="${WORKDIR}/${PN}-${COMMIT}" -PATCHES=( "${FILESDIR}"/${PN}-build-fixes.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-build-fixes.patch + "${FILESDIR}"/${PN}-0.49.4_p20190718-fix-configure-clang.patch +) src_prepare() { default @@ -30,7 +33,7 @@ src_prepare() { mv configure.{in,ac} || die # missing include for memset - sed -i '1s;^;#include <string.h>\n;' pts_defl.c + sed -i '1s;^;#include <string.h>\n;' pts_defl.c || die # eautoreconf is still needed or you get bad warnings eautoreconf diff --git a/media-gfx/sane-airscan/Manifest b/media-gfx/sane-airscan/Manifest new file mode 100644 index 000000000000..7215809211bd --- /dev/null +++ b/media-gfx/sane-airscan/Manifest @@ -0,0 +1,4 @@ +AUX sane-airscan-0.99.27-makefile-fixes.patch 1913 BLAKE2B 1fe9fc148e3ac4f9928cb46a9ef35d2b94104dca39ffec09617d6143ce619c8739afad2811d7c5455ce4c0f190a88c68069a800607926009d2121c90aa8bca8b SHA512 8ed38a9debaf0520d7576f1874dd05b634a43825fb258fa3a0df0f3a93ebac6391d5a7e30ba460221d4174b7865f0372e91ff88f430baeca567dd4f633c0099a +DIST sane-airscan-0.99.27.tar.gz 198418 BLAKE2B bcf2aff08feb90a65c10a4abaca67939874ad7c9376745b572f18ebfdaf7bff3e344d1379b00c73904a6892731a75f4632a90ea7c20f7cb4e30eab43413b829d SHA512 a35a92e26a4e3831f127e59bc520248abde8a7b304eb63ecf1d68092f51a8bc49bbc7503bead47ac84d0333d59ae0045d6d7a9f7b89d95f3ddfa2458f3781256 +EBUILD sane-airscan-0.99.27.ebuild 804 BLAKE2B 80b56646bdc0c4dfde9c0a0eb3cba9e3683ac0f7eea5f70d0ce57d0ea9da3ef4445b0d897b36b74ce4b6a31e9cc1e8a423507b0aaea1142e7c6e6ee99f86f353 SHA512 8c7861f806874899968160f0d2c6077785ea405f15ec440012e53ad9230b36fc72bd538b1c91f6207721f6397c05f748233bf0476006af813ca2c668ecdd2141 +MISC metadata.xml 245 BLAKE2B c146502191378e07b2d7d4d97bcb6daa8eb65f6c0b0d947b8214c19e5302fefc9921d9f8d13516c8bf31d9f642782d098a5d8aa67f45ed4fb33f65c25b1ef8ed SHA512 e901bb8274c666979c1a357a6681d5a0a0f73d5e1d6a4e87eb2f23b16e2ba28592b7d5bd9e2a3e37cf5aec66c159707deaf68619d0cda5e51e1ca98b73253c3a diff --git a/media-gfx/sane-airscan/files/sane-airscan-0.99.27-makefile-fixes.patch b/media-gfx/sane-airscan/files/sane-airscan-0.99.27-makefile-fixes.patch new file mode 100644 index 000000000000..204d1a5466a7 --- /dev/null +++ b/media-gfx/sane-airscan/files/sane-airscan-0.99.27-makefile-fixes.patch @@ -0,0 +1,56 @@ +From 8e9d059fa88606cba97291232ec16732f552bd48 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" <Jason@zx2c4.com> +Date: Thu, 25 Nov 2021 14:24:25 +0100 +Subject: [PATCH] Makefile: abstract ar to $(AR) and remove tags from all + +Build systems need to be able to use a custom `ar` binary. Also, running +ctags is generally not desirable for the default target. + +Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> +--- +Sent upstream as: https://github.com/alexpevzner/sane-airscan/pull/197 + + Makefile | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 4c7e202..415d489 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,6 +7,7 @@ + # ---- ------- ----------- + # DESTDIR Destination directory for make install + # CC gcc C compiler ++# AR ar Archiver + # CPPFLAGS C preprocessor flags + # CFLAGS -O2 -g -W -Wall -Werror C compiler flags + # LDFLAGS Linker flags +@@ -28,6 +29,7 @@ + # + + CC = gcc ++AR = ar + COMPRESS = gzip -n + CFLAGS += -O2 -g -W -Wall -Werror -pthread $(CPPFLAGS) + PKG_CONFIG = pkg-config +@@ -101,7 +103,7 @@ $(OBJDIR)%.o: %.c Makefile airscan.h + + .PHONY: all clean install man + +-all: tags $(BACKEND) $(DISCOVER) test test-decode test-multipart test-zeroconf test-uri ++all: $(BACKEND) $(DISCOVER) test test-decode test-multipart test-zeroconf test-uri + + tags: $(SRC) airscan.h test.c test-decode.c test-multipart.c test-zeroconf.c test-uri.c + -ctags -R . +@@ -113,7 +115,7 @@ $(DISCOVER): $(OBJDIR)discover.o $(LIBAIRSCAN) + $(CC) -o $(DISCOVER) discover.c $(CPPFLAGS) $(common_CFLAGS) $(LIBAIRSCAN) $(tools_LDFLAGS) + + $(LIBAIRSCAN): $(OBJ) Makefile +- ar cru $(LIBAIRSCAN) $(OBJ) ++ $(AR) cru $(LIBAIRSCAN) $(OBJ) + + install: all + mkdir -p $(DESTDIR)/$(bindir) +-- +2.34.1 + diff --git a/media-gfx/sane-airscan/metadata.xml b/media-gfx/sane-airscan/metadata.xml new file mode 100644 index 000000000000..78a9d6b02d0f --- /dev/null +++ b/media-gfx/sane-airscan/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="person"> +<email>zx2c4@gentoo.org</email> +<name>Jason A. Donenfeld</name> +</maintainer> +</pkgmetadata> diff --git a/media-gfx/sane-airscan/sane-airscan-0.99.27.ebuild b/media-gfx/sane-airscan/sane-airscan-0.99.27.ebuild new file mode 100644 index 000000000000..61f7cc9da931 --- /dev/null +++ b/media-gfx/sane-airscan/sane-airscan-0.99.27.ebuild @@ -0,0 +1,40 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="SANE backend for AirScan (eSCL) and WSD document scanners" +HOMEPAGE="https://github.com/alexpevzner/sane-airscan" +SRC_URI="https://github.com/alexpevzner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + net-dns/avahi + net-libs/gnutls + dev-libs/libxml2 + virtual/jpeg + media-libs/libpng +" +RDEPEND="${DEPEND} + media-gfx/sane-backends +" + +PATCHES=( "${FILESDIR}/${PN}-0.99.27-makefile-fixes.patch" ) + +src_compile() { + emake \ + CFLAGS="${CFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" +} + +src_install() { + emake DESTDIR="${D}" COMPRESS= STRIP= install +} diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index df9c2d98639e..60171e34c49a 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -12,5 +12,5 @@ AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71 DIST backends-1.0.31.tar.gz 5731445 BLAKE2B d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298 SHA512 d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb DIST sane-backends-1.0.32.tar.gz 7349442 BLAKE2B 8841542ffd520b38bbeb532eaae7cce803f0bd868cae7edc28d2138729dcffb5a2a0908b56c16c25ffbba539525331c12c259e1768e105de1bdd1419d29efe83 SHA512 416757d9a69bbc18678d1f16a024ba5a949c571204a68f36009d416be28723886ccea71daaa7da90d20eac9696cd44e567802d6c21c3fc5914b97213bbedb6d5 EBUILD sane-backends-1.0.31-r2.ebuild 8554 BLAKE2B 20ef534583a3052e699693472bca958e49426353f6f1cf8e721690657c657e1411fcbf7c49ed28a84367afbd5e1f40a70bf3551a06d3d0e169b3dbdf6d89075e SHA512 690006aef47beaaad149199cef5ee694a6fa74913e30dc61d14aedd1558ef8e14f238e88d71c316a4c38f29f4e6a069f9ccd8508f5ec536864d192eb504105cf -EBUILD sane-backends-1.0.32.ebuild 8378 BLAKE2B 77be0023958ecc1ab0d7b5540d64ddde7e47199a78d9f9dfdcb20a0b613b4734f80ce3ff3439956038f4beb05822ccaf91c1fee6124bb2ad780e058c760a4eb3 SHA512 bc66b785de5b525eaa37b80437a80b70b3353aedc86227ad74cfd8fdaa59919ba8801b5e5f8b73c55b25062cb8ea47b00728100b25ceb40f741d396ab29942e3 +EBUILD sane-backends-1.0.32.ebuild 8439 BLAKE2B 300c5dd0fbf88740441f8352ab7d4a2b6460ea431a2464669bfab2bbf04d1b99e4812bbd38a801195ca1da22f9e7384a21d5e41d5dfec4ab932b64c1e9af36af SHA512 336272f09744155e20970acc72b279c1efdcaebf531297490e7201fda2c5c4d78d3865aac2ec148694db8fe7982419af004396f3e3514ed4ff615753251176cd MISC metadata.xml 267 BLAKE2B cf3ca2583acfc7c5d4b3e053cef4d72bf240aa58c54e8a0f72b9393ee8587bd587d4a88bad4b041cfd50d4465879ed546afa71b6e4570477b376a92ab47bb415 SHA512 d471748b0a9f7d7d4aca203c6bd1ff222f3faa455e7d1df2f8437a188922a40e3a656a5e20032256caf58d664e0f723e25055871e62d102e0c677264942b6fb1 diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild index 36bb18f0a982..8b3d4b7763ca 100644 --- a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild @@ -337,6 +337,7 @@ multilib_src_install_all() { } pkg_postinst() { + optfeature "Network scanner backend" media-gfx/sane-airscan optfeature "Epson-specific backend" media-gfx/iscan optfeature "HP-specific backend" net-print/hplip diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest index 1bcd5dc32bb7..1e243432643b 100644 --- a/media-gfx/viewnior/Manifest +++ b/media-gfx/viewnior/Manifest @@ -1,5 +1,7 @@ AUX 0.17-Replace-calls-to-getenv-with-g_getenv.patch 1182 BLAKE2B 37a7f395e35a8ac3edbfd3b8d057275c1981347c6e5018c8bca29322ebc33a32b16e0880bddcd394cb9da4315eb26592f9342d8cf58c88f1a29f902e858d8f97 SHA512 190f6b1fd7f4640022274207254be0967718c3d602bc521557a3e4eed6afca274bf650cf9e06ed4ec9a0527eca6b45c39c4b8e1091064b8408dac8033ca07c9d AUX viewnior-0.17-update_metadata_location.patch 1260 BLAKE2B c3b522f56bcc039978e559f3f0bc4095f5b7750c5d3b54ada39c43631275b0e619a0aed04cabe6a6ca7c0237bed687f46db0eff226f6ab8a6184b08783e09628 SHA512 6ce85095c0cbecfa4d2e9da1a9fa76aec0ef38a585d9aa588403fe9afb76b3faf041144b050e56ad6ec87769cf164c4d7f854003a09d7e21919205903f0f0c2e DIST viewnior-1.7.tar.gz 165719 BLAKE2B 906ab0b632fcc102ac62dd77d6742c2121c46cd92adc0dfe9ba772bf697eff356519dbb6219016a6470903c855aa4c9081f0d61ca1607d8d1b6d8e03236a19bc SHA512 5ba17d7b5ceeffa65b04213f179c1439b09ac44e412e0750dde159b118a714f28d3a290509a402b234e4e7ba5b185fc73eef65d418598f344911e4e2c1373fe5 +DIST viewnior-1.8.tar.gz 169219 BLAKE2B 6f6da16aa987acce8a48d24a645e1c033f113bb6e291da9f17810a7a04e5007d27c2f1afe3c62cc2d192003633a4128fb04a031160fbd51efbd0bb7dfabd8970 SHA512 0f9698801172ef6b8f5df4132526b2e605e9aa9fd69cf41a091a3623de9b2e84ca857e625aaa9e83f29df318f70a13fb458bac0df11ae46837b78ef257a00bee EBUILD viewnior-1.7-r2.ebuild 1167 BLAKE2B 138ed55bfa3439f8030218cb981459eeb4c5347e159f6628e7b22ec5a275892a1aafc85c8d19e34cafb0764284bb4001d7c25c22cdc53a3dc762b8e63a72051e SHA512 520c347b2388a4d31adbb90492ef32577223fa24bc4df6e3c05e316f9bc482ad424894054cf3424fd80d1fa17eef601211387cb70a460905eaba9a6405f08aef +EBUILD viewnior-1.8.ebuild 1022 BLAKE2B 2fed3ab9103e8f4c46b52f5818087778e496dad4f979d456f003e9d2e4b8704168ef6954128a692df28043241000d0291ece9baf559246beb4f7735a1e728693 SHA512 0b28968d170e34e7500451e22fecc10adac21d847131999fd23995a5ced06aa4c5cf3faa3340f5e06a05e7ebc06b5a5a8bbd9ac5140f04e493464ff1e1973ab1 MISC metadata.xml 553 BLAKE2B 7fa77da8d1dcd0a0b6d53f1de26b13ead4edaf6be6ea93858328ce412c7c97e40240aebbedd68ccc66469992b637b11d14763435e3451ac16dc1a1a72e9f2e2a SHA512 e3b2daa2db92f02e6e2c7e51828a60acd9b74a99949643e1cdc429e9f02dacf0e3f7b7d7c8bc86c10eb46fe1aaa06f3b07d8e7ddc491951f8e14f881d69c61d0 diff --git a/media-gfx/viewnior/viewnior-1.8.ebuild b/media-gfx/viewnior/viewnior-1.8.ebuild new file mode 100644 index 000000000000..bfc5e7d7d105 --- /dev/null +++ b/media-gfx/viewnior/viewnior-1.8.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson xdg + +DESCRIPTION="Fast and simple image viewer" +HOMEPAGE="https://siyanpanayotov.com/project/viewnior" +SRC_URI="https://github.com/hellosiyan/${PN^}/archive/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +RDEPEND=" + dev-libs/glib:2 + media-gfx/exiv2:0= + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + sys-devel/gettext + virtual/pkgconfig +" + +S="${WORKDIR}/${PN^}-${P}" + +src_prepare() { + # That script would update icon cache and desktop database. + sed -i "s/meson.add_install_script('meson_post_install.py')//" meson.build \ + || die 'Failed to remove post-install-script invocation from meson.build' + # Don't let meson compress the manpage. + sed -i "s/subdir('man')//" meson.build \ + || die 'Failed to remove manpage compression from meson.build' + + default +} + +src_install() { + meson_src_install + doman man/viewnior.1 +} diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest index 9d4aa910353d..2e180b8e78c5 100644 --- a/media-gfx/xpaint/Manifest +++ b/media-gfx/xpaint/Manifest @@ -2,8 +2,6 @@ AUX xpaint-3.1.3-gentoo-prefix.patch 3605 BLAKE2B c513a72991ec83b99fc12d90c112c7 AUX xpaint-3.1.3-gentoo-qa.patch 1480 BLAKE2B 43b80854e8d0bb68566f86116444507852bf61807846ec97238a90fefc8a86f9be3978858c12af3278b787b14f805edb628327ae411b8b6fbdcd7530ee72cbd5 SHA512 cfa7057625f3086b573f9109a89f29e1cf17c15d253a0c903bd0f315e4aac3d8111df899ef98d0a3416486d81305f0a041f061985d31d435ccbd24b0fc5a57b3 AUX xpaint-3.1.3-libtool-clang.patch 1434 BLAKE2B d89978f8c925a64fa62ff2a0788ed81ca5faee6a71afda069930a7381e2bb095bbad3c1236c3594532afc5441ef789bf6ea0571b4bb25065e2cbef7fdc52ebe3 SHA512 f4027619c4eda686953fc33c62518a7ef12db09e6160f5e038179aa06f64629d2ad28b373ec332fe3266fd7e15af77577b6a60cfdffb165afe1358519201c399 AUX xpaint-3.1.4-gentoo-shared-lib.patch 503 BLAKE2B 12bae42eb3a119c8acb3c5a6436191bf65c9697f6d743531633f0d64f5cdb26270f659eb0725a26efcc780cc06f91cf7f4e4f5032cf72f21614f3f7e48615b25 SHA512 971fb77386f2a896605d05346c4cf65fd68bdcc7b2f82e1319059f1c4ac37b0d76585c8ff0ce6d5841639bd94b420ac29b2e5275fe9309b31549cc540f2a9833 -DIST xpaint-3.1.3.tar.bz2 1656489 BLAKE2B c6f5ed4a6c990dccacc572c834fabf68a16cacfde477915e5c3598a96335a899344d4375a48e6bf06fb601e9b260a11cc2b43afb404a83b9fb7b3044288ce1fa SHA512 8ef15d6af4b65d9da18d3e5eb9eacc0b42e718d069e20de91f2e0352b642d0a4b7626a2008fdd6217c0668ed1ecdc7a09c4a993a6074c77b7899b4613c1c4bda DIST xpaint-3.1.4.tar.bz2 1630009 BLAKE2B 6090156f0c27742487edfd24e803e814d7f2801c3847a5435a896e575ee3bf0b17f498e8ba8f4b7a87536780dd7c15ec7e0c0e0acb28b225d95ed0c835abfa97 SHA512 ea81f0f0eaad2072fe487efba933b6f0a4f2a4d8ae7548169b8e765cf1232c9944149a822173350af91309535d8f3625b8e58814811a5f4491fa3e2fcdf92e1d -EBUILD xpaint-3.1.3.ebuild 1941 BLAKE2B 5e739c74c5341e48c973cb0786b96f56724ea602cf463855d2e587ce67a5437620585bfa84b8b6de2707c882453c43e3f1181e3f76fae69ad6ca73725d60caf4 SHA512 3b073c54cc13783430d34d6777eab200953dff07d01c529fc6ba1a5ff21de390a98758b588388fcc217c06783f335033f2de71275961b5563d68aa231fdc7dbf -EBUILD xpaint-3.1.4.ebuild 1833 BLAKE2B e0059015e593960e104a5270bc7122d51c4b0589cdc0d6bb3c617b3b0845de5b7a0a92c09d12fff5abe813646622307edfa5e67f1c87da6c0a9e2d152c131963 SHA512 afb301b6c6e0c93cb1157acfbdf91f7240d786e36a06319a41cba49c438597832dff70bc66380903a155fc77f33bf5d08fcceb7665ab4c434c0adf6dfa303a3d +EBUILD xpaint-3.1.4.ebuild 1831 BLAKE2B b58a61ef1b8713afd3483f0222aef890c88a439551ef417d1cd3b88f5429eecba6b141485ad60856083b5794acebb8a91f3dbe4c2668ab419656d7f3393b45b7 SHA512 f8c103d2e97011cece1ca579b12d186eefd10478f591269b234297edd6c2a6f166384fb329fb92fcf920d717c2a6011aaa5cf023fad771e1d1cb7296d338ab4a MISC metadata.xml 1440 BLAKE2B 54c11ed5ec99921d5ff28f23ee6be2df1fb2d21b3a994c92a94f0edfb2b69116620767bb51811c095736c1f1a7fb4205d6f1971997d81ca9f3c17c6c394d3068 SHA512 34c889965c22aa055b0205d0f93b45f51572958bf0ac992a781a3a5c679303081c368e4af35fa4c4699e8ac4724e125b4048b2d2856c408092cd4c7859728880 diff --git a/media-gfx/xpaint/xpaint-3.1.3.ebuild b/media-gfx/xpaint/xpaint-3.1.3.ebuild deleted file mode 100644 index 1c03f7e9b5fb..000000000000 --- a/media-gfx/xpaint/xpaint-3.1.3.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop toolchain-funcs xdg-utils - -DESCRIPTION="Image editor with tiff, jpeg and png support" -HOMEPAGE="http://sf-xpaint.sourceforge.net/" -SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="pgf tiff" -# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592 - -RDEPEND=" - media-libs/fontconfig - media-libs/freetype:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - media-libs/netpbm:= - x11-libs/libICE - x11-libs/libX11 - >=x11-libs/libXaw3dXft-1.6.2h[unicode] - x11-libs/libXext - x11-libs/libXft - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - sys-libs/zlib - pgf? ( media-libs/libpgf ) - tiff? ( - media-libs/jbigkit:0= - media-libs/tiff:0 - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-libtool-clang.patch - "${FILESDIR}"/${P}-gentoo-qa.patch - "${FILESDIR}"/${P}-gentoo-prefix.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable tiff) \ - --disable-libdvipgm \ - --disable-libopenjpeg -} - -src_compile() { - # clean up - emake clean - emake -C util clean - - # parallel make still fails sometimes - emake substads - emake xpaint.1 - - # regenerate resources in app-defaults - rm XPaint.ad || die - - default - emake \ - WITH_PGF="$(usex pgf "yes" "no")" \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - includedir="${EPREFIX}"/usr/include \ - -C util -} - -src_install() { - default - emake \ - WITH_PGF="$(usex pgf "yes" "no")" \ - DESTDIR="${ED}" \ - -C util install - doicon icons/xpaint.svg - make_desktop_entry "${PN}" - find "${ED}" \( -name '*.la' -o -name '*.a' \) -type f -delete || die -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/media-gfx/xpaint/xpaint-3.1.4.ebuild b/media-gfx/xpaint/xpaint-3.1.4.ebuild index 64e86898d496..adb623f11685 100644 --- a/media-gfx/xpaint/xpaint-3.1.4.ebuild +++ b/media-gfx/xpaint/xpaint-3.1.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="pgf tiff" # jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592 |