summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-02-28 16:04:24 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-02-28 16:04:24 +0000
commit158e7d0067767d034ef3a86a07afbf5bb9bf579f (patch)
treee845f4403370242aa438d03c25ff5813f01af6a4 /media-gfx
parent24a48769f03b243065aec42c384c39a2d2306964 (diff)
gentoo auto-resync : 28:02:2023 - 16:04:24
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin37957 -> 37973 bytes
-rw-r--r--media-gfx/darktable/Manifest3
-rw-r--r--media-gfx/darktable/darktable-4.2.1.ebuild8
-rw-r--r--media-gfx/darktable/files/darktable-4.2.1_cmake-musl.patch22
-rw-r--r--media-gfx/gmic/Manifest6
-rw-r--r--media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch16
-rw-r--r--media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch28
-rw-r--r--media-gfx/gmic/gmic-3.0.1-r3.ebuild176
-rw-r--r--media-gfx/gmic/gmic-3.2.1.ebuild138
9 files changed, 171 insertions, 226 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 01834c6b614f..24eb46fce5a1 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index ef49b981c080..02234273b17b 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -4,6 +4,7 @@ AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556d
AUX darktable-3.4.1_libxcf-cmake.patch 788 BLAKE2B b6ecb84de804b0bf16f907f825d93d00a62c1d996077514b3e55f370347f47e561707cb8da6a270aa42c3320142437691cc8b132718c485b5b7df40068d41ee5 SHA512 d94247c4f2c3b4894bd6455cd036a62ef5edb90a77bf8f930efc3e540d00712000fe8eeb7d4c937fa826aef1dd129448223c8696ff094e823894b17ef2669a4e
AUX darktable-4.0.1_libs-deps-automagic.patch 968 BLAKE2B e81e63814185d38cd850108492e656c4760b35b76b52424f06c9cf25ee5e33dba1ecd92507827451b1096e7caeb1793ca6877ae70f15d5b1e10c7c986a08bc0e SHA512 c36b21a0eb265a5da0fb75e766ec260bc9ab36d25503ff0d0406dca1cbb9cee04bed96ecb7f4ddb0f5ac2352a85577c458dd28affdd4d3bb5e3cac982022eef9
AUX darktable-4.2.0_libs-deps-automagic.patch 1796 BLAKE2B da5c62e7331435bdcf8c72fa5f488a969c8fa1178782be6116add4a1c3212a8ac4169ab3657044d9d2a0c57ea4734f5aa867e1006faf6bee49f9f66d146afb04 SHA512 7998b809a46be079ac50109158c19518663489f2fd928a329461ef4d3be3aef59afe78cdf70fc80f4e9e4a0d11620e448cf538b132d85e8035416e49faef3f9b
+AUX darktable-4.2.1_cmake-musl.patch 796 BLAKE2B 2e26cc969f01dc948f4f92f42c768a28bb879b3592d98dc1de0c3b5b7335a2985fbb5659c58b421fbca896b1f2585a5cb993b5cdf3ee6f87d9834afe3fd1a23a SHA512 82c7a4f6d6112fa024503a99e05d3050922b120821c93922ae846f9da6b02cd6f2e27315448c20ed1032c5526b85cb6d01dd6eec5109db1af3f8e92e4818ea06
DIST darktable-4.0.1.tar.xz 5958392 BLAKE2B 677ee85d8b353e9e4fa015226e7383b98b90b319f99142ce8c146c75b3a65a6f057412e8f2a4741d03c5e0a1bd60156245328380e1446c511ab2fb810077b0a3 SHA512 f7107024e52cedeb7775b410329e15a667c97f115d5722530add7d3d542974df1ceabeb7f33161d31e0388a682825941947fb9da2546ea2865a090acb7448729
DIST darktable-4.2.0.tar.xz 5862080 BLAKE2B eb1c6ab821587cd9d79628d2be24659db6e698a52ee7a7f830b386dd409c96b243a017644a09cf38fcc366c9d7563d057200904aed3ac6f17d4a07fc2758f466 SHA512 17f3e1a97f0af8928b6a7936e1f8923e164344c6adb8393c7aaabce6e62541f2d941929b331283d4f73c477081850c98d694d01f9a002add71c0a41e2272289f
DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752 SHA512 05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d
@@ -13,5 +14,5 @@ DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 144b7e76567e92138c7e75c996
DIST darktable-usermanual-4.2.uk.pdf 26454596 BLAKE2B e497c87903f85ae7ebb9b9624124ba19936869db6d19d229182e5d249938f5d9461435ac7ae15f9a2fd64b367aa712ac1de5f32d053cc08a99a3bd672e8cac0b SHA512 ba37d680f29d2d79f517360a1b43d88b49cf5810b638aa5bc6eeeb8016bd1634801119c2d283473bafc72920db2525b122815fa475bac0c41a6cc8d2ac579a61
EBUILD darktable-4.0.1-r1.ebuild 5778 BLAKE2B 67016be74606a3580c446135fb5059f82cd3e9ddd05f6b0acb9009b9b7e0e286d9ac73ccf1382511b35e13e03f0b438bc6bf94cbf55d6f8aaa6b54443533714a SHA512 e1debafcc7d037589843a1dc481dc3b2c3b7baf3ed7de27349bfa99fea96366f4926417c8e4929b62dfbfee7f8eba8d019c238654403d4269a7e0d304d1c93d6
EBUILD darktable-4.2.0.ebuild 5776 BLAKE2B b7d6a90bbbc614dfec6bc15589f1cfcfca66164c65ae36d4fd47d983affc1fcaa27bcfa12da1cf8e9da8e62660bcaab4446ee114680ed81dcaeacca0bd17b5a4 SHA512 ce3ee5c4ed754dbb531926174f618a0edb2dbe9ae7cd60920025ddafd946e884c409a83f782f82ba10f3c945cc53534522b208df16c72c6dbb161d2188497340
-EBUILD darktable-4.2.1.ebuild 5683 BLAKE2B 1f5f946b5bd09a721791d3e602a67a8aa2a60e056e32b63d85c300e14c4324072e8993c2990493bd6debf52ad5d99e1209450bf6cf9e5af20761eb2201ac7ac6 SHA512 558b4ba79dc856af46d492f74c38f98ca34fcd57bb241542f649703560ff6f26177ba5d7f87cd821a78762130404b758a34e8d54ffe24c3f2e633a6fb9a7afe8
+EBUILD darktable-4.2.1.ebuild 5814 BLAKE2B 6701832b455282f974a698a9131b3d3fe9e767e09d5fea9e14734be63f256191c9b0bb8685123203a9eb33af65ae06a041f967eee8d0625f9fd757feec4eebbd SHA512 ccd6ca8c52ac4a3d5eca2284dae4bd6369c2cac4a93f1edc246b2ac610df301e2ac1d9c0547c334e3811ce0277e1f79c1c5b53b04a3e21a03458b08faa8f496d
MISC metadata.xml 1378 BLAKE2B 7373550c5362c32832830bd94dbd712f963246805af5119214a43cfe4dfb1aac9e7bb03d4af6f4f1dfae3cc44e09d6ba8baff53d67b5ddd96115c460b5e19ad9 SHA512 ffdc1ff8eb068372b1f24691bb0832d5a845e49b41adf211dec1c2faf0d1a573a0e4c62c38e97758a8f87de15569ce6f3cd2c7a768c95eb0d2b166e30b20ae3a
diff --git a/media-gfx/darktable/darktable-4.2.1.ebuild b/media-gfx/darktable/darktable-4.2.1.ebuild
index 20656cde0bbd..aba89cc810c2 100644
--- a/media-gfx/darktable/darktable-4.2.1.ebuild
+++ b/media-gfx/darktable/darktable-4.2.1.ebuild
@@ -25,7 +25,10 @@ else
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}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf
- l10n_uk? ( https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.uk.pdf )
+ l10n_uk? (
+ https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf
+ -> ${PN}-usermanual-${DOC_PV}.uk.pdf
+ )
)"
KEYWORDS="~amd64 ~arm64 -x86"
@@ -95,6 +98,7 @@ PATCHES=(
"${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}-4.2.1_cmake-musl.patch
)
S="${WORKDIR}/${P/_/~}"
@@ -136,6 +140,8 @@ src_configure() {
-DCUSTOM_CFLAGS=ON
-DDONT_USE_INTERNAL_LUA=ON
-DRAWSPEED_ENABLE_LTO=$(usex lto)
+ -DRAWSPEED_ENABLE_WERROR=OFF
+ -DRAWSPEED_MUSL_SYSTEM=$(usex elibc_musl)
-DTESTBUILD_OPENCL_PROGRAMS=OFF
-DUSE_AVIF=$(usex avif)
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
diff --git a/media-gfx/darktable/files/darktable-4.2.1_cmake-musl.patch b/media-gfx/darktable/files/darktable-4.2.1_cmake-musl.patch
new file mode 100644
index 000000000000..33ad7f647752
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-4.2.1_cmake-musl.patch
@@ -0,0 +1,22 @@
+--- a/src/external/rawspeed/cmake/Modules/cpu-cache-line-size.cmake
++++ b/src/external/rawspeed/cmake/Modules/cpu-cache-line-size.cmake
+@@ -2,7 +2,7 @@
+
+ unset(RAWSPEED_CACHELINESIZE)
+
+-if(BINARY_PACKAGE_BUILD)
++if(BINARY_PACKAGE_BUILD OR RAWSPEED_MUSL_SYSTEM)
+ message(STATUS "Performing binary package build, using hardcoded value.")
+ else()
+ try_run(RAWSPEED_CACHELINESIZE_EXITCODE RAWSPEED_CACHELINESIZE_COMPILED
+--- a/src/external/rawspeed/cmake/Modules/cpu-page-size.cpp
++++ b/src/external/rawspeed/cmake/Modules/cpu-page-size.cpp
+@@ -4,7 +4,7 @@
+ #include <unistd.h> // for _POSIX_C_SOURCE, sysconf, _SC_PAGESIZE
+ #endif
+
+-#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 1) || defined(__APPLE__)
++#if defined(_SC_PAGESIZE)
+
+ int main() {
+ long val = ::sysconf(_SC_PAGESIZE);
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 342df65f1d19..e86b227e331e 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,5 +1,3 @@
-AUX gmic-3.0.0_ipa-sra.patch 665 BLAKE2B d1b47e2f0e8e63251172ee6cbc2c5b1bd86d100904a3d7bb0c5df39c051769b8b6c0aa0bb1f81010fd9ca195886a0dbce41528d31a811627ee28d1af58a83432 SHA512 4677fc93e72ed5e71a91197d364a04e1f8c6c13bb3f5b6eb5402a03c0d6ab395b54788669e028b932e207986121138419a58ed5f4333c0a45cbe6c0b9638ed96
-AUX gmic-3.0.1-openexr-3-imath.patch 1051 BLAKE2B 03d1cd6be5c5af76b6ecb071b46ee20abc4bd05d055fcd3ee21943ae5821c8c41e080b20d054b2f5e53cfbeb7326b8af6fa599182cdfd5e47679a57b47fa2f1d SHA512 83e9ec847328eef9f275f747ca6d2ac1071151cc7eb62ad70fa9de121d790e45d60514993274a44fe980537a793eaa56d397da5e207355fa2c9723bdafe7ff88
AUX gmic-3.1.6-ar_so.patch 758 BLAKE2B 95031f8c3af292ef91d5cdf94406db158c74864c644571ad98630f9b3bd57d816c512a103cf6dd2adc86aa859d06bf73b3596f0c789d3e0d373f0ae0a7a6505f SHA512 19b424e189ddd3b3660a8a80821a907de86f79f22f6014f9af9f8f895bdef0e61c023b9d6859370bfec018274bacf3d13a0da5addf62430b6020f290ccca3f6f
AUX gmic-3.1.6-grep38.patch 1200 BLAKE2B 6cfe274eb0577c9fb55b98564dc7a69e407ae8e7e80e66d62ca6d09485dbad4f578a1c2569041887040d73c02c0865695afaf504a546c93aa3a5f3e9574d3408 SHA512 7bdb4f45aef020dd4a9071f4bfd995da078526b37d693781c463d866e31a6bc1387c46035007fc4fcb9e2b871c42886483142aa4e8c244d5bd9e684a7e98e8af
AUX gmic-3.1.6-makefile_automagic.patch 5327 BLAKE2B 0df03edbba289d327957a2e703be955dc357e12047e6f1d95a19fc906e4f42d395c2964d10220f642e9a0091b9349d2872066b787b3ae29ca7e231b21bec280f SHA512 80b28b476c61d80466d389924758a218591f5a50edd4583dfd8239d4f8f5a684da1403f7638ca2c99d8038a1135b15b95a87c51bdb65c7f637ce613429922143
@@ -7,10 +5,10 @@ AUX gmic-3.1.6-relative_rpath.patch 400 BLAKE2B 0f457f585d7efde1b05937f1baa240f6
AUX gmic-3.2.0-grep38.patch 1330 BLAKE2B 22a241d8c574ca87691ec84107c718aa36404325891e3f50458753cc9051f1da3100206286ebeab2142360146b81b94ba3c063897722dd7b01730790f5672276 SHA512 46c078ef39cae6a0763a6e4e8d6ff9ac736b51e0b5f73fc6f75609fffa06eddd895f6803b5d39cfcd3bccb6e09549bdc0ca2ca3a7c1a2c8fa075869599eeb7d1
AUX gmic-3.2.0-makefile_automagic.patch 5397 BLAKE2B f5678cf7aba485c9d035fc34c0a2a75133567e6c4b91dc0a58f8511f8858c6c5facc4fced4fb4582a2336d03b68f6a5e95cc3490de0385e4a083568a20769c17 SHA512 904dbddee273c6ebb80d94e24a508043766e43c712464d02631fa584634248379f01e989749d218965afa593865883da2ebe267ac9b1755ca116573cdcfeeb73
AUX gmic-3.2.0-relative_rpath.patch 406 BLAKE2B cb92f21c090bfdb3c91aef60fc854fd21531ba8e7560458503ae0c123baf89a703057b870dc9a4366f179575373861696dedebd930c472a51644d4ef41553520 SHA512 8653697eea7da0b0db5ad9f7d8882a147a6aa9bd80085e6bfba21922431e52fa0b7e67c1c74afe8237a994861864f1df07ca2855c5d99bc0e69d0c630f11ebc7
-DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a
DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775
DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b
-EBUILD gmic-3.0.1-r3.ebuild 4205 BLAKE2B 71f6968b9f8b6b4a242c5995c5f521c29830bf4a438d6e67f1f1422a0d2f7093b8b6bbf02338cc97cd302dbcf218edcda2ed6d532fcbd6ccd4163f7d23454a1f SHA512 15715c804177eeabb7184996526a8b9ff7a03c2c62e8207b0f3439a3425847f5bb142aa9b5820de776b227b12e72849e5ca62b2750bbef389c6b67e78a0a3625
+DIST gmic_3.2.1.tar.gz 11236401 BLAKE2B 8a68cee641892298e93373f9ad1a1ea4dd9995d813db7050a8a1c5f6658b2b08f9f9c4064dbef2a87e5350dc62c0bfa10d226a53ebff1962c3ad3a75ad318fba SHA512 c03a06acdf6669291602df4938a14de113d48ffa598b3c4af7975bd16aea37d426878ff0f593f22992da135a7b6e27fbb39dbaca4f89726ec367552f14be433b
EBUILD gmic-3.1.6-r1.ebuild 3509 BLAKE2B 0934a967523f764a803828dfdd37cc0e3ec0823058fda0c3e75c8f6f22c89e2c9d12c222681c747ece4b2ef63d3eef942285a180eedfaad96a07ff807249d921 SHA512 0180b54c193419f2c9bc382d1f59faa8fce136fc5d1ed87862b5107126133dd6424e7a930aab2c0eb414200be1676251c42924e99a17593ffb2d158919cc72c6
EBUILD gmic-3.2.0.ebuild 3459 BLAKE2B f0bb5422482b190bf24bc0af0478da7939183ebf40184ceb2b48f568bb662f06309faddddf8ea65f693c9780db6573011d24e9fba2d4a8709bdd77527c87b234 SHA512 9a92034fca2e8d309d73f7b5851506042e5036703a69b522e8d51c4a5e7f67b3d2258bbfcca42b241f5860b90ad607bdae552f9a8ab5fb58da10d410f8dafd33
+EBUILD gmic-3.2.1.ebuild 3459 BLAKE2B f0bb5422482b190bf24bc0af0478da7939183ebf40184ceb2b48f568bb662f06309faddddf8ea65f693c9780db6573011d24e9fba2d4a8709bdd77527c87b234 SHA512 9a92034fca2e8d309d73f7b5851506042e5036703a69b522e8d51c4a5e7f67b3d2258bbfcca42b241f5860b90ad607bdae552f9a8ab5fb58da10d410f8dafd33
MISC metadata.xml 466 BLAKE2B 672259377cf7d693bc2493557b22150ddd3504d5bcb3f7b11c8e7e9a8ff591573503e5c9481d8a81e27757d4ebe205dd51a0fb57c0e691461988bc99fc714fc5 SHA512 62d65a13a3061fb31954fc08d753f6df7d76c262dc1c14304c1473dbe3f3412fb77cf808f0f205dc73d124f6dd1104c13d9dc79194eba702a0acdfb112fe6530
diff --git a/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch b/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch
deleted file mode 100644
index 04cfa560f193..000000000000
--- a/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-A GCC-specific setting from years ago. gcc-9 quietly ignores it (the
-resulting binaries appear to be the same whether -fno-ipa-sra has been
-specified or not), clang fails on it as not recognised.
-Just get rid of it altogether.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -100,7 +100,7 @@
- if(APPLE)
- list(APPEND GMIC_CXX_COMPILE_FLAGS -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive)
- else()
-- list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fno-ipa-sra -fpermissive)
-+ list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fpermissive)
- endif()
-
- if(NOT "${PRERELEASE_TAG}" STREQUAL "")
diff --git a/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch b/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch
deleted file mode 100644
index e97ef6bf6138..000000000000
--- a/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://src.fedoraproject.org/rpms/gmic/raw/rawhide/f/gmic-openexr3.patch
---- a/cmake/FindCImg.cmake
-+++ b/cmake/FindCImg.cmake
-@@ -147,7 +147,10 @@ if(ENABLE_JPEG)
- endif()
-
- if(ENABLE_OPENEXR)
-- find_package(OpenEXR)
-+ find_package(OpenEXR CONFIG)
-+ if(NOT TARGET OpenEXR::OpenEXR)
-+ find_package(OpenEXR)
-+ endif()
-
- if(OpenEXR_FOUND)
- list(APPEND CLI_COMPILE_FLAGS "cimg_use_openexr")
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -307,8 +307,8 @@
-
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR)
--OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf)
-+OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath)
-+OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lOpenEXR -lImath)
-
- # Enable Fast Fourier Transforms, using the FFTW3 library.
- # (http://www.fftw.org/)
diff --git a/media-gfx/gmic/gmic-3.0.1-r3.ebuild b/media-gfx/gmic/gmic-3.0.1-r3.ebuild
deleted file mode 100644
index bb07cf674b67..000000000000
--- a/media-gfx/gmic/gmic-3.0.1-r3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X zlib"
-REQUIRED_USE="
- gimp? ( 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=
-"
-DEPEND="
- curl? ( net-misc/curl )
- fftw? ( sci-libs/fftw:3.0=[threads] )
- gimp? (
- media-gfx/gimp:0/2
- ${QT_DEPEND}
- )
- graphicsmagick? ( media-gfx/graphicsmagick:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- opencv? ( >=media-libs/opencv-2.3.1a-r1:= )
- openexr? (
- dev-libs/imath:=
- media-libs/openexr:=
- )
- png? ( media-libs/libpng:= )
- qt5? ( ${QT_DEPEND} )
- tiff? ( media-libs/tiff:= )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- )
- zlib? ( sys-libs/zlib:= )"
-RDEPEND="${DEPEND}
- ffmpeg? ( media-video/ffmpeg:= )
-"
-BDEPEND="
- virtual/pkgconfig
- gimp? ( dev-qt/linguist-tools:5 )
- qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch
- "${FILESDIR}"/${PN}-3.0.1-openexr-3-imath.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
- cmake_src_prepare
- sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
- if use gimp || 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=no
- -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"
- local 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 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 qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
- cmake_src_install
-
- 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 qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}
-
-pkg_postinst() {
- if [[ -n "${REPLACING_VERSIONS}" ]]; then
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "${v}" -le "3.0.0"; then
- einfo "Note that starting with version 3.0.1 ${CATEGORY}/${PN} no longer provides a Krita interface."
- einfo "Please use the built-in G'MIC plugin provided with Krita 5 instead."
- break
- fi
- done
- fi
-}
diff --git a/media-gfx/gmic/gmic-3.2.1.ebuild b/media-gfx/gmic/gmic-3.2.1.ebuild
new file mode 100644
index 000000000000..e37b2cb59f90
--- /dev/null
+++ b/media-gfx/gmic/gmic-3.2.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"
+SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
+
+REQUIRED_USE="
+ gimp? ( png fftw X )
+ qt5? ( png 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
+"
+DEPEND="
+ sys-libs/zlib:0=
+ curl? ( net-misc/curl )
+ fftw? ( sci-libs/fftw:3.0=[threads] )
+ gimp? (
+ media-gfx/gimp:0/2
+ ${QT_DEPEND}
+ )
+ graphicsmagick? ( media-gfx/graphicsmagick:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ opencv? ( >=media-libs/opencv-2.3.1a-r1:= )
+ openexr? (
+ dev-libs/imath:=
+ media-libs/openexr:=
+ )
+ png? ( media-libs/libpng:= )
+ qt5? ( ${QT_DEPEND} )
+ tiff? ( media-libs/tiff:= )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ )"
+RDEPEND="${DEPEND}
+ ffmpeg? ( media-video/ffmpeg:= )
+"
+BDEPEND="
+ virtual/pkgconfig
+ gimp? (
+ dev-qt/linguist-tools:5
+ media-gfx/gimp:0/2
+ )
+ qt5? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1.6-ar_so.patch
+ "${FILESDIR}"/${PN}-3.2.0-grep38.patch
+ "${FILESDIR}"/${PN}-3.2.0-makefile_automagic.patch
+ "${FILESDIR}"/${PN}-3.2.0-relative_rpath.patch
+)
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+gmic_emake() {
+ local mymakeargs=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ STRIP="/bin/true"
+ LIB="$(get_libdir)"
+ OPT_CFLAGS="${CXXFLAGS}"
+ OPT_LIBS="${LDFLAGS}"
+ GMIC_USE_CURL=$(usex curl)
+ GMIC_USE_EXR=$(usex openexr)
+ GMIC_USE_FFTW=$(usex fftw)
+ GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick)
+ GMIC_USE_JPEG=$(usex jpeg)
+ GMIC_USE_OPENCV=$(usex opencv)
+ GMIC_USE_OPENMP=$(usex openmp)
+ GMIC_USE_PNG=$(usex png)
+ GMIC_USE_TIFF=$(usex tiff)
+ GMIC_USE_X11=$(usex X)
+ QMAKE="qmake5"
+ )
+
+ # Possibly unnecessary since 3.2.0, just in case though.
+ tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" )
+
+ emake -j1 -C src \
+ "${mymakeargs[@]}" \
+ $@
+}
+
+src_compile() {
+ gmic_emake lib libc
+ use cli && gmic_emake cli_shared
+ use gimp && gmic_emake gimp_shared
+ use qt5 && gmic_emake gmic_qt_shared
+}
+
+src_install() {
+ # See below for why this has to name a directory even if USE=-gimp
+ local gimp_plugindir="/deleteme"
+ if use gimp; then
+ if type gimptool &>/dev/null; then
+ gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins"
+ elif type gimptool-2.0 &>/dev/null; then
+ gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+ elif type gimptool-2.99 &>/dev/null; then
+ gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins"
+ else
+ die "Cannot find GIMP plugin directory"
+ fi
+ fi
+
+ gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install
+
+ # Upstream build scripts create PLUGINDIR and write some files to it
+ # regardless of whether the GIMP plug-in has been built or not, or even
+ # when they haven't been able to execute gimptool to get the base path.
+ use gimp || rm -rf "${ED}/${gimp_plugindir}"
+
+ # These are already gzipped in the source tarballs
+ find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-29 00:29:14 +0000