diff options
Diffstat (limited to 'media-gfx')
38 files changed, 392 insertions, 2216 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex ca52f6a0dd38..255cd2c262ce 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest index 67fc749aeb6f..e2bbdc8cba69 100644 --- a/media-gfx/asymptote/Manifest +++ b/media-gfx/asymptote/Manifest @@ -6,6 +6,6 @@ DIST asymptote-2.89.src.tgz 15133552 BLAKE2B bde5acd3e76543b3c936e785ccf081c3868 DIST asymptote-2.90.src.tgz 15154576 BLAKE2B 57e3c4287f2e8a6b6f3d660cdd04bb753b435294d4769bbcf84d6c7bf80c813609528767af7d19853d9f72f4f1ce9e6a8dcc6a75731a2f3d16098d5da5b81b6c SHA512 2d050f7a2cfc34d2d6b5382a48e7bf09031d98a77e61b654b4af84b5e8e11553a9a713a6dea8d09291761427d7134742a3d266e57ac57ffda3587ec0487ecfca DIST asymptote-2.92.src.tgz 17075592 BLAKE2B 426fe3bb652f2f227d6f8cdd8e05c4b4bf0e2a0c47b3c252c5efb189ad3e7a0946664d714f161f70a9715f75dadf5510445e404d8c2e7b33f9e710200965caf0 SHA512 242a91357e7f0d2a4fc786fa881498d09d5b3b679cf1ee83e6af49f645935699a6e703eb8069446e11098028bc0cb0549f527695d3ea289066124d707c592559 EBUILD asymptote-2.89.ebuild 5547 BLAKE2B 8314b3258329322d6be911bacd9c5137d47ecc4515a2817be74c3784fbfd96bcb7cf2fa7c69e4396c2f0e9b752a292da4fbe00ca6931eedab0e91979fdf4186b SHA512 76dcde2b5e188c61728a933d264c541a795f0f808bba8eb565bb9e575d64f05ac38e163ac83cd747e9d3556acb9572a4934a33ca8833e2ba83bd9d58de3aead6 -EBUILD asymptote-2.90.ebuild 5549 BLAKE2B fb57e59e1dbfd10b83fad667f9145e6c5ac320f568d2a54e075c5336b698394c9d430baad91a555422bf9bf19d6f28f2d396778e01cc2f1bb595fdf165d58913 SHA512 d1b59c64bf4b7fff721eb58c6e8a51e1b082e619b07452f99d6f9e1bb426c29b710f19127ef9df0b2ff0a137e0f3868d134640b3cad568a288ab36aa2b8f850b +EBUILD asymptote-2.90.ebuild 5548 BLAKE2B 9116bc91fdc3b2c118daa6b92495dbb7062c6b32ab26688d218fbb3206b2c120dde636d18e13b2b926ec865fcc2bbe1e07e2022d608f9d4397948466e3fd394f SHA512 1e9b02fda72b8f36fdd96569551134b63befead5387f3f78c8d55fe56e82bb0ff38d9692e69916da83e159409515b384886d65e6a91c0192e0fa1b4794f6f845 EBUILD asymptote-2.92.ebuild 5549 BLAKE2B af0982ef5ed10cc7c5e21a24ffba2cb36f50c9443e428611f4c5433475dd6ceb17daa5e292dfa584d8869131f5d7ad3eb1b598e50f06dc948c97efcb862e94ec SHA512 cd18f9dfa1c630474a3405aae76d90358d6b5f7a6e7bd60d563272bd22a5118a8776bb8ce8fa79306b137b47f2a7387e5f9448587975886e28e7f0125d544a94 MISC metadata.xml 1423 BLAKE2B 64dd5d6c928a11d4a47297362223164cb19d91f6a08a0582b66831e2e8e2d7594389c2244fa1527dfe945da0e67985f5c639e3dae2482f57b510bf828a4605ed SHA512 1561e416e56bca130a72f90886981f63224c21e2a077a7b93e6fdd877f38dd12dfa9e0b747840e7f459e2df16c5b08e0177d26c526eb21bebe00fa8c91326bc9 diff --git a/media-gfx/asymptote/asymptote-2.90.ebuild b/media-gfx/asymptote/asymptote-2.90.ebuild index aa22384f0204..a16009ab6145 100644 --- a/media-gfx/asymptote/asymptote-2.90.ebuild +++ b/media-gfx/asymptote/asymptote-2.90.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/asymptote/${P}.src.tgz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~amd64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp offscreen +opengl python sigsegv svg test vim-syntax X" RESTRICT="!test? ( test )" diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 2c907209e565..189e493d60de 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,31 +1,19 @@ -AUX blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch 4517 BLAKE2B 703b5c8b04a187941caaefaa51e71266a96bb64d3e623bdfe9192bfc57fda1ceb5e1e83e57d1d585f9e8358169a49e91dcbaecd4aa9fe809213a8fc1b3372be2 SHA512 91b12b5bf161b48ef192981d12cdda03ce23e0d5a7f3b30c5232598f3122872f53e98ba1ba154f12558ce6abc4a015760f1898dbeb16810ba52850e985a58ab6 -AUX blender-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch 986 BLAKE2B 6055d38fded76be0c3f1f42f1e17e434ba69be90a0fb032856b1a339683a28c6786e945fc88d7b39006efc090e198586e5ebebb8fa542e93bcb07b9b91f6ce1f SHA512 8c5259d54e687ae03316fa69efcee02dbbf2a374de6fa9151484795af7d602c2d603900f1b38b7d4a09d8cb66e73666e500cb37004cbca5a13241d9cb5442ab0 -AUX blender-3.2.2-support-building-with-musl-libc.patch 5583 BLAKE2B 193548ea61608b6a355912cdd11eba60c58ac7975612890ff26b95b0d8974e3ed871e9e3d5437b7e36fc22b6a711e7af672b87a4e4f0b0765b95e4065dbcb934 SHA512 225065ac63344084918585272badfd58dc542e4b9370351fa4ff246fb8568d18027bd1d07fc139ac247236b75690578bb598731e00ea18767ed8e9d34d35b2fc -AUX blender-3.3.0-fix-build-with-boost-1.81.patch 490 BLAKE2B ff9625bec6783a5a55d2d0a8b9afeae718e0c8d714aee42e89577158504b72f6cdc325a3aa4b21291319ed886f722d6216af8ba4680ff5cb046289c9f2dc9f61 SHA512 9a7bad9947c03e3265c07266fb901319665cb2869395c46e5a9a63953772a5af880b6f038e38a695bb9e0cbfaae1f1a08fa61b8a565d2081e6c8d9e6c7a80547 -AUX blender-3.3.6-cycles-gcc13.patch 299 BLAKE2B c20c113bf845cb55188cd53c4c3e52e2876430d5b708161afbfd6afd0a50fb7cc4cf099df2202fa8c149bb18dc82e9e880cd083f35b61faaff80852a39358e3f SHA512 8986fd86e1f060c7310e5ecbae8f968faae5257af92f248874d7bccade4b75890a51a97706be653a6441292f0a459aa88b9935f545733eb34ac3b324c0d3b2df -AUX blender-4.0.1-fix-cflags-cleaner.patch 2222 BLAKE2B 2006ddd28ad270417e7832dbb4499752c90e8f6e5372c601a6694ee53aa0f47ed8eaef356e9b605f5add6144ff8fd200a7d9642441a1f213ec92e50e23806842 SHA512 5e130d917db80706b85e49b79803bd19b229bcf6e317789812ff5c0dc706b2c7bf31af43e6a226ee6dea9ee478f76eaefc903657c693f1d2dbcd85f552f2578c -AUX blender-4.0.1-openvdb-11.patch 3236 BLAKE2B e749db26f88b1e5329741a09c306ddd109f3feb4249bc5c50299477145f21f6a465a9dd2daf347c95c2cac7bf446300f47ab5feecc7887cff061fbeacc611feb SHA512 f6bd6db94ff631328e6b9aabe678a5a55a32e9f0a02aada90c843b31548d151533cbfcd1a61652bdad7060dc1f31db9269133c4f115bda13b77fa34c930631ed AUX blender-4.0.2-CUDA_NVCC_FLAGS.patch 627 BLAKE2B 45c9f327ee6d2fbd45446ba0787f6de9dd77364a9a0b8b1b7683acfc5f359c5745df5747e4359ba0609cbc7dfbcb569e5f6ebace433f1ab9b87305435c9fd680 SHA512 13784a75a7fc303fa548c1d8c79e4435c40c32beb1f00c05dbe2731d1d3cd19ae202ff0b4ef9eff10e9bbd6c6f52024220a843d237dd91c27077bd91552dd6a2 AUX blender-4.0.2-FindClang.patch 451 BLAKE2B 4b57395d440b590f9b2e097b74fbcf46dbe12fd13536cb335b914246995ede928f1208872c5044e1d0ecb1a702d0c46b656eb4b3abc3b0ed149abaf0d74bd433 SHA512 21aa3e158585184dfc1ccd931b53142cf436507a9126f4cee465214e7183553d02451babc5a636d3eb4ae0fd3ed0f0effb7b8962889f6dbec3e9476a61d0bbb2 -AUX blender-4.0.2-r1-osl-1.13.patch 14364 BLAKE2B fdee46fa3c5b1dc9a48499573e6bda242e2aa5d57f17e8b1e1a262673c5c2912c75cc8c531a30bcc0fd5019c4ff50ae089d0987e15ff1d57137e00f903356738 SHA512 2020b4f34c50ab1bb911a3b37b95a3da2a7f754e0b0ead7f651664131aa19debc00f8a8d32871b467bfdce9d83c43ca4597309351512635fdaf35f98c82266ff AUX blender-4.1.1-FindLLVM.patch 1388 BLAKE2B 721ba19ba6bdfde1672889d530bbd252665c12568363920561b7cfb7491e98a130cf0accc197f46a760c1bc57357183ce89903f2555125097d23361f1fe39ea7 SHA512 b13e8efaaf711bfba2a015b65153988c7ca9042e58785a483987634110c2bbdaec311744c633b7402dfaaca321984a5dc3fc549689c21fe0bfd6c27d890289da AUX blender-4.1.1-numpy.patch 1060 BLAKE2B 76b4c83e852f25be042c2a8267ad2b55fcbf8c3d4c3c2d1e8640e349174029de13a791d53e66215126dc76cdefca40b1e9f253e317f02f6d40a04652e9519bd5 SHA512 d3047c0eba1ce6d4cb68df65bd1563b7eb7c14253ff82edfcdae0a19d8270027a45273442258e0afef19bf1e805b99b91ae76a95fb4a0ada0454ee75f36c43b1 -DIST blender-3.3.15.tar.xz 41928632 BLAKE2B d93d7d47183fcd7afa547b8d3f0bd7240ea204dcce885f42d79d29352ebacac43a2f92e380f576c2688d2d90d910caff069484e22669847b0eea71079a8bdc7e SHA512 d55223b7b9ae9f9c6fdbf5ed2988e997693fcb8262196acb08bbe58bae86f9f34474ed1cf5a213ee0247225601726265ded3cb4ad4d89910fc247f9cf5fec1ff -DIST blender-3.3.21.tar.xz 41940868 BLAKE2B 74874226a0f690d2b81c0f96c441f519bd37ff0fec5c2dcae0f4f673d55863e2b2edbd60d2ed05890c440c5287e4cab943646cf4029d7c8287a636ac405e9bce SHA512 715a9808b25fe4c90ee3097edf21bdb3facfec51df0f6b6c6404a95bafe417d1e4998994f532ae9bac1e95de84cc8fd8fce8f8e672f9117646ad840074344d0e -DIST blender-3.3.8.tar.xz 41915180 BLAKE2B 7fb24afe2151bba53d8c25160bd697145aced74a8cd9a7ac92b2f66bc0ab59e995009f20f9e9bb622b05d614919137153805a2e233de5b0bb0a41a2ac3405a76 SHA512 63aef1e543a9c8bbc5f8838292ad2e8d0d9a8ee6fd2d71a419c1edc1a0ee1f59f7e9eab59bc20bf32ca56ba440bab1534c6c94c6ca2c5ab964e80bd452b7e519 DIST blender-3.6.15.tar.xz 67906200 BLAKE2B 8709b20347e78f3f71d22fee9799b1c0e20a39521b35cff83d6cd3462d4b172e31c1656812d7ce51eef25341a0cff2e9efdcdab0bc9a361ec843a666fc8c3185 SHA512 dfd1d80850fe6ab0616fd99ab039345da621418890b1a006e5320a4b739d1cf6f4ca313e8f8aed6e27c976400c75e8d6085847623d933de71932aefe82f3fd32 +DIST blender-3.6.18.tar.xz 67900952 BLAKE2B d4a619197abc3e4969846913f3c88cd64fd679bbefe007354af6ba2e83d47a8fcd27b3bcbaf6d850d28960eedeb3c50ff9336d0e61fd488d4916b6628bfd67dd SHA512 48a8b3e8b2fe75305061d7cb9b7b8491cef4f23fbd809d1fc34663a4f97f487d6e7e6e92848110fe6aa5a2fed18a2c1a2a0c1c928aa813e2456f7786681eae60 DIST blender-3.6.8.tar.xz 70453744 BLAKE2B 5361977951fa1720899fad26092b967cc78b7ba82c8823f92fe1e6a14419edae1f3914f639e88dd8b5fb3ec7c124783e1ece56199a80b9b51a0f320764e1eba7 SHA512 a5e15dc9de7024cebb955fc531ae592a4c58336196a07fd63ed5bb4eb14d66751a3697ea8b120283ca5078c92d8c87966e882862011ebb4368f132e2de004a45 -DIST blender-4.0.2.tar.xz 73281252 BLAKE2B 6ec72baa360049681c8ba18ae668041e87745bad51113cf50bca93d18f52ef5db84c58f9a2dc5b341ef1f0439e76288a1b1eda892a19033fb494e79cd3b2f983 SHA512 c37b85d06f5cf8b48cb8c657a9fb6b0ab1325271706fa34039f2993420f7606cd1e2c052173cdea94e9bec2924e7aa4df373e3a0fc1f9c4be336e62211b6bc4b DIST blender-4.1.1.tar.xz 82146268 BLAKE2B 1ab4a6c1046851ef619394c62fc73794430dc091e2cab26d3d1d542e9d4519889e9b9731606385e9dc8657448ca3827875526f4a57dd1b5c326a73d8a6f9be8d SHA512 13ad0cdd09879b5c28554faca5a54172f43dc3dcb749d2d1723d3e89e741e6255179af3bd88309b735e058b9b350191e44f3158e882e55f1cedea70b8b21540e DIST blender-4.2.1.tar.xz 72789532 BLAKE2B 74494e851e9e2e9fdcf4a77fa4e1c177d6b9f01ab1cde9daec40468e5399d84b04225ff3a6919191e685624e9094ea4cb2257a62344d3b0e87072f339253aa82 SHA512 20162bd1185e34c481a0520f4999f8c76018471b485fa72afa446f590638c564a370d036cc4a941bf204fce821d8305d4244b3ba9ec7f09f1839b8a276dfde39 -EBUILD blender-3.3.15.ebuild 13723 BLAKE2B b22a4fa62e27aa0f25f2e769de636d87a80ad959c4271005dccb01bc19596a19d81b8cba19034d20e433ebd9eeb7f51d235ad10f6e145c912a343db31ad7364e SHA512 de3eb7c4453a48297b50dbd2ce10a25151673fafb29ff6c1241cd8c1be9865727c128f6265e66a39ac48f095b9e5ec5b5f70510ad2ec5f861a2f5129bb81db5a -EBUILD blender-3.3.21.ebuild 13725 BLAKE2B d27a62328df46c6bb91ffe0ed569204501d1cc29bc31bf23aebcdaa7da32b812f485b0abce458045d8a7c34dbe9952ac84a803f1e48c2fd88d0f013b24ffc7b8 SHA512 c6900174eff0a309a5089a19f3ec9666a645eb3aeb89f1b43f92304ec0d7cf7c49841ba74550f41b87607087a4c33af04e215ede78b9ec836a25893d8e2b2bdd -EBUILD blender-3.3.8.ebuild 13722 BLAKE2B 12465f59bb137aaa869216b623df34fb8758a742bc517cd467865ecfbff6856429c7fda725b6a3e14d1581964b22adb27956e0b74838c1da5e9a573560269fdf SHA512 8d985d8efd20233d111b7efe2aaa0b8fe486d3de36d676575347d66b24a7fd14904c04d9edfcfc1e03c34956419dc3ec06c4e20175749254f120ae52e79a1396 +DIST blender-4.2.4.tar.xz 72804204 BLAKE2B 613ae4671cc9263d18fe988b07e8744eb04f67fe53f1c14ad3fbc7d80c58a577e7753871ca775cd40ab5f26ef2bc9030cda57012dda0c4785769f04263aea15b SHA512 1f61c1866aaa680c91fc6e3402b1e10533c8cce32572ffb825c53dc7c15ca51f1157a32d10134ca9e612fbf719406421ccc920b2d8ddd2993675784797381c6a EBUILD blender-3.6.15.ebuild 14132 BLAKE2B 0f533ce9cc66019fb6410ca26cd3c434e360d7ac454676711597776c425ae7749d9ec5402c94206a20e3473dd1e7a13adfbc34c74a91457d641dde8de22dcce2 SHA512 7bf2d8f5d85909773f614335f668bb21d19d1de39fae83f06a81c28e678dc8584d00f08e00ae1409066c04d99cea24d402e495fe46afc6c37f66712ae33c4bee +EBUILD blender-3.6.18.ebuild 14133 BLAKE2B 97030e2d089b2bd7cc7e8a3e0c4b8b302c168f3b12be5e18366493776095fd4b95b2107691f467f67fb95e006b3d5ad5442dddff8e39fa53044dbaf263f79216 SHA512 3d90056f798ce49c5028ff860296e1c18201d44fea9056c59150b6b6815d3ac98e03e9b1ba2aa985e883996e7755dec6ef27a9799e889c21bd6d539940fe858c EBUILD blender-3.6.8.ebuild 14127 BLAKE2B 1de13a7ef689f16a899698c7262bf0a59a9d6ca1a9ed27c446e11b1cfc4b39b94231f08d96b17323f2049b1ec05a28319718402c083061a2b805838ca90931ad SHA512 0647e31bef93c125c407611a690437de86c710beb5b7771801e27e2e561c3d7bfbc350e67fe0275bcbe4a5f049e87c3e600b95bcef9013f156677624b1ce445c -EBUILD blender-4.0.2-r1.ebuild 17323 BLAKE2B da8dd2e98235314e7acf564867c688ce8ca258ef154b6fecfee4b247360bfd1eda7d2d0a42b37356cf79b061bf3f2d3c862f19db77f29b74701a29c3e36e4eed SHA512 f6ec16f31c2ecb1578b1d0222fb02041753cf225347cefdd0b75ab28386ecf9840d54be5366e9e7231b05aca1a84f3d52a10c801a2431a289182e1a1a0ac0aa8 EBUILD blender-4.1.1-r2.ebuild 17612 BLAKE2B 6c730678d9ee6f98127a3df5df269ee06a3bbb69e6bd2d4d06195ae8efa424484a83b3a77cd58c0e1a8e2d516f67e0d38737cd199f4ee66c59f1bfc045dfd308 SHA512 4afc54c172de9eb3fe0d71a23f59b32f232ce66847272bbe8b03e770bb228a0e22c0556bbc7338294d9488ad221e4c117e557e85f1f32c44ebecc1cf6bbb72bc EBUILD blender-4.1.1.ebuild 17169 BLAKE2B 96ac5b0d84b5c45008ca67d07f55617833801220064e77e37d1f6f0b47a141f29ddc063667ebf09f482899640b02830c31b1cd8b148f3f5fbe61421f931ffd53 SHA512 ed20d53f7bcb93b0f0541145dabf903a10fe3811288c3cebf80396885a4d7aa4552687e86608d5510f8fe87adea9432956e6c21dec47f1e08adc0cc6e399b1c4 EBUILD blender-4.2.1.ebuild 17467 BLAKE2B 5e764bea5de6b0f689b161a1081768253cb7dcfc7906eb6b1bd30bac13671224344a861dfbff8380ed450237363a91dcf16e8e152bacbe92162d70a897914940 SHA512 aaaa65b695f0292894e0bcc6f521c3933a1be4550a2511b5b0c8cdb7a672c79da80ae0aa2d6e84c2ecd39e7dccbdaea67018db387f2b53bf9b45ed64f75320c1 -EBUILD blender-9999.ebuild 17468 BLAKE2B 6c4dc64995717956cc7dbbcca9e1420920d4ed0cfa4c484ab4eb38a27ba7d03b25b4987c067f88c214506baacbab24c8cee6c2a9a89969ec0a8df7a265781389 SHA512 e1c1ce5f0178b47c894610773e08991ea5affab1abb72b6b0a9085ae90c1cd577b272cb6b9dae794c0cd5544b954dad4eb8e69c659309acc8fd5593c9593f510 -MISC metadata.xml 3679 BLAKE2B cca8c2f8568be6c83244cf5a90b2db0df11faffa4f55820692990e02ce0bfd84cf3e6c2fdb146af9e6c8e09d1c72fe297c73f126e04ad918e709dc9064908aca SHA512 ac8bdbc0e00442f56d9d077d7d8c97deba90121e7dd34aac9d51b7ae6348bbaa875d2fcd01fe20ff7e9b1c3bf332a5cde63fd0b406a1e29c3f4de323225a17a9 +EBUILD blender-4.2.4.ebuild 17435 BLAKE2B 5ea860e1b4b5d816549fdf79023026c8e69985a56c245c5326919f410e8ae80b85eb366ef671c5f231cde620cc707004183f8d224c47efc24071239c570728c1 SHA512 d945dc321834317f587176d16e24c2490406181a11bd5824bb52d5b839c3699cf1bfd051ed5453613b48d17ea61148e667e5ab04f4cbc8eea1826b40d8270ac3 +EBUILD blender-9999.ebuild 17435 BLAKE2B 5ea860e1b4b5d816549fdf79023026c8e69985a56c245c5326919f410e8ae80b85eb366ef671c5f231cde620cc707004183f8d224c47efc24071239c570728c1 SHA512 d945dc321834317f587176d16e24c2490406181a11bd5824bb52d5b839c3699cf1bfd051ed5453613b48d17ea61148e667e5ab04f4cbc8eea1826b40d8270ac3 +MISC metadata.xml 3459 BLAKE2B 6fb5c60150a6ff87ef3011bd439886dbba0d41137cd7eb36afe5ce13daf4038178880f19a3afda52decc576132d6b44b17d99bafb611207b8417790706b299f9 SHA512 8057e29057a0a2d3851c44c95116b5ac8c04fbbf3efd1540df63ffe7837201007a99883fca9c6e31f89fb20a099959a81f97d88b14f99cf4910ae9e771b5fdbc diff --git a/media-gfx/blender/blender-3.3.21.ebuild b/media-gfx/blender/blender-3.3.21.ebuild deleted file mode 100644 index a0f55249f096..000000000000 --- a/media-gfx/blender/blender-3.3.21.ebuild +++ /dev/null @@ -1,432 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 python3_11 ) - -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="$(ver_cut 1-2).0" - #SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" - KEYWORDS="amd64 ~arm ~arm64" -fi - -LICENSE="GPL-3+ cycles? ( Apache-2.0 )" -SLOT="${PV%.*}" -IUSE="+bullet +dds +fluid +openexr +tbb \ - alembic collada +color-management cuda +cycles \ - debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ - man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ - +openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \ - test +tiff valgrind" -RESTRICT="!test? ( test ) test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - alembic? ( openexr ) - cuda? ( cycles ) - cycles? ( openexr tiff openimageio ) - fluid? ( tbb ) - openvdb? ( tbb ) - optix? ( cuda ) - osl? ( 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 -# -# <opencolorio-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:=[nls?] - dev-libs/lzo:2= - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/zstandard[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - media-libs/freetype:=[brotli] - media-libs/glew:* - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/libsamplerate - sys-libs/zlib:= - virtual/glu - virtual/libintl - virtual/opengl - alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( <media-libs/opencolorio-2.3.0:= ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - embree? ( <media-libs/embree-4.0.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[cxx] ) - !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.3.12.0-r3:= ) - openexr? ( - >=dev-libs/imath-3.1.4-r2:= - >=media-libs/openexr-3:0= - ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) - openvdb? ( - <media-gfx/openvdb-11.0.0:=[nanovdb?] - dev-libs/c-blosc:= - ) - optix? ( <dev-libs/optix-7.5.0 ) - osl? ( <media-libs/osl-1.13:= ) - pdf? ( media-libs/libharu ) - potrace? ( media-gfx/potrace ) - pugixml? ( dev-libs/pugixml ) - pulseaudio? ( media-libs/libpulse ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tbb? ( dev-cpp/tbb:= ) - tiff? ( media-libs/tiff:= ) - valgrind? ( dev-debug/valgrind ) -" - -DEPEND="${RDEPEND} - dev-cpp/eigen:= -" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-text/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}/${PN}-3.2.2-support-building-with-musl-libc.patch" - "${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch" - "${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch" - "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch" - "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.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 ${T}/usr)|g" -i tests/CMakeLists.txt || die - sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die - fi -} - -src_configure() { - # -Werror=odr, -Werror=lto-type-mismatch - # https://bugs.gentoo.org/859607 - # https://projects.blender.org/blender/blender/issues/120444 - filter-lto - - # Workaround for bug #922600 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - 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_OPTIX=$(usex optix) - -DWITH_CYCLES_EMBREE=$(usex embree) - -DWITH_CYCLES_OSL=$(usex osl) - -DWITH_CYCLES_STANDALONE=OFF - -DWITH_CYCLES_STANDALONE_GUI=OFF - -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=$(usex nanovdb) - -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=OFF - -DWITH_SDL=$(usex sdl) - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_EIGEN3=ON - -DWITH_SYSTEM_FREETYPE=ON - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_LZO=ON - -DWITH_TBB=$(usex tbb) - -DWITH_USD=OFF - -DWITH_XR_OPENXR=OFF - ) - - if use optix; then - mycmakeargs+=( - -DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix - -DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix - ) - fi - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - use arm64 && append-flags -flax-vector-conversions - - 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. - DESTDIR="${T}" cmake_build 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="${T}/usr/share/blender/${BV}/scripts" - export BLENDER_SYSTEM_DATAFILES="${T}/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 "${T}"/usr || die -} - -src_install() { - blender_get_version - - # Pax mark blender for hardened support. - pax-mark m "${BUILD_DIR}"/bin/blender - - 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 - - if use osl; then - ewarn "" - ewarn "OSL is know to cause runtime segfaults if Mesa has been linked to" - ewarn "an other LLVM version than what OSL is linked to." - ewarn "See https://bugs.gentoo.org/880671 for more details" - ewarn "" - fi - - if ! use python_single_target_python3_10; 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_10 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.3.8.ebuild b/media-gfx/blender/blender-3.3.8.ebuild deleted file mode 100644 index 69f830424c87..000000000000 --- a/media-gfx/blender/blender-3.3.8.ebuild +++ /dev/null @@ -1,432 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 python3_11 ) - -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="$(ver_cut 1-2).0" - #SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" - KEYWORDS="amd64 ~arm ~arm64" -fi - -LICENSE="GPL-3+ cycles? ( Apache-2.0 )" -SLOT="${PV%.*}" -IUSE="+bullet +dds +fluid +openexr +tbb \ - alembic collada +color-management cuda +cycles \ - debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ - man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ - +openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \ - test +tiff valgrind" -RESTRICT="!test? ( test ) test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - alembic? ( openexr ) - cuda? ( cycles ) - cycles? ( openexr tiff openimageio ) - fluid? ( tbb ) - openvdb? ( tbb ) - optix? ( cuda ) - osl? ( 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 -# -# <opencolorio-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:=[nls?] - dev-libs/lzo:2= - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/zstandard[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - media-libs/freetype:=[brotli] - media-libs/glew:* - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/libsamplerate - sys-libs/zlib:= - virtual/glu - virtual/libintl - virtual/opengl - alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( <media-libs/opencolorio-2.3.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.3.12.0-r3:= ) - openexr? ( - >=dev-libs/imath-3.1.4-r2:= - >=media-libs/openexr-3:0= - ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) - openvdb? ( - <media-gfx/openvdb-11.0.0:=[nanovdb?] - dev-libs/c-blosc:= - ) - optix? ( <dev-libs/optix-7.5.0 ) - osl? ( <media-libs/osl-1.13:= ) - pdf? ( media-libs/libharu ) - potrace? ( media-gfx/potrace ) - pugixml? ( dev-libs/pugixml ) - pulseaudio? ( media-libs/libpulse ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tbb? ( dev-cpp/tbb:= ) - tiff? ( media-libs/tiff:= ) - valgrind? ( dev-debug/valgrind ) -" - -DEPEND="${RDEPEND} - dev-cpp/eigen:= -" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-text/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}/${PN}-3.2.2-support-building-with-musl-libc.patch" - "${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch" - "${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch" - "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch" - "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.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 ${T}/usr)|g" -i tests/CMakeLists.txt || die - sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die - fi -} - -src_configure() { - # -Werror=odr, -Werror=lto-type-mismatch - # https://bugs.gentoo.org/859607 - # https://projects.blender.org/blender/blender/issues/120444 - filter-lto - - # Workaround for bug #922600 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - 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_OPTIX=$(usex optix) - -DWITH_CYCLES_EMBREE=$(usex embree) - -DWITH_CYCLES_OSL=$(usex osl) - -DWITH_CYCLES_STANDALONE=OFF - -DWITH_CYCLES_STANDALONE_GUI=OFF - -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=$(usex nanovdb) - -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=OFF - -DWITH_SDL=$(usex sdl) - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_EIGEN3=ON - -DWITH_SYSTEM_FREETYPE=ON - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_LZO=ON - -DWITH_TBB=$(usex tbb) - -DWITH_USD=OFF - -DWITH_XR_OPENXR=OFF - ) - - if use optix; then - mycmakeargs+=( - -DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix - -DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix - ) - fi - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - use arm64 && append-flags -flax-vector-conversions - - 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. - DESTDIR="${T}" cmake_build 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="${T}/usr/share/blender/${BV}/scripts" - export BLENDER_SYSTEM_DATAFILES="${T}/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 "${T}"/usr || die -} - -src_install() { - blender_get_version - - # Pax mark blender for hardened support. - pax-mark m "${BUILD_DIR}"/bin/blender - - 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 - - if use osl; then - ewarn "" - ewarn "OSL is know to cause runtime segfaults if Mesa has been linked to" - ewarn "an other LLVM version than what OSL is linked to." - ewarn "See https://bugs.gentoo.org/880671 for more details" - ewarn "" - fi - - if ! use python_single_target_python3_10; 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_10 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.3.15.ebuild b/media-gfx/blender/blender-3.6.18.ebuild index aa58233b6a81..698ccf250f72 100644 --- a/media-gfx/blender/blender-3.3.15.ebuild +++ b/media-gfx/blender/blender-3.6.18.ebuild @@ -13,29 +13,30 @@ 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" + EGIT_REPO_URI="https://projects.blender.org/blender/blender.git" + ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git" else SRC_URI="https://download.blender.org/source/${P}.tar.xz" # Update these between major releases. TEST_TARBALL_VERSION="$(ver_cut 1-2).0" - #SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" + # SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" KEYWORDS="~amd64 ~arm ~arm64" fi LICENSE="GPL-3+ cycles? ( Apache-2.0 )" SLOT="${PV%.*}" -IUSE="+bullet +dds +fluid +openexr +tbb \ - alembic collada +color-management cuda +cycles \ - debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ - man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ - +openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \ - test +tiff valgrind" -RESTRICT="!test? ( test ) test" +IUSE="+bullet +dds +fluid +openexr +tbb + alembic collada +color-management cuda +cycles cycles-bin-kernels + debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k + man +nanovdb ndof nls openal +oidn +openmp +openpgl +opensubdiv + +openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl + +sndfile test +tiff valgrind wayland X" +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} alembic? ( openexr ) cuda? ( cycles ) - cycles? ( openexr tiff openimageio ) + cycles? ( openexr tiff ) fluid? ( tbb ) openvdb? ( tbb ) optix? ( cuda ) @@ -44,8 +45,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # Library versions for official builds can be found in the blender source directory in: # build_files/build_environment/install_deps.sh -# -# <opencolorio-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. RDEPEND="${PYTHON_DEPS} dev-libs/boost:=[nls?] dev-libs/lzo:2= @@ -56,27 +55,23 @@ RDEPEND="${PYTHON_DEPS} dev-python/requests[${PYTHON_USEDEP}] ') media-libs/freetype:=[brotli] - media-libs/glew:* + media-libs/libepoxy:= media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate + >=media-libs/openimageio-2.4.6.0:= sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( <media-libs/opencolorio-2.3.0:= ) + color-management? ( media-libs/opencolorio:= ) 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 - ) + gmp? ( dev-libs/gmp[cxx] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) @@ -87,11 +82,11 @@ RDEPEND="${PYTHON_DEPS} nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) - openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) + openpgl? ( media-libs/openpgl:0/0.5 ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( <media-gfx/openvdb-11.0.0:=[nanovdb?] @@ -108,6 +103,18 @@ RDEPEND="${PYTHON_DEPS} tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff:= ) valgrind? ( dev-debug/valgrind ) + wayland? ( + >=dev-libs/wayland-1.12 + >=dev-libs/wayland-protocols-1.15 + >=x11-libs/libxkbcommon-0.2.0 + media-libs/mesa[wayland] + sys-apps/dbus + ) + X? ( + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + ) " DEPEND="${RDEPEND} @@ -126,16 +133,11 @@ BDEPEND=" dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) + wayland? ( + dev-util/wayland-scanner + ) " -PATCHES=( - "${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch" - "${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch" - "${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch" - "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch" - "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch" -) - blender_check_requirements() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -168,10 +170,16 @@ pkg_setup() { src_unpack() { if [[ ${PV} = *9999* ]] ; then git-r3_src_unpack + + git-r3_fetch "${ADDONS_EGIT_REPO_URI}" + git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons" + 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 + ASSETS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/assets + subversion_fetch ${ASSETS_SVN_URL} ../lib/assets else default if use test; then @@ -208,7 +216,7 @@ src_prepare() { 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 ${T}/usr)|g" -i tests/CMakeLists.txt || die + sed -e "s|set(TEST_INSTALL_DIR.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i tests/CMakeLists.txt || die sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${T}/usr)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die fi } @@ -223,6 +231,7 @@ src_configure() { append-ldflags $(test-flags-CCLD -Wl,--undefined-version) append-lfs-flags + blender_get_version local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF @@ -237,18 +246,26 @@ src_configure() { -DWITH_CODEC_SNDFILE=$(usex sndfile) -DWITH_CXX_GUARDEDALLOC=$(usex debug) -DWITH_CYCLES=$(usex cycles) + -DWITH_CYCLES_CUDA_BINARIES=$(usex cycles-bin-kernels) -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) -DWITH_CYCLES_DEVICE_OPTIX=$(usex optix) -DWITH_CYCLES_EMBREE=$(usex embree) -DWITH_CYCLES_OSL=$(usex osl) + -DWITH_CYCLES_PATH_GUIDING=$(usex openpgl) -DWITH_CYCLES_STANDALONE=OFF -DWITH_CYCLES_STANDALONE_GUI=OFF -DWITH_DOC_MANPAGE=$(usex man) -DWITH_FFTW3=$(usex fftw) + -DWITH_GHOST_WAYLAND=$(usex wayland) + -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}" + -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland) + -DWITH_GHOST_WAYLAND_DYNLOAD=OFF + -DWITH_GHOST_WAYLAND_LIBDECOR=OFF + -DWITH_GHOST_X11=$(usex X) -DWITH_GMP=$(usex gmp) -DWITH_GTESTS=$(usex test) -DWITH_HARU=$(usex pdf) - -DWITH_HEADLESS=$(usex headless) + -DWITH_HEADLESS=$($(use X || use wayland) && echo OFF || echo ON) -DWITH_INSTALL_PORTABLE=OFF -DWITH_IMAGE_DDS=$(usex dds) -DWITH_IMAGE_OPENEXR=$(usex openexr) @@ -266,7 +283,6 @@ src_configure() { -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) @@ -279,7 +295,6 @@ src_configure() { -DWITH_STATIC_LIBS=OFF -DWITH_SYSTEM_EIGEN3=ON -DWITH_SYSTEM_FREETYPE=ON - -DWITH_SYSTEM_GLEW=ON -DWITH_SYSTEM_LZO=ON -DWITH_TBB=$(usex tbb) -DWITH_USD=OFF diff --git a/media-gfx/blender/blender-4.0.2-r1.ebuild b/media-gfx/blender/blender-4.2.4.ebuild index ae693845b6b7..b062e630b1a5 100644 --- a/media-gfx/blender/blender-4.0.2-r1.ebuild +++ b/media-gfx/blender/blender-4.2.4.ebuild @@ -3,9 +3,10 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) -# matches media-libs/osl -LLVM_COMPAT=( {15..17} ) +PYTHON_COMPAT=( python3_{11..12} ) +# NOTE must match media-libs/osl +LLVM_COMPAT=( {15..18} ) +LLVM_OPTIONAL=1 inherit check-reqs cmake cuda flag-o-matic llvm-r1 pax-utils python-single-r1 toolchain-funcs xdg-utils @@ -17,7 +18,6 @@ if [[ ${PV} = *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://projects.blender.org/blender/blender.git" EGIT_SUBMODULES=( '*' '-lib/*' ) - ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git" RESTRICT="!test? ( test )" else SRC_URI=" @@ -35,9 +35,9 @@ LICENSE="GPL-3+ cycles? ( Apache-2.0 )" SLOT="${PV%.*}" IUSE=" alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels - debug doc +embree experimental +ffmpeg +fftw +fluid +gmp gnome hip jack - jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp openpgl - +opensubdiv +openvdb optix osl +pdf +potrace +pugixml pulseaudio + debug doc +embree +ffmpeg +fftw +fluid +gmp gnome hip jack + jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp +openpgl + +opensubdiv +openvdb optix osl +otf +pdf +potrace +pugixml pulseaudio renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X " @@ -71,7 +71,7 @@ RDEPEND="${PYTHON_DEPS} media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate - >=media-libs/openimageio-2.4.6.0:= + >=media-libs/openimageio-2.5.6.0:= sys-libs/zlib:= virtual/glu virtual/libintl @@ -85,7 +85,14 @@ RDEPEND="${PYTHON_DEPS} fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp[cxx] ) gnome? ( gui-libs/libdecor ) - hip? ( >=dev-util/hip-5.7:= ) + hip? ( + llvm_slot_17? ( + dev-util/hip:0/5.7 + ) + llvm_slot_18? ( + >=dev-util/hip-6.1:=[llvm_slot_18(-)] + ) + ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) @@ -95,13 +102,13 @@ RDEPEND="${PYTHON_DEPS} ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) - oidn? ( >=media-libs/oidn-2.1.0 ) + oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] ) oneapi? ( dev-libs/intel-compute-runtime[l0] ) openexr? ( - >=dev-libs/imath-3.1.4-r2:= - >=media-libs/openexr-3:0= + >=dev-libs/imath-3.1.7:= + >=media-libs/openexr-3.2.1:0= ) - openpgl? ( media-libs/openpgl:0/0.5 ) + openpgl? ( media-libs/openpgl:= ) opensubdiv? ( >=media-libs/opensubdiv-3.5.0 ) openvdb? ( >=media-gfx/openvdb-11.0.0:=[nanovdb?] @@ -109,11 +116,8 @@ RDEPEND="${PYTHON_DEPS} ) optix? ( dev-libs/optix ) osl? ( - >=media-libs/osl-1.13:= - $(llvm_gen_dep ' - >=media-libs/osl-1.13[llvm_slot_${LLVM_SLOT}] - media-libs/mesa[llvm_slot_${LLVM_SLOT}] - ') + >=media-libs/osl-1.13:=[${LLVM_USEDEP}] + media-libs/mesa[${LLVM_USEDEP}] ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) @@ -138,6 +142,9 @@ RDEPEND="${PYTHON_DEPS} dev-util/glslang media-libs/vulkan-loader ) + otf? ( + media-libs/harfbuzz + ) renderdoc? ( media-gfx/renderdoc ) @@ -177,11 +184,10 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-4.0.1-fix-cflags-cleaner.patch" # to be dropped for releases after Dec 8, 2023 - "${FILESDIR}/${PN}-4.0.1-openvdb-11.patch" "${FILESDIR}/${PN}-4.0.2-FindClang.patch" "${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch" - "${FILESDIR}/${PN}-4.0.2-r1-osl-1.13.patch" + "${FILESDIR}/${PN}-4.1.1-FindLLVM.patch" + "${FILESDIR}/${PN}-4.1.1-numpy.patch" ) blender_check_requirements() { @@ -206,6 +212,12 @@ blender_get_version() { pkg_pretend() { blender_check_requirements + + if use oneapi; then + einfo "The Intel oneAPI support is rudimentary." + einfo "" + einfo "Please report any bugs you find to https://bugs.gentoo.org/" + fi } pkg_setup() { @@ -223,9 +235,6 @@ src_unpack() { EGIT_SUBMODULES+=( '-tests/*' ) fi git-r3_src_unpack - - git-r3_fetch "${ADDONS_EGIT_REPO_URI}" - git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons" else default @@ -308,6 +317,7 @@ src_configure() { -DWITH_BULLET=$(usex bullet) -DWITH_CODEC_FFMPEG=$(usex ffmpeg) -DWITH_CODEC_SNDFILE=$(usex sndfile) + -DWITH_CPU_CHECK=no -DWITH_CYCLES=$(usex cycles) @@ -330,16 +340,13 @@ src_configure() { -DWITH_DOC_MANPAGE=$(usex man) -DWITH_DRACO="no" # TODO: Package Draco - -DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)" -DWITH_FFTW3=$(usex fftw) -DWITH_GHOST_WAYLAND=$(usex wayland) - -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}" - -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland) - -DWITH_GHOST_WAYLAND_DYNLOAD="$(usex gnome)" # https://bugs.gentoo.org/930412 fixed in 4.1 # no - -DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)" + -DWITH_GHOST_WAYLAND_DYNLOAD="no" -DWITH_GHOST_X11=$(usex X) -DWITH_GMP=$(usex gmp) -DWITH_GTESTS=$(usex test) + -DWITH_HARFBUZZ="$(usex otf)" -DWITH_HARU=$(usex pdf) -DWITH_HEADLESS=$($(use X || use wayland) && echo OFF || echo ON) -DWITH_HYDRA="no" # TODO: Package Hydra @@ -383,6 +390,13 @@ src_configure() { -DWITH_XR_OPENXR=no ) + if has_version ">=dev-python/numpy-2"; then + mycmakeargs+=( + -DPYTHON_NUMPY_INCLUDE_DIRS="$(python_get_sitedir)/numpy/_core/include" + -DPYTHON_NUMPY_PATH="$(python_get_sitedir)/numpy/_core/include" + ) + fi + # requires dev-vcs/git if [[ ${PV} = *9999* ]] ; then mycmakeargs+=( -DWITH_BUILDINFO="yes" ) @@ -398,6 +412,7 @@ src_configure() { if use hip; then mycmakeargs+=( + -DROCM_PATH="$(hipconfig -R)" -DHIP_HIPCC_FLAGS="-fcf-protection=none" ) fi @@ -409,6 +424,13 @@ src_configure() { ) fi + if use wayland; then + mycmakeargs+=( + -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}" + -DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)" + ) + fi + # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully use arm64 && append-flags -flax-vector-conversions @@ -457,15 +479,16 @@ src_test() { DESTDIR="${T}" cmake_build 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="${T}/usr/share/blender/${BV}/scripts" - export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles" + # By default, blender will look for system scripts and data in + # /usr/share/, but until this is installed, they are not necessarily + # available there. Use this to have blender search the intermediate + # install directory instead. + export BLENDER_SYSTEM_RESOURCES="${T}/usr/share/blender/${BV}" - # 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!" + # Brake check: Make sure the above path is valid. + # If not, blender will fallback to the default path which is not what + # we want. + [ -d "$BLENDER_SYSTEM_RESOURCES" ] || die "The custom script path is invalid, fix the ebuild!" if use cuda; then cuda_add_sandbox -w @@ -477,6 +500,8 @@ src_test() { xdg_environment_reset fi + addwrite /dev/dri + cmake_src_test # Clean up the image directory for src_install @@ -489,21 +514,24 @@ src_install() { # Pax mark blender for hardened support. pax-mark m "${BUILD_DIR}"/bin/blender - if use man; then - # XXX: Stupid temporary hack for bug #925254 - cmake_src_install -j1 + 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 - else - cmake_src_install 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 + # By default, blender will look for system scripts and data in + # /usr/share/, but until this is installed, they are not necessarily + # available there. Use this to have blender search the intermediate + # install directory instead. + export BLENDER_SYSTEM_RESOURCES="${ED}/usr/share/blender/${BV}" + + # Brake check: Make sure the above path is valid. + # If not, blender will fallback to the default path which is not what + # we want. + [ -d "$BLENDER_SYSTEM_RESOURCES" ] || die "The custom script path is invalid, fix the ebuild!" # Workaround for binary drivers. addpredict /dev/ati @@ -559,11 +587,11 @@ pkg_postinst() { ewarn "" fi - if ! use python_single_target_python3_10; then + if ! use python_single_target_python3_11; 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_10 instead." + elog "python_single_target_python3_11 instead." elog "Bug: https://bugs.gentoo.org/737388" elog fi diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index 88bb85849015..b062e630b1a5 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -35,7 +35,7 @@ LICENSE="GPL-3+ cycles? ( Apache-2.0 )" SLOT="${PV%.*}" IUSE=" alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels - debug doc +embree experimental +ffmpeg +fftw +fluid +gmp gnome hip jack + debug doc +embree +ffmpeg +fftw +fluid +gmp gnome hip jack jemalloc jpeg2k man +nanovdb ndof nls +oidn oneapi openal +openexr +openmp +openpgl +opensubdiv +openvdb optix osl +otf +pdf +potrace +pugixml pulseaudio renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X @@ -340,7 +340,6 @@ src_configure() { -DWITH_DOC_MANPAGE=$(usex man) -DWITH_DRACO="no" # TODO: Package Draco - -DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)" -DWITH_FFTW3=$(usex fftw) -DWITH_GHOST_WAYLAND=$(usex wayland) -DWITH_GHOST_WAYLAND_DYNLOAD="no" @@ -480,15 +479,16 @@ src_test() { DESTDIR="${T}" cmake_build 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="${T}/usr/share/blender/${BV}/scripts" - export BLENDER_SYSTEM_DATAFILES="${T}/usr/share/blender/${BV}/datafiles" + # By default, blender will look for system scripts and data in + # /usr/share/, but until this is installed, they are not necessarily + # available there. Use this to have blender search the intermediate + # install directory instead. + export BLENDER_SYSTEM_RESOURCES="${T}/usr/share/blender/${BV}" - # 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!" + # Brake check: Make sure the above path is valid. + # If not, blender will fallback to the default path which is not what + # we want. + [ -d "$BLENDER_SYSTEM_RESOURCES" ] || die "The custom script path is invalid, fix the ebuild!" if use cuda; then cuda_add_sandbox -w @@ -522,10 +522,16 @@ src_install() { 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 + # By default, blender will look for system scripts and data in + # /usr/share/, but until this is installed, they are not necessarily + # available there. Use this to have blender search the intermediate + # install directory instead. + export BLENDER_SYSTEM_RESOURCES="${ED}/usr/share/blender/${BV}" + + # Brake check: Make sure the above path is valid. + # If not, blender will fallback to the default path which is not what + # we want. + [ -d "$BLENDER_SYSTEM_RESOURCES" ] || die "The custom script path is invalid, fix the ebuild!" # Workaround for binary drivers. addpredict /dev/ati diff --git a/media-gfx/blender/files/blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch b/media-gfx/blender/files/blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch deleted file mode 100644 index 2a7b33cf8ac4..000000000000 --- a/media-gfx/blender/files/blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch +++ /dev/null @@ -1,108 +0,0 @@ -From https://developer.blender.org/rB74caf773619bbf6a0f95c598b66261a6bef392ee -From: Brecht Van Lommel <brecht@blender.org> -Date: Mon, 29 Aug 2022 19:12:15 +0200 -Subject: [PATCH 001/539] Cycles: add option to specify OptiX runtime root - directory - -This allows individual users or Linux distributions to specify a directory -Cycles will automatically look for the OptiX include folder, to compile kernels -at runtime. - -It is still possible to override this with the OPTIX_ROOT_DIR environment -variable at runtime. - -Based on patch by Sebastian Parborg. - -Ref D15792 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -435,10 +435,16 @@ if(NOT APPLE) - option(WITH_CYCLES_CUBIN_COMPILER "Build cubins with nvrtc based compiler instead of nvcc" OFF) - option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF) - option(WITH_CUDA_DYNLOAD "Dynamically load CUDA libraries at runtime (for developers, makes cuda-gdb work)" ON) -+ -+ set(OPTIX_ROOT_DIR "" CACHE PATH "Path to the OptiX SDK root directory, for building Cycles OptiX kernels.") -+ set(CYCLES_RUNTIME_OPTIX_ROOT_DIR "" CACHE PATH "Path to the OptiX SDK root directory. When set, this path will be used at runtime to compile OptiX kernels.") -+ - mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH) - mark_as_advanced(WITH_CYCLES_CUBIN_COMPILER) - mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL) - mark_as_advanced(WITH_CUDA_DYNLOAD) -+ mark_as_advanced(OPTIX_ROOT_DIR) -+ mark_as_advanced(CYCLES_RUNTIME_OPTIX_ROOT_DIR) - endif() - - # AMD HIP ---- a/intern/cycles/device/CMakeLists.txt -+++ b/intern/cycles/device/CMakeLists.txt -@@ -19,6 +19,8 @@ if(WITH_CYCLES_DEVICE_OPTIX OR WITH_CYCLES_DEVICE_CUDA) - ) - add_definitions(-DCYCLES_CUDA_NVCC_EXECUTABLE="${CUDA_NVCC_EXECUTABLE}") - endif() -+ -+ add_definitions(-DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${CYCLES_RUNTIME_OPTIX_ROOT_DIR}") - endif() - - if(WITH_CYCLES_DEVICE_HIP AND WITH_HIP_DYNLOAD) ---- a/intern/cycles/device/optix/device_impl.cpp -+++ b/intern/cycles/device/optix/device_impl.cpp -@@ -342,15 +342,29 @@ BVHLayoutMask OptiXDevice::get_bvh_layout_mask() const - return BVH_LAYOUT_OPTIX; - } - -+static string get_optix_include_dir() -+{ -+ const char *env_dir = getenv("OPTIX_ROOT_DIR"); -+ const char *default_dir = CYCLES_RUNTIME_OPTIX_ROOT_DIR; -+ -+ if (env_dir && env_dir[0]) { -+ const string env_include_dir = path_join(env_dir, "include"); -+ return env_include_dir; -+ } -+ else if (default_dir[0]) { -+ const string default_include_dir = path_join(default_dir, "include"); -+ return default_include_dir; -+ } -+ -+ return string(); -+} -+ - string OptiXDevice::compile_kernel_get_common_cflags(const uint kernel_features) - { - string common_cflags = CUDADevice::compile_kernel_get_common_cflags(kernel_features); - - /* Add OptiX SDK include directory to include paths. */ -- const char *optix_sdk_path = getenv("OPTIX_ROOT_DIR"); -- if (optix_sdk_path) { -- common_cflags += string_printf(" -I\"%s/include\"", optix_sdk_path); -- } -+ common_cflags += string_printf(" -I\"%s/include\"", get_optix_include_dir().c_str()); - - /* Specialization for shader raytracing. */ - if (kernel_features & KERNEL_FEATURE_NODE_RAYTRACE) { -@@ -460,10 +474,19 @@ bool OptiXDevice::load_kernels(const uint kernel_features) - "lib/kernel_optix_shader_raytrace.ptx" : - "lib/kernel_optix.ptx"); - if (use_adaptive_compilation() || path_file_size(ptx_filename) == -1) { -- if (!getenv("OPTIX_ROOT_DIR")) { -+ std::string optix_include_dir = get_optix_include_dir(); -+ if (optix_include_dir.empty()) { - set_error( -- "Missing OPTIX_ROOT_DIR environment variable (which must be set with the path to " -- "the Optix SDK to be able to compile Optix kernels on demand)."); -+ "Unable to compile OptiX kernels at runtime. Set OPTIX_ROOT_DIR environment variable " -+ "to a directory containing the OptiX SDK."); -+ return false; -+ } -+ else if (!path_is_directory(optix_include_dir)) { -+ set_error(string_printf( -+ "OptiX headers not found at %s, unable to compile OptiX kernels at runtime. Install " -+ "OptiX SDK in the specified location, or set OPTIX_ROOT_DIR environment variable to a " -+ "directory containing the OptiX SDK.", -+ optix_include_dir.c_str())); - return false; - } - ptx_filename = compile_kernel( --- -2.37.3 - diff --git a/media-gfx/blender/files/blender-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch b/media-gfx/blender/files/blender-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch deleted file mode 100644 index 921b648ca388..000000000000 --- a/media-gfx/blender/files/blender-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch +++ /dev/null @@ -1,23 +0,0 @@ -From https://developer.blender.org/rB74477149dddfddeca71be6770d520f870c0b5bc9 -From: Josh Whelchel <soundofjw> -Date: Tue, 6 Sep 2022 15:39:39 +0200 -Subject: [PATCH 663/965] Fix T100845: wrong Cycles OptiX runtime compilation - include path - -Causing OptiX kernel build errors on Arch Linux. - -Differential Revision: https://developer.blender.org/D15891 ---- a/intern/cycles/device/optix/device_impl.cpp -+++ b/intern/cycles/device/optix/device_impl.cpp -@@ -364,7 +364,7 @@ string OptiXDevice::compile_kernel_get_common_cflags(const uint kernel_features) - string common_cflags = CUDADevice::compile_kernel_get_common_cflags(kernel_features); - - /* Add OptiX SDK include directory to include paths. */ -- common_cflags += string_printf(" -I\"%s/include\"", get_optix_include_dir().c_str()); -+ common_cflags += string_printf(" -I\"%s\"", get_optix_include_dir().c_str()); - - /* Specialization for shader raytracing. */ - if (kernel_features & KERNEL_FEATURE_NODE_RAYTRACE) { --- -2.37.3 - diff --git a/media-gfx/blender/files/blender-3.2.2-support-building-with-musl-libc.patch b/media-gfx/blender/files/blender-3.2.2-support-building-with-musl-libc.patch deleted file mode 100644 index fb3f2584f0fe..000000000000 --- a/media-gfx/blender/files/blender-3.2.2-support-building-with-musl-libc.patch +++ /dev/null @@ -1,177 +0,0 @@ -CMake: support building with musl libc - -Instead of using macros like GLIBC we can use the CMake build -systems internal functions to check if some header or functions are -present on the running system's libc. - -Add ./build_files/cmake/have_features.cmake to add checks for -platform features which can be used to set defines for source -files that require them. - -Please refer: https://github.com/blender/blender/commit/f197b1a1f1bbc0334310fb1c911327246767a1a3 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -112,6 +112,11 @@ blender_project_hack_post() - - enable_testing() - -+#----------------------------------------------------------------------------- -+# Test compiler/library features. -+ -+include(build_files/cmake/have_features.cmake) -+ - #----------------------------------------------------------------------------- - # Redirect output files - ---- /dev/null -+++ b/build_files/cmake/have_features.cmake -@@ -0,0 +1,33 @@ -+# SPDX-License-Identifier: GPL-2.0-or-later -+# Copyright 2022 Blender Foundation. All rights reserved. -+ -+# This file is used to test the system for headers & symbols. -+# Variables should use the `HAVE_` prefix. -+# Defines should use the same name as the CMAKE variable. -+ -+include(CheckSymbolExists) -+ -+# Used for: `intern/guardedalloc/intern/mallocn_intern.h`. -+# Function `malloc_stats` is only available on GLIBC, -+# so check that before defining `HAVE_MALLOC_STATS`. -+check_symbol_exists(malloc_stats "malloc.h" HAVE_MALLOC_STATS_H) -+ -+# Used for: `source/creator/creator_signals.c`. -+# The function `feenableexcept` is not present non-GLIBC systems, -+# hence we need to check if it's available in the `fenv.h` file. -+set(HAVE_FEENABLEEXCEPT OFF) -+if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -+ check_symbol_exists(feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT) -+endif() -+ -+# Used for: `source/blender/blenlib/intern/system.c`. -+# `execinfo` is not available on non-GLIBC systems (at least not on MUSL-LIBC), -+# so check the presence of the header before including it and using the it for back-trace. -+set(HAVE_EXECINFO_H OFF) -+if(NOT MSVC) -+ include(CheckIncludeFiles) -+ check_include_files("execinfo.h" HAVE_EXECINFO_H) -+ if(HAVE_EXECINFO_H) -+ add_definitions(-DHAVE_EXECINFO_H) -+ endif() -+endif() ---- a/intern/guardedalloc/CMakeLists.txt -+++ b/intern/guardedalloc/CMakeLists.txt -@@ -1,6 +1,10 @@ - # SPDX-License-Identifier: GPL-2.0-or-later - # Copyright 2006 Blender Foundation. All rights reserved. - -+if(HAVE_MALLOC_STATS_H) -+ add_definitions(-DHAVE_MALLOC_STATS_H) -+endif() -+ - set(INC - . - ../atomic ---- a/intern/guardedalloc/intern/mallocn_intern.h -+++ b/intern/guardedalloc/intern/mallocn_intern.h -@@ -17,8 +17,7 @@ - #undef HAVE_MALLOC_STATS - #define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */ - --#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \ -- defined(__GLIBC__) -+#if defined(HAVE_MALLOC_STATS_H) - # include <malloc.h> - # define HAVE_MALLOC_STATS - #elif defined(__FreeBSD__) ---- a/source/blender/blenlib/CMakeLists.txt -+++ b/source/blender/blenlib/CMakeLists.txt -@@ -1,6 +1,10 @@ - # SPDX-License-Identifier: GPL-2.0-or-later - # Copyright 2006 Blender Foundation. All rights reserved. - -+if(HAVE_EXECINFO_H) -+ add_definitions(-DHAVE_EXECINFO_H) -+endif() -+ - set(INC - . - # ../blenkernel # don't add this back! ---- a/source/blender/blenlib/intern/system.c -+++ b/source/blender/blenlib/intern/system.c -@@ -21,7 +21,9 @@ - - # include "BLI_winstuff.h" - #else --# include <execinfo.h> -+# if defined(HAVE_EXECINFO_H) -+# include <execinfo.h> -+# endif - # include <unistd.h> - #endif - -@@ -61,9 +63,9 @@ int BLI_cpu_support_sse2(void) - #if !defined(_MSC_VER) - void BLI_system_backtrace(FILE *fp) - { -- /* ------------- */ -- /* Linux / Apple */ --# if defined(__linux__) || defined(__APPLE__) -+ /* ----------------------- */ -+ /* If system as execinfo.h */ -+# if defined(HAVE_EXECINFO_H) - - # define SIZE 100 - void *buffer[SIZE]; ---- a/source/blender/makesdna/intern/CMakeLists.txt -+++ b/source/blender/makesdna/intern/CMakeLists.txt -@@ -5,6 +5,11 @@ - - add_definitions(-DWITH_DNA_GHASH) - -+# Needed for `mallocn.c`. -+if(HAVE_MALLOC_STATS_H) -+ add_definitions(-DHAVE_MALLOC_STATS_H) -+endif() -+ - blender_include_dirs( - ../../../../intern/atomic - ../../../../intern/guardedalloc ---- a/source/blender/makesrna/intern/CMakeLists.txt -+++ b/source/blender/makesrna/intern/CMakeLists.txt -@@ -6,6 +6,11 @@ if(CMAKE_COMPILER_IS_GNUCC) - string(APPEND CMAKE_C_FLAGS " -Werror=implicit-function-declaration") - endif() - -+# Needed for `mallocn.c`. -+if(HAVE_MALLOC_STATS_H) -+ add_definitions(-DHAVE_MALLOC_STATS_H) -+endif() -+ - # files rna_access.c rna_define.c makesrna.c intentionally excluded. - set(DEFSRC - rna_ID.c ---- a/source/creator/CMakeLists.txt -+++ b/source/creator/CMakeLists.txt -@@ -22,6 +22,10 @@ set(LIB - bf_windowmanager - ) - -+if(HAVE_FEENABLEEXCEPT) -+ add_definitions(-DHAVE_FEENABLEEXCEPT) -+endif() -+ - if(WITH_TBB) - # Force TBB libraries to be in front of MKL (part of OpenImageDenoise), so - # that it is initialized before MKL and static library initialization order ---- a/source/creator/creator_signals.c -+++ b/source/creator/creator_signals.c -@@ -258,7 +258,7 @@ void main_signal_setup_fpe(void) - * set breakpoints on sig_handle_fpe */ - signal(SIGFPE, sig_handle_fpe); - --# if defined(__linux__) && defined(__GNUC__) -+# if defined(__linux__) && defined(__GNUC__) && defined(HAVE_FEENABLEEXCEPT) - feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW); - # endif /* defined(__linux__) && defined(__GNUC__) */ - # if defined(OSX_SSE_FPE) diff --git a/media-gfx/blender/files/blender-3.3.0-fix-build-with-boost-1.81.patch b/media-gfx/blender/files/blender-3.3.0-fix-build-with-boost-1.81.patch deleted file mode 100644 index 3a544811e484..000000000000 --- a/media-gfx/blender/files/blender-3.3.0-fix-build-with-boost-1.81.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/887059 - -Adding include as suggested by the compiler: - -"intern/locale/boost_locale_wrapper.cpp:12:1: note: ‘std::cout’ is defined -in header ‘<iostream>’; did you forget to ‘#include <iostream>’?" - ---- a/intern/locale/boost_locale_wrapper.cpp -+++ b/intern/locale/boost_locale_wrapper.cpp -@@ -9,6 +9,7 @@ - #include <stdio.h> - - #include "boost_locale_wrapper.h" -+#include <iostream> - - static std::string messages_path; - static std::string default_domain; diff --git a/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch b/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch deleted file mode 100644 index 955be2424e19..000000000000 --- a/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/914740 ---- a/intern/cycles/util/thread.cpp -+++ b/intern/cycles/util/thread.cpp -@@ -6,6 +6,8 @@ - #include "util/system.h" - #include "util/windows.h" - -+#include <system_error> -+ - CCL_NAMESPACE_BEGIN - - thread::thread(function<void()> run_cb) : run_cb_(run_cb), joined_(false) diff --git a/media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch b/media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch deleted file mode 100644 index d28db84d8c36..000000000000 --- a/media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix CMake Error: string sub-command REGEX, mode REPLACE needs at least 6 arguments total to command. -https://bugs.gentoo.org/922324 -https://github.com/blender/blender/commit/ecd307041e4181f721bf5d2248c02ffe980edcba ---- a/build_files/cmake/macros.cmake -+++ b/build_files/cmake/macros.cmake -@@ -750,11 +750,11 @@ macro(remove_c_flag - _flag) - - foreach(f ${ARGV}) -- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) -- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) -- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) -- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) -- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) -+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") -+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") -+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") -+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}") -+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") - endforeach() - unset(f) - endmacro() -@@ -763,11 +763,11 @@ macro(remove_cxx_flag - _flag) - - foreach(f ${ARGV}) -- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) -- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) -- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) -- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) -+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") -+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") -+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}") -+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") - endforeach() - unset(f) - endmacro()
\ No newline at end of file diff --git a/media-gfx/blender/files/blender-4.0.1-openvdb-11.patch b/media-gfx/blender/files/blender-4.0.1-openvdb-11.patch deleted file mode 100644 index 1f1561e8e7db..000000000000 --- a/media-gfx/blender/files/blender-4.0.1-openvdb-11.patch +++ /dev/null @@ -1,75 +0,0 @@ -From: Paul Zander <negril.nx+gentoo@gmail.com> -Change lookup for OpenVDB-11 ---- a/intern/cycles/scene/image_vdb.cpp 2023-11-23 14:42:38.772685628 +0100 -+++ b/intern/cycles/scene/image_vdb.cpp 2023-11-23 15:19:55.475804922 +0100 -@@ -11,7 +11,14 @@ - # include <openvdb/tools/Dense.h> - #endif - #ifdef WITH_NANOVDB --# include <nanovdb/util/OpenToNanoVDB.h> -+# include <nanovdb/NanoVDB.h> -+# define NANOVDB_VERSION(major, minor, patch) (major << 21 | minor << 10 | patch) -+# if NANOVDB_VERSION(NANOVDB_MAJOR_VERSION_NUMBER, NANOVDB_MINOR_VERSION_NUMBER, NANOVDB_PATCH_VERSION_NUMBER) >= NANOVDB_VERSION(32, 6, 0) -+# include <nanovdb/util/CreateNanoGrid.h> -+# else -+# include <nanovdb/util/OpenToNanoVDB.h> -+# endif -+# undef NANOVDB_VERSION - #endif - - CCL_NAMESPACE_BEGIN -@@ -55,20 +62,35 @@ - FloatGridType floatgrid(*openvdb::gridConstPtrCast<GridType>(grid)); - if constexpr (std::is_same_v<FloatGridType, openvdb::FloatGrid>) { - if (precision == 0) { -- nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer, -- typename FloatGridType::TreeType, -- nanovdb::FpN>(floatgrid); -+ if constexpr (nanovdb::Version() >= nanovdb::Version(32,6,0)) { -+ nanogrid = nanovdb::createNanoGrid(floatgrid); -+ } -+ else { -+ nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer, -+ typename FloatGridType::TreeType, -+ nanovdb::FpN>(floatgrid); -+ } - return true; - } -- else if (precision == 16) { -- nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer, -- typename FloatGridType::TreeType, -- nanovdb::Fp16>(floatgrid); -+ if (precision == 16) { -+ if constexpr (nanovdb::Version() > nanovdb::Version(32,4,0)) { -+ nanogrid = nanovdb::createNanoGrid(floatgrid); -+ } -+ else { -+ nanogrid = nanovdb::openToNanoVDB<nanovdb::HostBuffer, -+ typename FloatGridType::TreeType, -+ nanovdb::Fp16>(floatgrid); -+ } - return true; - } - } - -- nanogrid = nanovdb::openToNanoVDB(floatgrid); -+ if constexpr (nanovdb::Version() > nanovdb::Version(32,4,0)) { -+ nanogrid = nanovdb::createNanoGrid(floatgrid); -+ } -+ else { -+ nanogrid = nanovdb::openToNanoVDB(floatgrid); -+ } - } - catch (const std::exception &e) { - VLOG_WARNING << "Error converting OpenVDB to NanoVDB grid: " << e.what(); ---- a/CMakeLists.txt 2023-11-23 15:59:58.715805024 +0100 -+++ b/CMakeLists.txt 2023-11-23 16:06:42.352711508 +0100 -@@ -1461,7 +1461,7 @@ - endif() - - if(WITH_OPENVDB) -- list(APPEND OPENVDB_DEFINITIONS -DWITH_OPENVDB) -+ list(APPEND OPENVDB_DEFINITIONS -DWITH_OPENVDB -DNANOVDB_USE_OPENVDB) - - if(WITH_OPENVDB_3_ABI_COMPATIBLE) - list(APPEND OPENVDB_DEFINITIONS -DOPENVDB_3_ABI_COMPATIBLE) diff --git a/media-gfx/blender/files/blender-4.0.2-r1-osl-1.13.patch b/media-gfx/blender/files/blender-4.0.2-r1-osl-1.13.patch deleted file mode 100644 index 064abf21c6a6..000000000000 --- a/media-gfx/blender/files/blender-4.0.2-r1-osl-1.13.patch +++ /dev/null @@ -1,342 +0,0 @@ -From 798a0b301e640e73ae12e6f8a36a66746893bff1 Mon Sep 17 00:00:00 2001 -From: Brecht Van Lommel <brecht@blender.org> -Date: Sun, 10 Dec 2023 17:08:47 +0100 -Subject: [PATCH] Cycles: update OSL to work with version 1.13.5 - -This keeps compatibility with older stable versions, but not -older unreleased versions in the 1.13.x series. - -Ref #113157 - -Pull Request: https://projects.blender.org/blender/blender/pulls/116004 ---- - intern/cycles/device/cpu/device_impl.cpp | 2 +- - .../device/cpu/kernel_thread_globals.cpp | 6 ++- - .../cycles/device/cpu/kernel_thread_globals.h | 3 +- - intern/cycles/kernel/device/cpu/globals.h | 1 + - intern/cycles/kernel/osl/closures.cpp | 52 ++++++++++++++++++- - intern/cycles/kernel/osl/globals.cpp | 3 +- - intern/cycles/kernel/osl/globals.h | 4 +- - intern/cycles/kernel/osl/osl.h | 5 ++ - intern/cycles/kernel/osl/services.cpp | 27 ++++++++-- - intern/cycles/kernel/osl/services.h | 21 +++++++- - intern/cycles/kernel/osl/types.h | 4 +- - 11 files changed, 115 insertions(+), 13 deletions(-) - -diff --git a/intern/cycles/device/cpu/device_impl.cpp b/intern/cycles/device/cpu/device_impl.cpp -index cbbdb844323..ba838233855 100644 ---- a/intern/cycles/device/cpu/device_impl.cpp -+++ b/intern/cycles/device/cpu/device_impl.cpp -@@ -313,7 +313,7 @@ void CPUDevice::get_cpu_kernel_thread_globals( - kernel_thread_globals.clear(); - void *osl_memory = get_cpu_osl_memory(); - for (int i = 0; i < info.cpu_threads; i++) { -- kernel_thread_globals.emplace_back(kernel_globals, osl_memory, profiler); -+ kernel_thread_globals.emplace_back(kernel_globals, osl_memory, profiler, i); - } - } - -diff --git a/intern/cycles/device/cpu/kernel_thread_globals.cpp b/intern/cycles/device/cpu/kernel_thread_globals.cpp -index 546061a5086..998a63aa334 100644 ---- a/intern/cycles/device/cpu/kernel_thread_globals.cpp -+++ b/intern/cycles/device/cpu/kernel_thread_globals.cpp -@@ -12,14 +12,16 @@ CCL_NAMESPACE_BEGIN - - CPUKernelThreadGlobals::CPUKernelThreadGlobals(const KernelGlobalsCPU &kernel_globals, - void *osl_globals_memory, -- Profiler &cpu_profiler) -+ Profiler &cpu_profiler, -+ const int thread_index) - : KernelGlobalsCPU(kernel_globals), cpu_profiler_(cpu_profiler) - { - clear_runtime_pointers(); - - #ifdef WITH_OSL -- OSLGlobals::thread_init(this, static_cast<OSLGlobals *>(osl_globals_memory)); -+ OSLGlobals::thread_init(this, static_cast<OSLGlobals *>(osl_globals_memory), thread_index); - #else -+ (void)thread_index; - (void)osl_globals_memory; - #endif - -diff --git a/intern/cycles/device/cpu/kernel_thread_globals.h b/intern/cycles/device/cpu/kernel_thread_globals.h -index dc4b693702a..3dbc35fefa3 100644 ---- a/intern/cycles/device/cpu/kernel_thread_globals.h -+++ b/intern/cycles/device/cpu/kernel_thread_globals.h -@@ -23,7 +23,8 @@ class CPUKernelThreadGlobals : public KernelGlobalsCPU { - * without OSL support. Will avoid need to those unnamed pointers and casts. */ - CPUKernelThreadGlobals(const KernelGlobalsCPU &kernel_globals, - void *osl_globals_memory, -- Profiler &cpu_profiler); -+ Profiler &cpu_profiler, -+ const int thread_index); - - ~CPUKernelThreadGlobals(); - -diff --git a/intern/cycles/kernel/device/cpu/globals.h b/intern/cycles/kernel/device/cpu/globals.h -index 90a274b2bcf..d0495883e27 100644 ---- a/intern/cycles/kernel/device/cpu/globals.h -+++ b/intern/cycles/kernel/device/cpu/globals.h -@@ -49,6 +49,7 @@ typedef struct KernelGlobalsCPU { - OSLGlobals *osl = nullptr; - OSLShadingSystem *osl_ss = nullptr; - OSLThreadData *osl_tdata = nullptr; -+ int osl_thread_index = 0; - #endif - - #ifdef __PATH_GUIDING__ -diff --git a/intern/cycles/kernel/osl/closures.cpp b/intern/cycles/kernel/osl/closures.cpp -index 808e13f48d6..4a5906873af 100644 ---- a/intern/cycles/kernel/osl/closures.cpp -+++ b/intern/cycles/kernel/osl/closures.cpp -@@ -110,7 +110,17 @@ void osl_eval_nodes<SHADER_TYPE_SURFACE>(const KernelGlobalsCPU *kg, - if (sd->object == OBJECT_NONE && sd->lamp == LAMP_NONE) { - /* background */ - if (kg->osl->background_state) { -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ ss->execute(*octx, -+ *(kg->osl->background_state), -+ kg->osl_thread_index, -+ 0, -+ *globals, -+ nullptr, -+ nullptr); -+#else - ss->execute(octx, *(kg->osl->background_state), *globals); -+#endif - } - } - else { -@@ -150,8 +160,18 @@ void osl_eval_nodes<SHADER_TYPE_SURFACE>(const KernelGlobalsCPU *kg, - globals->dPdy = TO_VEC3(tmp_dP.dy); - } - -- /* execute bump shader */ -+/* execute bump shader */ -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ ss->execute(*octx, -+ *(kg->osl->bump_state[shader]), -+ kg->osl_thread_index, -+ 0, -+ *globals, -+ nullptr, -+ nullptr); -+#else - ss->execute(octx, *(kg->osl->bump_state[shader]), *globals); -+#endif - - /* reset state */ - sd->P = P; -@@ -164,7 +184,17 @@ void osl_eval_nodes<SHADER_TYPE_SURFACE>(const KernelGlobalsCPU *kg, - - /* surface shader */ - if (kg->osl->surface_state[shader]) { -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ ss->execute(*octx, -+ *(kg->osl->surface_state[shader]), -+ kg->osl_thread_index, -+ 0, -+ *globals, -+ nullptr, -+ nullptr); -+#else - ss->execute(octx, *(kg->osl->surface_state[shader]), *globals); -+#endif - } - } - -@@ -208,7 +238,17 @@ void osl_eval_nodes<SHADER_TYPE_VOLUME>(const KernelGlobalsCPU *kg, - int shader = sd->shader & SHADER_MASK; - - if (kg->osl->volume_state[shader]) { -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ ss->execute(*octx, -+ *(kg->osl->volume_state[shader]), -+ kg->osl_thread_index, -+ 0, -+ *globals, -+ nullptr, -+ nullptr); -+#else - ss->execute(octx, *(kg->osl->volume_state[shader]), *globals); -+#endif - } - - /* flatten closure tree */ -@@ -245,7 +285,17 @@ void osl_eval_nodes<SHADER_TYPE_DISPLACEMENT>(const KernelGlobalsCPU *kg, - int shader = sd->shader & SHADER_MASK; - - if (kg->osl->displacement_state[shader]) { -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ ss->execute(*octx, -+ *(kg->osl->displacement_state[shader]), -+ kg->osl_thread_index, -+ 0, -+ *globals, -+ nullptr, -+ nullptr); -+#else - ss->execute(octx, *(kg->osl->displacement_state[shader]), *globals); -+#endif - } - - /* get back position */ -diff --git a/intern/cycles/kernel/osl/globals.cpp b/intern/cycles/kernel/osl/globals.cpp -index c4f055af7f7..573ddb6f362 100644 ---- a/intern/cycles/kernel/osl/globals.cpp -+++ b/intern/cycles/kernel/osl/globals.cpp -@@ -14,7 +14,7 @@ - - CCL_NAMESPACE_BEGIN - --void OSLGlobals::thread_init(KernelGlobalsCPU *kg, OSLGlobals *osl_globals) -+void OSLGlobals::thread_init(KernelGlobalsCPU *kg, OSLGlobals *osl_globals, const int thread_index) - { - /* no osl used? */ - if (!osl_globals->use) { -@@ -37,6 +37,7 @@ void OSLGlobals::thread_init(KernelGlobalsCPU *kg, OSLGlobals *osl_globals) - - kg->osl_ss = (OSLShadingSystem *)ss; - kg->osl_tdata = tdata; -+ kg->osl_thread_index = thread_index; - } - - void OSLGlobals::thread_free(KernelGlobalsCPU *kg) -diff --git a/intern/cycles/kernel/osl/globals.h b/intern/cycles/kernel/osl/globals.h -index 9656ef08306..cf24c62613b 100644 ---- a/intern/cycles/kernel/osl/globals.h -+++ b/intern/cycles/kernel/osl/globals.h -@@ -45,7 +45,9 @@ struct OSLGlobals { - } - - /* per thread data */ -- static void thread_init(struct KernelGlobalsCPU *kg, OSLGlobals *osl_globals); -+ static void thread_init(struct KernelGlobalsCPU *kg, -+ OSLGlobals *osl_globals, -+ const int thread_init); - static void thread_free(struct KernelGlobalsCPU *kg); - - bool use; -diff --git a/intern/cycles/kernel/osl/osl.h b/intern/cycles/kernel/osl/osl.h -index 347b635632a..3238eb5096b 100644 ---- a/intern/cycles/kernel/osl/osl.h -+++ b/intern/cycles/kernel/osl/osl.h -@@ -52,6 +52,11 @@ ccl_device_inline void shaderdata_to_shaderglobals(KernelGlobals kg, - - /* shader data to be used in services callbacks */ - globals->renderstate = sd; -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ globals->shadingStateUniform = nullptr; -+ globals->thread_index = 0; -+ globals->shade_index = 0; -+#endif - - /* hacky, we leave it to services to fetch actual object matrix */ - globals->shader2common = sd; -diff --git a/intern/cycles/kernel/osl/services.cpp b/intern/cycles/kernel/osl/services.cpp -index 02dc1cd1aec..93595b0a458 100644 ---- a/intern/cycles/kernel/osl/services.cpp -+++ b/intern/cycles/kernel/osl/services.cpp -@@ -1165,7 +1165,18 @@ bool OSLRenderServices::get_userdata( - return false; /* disabled by lockgeom */ - } - --#if OSL_LIBRARY_VERSION_CODE >= 11100 -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+TextureSystem::TextureHandle *OSLRenderServices::get_texture_handle(OSLUStringHash filename, -+ OSL::ShadingContext *context, -+ const TextureOpt *opt) -+{ -+ return get_texture_handle(to_ustring(filename), context, opt); -+} -+ -+TextureSystem::TextureHandle *OSLRenderServices::get_texture_handle(OSL::ustring filename, -+ OSL::ShadingContext *, -+ const TextureOpt *) -+#elif OSL_LIBRARY_VERSION_CODE >= 11100 - TextureSystem::TextureHandle *OSLRenderServices::get_texture_handle(OSLUStringHash filename, - OSL::ShadingContext *) - #else -@@ -1616,7 +1627,17 @@ bool OSLRenderServices::environment(OSLUStringHash filename, - return status; - } - --#if OSL_LIBRARY_VERSION_CODE >= 11100 -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+bool OSLRenderServices::get_texture_info(OSLUStringHash filename, -+ TextureHandle *texture_handle, -+ TexturePerthread *texture_thread_info, -+ OSL::ShaderGlobals *, -+ int subimage, -+ OSLUStringHash dataname, -+ TypeDesc datatype, -+ void *data, -+ OSLUStringHash *) -+#elif OSL_LIBRARY_VERSION_CODE >= 11100 - bool OSLRenderServices::get_texture_info(OSLUStringHash filename, - TextureHandle *texture_handle, - TexturePerthread *texture_thread_info, -@@ -1627,7 +1648,7 @@ bool OSLRenderServices::get_texture_info(OSLUStringHash filename, - void *data, - OSLUStringHash *) - #else --bool OSLRenderServices::get_texture_info(OSL::ShaderGlobals *sg, -+bool OSLRenderServices::get_texture_info(OSL::ShaderGlobals *, - OSLUStringHash filename, - TextureHandle *texture_handle, - int subimage, -diff --git a/intern/cycles/kernel/osl/services.h b/intern/cycles/kernel/osl/services.h -index b674fa7c7a7..62d8a4c5416 100644 ---- a/intern/cycles/kernel/osl/services.h -+++ b/intern/cycles/kernel/osl/services.h -@@ -189,7 +189,14 @@ class OSLRenderServices : public OSL::RendererServices { - void *val, - bool derivatives) override; - --#if OSL_LIBRARY_VERSION_CODE >= 11100 -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ TextureSystem::TextureHandle *get_texture_handle(OSL::ustring filename, -+ OSL::ShadingContext *context, -+ const TextureOpt *options) override; -+ TextureSystem::TextureHandle *get_texture_handle(OSLUStringHash filename, -+ OSL::ShadingContext *context, -+ const TextureOpt *options) override; -+#elif OSL_LIBRARY_VERSION_CODE >= 11100 - TextureSystem::TextureHandle *get_texture_handle(OSLUStringHash filename, - OSL::ShadingContext *context) override; - #else -@@ -245,7 +252,17 @@ class OSLRenderServices : public OSL::RendererServices { - float *dresultdt, - OSLUStringHash *errormessage) override; - --#if OSL_LIBRARY_VERSION_CODE >= 11100 -+#if OSL_LIBRARY_VERSION_CODE >= 11304 -+ bool get_texture_info(OSLUStringHash filename, -+ TextureHandle *texture_handle, -+ TexturePerthread *texture_thread_info, -+ OSL::ShaderGlobals *sg, -+ int subimage, -+ OSLUStringHash dataname, -+ TypeDesc datatype, -+ void *data, -+ OSLUStringHash *errormessage) override; -+#elif OSL_LIBRARY_VERSION_CODE >= 11100 - bool get_texture_info(OSLUStringHash filename, - TextureHandle *texture_handle, - TexturePerthread *texture_thread_info, -diff --git a/intern/cycles/kernel/osl/types.h b/intern/cycles/kernel/osl/types.h -index 71c808ff91b..8cb5779961a 100644 ---- a/intern/cycles/kernel/osl/types.h -+++ b/intern/cycles/kernel/osl/types.h -@@ -86,8 +86,10 @@ struct ShaderGlobals { - ccl_private void *tracedata; - ccl_private void *objdata; - void *context; --#if OSL_LIBRARY_VERSION_CODE >= 11302 -+#if OSL_LIBRARY_VERSION_CODE >= 11304 - void *shadingStateUniform; -+ int thread_index; -+ int shade_index; - #endif - void *renderer; - ccl_private void *object2common; diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml index e9c0f2846ae7..927ab93cc1a5 100644 --- a/media-gfx/blender/metadata.xml +++ b/media-gfx/blender/metadata.xml @@ -37,8 +37,7 @@ Build cycles renderer with AMD HIP support. </flag> <flag name="cycles"> - Build cycles renderer (requires <pkg>media-libs/openimageio</pkg> and - <pkg>dev-libs/boost</pkg>). + Enable the Cycles raytracing render engine. </flag> <flag name="cycles-bin-kernels"> Precompile the cycles render kernels for the CUDA/HIP/OneAPI backends, if they are enabled, at compile time. @@ -57,9 +56,6 @@ <flag name="fluid"> Adds fluid simulation support via the built-in Mantaflow library. </flag> - <flag name="headless"> - Build without graphical support (renderfarm, server mode only). - </flag> <flag name="nanovdb"> Enable nanoVDB support in Cycles. Uses less memory than regular openVDB when rendering. </flag> @@ -68,7 +64,6 @@ </flag> <flag name="oidn">Enable OpenImageDenoiser Support</flag> <flag name="oneapi">Build OIDN with Intel oneAPI SyCL support</flag> - <flag name="openimageio">Enable OpenImageIO Support</flag> <flag name="openpgl">Enable path guiding support in Cycles</flag> <flag name="opensubdiv"> Add rendering support form OpenSubdiv from Dreamworks Animation diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index 974d2c9a0751..fa862159cc28 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -4,7 +4,6 @@ AUX freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch 347 BLAKE2B 1c8119aec AUX freecad-9999-Gentoo-specific-don-t-check-vcs.patch 322 BLAKE2B 431b69d749c5639d2407207632ab48f1af36319290c1016985ed2431fe7a5314a5df8373a0a5235fcd08de5762dd090dd89b73846703348d5e2e0fac7c9c7048 SHA512 f67b3bfa013a497d0372649d9339665dd5c48b2dd00814e55ee6fcad6580a8219139f6c1931f2da5e210d181205af55e19b91a4d08b4d0dc7d45fcef358eb0ed AUX freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch 469 BLAKE2B 23e56fbc49b3c3d5ede85e6ec15d26c88c93590fce105e0b75e8b0bd3fee125c500cd59d8db0144c610edb371df318396e056333ec7a411f7647b38d18006efc SHA512 82737af95603ff1f667bf49ee43b85b411eeeb5fd9b577ad7fca6e02bcbfda5c3bbb6c70386e5f69d2181d6226574f82cb68b7e66dfe8f4bb14d946f594582cf DIST freecad-1.0.0.tar.gz 91599325 BLAKE2B 65540eb42e7d508456c9edbf2122e0f288708c33e6d00d3c8c45550e7a614f658f91ba25978a66819bc094b7138aab72a89c0172d0841be1ff798ade5a8bdc64 SHA512 afc1079ea04fd5bb8135f8ad1012d9e4e05c8839dd0a4e00253eada58fe018f445c1200d1ca7ac9f268644c946cbf55b7b313dc3d6bd010f9da3a3334103b7db -EBUILD freecad-1.0.0-r1.ebuild 8777 BLAKE2B 8dfb0994510ea0a7ba3ef5b943ce5f61ba659a8776d3da90099dc2b15aa767434b1954872fbe3534570d1860786f2daefefa7ac75d9668f1e7141422b146bcfc SHA512 f467f0d82480f5210d9a25e49160903cafd6b6a68792e6be51abb03e4fbabc9cab35b682209e415458e604bfee673cb4f816ce7d29538eb2335b0707ee32e012 -EBUILD freecad-1.0.0.ebuild 12031 BLAKE2B 7aab12b69ed67210a4d5815860c47ec832f9538d5ff2bedd30e837399cde1608798cf6b87ea7d079bb29d058f3f7d048f698dbb8717c21e3dd2f97f97d8ff0d3 SHA512 cdaa165c05a3cb2b680397f8a5518ff0bf47baf6ce731e56f8579b2494ed5b59d7852d59e2a251c178629e30513d1c39c8472cc3b7a2845ae8b15c3c16e2bc24 +EBUILD freecad-1.0.0-r1.ebuild 8776 BLAKE2B 6af3f807f99da332f50cf70c3854a5ae7c0f24a87d1e241670a9026521973ab662582dd37fe9586954fa7cc58e47e2cdadf5748eeeaa9e0b1925b8a8ce8d7267 SHA512 ddffd3f5ae196f69f4f437873ac5b0be44f442939390b954bf209b7545410da9833ea3f3e47d92d61c3adbaee18efb7a5802891828b1c1dc53f0425d3fea48ad EBUILD freecad-9999.ebuild 8689 BLAKE2B e796cbc17a48eccf792ccd336f1ac650dbb46d43dfb5f2bd431db87802120cbdb3752c99d89b01d4bf289e13d37c5392ed942e3c3bad46626eae9322a9a47e88 SHA512 41514c4c7e4cb4601f1eccb52658db6bc2ac7f24601c97f677c7f1ca8ba18901fe195d32a0864d8f276b90f6e20589ca09b85951110fe0ccee8cb4a867310f0f -MISC metadata.xml 3656 BLAKE2B 81367f486e966237e6424cca386644bbef79fb7014de4d24234ee090b9d3e4947f95541f823330137aec57916c757f07996e568eded062eadeb44a3c47417761 SHA512 0e162aec1f90c333961670e5090e8bcb8cdbeaddbae49f7d91fb3cd811857939d53035b54b5f9554e80fd29bc653b4fe5df726187204c9f0e0c5c89b671008d8 +MISC metadata.xml 2907 BLAKE2B caf71b22b1a242778cd62fef19796e442500ec16850d38e07c1773f773b4d8ca3a063ccb13aa044ae6c4efc3e3c9ee8ba5b03465ccc4b9758c8f08e75675f8e4 SHA512 9d336ec1b1f307ca510b470ba362144ad8ca579de2968483661b7d8868a0dd0f6cd18090dbdf1d0f7c98a746e39f43f2e25422c1dfec4d995c572ac6083272ea diff --git a/media-gfx/freecad/freecad-1.0.0-r1.ebuild b/media-gfx/freecad/freecad-1.0.0-r1.ebuild index 4e4522a105d2..7c3e04d2865c 100644 --- a/media-gfx/freecad/freecad-1.0.0-r1.ebuild +++ b/media-gfx/freecad/freecad-1.0.0-r1.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == *9999* ]]; then S="${WORKDIR}/freecad-${PV}" else SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="amd64" S="${WORKDIR}/FreeCAD-${PV}" fi diff --git a/media-gfx/freecad/freecad-1.0.0.ebuild b/media-gfx/freecad/freecad-1.0.0.ebuild deleted file mode 100644 index 0807027c8d44..000000000000 --- a/media-gfx/freecad/freecad-1.0.0.ebuild +++ /dev/null @@ -1,390 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg - -DESCRIPTION="QT based Computer Aided Design application" -HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD" - -MY_PN=FreeCAD - -if [[ ${PV} = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" - S="${WORKDIR}/freecad-${PV}" -else - SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64" - S="${WORKDIR}/FreeCAD-${PV}" -fi - -# code is licensed LGPL-2 -# examples are licensed CC-BY-SA (without note of specific version) -LICENSE="LGPL-2 CC-BY-SA-4.0" -SLOT="0" -IUSE="debug designer +gui qt5 test" - -FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl" -FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material - openscad part-design path points raytracing robot show smesh - surface techdraw tux" - -for module in ${FREECAD_STABLE_MODULES}; do - IUSE="${IUSE} +${module}" -done -for module in ${FREECAD_EXPERIMENTAL_MODULES}; do - IUSE="${IUSE} ${module}" -done -unset module - -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-cpp/gtest - dev-cpp/yaml-cpp - dev-libs/OpenNI2[opengl(+)] - dev-libs/boost:= - dev-libs/libfmt:= - dev-libs/libspnav[X] - dev-libs/xerces-c[icu] - dev-ruby/asciidoctor - qt5? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - ) - !qt5? ( - dev-qt/qtbase:6[concurrent,network,xml] - ) - media-libs/freetype - media-libs/qhull:= - sci-libs/hdf5:=[fortran,zlib] - >=sci-libs/med-4.0.0-r1 - sci-libs/opencascade:=[json,vtk] - sci-libs/orocos_kdl:= - sys-libs/zlib - virtual/libusb:1 - cloud? ( - dev-libs/openssl:= - net-misc/curl - ) - fem? ( - qt5? ( sci-libs/vtk:=[qt5,rendering] ) - !qt5? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) - ) - gui? ( - >=media-libs/coin-4.0.0 - virtual/glu - virtual/opengl - qt5? ( - dev-qt/designer:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - pcl? ( sci-libs/pcl[qt5] ) - $(python_gen_cond_dep ' - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] - dev-python/pyside2:=[gui,svg,webchannel,${PYTHON_USEDEP}] - dev-python/shiboken2:=[${PYTHON_USEDEP}] - ' python3_{10..11} ) - ) - !qt5? ( - designer? ( dev-qt/qttools:6[designer] ) - dev-qt/qt5compat:6 - dev-qt/qttools:6[widgets] - dev-qt/qtbase:6[gui,opengl,widgets] - dev-qt/qtsvg:6 - pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) - $(python_gen_cond_dep ' - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] - dev-python/pyside6:=[gui,svg,webchannel,${PYTHON_USEDEP}] - dev-python/shiboken6:=[${PYTHON_USEDEP}] - ' ) - ) - ) - netgen? ( media-gfx/netgen[opencascade] ) - openscad? ( media-gfx/openscad ) - pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) - smesh? ( - qt5? ( sci-libs/vtk:=[qt5] ) - !qt5? ( sci-libs/vtk:=[-qt5,qt6] ) - ) - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - addonmgr? ( dev-python/gitpython[${PYTHON_USEDEP}] ) - fem? ( dev-python/ply[${PYTHON_USEDEP}] ) - ') -" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.3.1:3 - dev-cpp/ms-gsl - test? ( - $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - qt5? ( dev-qt/qttest:5 ) - ) -" -BDEPEND=" - app-text/dos2unix - dev-lang/swig - test? ( - $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - qt5? ( dev-qt/qttest:5 ) - dev-cpp/gtest - ) -" - -# To get required dependencies: -# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' -# We set the following requirements by default: -# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web. -# -# Additionally, we auto-enable mesh_part, flat_mesh and smesh -# Fem actually needs smesh, but as long as we don't have a smesh package, we enable -# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't -# reflected by the REQUIRES_MODS macro, but at -# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187. -# -# The increase in auto-enabled workbenches is due to their need in parts of the -# test suite when compiled with a minimal set of USE flags. -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - designer? ( gui ) - inspection? ( points ) - path? ( robot ) - python_single_target_python3_12? ( gui? ( !qt5 ) ) -" -# There is no py3.12 support planned for pyside2 - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.0-Gentoo-specific-don-t-check-vcs.patch - "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch - "${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch -) - -DOCS=( CODE_OF_CONDUCT.md README.md ) - -CHECKREQS_DISK_BUILD="2G" - -pkg_setup() { - check-reqs_pkg_setup - python-single-r1_pkg_setup - [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade" -} - -src_prepare() { - # Fix desktop file - sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die - - find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings" - - cmake_src_prepare -} - -src_configure() { - # -Werror=odr, -Werror=lto-type-mismatch - # https://bugs.gentoo.org/875221 - # https://github.com/FreeCAD/FreeCAD/issues/13173 - filter-lto - - # Fix building tests - append-ldflags -Wl,--copy-dt-needed-entries - - local mycmakeargs=( - -DBUILD_ADDONMGR=$(usex addonmgr) - -DBUILD_ARCH=ON - -DBUILD_ASSEMBLY=OFF # Requires OndselSolver - -DBUILD_CLOUD=$(usex cloud) - -DBUILD_COMPLETE=OFF # deprecated - -DBUILD_DRAFT=ON - -DBUILD_DESIGNER_PLUGIN=$(usex designer) - -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for current git master - -DBUILD_FEM=$(usex fem) - -DBUILD_FEM_NETGEN=$(usex netgen) - -DBUILD_FLAT_MESH=ON - -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory - -DBUILD_FREETYPE=ON # automagic dep - -DBUILD_GUI=$(usex gui) - -DBUILD_IDF=$(usex idf) - -DBUILD_IMAGE=$(usex image) - -DBUILD_IMPORT=ON # import module for various file formats - -DBUILD_INSPECTION=$(usex inspection) - -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there - -DBUILD_MATERIAL=$(usex material) - -DBUILD_MESH=ON - -DBUILD_MESH_PART=ON - -DBUILD_OPENSCAD=$(usex openscad) - -DBUILD_PART=ON - -DBUILD_PART_DESIGN=$(usex part-design) - -DBUILD_PATH=$(usex path) - -DBUILD_POINTS=$(usex points) - -DBUILD_RAYTRACING=$(usex raytracing) - -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox - -DBUILD_ROBOT=$(usex robot) - -DBUILD_SHOW=$(usex show) - -DBUILD_SKETCHER=ON # needed by draft workspace - -DBUILD_SMESH=$(usex smesh) - -DBUILD_SPREADSHEET=ON - -DBUILD_START=ON - -DBUILD_SURFACE=$(usex surface) - -DBUILD_TECHDRAW=$(usex techdraw) - -DBUILD_TEST=ON # always build test workbench for run-time testing - -DBUILD_TUX=$(usex tux) - -DBUILD_VR=OFF - -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} - - -DFREECAD_BUILD_DEBIAN=OFF - - -DFREECAD_USE_EXTERNAL_KDL=ON - -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo - -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree - -DFREECAD_USE_FREETYPE=ON - -DFREECAD_USE_OCC_VARIANT:STRING="Official Version" - -DFREECAD_USE_PCL=$(usex pcl) - -DFREECAD_USE_PYBIND11=ON - -DFREECAD_USE_QT_FILEDIALOG=ON - - # install python modules to site-packages' dir. True only for the main package, - # sub-packages will still be installed inside /usr/lib64/freecad - -DINSTALL_TO_SITEPACKAGES=ON - - # Use the version of shiboken2 that matches the selected python version - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPython3_EXECUTABLE=${PYTHON} - ) - - if use debug; then - # BUILD_SANDBOX currently broken, see - # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595 - mycmakeargs+=( - -DBUILD_SANDBOX=OFF - -DBUILD_TEMPLATE=ON - ) - else - mycmakeargs+=( - -DBUILD_SANDBOX=OFF - -DBUILD_TEMPLATE=OFF - ) - fi - - if ! use qt5; then - mycmakeargs+=( - -DFREECAD_QT_MAJOR_VERSION=6 - -DFREECAD_QT_VERSION=6 - -DQT_DEFAULT_MAJOR_VERSION=6 - -DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc" - -DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc" - -DBUILD_QT5=OFF - # Drawing module unmaintained and not ported to qt6 - -DBUILD_DRAWING=OFF - ) - else - mycmakeargs+=( - -DFREECAD_QT_MAJOR_VERSION=5 - -DFREECAD_QT_VERSION=5 - -DQT_DEFAULT_MAJOR_VERSION=5 - -DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" - -DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc" - -DBUILD_QT5=ON - # Drawing module unmaintained and not ported to qt6 - -DBUILD_DRAWING=ON - ) - fi - - cmake_src_configure -} - -# We use the FreeCADCmd binary instead of the FreeCAD binary here -# for two reasons: -# 1. It works out of the box with USE=-gui as well, not needing a guard -# 2. We don't need virtualx.eclass and it's dependencies -# The exported environment variables are needed, so freecad does know -# where to save it's temporary files, and where to look and write it's -# configuration. Without those, there are sandbox violation, when it -# tries to create /var/lib/portage/home/.FreeCAD directory. -src_test() { - pushd "${BUILD_DIR}" > /dev/null || die - export FREECAD_USER_HOME="${HOME}" - export FREECAD_USER_DATA="${T}" - export FREECAD_USER_TEMP="${T}" - nonfatal ./bin/FreeCADCmd --run-test 0 - popd > /dev/null || die -} - -src_install() { - cmake_src_install - - dobin src/Tools/freecad-thumbnailer - - if use gui; then - newbin - freecad <<- _EOF_ - #!/bin/sh - # https://github.com/coin3d/coin/issues/451 - : \${QT_QPA_PLATFORM:=xcb} - export QT_QPA_PLATFORM - exec /usr/$(get_libdir)/${PN}/bin/FreeCAD "\${@}" - _EOF_ - mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources" - fi - dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd - - rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format" - - 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 -} - -pkg_postinst() { - xdg_pkg_postinst - - einfo "You can load a lot of additional workbenches using the integrated" - einfo "AddonManager." - - # ToDo: check opencv, pysolar (::science), elmerfem (::science) - # ifc++, ifcopenshell, z88 (no pkgs), calculix-ccx (::waebbl) - einfo "There are a lot of additional tools, for which FreeCAD has builtin" - einfo "support. Some of them are available in Gentoo. Take a look at" - einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD" - optfeature_header "Computational utilities" - optfeature "BLAS library" sci-libs/openblas - optfeature "Statistical computation with Python" dev-python/pandas - optfeature "Use scientific computation with Python" dev-python/scipy - optfeature "Use symbolic math with Python" dev-python/sympy - optfeature_header "Imaging, Plotting and Rendering utilities" - optfeature "Dependency graphs" media-gfx/graphviz - optfeature "PBR Rendering" media-gfx/povray - optfeature_header "Import / Export" - optfeature "Interact with git repositories" dev-python/gitpython - optfeature "Work with COLLADA documents" dev-python/pycollada - optfeature "YAML importer and emitter" dev-python/pyyaml - optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg - optfeature "Importing and exporting geospatial data formats" sci-libs/gdal - optfeature "Working with projection data" sci-libs/proj - optfeature_header "Meshing and FEM" - optfeature "FEM mesh generator" sci-libs/gmsh - optfeature "Triangulating meshes" sci-libs/gts - optfeature "Visualization" sci-visualization/paraview -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml index 5d5e1aeb6daa..35a605b4e6ef 100644 --- a/media-gfx/freecad/metadata.xml +++ b/media-gfx/freecad/metadata.xml @@ -43,17 +43,10 @@ Build the IDF module to provide file exchange capabilities with IDF files </flag> - <flag name="image"> - Build the image module and workbench for working with bitmap - images - </flag> <flag name="inspection"> Build the inspection workbench which gives you specific tools for examination of shapes (experimental) </flag> - <flag name="material"> - Build the material module and workbench to work with materials - </flag> <flag name="mesh"> Build the mesh module and workbench </flag> @@ -64,32 +57,18 @@ Build the OpenSCAD module for interoperability with OpenSCAD and repairing Constructive Solid Geometry (CSG) history </flag> - <flag name="part-design"> - Build the part design module and workbench for build part shapes - from sketches - </flag> - <flag name="path"><!-- FIXME: auto-enable through robot? --> - Build the path module and workbench to procude G-Code instructions - for CNC - </flag> <flag name="pcl"> Use external <pkg>sci-libs/pcl</pkg> for point clouds support. </flag> <flag name="points"> Build the points module and workbench for working with point clouds </flag> - <flag name="raytracing"> - Build the raytracing module and workbench for raytracing and rendering - </flag> <flag name="reverse"> Build the reverse engineering module and workbench </flag> <flag name="robot"> Build the robot module and workbench for studying robot movements </flag> - <flag name="show"> - Build the show module, a helper module for visibility automation - </flag> <flag name="smesh"> Build Salome SMESH </flag> @@ -104,9 +83,6 @@ Build the techdraw module and workbench, a more advanced and feature-rich successor of the drawing workbench </flag> - <flag name="tux"> - Build the Tux module - </flag> </use> <upstream> <bugs-to>https://github.com/FreeCAD/FreeCAD/issues</bugs-to> diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 4f7058bdae58..f837e2a752cd 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -16,6 +16,6 @@ EBUILD gimp-2.10.36-r4.ebuild 6152 BLAKE2B b0013afb683f05ea7b5dfd1e9ced41bafb6f3 EBUILD gimp-2.10.38-r1.ebuild 6263 BLAKE2B 33b03f460723be7296b458ca7fe6c93d4c3fba91c30453ab67dec74415306c91ba248207c255a39459c06b042f423460a2689af76967c5d69680caa0817a78ca SHA512 1b76ead707da38695b9c34885ab464508cb91d20ddf4fa85cbd95458f8ca3fbad89dbf7fdf65adc032dfe519df04e49759b8c4dc6a5c045355f5e6020d771e5d EBUILD gimp-2.99.18-r1.ebuild 7253 BLAKE2B 0c95a252589be3d821a73b7651e866207928cee724d16e934f585bd9080869620d1b20546672ddf229ef59bd21f54d5906da19bf2bafab76d479b05b3adfc403 SHA512 042f9a4d904d2be0bedbb6dde123a7d12f8c43b7502990e2a0c6884c287522db8e0bfeebc0fa621a54992739482db4a8b8f3675ba7f5af33999ea4c390f6bf37 EBUILD gimp-2.99.18-r2.ebuild 7334 BLAKE2B 48ac3cbc7462d69b6bb36611f72d0d1dc26dee5ca4764c8acf1e65c434fc106aa6ea6f05a10e81b62f8608e109cfae52be6d2e84f46e7c9e5e2443db5a92ebbc SHA512 084e3039ff16d1e6eccb02ca01beee6d702dbac2748ba87e9550949766454cf810357c06c978c5fcb35dc10413aa00a5eee69355cc90fe2103749e0f83a37296 -EBUILD gimp-3.0.0_rc1.ebuild 7043 BLAKE2B 1119162da595325f9b73b6b1344c6e85595f9177c9cd7924d40bebc1b6ac2bb59dab04e740e98b728c469e62d4783d86f50fef27079adcf7909bf34e37b22adc SHA512 84bfc3a42e1d1da2791710229bd58f08be17104107e9d7df4cc798413f0ba05f0a5823629572ea71203f4a8476f0499bf9f953a1d51a3103cf588c3a2b3d23f9 -EBUILD gimp-9999.ebuild 7259 BLAKE2B 94f6605dbe4ce61288c60c9d0650be8021be3b5b5490ea4b1939796a6f8417a9f40df0d6abf6470750acf85a698151644243abd127612427170ea8a564ee4798 SHA512 5b02f36c4e32749d09462fe2418239f74c2142934527775a1619647a971eccd2c697ca4108b7b663b1ebc21c164ae256e1d8d779e58f7f0b76d0d0a3284e669c +EBUILD gimp-3.0.0_rc1.ebuild 7043 BLAKE2B bec2a409e288e90a58214febedf99b113bfc0c77412a823aef85a683b129ddc11876e8a3457d27380be780dc97ddd193be0b7341ecfce96aafceb77997575b2a SHA512 91396c43aa2beb6304a56cc84f9c088da4416a7b34e1d70b00f8fcb3c25eac22b96bdaac0c1523ae929014a5be17cd221cec5d56bd9dcf43e0f854222e5620a6 +EBUILD gimp-9999.ebuild 7259 BLAKE2B 1ccbd31727bac846d9bef5d3221a859cccc2069e98831bb8aeb03b6f9c52f6d7d13e8ce57db087a6082754acbdf4f3ae25f46d53232bcb7baa5303d8c2b17224 SHA512 149dbbb73e0116fc9694bbb5659033156f585fe9c8208939ab6d391c99332cafb5b2bdb59498df729b9024c05a14b1243aa90a07fb3192131262e7a425c10c7c MISC metadata.xml 655 BLAKE2B f6628a2c5edb90b16db0f59af05446a3f31316f5558ece238d30c9350632713cf2db3d315c90b31229596659ec20859c17fde6b051f9ab8f8fe34d64902dad57 SHA512 712a259ae41d9052bde0761087928685b9b66a132db3f3b49121241d87728f51bf31a00541aa385bd03b57a2e2a03a0176356045dd4752485a8dca2bd61c5886 diff --git a/media-gfx/gimp/gimp-3.0.0_rc1.ebuild b/media-gfx/gimp/gimp-3.0.0_rc1.ebuild index 357b6ffb72e4..00639d92cbe4 100644 --- a/media-gfx/gimp/gimp-3.0.0_rc1.ebuild +++ b/media-gfx/gimp/gimp-3.0.0_rc1.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) VALA_USE_DEPEND=vapigen inherit lua-single meson python-single-r1 toolchain-funcs vala xdg diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index 473f80d33404..918db05ef232 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) VALA_USE_DEPEND=vapigen inherit git-r3 lua-single meson python-single-r1 toolchain-funcs vala xdg diff --git a/media-gfx/opencsg/Manifest b/media-gfx/opencsg/Manifest index ead371f41bde..ba125aba40d6 100644 --- a/media-gfx/opencsg/Manifest +++ b/media-gfx/opencsg/Manifest @@ -5,5 +5,5 @@ DIST OpenCSG-1.5.1.tar.gz 967182 BLAKE2B a24d7e736b58af78dfed218e7015c9a580c447b DIST OpenCSG-1.6.0.tar.gz 302547 BLAKE2B ceb99fb6558b38df0eb629cfd5e5e2b768311f026f2f42e0e35ca948761bd7c67fcfc35322d54eb6c013eded39d95ede08f634b30241ebad4231bf783f76b591 SHA512 0cbf28353aafb47738a122bd5fa8e8ab0abc616d7b3f4e5f1ee02f550a060ccfbd6569d1183fcc4e992fe9bbb49584c23aa9cc7db2a7e7c53b119544aa9589a7 EBUILD opencsg-1.5.1-r1.ebuild 1165 BLAKE2B 535c82bade697db1063d85464ea38acc104843e05288c73d89c1cc8d6a601586b5410db197ec7e1839cf40bcb7aa36b53037f44f9c6ea84193690ca0abc7b4e7 SHA512 7e3cdba506001516bfd795c9d3982d7be84cae080a12b2ca554ba5c706222dd05f18194f85993d7102f2b60af69485cae3573bb29bf2c0ea5d46abf981d379ca EBUILD opencsg-1.6.0-r1.ebuild 686 BLAKE2B 34047a1512451af054ba3ea2d94ae27d47e38388dc74902ee718ce439f587b18e321fbd254a03005265f54376c0770649e8367dcb245f2c9fafc89edc5af6537 SHA512 6589a5bb18b8a2a223cf3433cde272492615c2029f7ea5cf17e6836bb54b32811fe7d7676cbeca4e6c75dd1575f552721d70a01ea87de1bd430bca8c8401d8db -EBUILD opencsg-1.6.0.ebuild 1037 BLAKE2B 0fb9e5764a37b39088ae51ee0447d908af72ff94edbe19df5c34ab6e1789f98aaf87dbf0c5d64af196b746ad3cb3be2c5b4a8c8e88b9b0f024d28c4697b5af8a SHA512 27f77aa726e038e6ac266dd26987e8029385937f825740a34ef557976e2acc0815bccec3a5a6dd15919f37b5f24abdb93ac8dab78a3509041109db00258ea4b2 +EBUILD opencsg-1.6.0.ebuild 1036 BLAKE2B de068931a091306ae4a08f1d6a72c68838f54b58c64b8140f7b60eb7fba92291a244b7beb8b945b667d4c8ba65bbd7ac2d967fd5f3c826b661ce33b90966f12c SHA512 823aca21ac593b092c7c3f7ad5b0cb6df9d0f86233b6947ad9b099a765ec8d35104616e84bbcb257062b59a6698966f87f8bd888d31e1e7ce482af3e74a86347 MISC metadata.xml 1303 BLAKE2B 39b12bf1071d488890726841c2e609023e99edc3387007408b1a332051cb7adb7faf71ea3e5afdc660ba9a62116a322addba637aa1a7dc78adcae4cf27ac6508 SHA512 5a56d0545ab79ed384f580aa97be7736ac844ed8951262d016b4eb43193c594fe889f067b1c7243346b8185c8e63d933457b9b1f1f1ae47d5e350fc93d65476c diff --git a/media-gfx/opencsg/opencsg-1.6.0.ebuild b/media-gfx/opencsg/opencsg-1.6.0.ebuild index 7afafcd37947..719af99f7936 100644 --- a/media-gfx/opencsg/opencsg-1.6.0.ebuild +++ b/media-gfx/opencsg/opencsg-1.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-2+" SLOT="0/1.6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86" IUSE="doc" RESTRICT="test" diff --git a/media-gfx/oxipng/Manifest b/media-gfx/oxipng/Manifest index 190b47bf88ed..2c8db34609ed 100644 --- a/media-gfx/oxipng/Manifest +++ b/media-gfx/oxipng/Manifest @@ -1,3 +1,5 @@ +AUX libdeflater-1.20.0-relax-libdeflate-sys-version.patch 354 BLAKE2B cb3befcba80d6efca1d642c2aa632ff16c8a3a8df07ebf5c7b731fafda8c0090b011fca0022a7de903310bb74f0075c49fe21ee0ebc9cc1395a81baff357d3e9 SHA512 e63cac81e7766b856c1af4322aca530ca1d76ef6267755d0d8898c1a4768d8dbd9860e89025818998a1f68c8c1484fad6d11330e795c8398596e22dbc1169e92 +AUX oxipng-9.1.2-use-system-libdeflate.patch 1080 BLAKE2B 80bb7326d51b272994537f0cca93e533ec74a9d09ff634db3dac3a6a0149bd94cbfcce4b6b4f9819b42ff6a4be28c680e1785838e60ca401302b4fd27ad62c9d SHA512 94b2abe045ad8e8706a19dd4e95cf71d5d99d6d19b7daf93123e7e43eb27d7258fc211c0f1c098953e96bcc462591e5e3da6dd025e2c4c715c697b93486d9cb1 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3 DIST anstream-0.3.2.crate 19504 BLAKE2B 617b846c244ea4ccd6c7835a382afe85e14c245ea56b678f57ee12e9c7bcc1c0c3db9620eb4d16bf35e17eca38968bf04420b758f482ac5594670e6292c1fbb9 SHA512 b896e5208a2ee6a3c98bf3bb9ac1c52792de114dfa5709dadcac6183ea19ea63230dffd3217e571354a71d69b8eafbb0189e05f8f77f50922020de54e3aeecc8 @@ -119,6 +121,7 @@ DIST os_str_bytes-6.4.1.crate 23101 BLAKE2B 252fc826f646bbb999fa80b47f58ac9a77e4 DIST oxipng-8.0.0.tar.gz 51646362 BLAKE2B 3f2223f515d81bf7b229f3cd4cff5f26a49c8db4aef52076a0fbd5ad2bf259b3b56e83f90a9b2c2a6847e653b73910d9316cc85b00d43614c99e047dbbcfb2da SHA512 e8a45082f65c392d7c4caff10911e52958c671e86850681c281aaaadd24f50a153919cf714626326028769f3627b1664c420ba17cfc8fec86d82a8e81a7ab9ca DIST oxipng-9.0.0.tar.gz 22303586 BLAKE2B b1e5776a97ec305514393e186dba3ff4b19a6d0020182b1d1933020eb8cb6f550c0474517efbe4b9ee95ac40f867c05f5be66e7a7239eb00c2d5b7897066e980 SHA512 ac12b1e823c748b5a3d58081b86d5be69b970788fb3f2d4acc1db1f790455bd35b8b897203b1157674be83b9172bb4cb3ec1d6401538270f42a5f35f92a62f5a DIST oxipng-9.1.2.tar.gz 20940722 BLAKE2B 6067d9a222f917e9b9c7e9628461576e37cd9c51df8a0c6b1167b0c3f866dde1767804aeae48ccba5d3043fd05532754b6869ec32f9d2df919645be7d1134cbf SHA512 5e4ab6f8797bc03373c24886b105ffe79fb617342f9924f8fc416d1649bbc55cfe397889fba0a0211717f20807ef4e96c42cc3985c13009a1200ed755c5dc7eb +DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4 DIST png-0.17.13.crate 103176 BLAKE2B 99bfd1c444f5967b715b81607e3c3266fb3b1d8110897e4c93afb5b6e0e28df262f9c9d842aefed922c38a5ff9d16e75cca065d7cc14ddadb3a7e9ea4776e787 SHA512 064a932f4c48c2243286a9b4cdec0487cc976291bc8ecf4753691afdfe43acda4b17ea8d48ec933f309d158df28f40ee93b5b32b3ab5252e2e7aa1ee1c0e4e84 DIST png-0.17.7.crate 80979 BLAKE2B 37628fa2282c7195f983a95939eda1c73745f89d772904173775d7e1906b71615e45de8f59489d6842450ed6f7c7b809b28881c84d5a3399da38013fc3062c79 SHA512 f8009925a6948d8b9c82007f31eefd18d2173274816c0329673e48ef725aec52ca3aab2b91e8fc4f776c8f7f17475a3e065835e578a632445e1bd70794b18270 DIST png-0.17.9.crate 88839 BLAKE2B b218fcaa166f142ced8ae75a47bb587015d0a449210f3cf789ef3f85eb6dec946c3744ff93a40a2e2d08de8a4973e12cc0880f8ef95c36f96c920ee47bc096fc SHA512 95c532136b7f31dc7aa3b04e721307b5a722f95cb815c885ed26a751b5c1eabd52b38aa1a1f504e610a5bc1baa6058ade1406cc833d0d2286fa7523f0c6ad5d1 @@ -202,4 +205,5 @@ DIST zopfli-0.8.0.crate 54234 BLAKE2B a5e0434a4b20840f2bd59d72121849ea23c2f21d0e EBUILD oxipng-8.0.0-r1.ebuild 2196 BLAKE2B 3fa673c72e60fdadf00a8291823e0dd30e6a8b1105165af0ca32f70ffc003e84c03484802ca72e7dfa7273f552e657eb5849f2d853529831a329c3edd643a1d8 SHA512 a5fa5455878e9ec1aaf03ddf9ff59936799ff3677e1c65ac173dbe930fadb20970b98c3e6124a863946533759c6daf70e551d3b3c583718994b24fb0128c831a EBUILD oxipng-9.0.0-r1.ebuild 2246 BLAKE2B 8a387c10ff50710d77c45561dd4994ef1c1bfecbf66224b9254a0e4dc65e040069c51eb2664a7f29ae7c97bc6df7bc4d2ab654a95fb64e4aa125da12983510b2 SHA512 261fbe5f71328d823eb5ea9ee192d3e198368b36504c33b82e5bef337709aa2d3d9d1bd03101616043642eeb81efca38d36e7f7527c161c568773c6e4c16ebbf EBUILD oxipng-9.1.2-r1.ebuild 2625 BLAKE2B 7a738af1ddaa7df09e072b22ea073cfddc60d1b2d21d1c9eab37ff57a49c1976ded03bba4a8d6f5ef65f138af08c2fb7a0094c85926f272ef356ec62b01b3039 SHA512 85491eea2f98185272bd3c6cfab9fe1004a69b35a201ca68ebb0fb1084a26324b873e239fe1acc4ad9e3f1912e6c7d388f930c8b262f4a120af16b982952847d +EBUILD oxipng-9.1.2-r2.ebuild 3559 BLAKE2B 9f4dba6f221ce4454a96a42104030298e86a5e9962e88ec6a2cf7d63df061c1a0c9281ae9fc179267968d18379ad8ac8807d2e8d82658622e88b46679be21b61 SHA512 2e187d6b983f225e43683a41fed367031d2ae867b1654cbbd38492752a29eaeca444dd5d2aab7590a26f7a98a4e1962e9a10a26edc4d02142b9a5b70a19bc353 MISC metadata.xml 623 BLAKE2B e494053d292bf36c65237f5cb7c8b488ac60ead764ae88d90e9ff80aefe46f11c4d2c4bfea88258d0fb70eea136f552f5b77cdb16e3de0438e1843c79f5c5c56 SHA512 3a886300372c8cd3d837cd206e4451ba156afad49400b3594e3dff7ce430c2f8612a72d986485cb848b6f9ecf852f739a184f0d8f3015defc716beccee162654 diff --git a/media-gfx/oxipng/files/libdeflater-1.20.0-relax-libdeflate-sys-version.patch b/media-gfx/oxipng/files/libdeflater-1.20.0-relax-libdeflate-sys-version.patch new file mode 100644 index 000000000000..a7435085aa4f --- /dev/null +++ b/media-gfx/oxipng/files/libdeflater-1.20.0-relax-libdeflate-sys-version.patch @@ -0,0 +1,13 @@ +diff --git a/build.rs b/build.rs +index 9c5f169589aa..14f79d18d5f7 100644 +--- a/build.rs ++++ b/build.rs +@@ -9,7 +9,7 @@ fn main() { + if pkg_config::Config::new() + .print_system_libs(false) + .cargo_metadata(true) +- .exactly_version("1.20") ++ .atleast_version("1.20") + .probe("libdeflate") + .is_ok() + { diff --git a/media-gfx/oxipng/files/oxipng-9.1.2-use-system-libdeflate.patch b/media-gfx/oxipng/files/oxipng-9.1.2-use-system-libdeflate.patch new file mode 100644 index 000000000000..704916d9e08b --- /dev/null +++ b/media-gfx/oxipng/files/oxipng-9.1.2-use-system-libdeflate.patch @@ -0,0 +1,38 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 2ad4fcc0f23a..b749a4311652 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -325,6 +325,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "669ea17f9257bcb48c09c7ee4bef3957777504acffac557263e20c11001977bc" + dependencies = [ + "cc", ++ "pkg-config", + ] + + [[package]] +@@ -389,6 +390,12 @@ dependencies = [ + "zopfli", + ] + ++[[package]] ++name = "pkg-config" ++version = "0.3.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" ++ + [[package]] + name = "png" + version = "0.17.13" +diff --git a/Cargo.toml b/Cargo.toml +index 717bf26fd441..d9036c8c5255 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -39,7 +39,7 @@ required-features = ["zopfli"] + zopfli = { version = "0.8.0", optional = true, default-features = false, features = ["std", "zlib"] } + rgb = "0.8.43" + indexmap = "2.2.6" +-libdeflater = "1.20.0" ++libdeflater = { version = "1.20.0", features = ["dynamic"] } + log = "0.4.21" + bitvec = "1.0.1" + rustc-hash = "1.1.0" diff --git a/media-gfx/oxipng/oxipng-9.1.2-r2.ebuild b/media-gfx/oxipng/oxipng-9.1.2-r2.ebuild new file mode 100644 index 000000000000..d225fadafc14 --- /dev/null +++ b/media-gfx/oxipng/oxipng-9.1.2-r2.ebuild @@ -0,0 +1,154 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Auto-Generated by cargo-ebuild 0.5.4-r1 + +EAPI=8 + +CRATES=" + adler@1.0.2 + anstream@0.6.13 + anstyle@1.0.6 + anstyle-parse@0.2.3 + anstyle-query@1.0.2 + anstyle-wincon@3.0.2 + autocfg@1.2.0 + bitflags@1.3.2 + bitflags@2.5.0 + bitvec@1.0.1 + bytemuck@1.16.1 + byteorder@1.5.0 + cc@1.0.92 + cfg-if@1.0.0 + clap@4.5.4 + clap_builder@4.5.2 + clap_lex@0.7.0 + clap_mangen@0.2.20 + colorchoice@1.0.0 + crc32fast@1.4.0 + crossbeam-channel@0.5.12 + crossbeam-deque@0.8.5 + crossbeam-epoch@0.9.18 + crossbeam-utils@0.8.19 + either@1.10.0 + env_filter@0.1.0 + env_logger@0.11.3 + equivalent@1.0.1 + errno@0.3.8 + fdeflate@0.3.4 + filetime@0.2.23 + flate2@1.0.28 + funty@2.0.0 + glob@0.3.1 + hashbrown@0.14.3 + image@0.25.1 + indexmap@2.2.6 + libc@0.2.153 + libdeflate-sys@1.20.0 + libdeflater@1.20.0 + linux-raw-sys@0.4.13 + log@0.4.21 + miniz_oxide@0.7.2 + num-traits@0.2.18 + pkg-config@0.3.31 + png@0.17.13 + radium@0.7.0 + rayon@1.10.0 + rayon-core@1.12.1 + redox_syscall@0.4.1 + rgb@0.8.44 + roff@0.2.1 + rustc-hash@1.1.0 + rustc_version@0.4.0 + rustix@0.38.32 + semver@1.0.22 + simd-adler32@0.3.7 + strsim@0.11.1 + tap@1.0.1 + terminal_size@0.3.0 + typed-arena@2.0.2 + utf8parse@0.2.1 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.5 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.5 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.5 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.5 + windows_i686_gnullvm@0.52.5 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.5 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.5 + wyz@0.5.1 + zopfli@0.8.0 +" + +RUST_MIN_VER="1.74.0" + +inherit cargo + +DESCRIPTION="Multithreaded lossless PNG compression optimizer written in Rust" +HOMEPAGE="https://github.com/shssoichiro/oxipng" +SRC_URI="https://github.com/shssoichiro/oxipng/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" ${CARGO_CRATE_URIS}" + +LICENSE=" + Apache-2.0 + || ( Apache-2.0 MIT ) + || ( Apache-2.0 MIT ZLIB ) + MIT +" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +PATCHES=( "${FILESDIR}/oxipng-9.1.2-use-system-libdeflate.patch" ) + +BDEPEND="virtual/pkgconfig" +DEPEND=">=app-arch/libdeflate-1.20:=" +RDEPEND="${DEPEND}" + +# rust does not use *FLAGS from make.conf, silence portage warning +# update with proper path to binaries this crate installs, omit leading / +QA_FLAGS_IGNORED="usr/bin/${PN}" +QA_PRESTRIPPED="usr/bin/${PN}" + +src_prepare() { + # Relax the version restriction of libdeflate. + # https://bugs.gentoo.org/944285 + # + # Any API/ABI-compatible versions would be ok for app-arch/libdeflate, but + # in such case the build script of libdeflate_sys should be patched to pick + # even if the system library is newer. + # See <https://github.com/adamkewley/libdeflater/pull/32#issuecomment-1971198374>. + # + # Also, don't forget updating `DEPNED` and `RDEPEND` in sync, or libdeflater + # crate will fail to pick system library and silently use the bundled + # version of libdeflate. + ( cd "${WORKDIR}"/cargo_home/gentoo/libdeflate-sys-1.20.0 && \ + eapply "${FILESDIR}"/libdeflater-1.20.0-relax-libdeflate-sys-version.patch ) + + # Remove the linker configs (in `.cargo/config.toml`) specific to GitHub CI. + # https://bugs.gentoo.org/924946 + rm -rv "${S}/.cargo/config.toml" || die + + default_src_prepare +} + +src_configure() { + export PKG_CONFIG_ALLOW_CROSS=1 + + cargo_src_configure +} + +src_install() { + cargo_src_install + + dodoc CHANGELOG.md README.md +} diff --git a/media-gfx/tif22pnm/Manifest b/media-gfx/tif22pnm/Manifest index a30eeef2afbe..24f6a2c967f6 100644 --- a/media-gfx/tif22pnm/Manifest +++ b/media-gfx/tif22pnm/Manifest @@ -1,5 +1,5 @@ AUX tif22pnm-0.14-gentoo.patch 990 BLAKE2B 03603a6082d3b29f6917b14b8f43890886303d5b88ff602c03fb15d98b4271594677869e5432473f91dfd55062b8d0d459d235b7581908f978d957b3b1a9c54f SHA512 583a43fec6e9152bf7452f693fcd47e611d4eec05cc4073422f895350e6c02b10b914c5ef6edc83ba12ccda8eb16063878dbb0736b14092671bdfb51889459b9 AUX tif22pnm-0.14-math.patch 760 BLAKE2B a5a9b9c30c60fd78bec411925b545c4fe5396c13a7598cd259eed376bbeee3c14ed4b4e19e82282d39a2bc45be35197c0655db897ee2914511da634f1b72eed8 SHA512 616217de0ebb1ef790096d82582508e5b0df1224e2aecd35638205aa9f088683acf7e8d51db060fabcece21976b0f048ac816b361d2240656f3edb262612d6ea DIST tif22pnm-0.14.tar.gz 108047 BLAKE2B e6252a9388710950e62c9500fa1578a9a624d4181ff6482f9333b84daf79a9f2d5b62ab6e1cc80b08d96c47b8d401f7fb53afe4523672fe9e0eec38ed2fb4f5a SHA512 0cc09cfca3dcf0de8d3ee50a3d9a061e80a5298f40e7bdc3483f0ec5dfcca419af797fb30c2d97ae7a1d16e3e58d627ae5a3596043eea7ad35a504abab4885f9 -EBUILD tif22pnm-0.14-r1.ebuild 643 BLAKE2B 2eb1a0de864646e0f30d9b5862e023fdf0f7ec1f90bfea2e6e8dae246e08d6482e3ecaf423e4a66943e0d4cf1d9a40b9e67c7d81534523ced00c62554df1cfd2 SHA512 878178569792b96053ec0c69057a38e5888f5bb0868cc586a7055c0797adb3ad35a9294a50cd511237910ae3188d7077ac6fffb84930475cc537e7668fa0fd82 +EBUILD tif22pnm-0.14-r1.ebuild 728 BLAKE2B 035f257fc3629890e73b7e11544195d0b7370ad71eb812135a62f05d1e2c03e3f945a96c6b0b87b51ac6fa8aa0257e22ef53f362aa56cd06781b5a5a5411b8a9 SHA512 64ec3f3acc68a2691ca99fabf155414203fece8dfae2fb126c096816b2d0129817e74a0ebc1051e8150b366b487a929baa570cc6459d25d1cf22ac7eebbac778 MISC metadata.xml 325 BLAKE2B 942b67f8ebd6e199e6f123791f082bb7fcb9c25005613819688ca8358c47efec6bdce5270ceb3ba87c85cddf650553041a804e5edc6378ee7aa579a7773153b0 SHA512 eb7c41bf79be0947ad3736ca1d5f3f9ac3074d4013f7921d49950011446651e55b17be2b5d6c2f10490bf63a958313685d2ef3af447a9055b866e10e98ab7f0f diff --git a/media-gfx/tif22pnm/tif22pnm-0.14-r1.ebuild b/media-gfx/tif22pnm/tif22pnm-0.14-r1.ebuild index eb2fd906a707..7e8f20c59ac1 100644 --- a/media-gfx/tif22pnm/tif22pnm-0.14-r1.ebuild +++ b/media-gfx/tif22pnm/tif22pnm-0.14-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="tif22pnm and png22pnm command-line converters" HOMEPAGE="http://pts.szit.bme.hu/ https://code.google.com/p/sam2p/" @@ -29,6 +29,13 @@ src_prepare() { eautoreconf } +src_configure() { + # bug #944994 + append-cflags -std=gnu17 + + default +} + src_install() { dobin png22pnm tif22pnm einstalldocs diff --git a/media-gfx/tintii/Manifest b/media-gfx/tintii/Manifest index f3e1f311d523..38b52f1d5fd2 100644 --- a/media-gfx/tintii/Manifest +++ b/media-gfx/tintii/Manifest @@ -1,4 +1,4 @@ DIST tintii-2.10.0.tar.gz 620863 BLAKE2B 61127bfe1ce1eca87cea7fcd5cc6ef95c445ad0cdf32fd2d752a27818df8132ee0d7e6eab355c37ff3535be416a79b34652e8a28d8f93e0bd523a15396f6a4cd SHA512 884a9a3393080ee064069288afc13b2f72272571efaabf013ea2029627fc2ed922dcb791b8316c1d2117faf553d6bf333cf35f0486ba82aa2dc0987f9ce5f9a3 DIST tintii_128.png 22351 BLAKE2B 54f32b1a0037e4acb05fa524ddbea10a942b0441570e4bb73f4659f1b536ac72261ad2ffd03db5a0df6f5819cb58081ce2371cce981ee037023b27054a31db56 SHA512 fb5458a10b6a461dc3b9a7e15d65616c8df318fc2a439118e0d0433e5badebe18da499ff7627ac30fd0374f754ebb90ac9c7ce5b2fb521820ea134a625862052 -EBUILD tintii-2.10.0-r2.ebuild 773 BLAKE2B 24b7bd86087b371c5d3e2646b48327da64d493f4ab9462919c601537d8a9f5670c21574098dd8588a444ce7cb40f26364eb96cc525c9a9a45fa21c80deb2a7ca SHA512 5aa51a0ea3716833e067b239ba08aec990e5f35e8cd6de88d84f7deae0063fe19830b338678eda29109898916a9f12be9fc223795485b9fac2eff4d3f47abeec +EBUILD tintii-2.10.0-r2.ebuild 745 BLAKE2B 9b598db2036ee84ba347e588e7bea5b215160fd785d96d5adf0c7a9be5e5b01c1dd5561481c0c4dad8a3a619022e463c95f07281f0c69b8e087faa2dc40874b0 SHA512 26d31875f8733638043b2cee60729bc6b11dbe510667213ca80d989a7a53bc5a902e67ada96b5521af2284bb04aada68df218942b58ed985f21e7a8637551ceb MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/media-gfx/tintii/tintii-2.10.0-r2.ebuild b/media-gfx/tintii/tintii-2.10.0-r2.ebuild index e7518338c7b0..93920542bbc7 100644 --- a/media-gfx/tintii/tintii-2.10.0-r2.ebuild +++ b/media-gfx/tintii/tintii-2.10.0-r2.ebuild @@ -23,12 +23,8 @@ DEPEND="${RDEPEND} " BDEPEND="app-alternatives/bc" -src_prepare() { - default - setup-wxwidgets -} - src_configure() { + setup-wxwidgets econf --disable-assert } diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest index 2cd472c839d6..5d99fafc9aa5 100644 --- a/media-gfx/valentina/Manifest +++ b/media-gfx/valentina/Manifest @@ -4,6 +4,6 @@ DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc DIST valentina-v0.6.1.tar.bz2 25575677 BLAKE2B 56d5adc973df319b3a65f877768c2195e1af2db39118e18fb17636e5739610d55e4ade4d4516a6817347dcdb0e4468e4587cff91fc5a5ea74a35029c52bf858c SHA512 52a3a02bd08f85c6241fe29baa9c8a2b80d2e8b071877bc68f98c3ff7bcdf810d9975903f804bf4e120f1a65c06de405fd44bc822292ab7b6191b778ec703542 DIST valentina-v0.7.52.tar.bz2 30819274 BLAKE2B 3b9b2ac2c4083371420dca4911bf5162d9d772ddf0a8b4582dac7ca47e6f027279a99bd3d674a7f0ce15e962cdf1afbdb573f8a14a5f6c02baae1f7a5aae37a1 SHA512 71ff3dc4ccea2ee3df34fda0364b211a80d4f953e6d3b9bf9b40ba1f4d1531e751d077983e8d13acb1f524c9883d2f565289d1b67d5de0a152c9a4df1428d6df EBUILD valentina-0.6.1-r1.ebuild 2172 BLAKE2B b63a3eb14070d035807174444cf7fdc8458c46bf00598ce536b2acd91ee176b46072d2ce06723b8cd4bfaac8ff05cfdb10298a2b81fcd4ec9ccb357d48e08ff4 SHA512 09c5cbb557a57bad0868e335ae465e1ffcd475070a955ab9db04ca5d0ff317c0a88dd4f5344f275edadb8df456f5602080b53c312b7d358c7722de0f4594f21b -EBUILD valentina-0.7.52.ebuild 2013 BLAKE2B 42d6f8fa863282131a95028c96fcee44607a0cdade9f64f2b2e35b745c4190f7d042f04b567b23fcbcc76855008691ff526130afd2221298e183aadca14e88fc SHA512 f9df543da310fad259ea1853f769f1a32f8d5145fc9cb3ff6418bbfdfd8771485f03ca59b9e4a07e576c8a596271cb12516715d34e327f6a9acc140e0fef3251 -EBUILD valentina-9999.ebuild 1928 BLAKE2B d3f0aad7c7d95a01274351bd9b7b18c493f210960a46bc00ecf83a4f6d3458d83b7d9909ec0c1d38296f9028576117c1c83acf342d0d32c28dc8bfb3d924e7b0 SHA512 68264e82fea642bef07c45a3a9d2ac3775aa34453d931fadabb49d6177f01f7d280e2d2dc11f6a5097e7e118b7708e3e3dd2ed8dfcd7e3ef4dbdc5943d9d3f5c +EBUILD valentina-0.7.52.ebuild 2040 BLAKE2B a9b1b52c4e5be76154e4f4a6a3a6ad3ab7c71d973b753a9e1cf8e92bc2cc01f4e6bc55fdb16a08e65c659b9d990ba41e7d8ad1d95045a572d1249ff3f03a28a2 SHA512 dcb4e34d6e4fb1405bf3205c4de357815f6ed33a495a101d2931c60c9bda2d60ec56839f5902bdbea955bbd2c836f1d3e5a3582a4007a60bdd56eb0e8531d696 +EBUILD valentina-9999.ebuild 1955 BLAKE2B b9e124e830e6e1de84c8e96d9424f07a6deeb6dd31ab3977218a82a3c7217b120be6f91bb16927d25fc1b603c2524c8b61ce5ae8200a326c45482e774a25a1b6 SHA512 199e54d12fa72cabb42c07213d0d896251fc29e39a4140c445219c9b44876bc41b2561a5501ad99359a3f583e5b21ea8d7e6730a324d4784ce5ea047fc8a42ce MISC metadata.xml 338 BLAKE2B e25c965f49a8f8a62e13090a542f31a4dd8e750d22c41f53f786e63508ac714f97bccffa45b980d276674b322c87939220a6ae78710bd3a5cef43fc6220abea6 SHA512 4a08041d3ff622c268d11d6f584ceee0912bfde684519962e942798fe47597b62edc5a00125a497c796b60d29e9f8b20e423ba2ad9ef52fcd7056982236c0851 diff --git a/media-gfx/valentina/valentina-0.7.52.ebuild b/media-gfx/valentina/valentina-0.7.52.ebuild index c44783b0bd50..c033a46d7a3e 100644 --- a/media-gfx/valentina/valentina-0.7.52.ebuild +++ b/media-gfx/valentina/valentina-0.7.52.ebuild @@ -30,7 +30,9 @@ RDEPEND=" dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5" + dev-qt/qtxmlpatterns:5 + !sci-biology/tree-puzzle +" DEPEND=" ${RDEPEND} dev-qt/qttest:5 diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild index 6b9c6fa11b44..1307c3f81ad2 100644 --- a/media-gfx/valentina/valentina-9999.ebuild +++ b/media-gfx/valentina/valentina-9999.ebuild @@ -30,7 +30,9 @@ RDEPEND=" dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5" + dev-qt/qtxmlpatterns:5 + !sci-biology/tree-puzzle +" DEPEND=" ${RDEPEND} dev-qt/qttest:5 |