diff options
Diffstat (limited to 'media-gfx')
25 files changed, 663 insertions, 126 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 94955d3281fd..94eb9711717c 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 74148c9073b0..f13010b46df2 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,6 +1,8 @@ AUX blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch 877 BLAKE2B 954cae23023e60ef38847927a8ddfc05a19f86c1b5f95a78227aba2af32707ca3490f815e370aa995944973d3ea44d58895817e3ac1ffbb006468ef33f3223a7 SHA512 f4d4e946ce177c82cbe63ab2beab05748e91786800885432f64c00b3ba93be3fec54f084663617dd1b877776d60c418da12cee9a3f4f59a447a3291d08eeba5e AUX blender-3.0.1-openexr.patch 4868 BLAKE2B eccd615d26ba6963220dd9128294d996890f5909707cae5b8b39a0b1e35147618ff2d92348c8e8613cea45c974442665be5036884c33737ccf4041eec5f0135c SHA512 f44288212a3e8e2ed04ced2e574ac240a18f90c3f6e28fabc9dc855545c9b28b216f9cc3ad70721dca754a0d032100fe2aa430eff54049f672219747728d5657 AUX blender-3.0.1-openimageio-2.3.patch 927 BLAKE2B 02ed40bf291ac6ec935a7412c8c1681023fb1fac3bfe7a6ecdbaddfd895f48557274f466849f1aa35900c66dbba6724a29b7d5553fe914e5a3df0f93a9791acd SHA512 0edd3e3c3265694593b242db5c96d3c123630819ff07b906b7f86c15cdf60e4bf1e8b61d555241eadf842a2a33c1f4f1ad4cce0e7d07c8d7308d8a9d536bf512 +AUX blender-3.2.2-musl-glibc-prereq.patch 814 BLAKE2B 1ca7438618074fa270cdda530ab160b5ae648217a6ad58b27f9c4b9f3de53442dbcfc1c59f70c47a6190dc1cbea9a431078263b04e2fdc963e5831ae97171e3b SHA512 5053d0ada8f6bfafc9517e133c8ed2221040b9df6d47f6e31c958b4c061360940b1b155ea6bd413dc4673e899c18468498df1bef7ad88ca22b94895524044af1 +AUX blender-3.2.2-support-building-with-musl-libc.patch 5583 BLAKE2B 193548ea61608b6a355912cdd11eba60c58ac7975612890ff26b95b0d8974e3ed871e9e3d5437b7e36fc22b6a711e7af672b87a4e4f0b0765b95e4065dbcb934 SHA512 225065ac63344084918585272badfd58dc542e4b9370351fa4ff246fb8568d18027bd1d07fc139ac247236b75690578bb598731e00ea18767ed8e9d34d35b2fc DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513 SHA512 0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe DIST blender-2.93.10.tar.xz 43036752 BLAKE2B c08560246fe9e494cf43df6afff2535d166f5faf920728b9b2d787a1029fabe027db3ef5ae5c55b0ec3ea2849c4948cc96f8f9243f19c66ff7b72c2ea81a6e5b SHA512 ff1cee2ab48a9409e3fb3ae73e60aa5514cc8060e31e9a1d9f5c1725dec6f583d482db4cdc765806da2c7529fdaaf7bebe714e148183d5ef16170160fb103ab7 DIST blender-2.93.9.tar.xz 43035004 BLAKE2B 3d3e316794d0ee5ec3500c84247f4d9cc37d9c490e82321a10e8b020eb148f8d71480ce45e5d2098ef8d6c6657eb5d9f8a34807f93e8ad25650bd4e65cc559d7 SHA512 605eedabd7f164138076c0c91ca9ee3a1e26616c2539602ebba07c014a989738b973a908cbc0a062b3942f3e36754b2f88e2abcabae18017749b409aeaa2f97e @@ -16,6 +18,6 @@ EBUILD blender-2.93.9.ebuild 12567 BLAKE2B 4166c365ab82c29e822007467b3bb8f216a55 EBUILD blender-3.1.2.ebuild 12668 BLAKE2B b10fec9888760b4c74efc7075f0bad32f82355997cb0e56c3e1c4dc63d57429fca162d4dd2f37cf9b0e0aa8a82f0f163f6c18d8c13c3ee8966879b30925aab22 SHA512 2316b7f9001885af988d06c694852c10ac4614ce45860208bd8d3f8ccac5454fb7241aa1a4c8190665547eb57bcc62ec15898941df864212393d0af4d266dc22 EBUILD blender-3.2.0.ebuild 12667 BLAKE2B 9f88c5faa5c2b1ae38ab0d88bd3ed4857a0db03fc714c304fd6a367717fcdfb93daa4c53f91766f27a939cce6ea6e70fe0d6ee2065370916ecd46aae79851446 SHA512 6277f2e95cd08d3539f448086b018db3cdb67293183411a9b19f92a1b000de3030e2fd39600f773f22741dce7ac75717aef9e81e27c76fb6b8e91fdaa969a7d6 EBUILD blender-3.2.1.ebuild 12671 BLAKE2B 0809971af87433cf8169ffc0f70db1de113e50146d0709c291a97ef6759dcf6a6eb8a2d90876a6d3f3996494e9020d8b657e1ac49292af69316d93016d52caac SHA512 32b8e1b8653bc7d03b490987a38f5da4742c319c2f6de16be2fdc51384b67ccaf0025e40afc9f6411a24a6ba59897ea9927ce907aa953de275c33dd4d3a613af -EBUILD blender-3.2.2.ebuild 12671 BLAKE2B 0809971af87433cf8169ffc0f70db1de113e50146d0709c291a97ef6759dcf6a6eb8a2d90876a6d3f3996494e9020d8b657e1ac49292af69316d93016d52caac SHA512 32b8e1b8653bc7d03b490987a38f5da4742c319c2f6de16be2fdc51384b67ccaf0025e40afc9f6411a24a6ba59897ea9927ce907aa953de275c33dd4d3a613af +EBUILD blender-3.2.2.ebuild 12800 BLAKE2B c270ee8675e1ed9abd87c6e4327c3ce1b3ecf06f4c8e9a64b8421781c643b09b423edf63325f9ee0d80ce29ccb93d903e55d29fa00d39fed107ef9baf2ea9419 SHA512 b3ab80640ea1cf0f5c87ca6b5065e2468fff1ca38c8d7f4cd810393d37a2857e4a6fea4d9629d5e3268b0fb4e38fcb036ad675b5ddf79c774d75f70692726a6b EBUILD blender-9999.ebuild 12675 BLAKE2B de44471779f56eba0784bddc62ec5abce8644fdea12fa528baa32a91b9bff60222cd004c36395eccbd1f6be5697a725a036e6016e4d3b5c2a9fbff0cd5cbb15d SHA512 fc71e655e86f4a041cfc6d2b3c974b1bbe69469278bf17d9a404fed216109a0eb3f4a9965431e41d9818a16423fae95f64828772da3a77bfdefe26db72447176 MISC metadata.xml 2998 BLAKE2B 46de114ec2a0f5ed454d9879e6c5c11f06c386a73f8f692635cea26fc813f1d8489bf9fbf5d45c3fd43502784e02047613420e9de8d17e0e637586194e369d8f SHA512 533fdfbe7ded02391d808b42edf26ba8218c086e279a67c168bf7c654075a9608aae46439a9a98e8d650cc429fb0f0d45d0dc584861ef13c39df4f288e93bfb1 diff --git a/media-gfx/blender/blender-3.2.2.ebuild b/media-gfx/blender/blender-3.2.2.ebuild index 8c82138b1e5a..70024e231bf6 100644 --- a/media-gfx/blender/blender-3.2.2.ebuild +++ b/media-gfx/blender/blender-3.2.2.ebuild @@ -123,6 +123,11 @@ BDEPEND=" nls? ( sys-devel/gettext ) " +PATCHES=( + "${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch + "${FILESDIR}"/${PN}-3.2.2-musl-glibc-prereq.patch +) + blender_check_requirements() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp diff --git a/media-gfx/blender/files/blender-3.2.2-musl-glibc-prereq.patch b/media-gfx/blender/files/blender-3.2.2-musl-glibc-prereq.patch new file mode 100644 index 000000000000..a572f25788de --- /dev/null +++ b/media-gfx/blender/files/blender-3.2.2-musl-glibc-prereq.patch @@ -0,0 +1,27 @@ +Fix build error in libc_compat when using musl libc + +Checking for the existence of and using __GLIBC_PREREQ can't be done in the +same conditional. + +Please refer: https://github.com/blender/blender/commit/7be7280c5710f7831789cdde140d010722be9068 +--- a/intern/libc_compat/libc_compat.c ++++ b/intern/libc_compat/libc_compat.c +@@ -13,7 +13,8 @@ + # include <features.h> + # include <math.h> + +-# if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 31) ++# if defined(__GLIBC_PREREQ) ++# if __GLIBC_PREREQ(2, 31) + + double __exp_finite(double x); + double __exp2_finite(double x); +@@ -112,5 +113,6 @@ float __powf_finite(float x, float y) + return powf(x, y); + } + +-# endif /* __GLIBC_PREREQ */ +-#endif /* __linux__ */ ++# endif /* __GLIBC_PREREQ(2, 31) */ ++# endif /* __GLIBC_PREREQ */ ++#endif /* __linux__ */ 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 new file mode 100644 index 000000000000..fb3f2584f0fe --- /dev/null +++ b/media-gfx/blender/files/blender-3.2.2-support-building-with-musl-libc.patch @@ -0,0 +1,177 @@ +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/gimp/Manifest b/media-gfx/gimp/Manifest index a97d789f1c4f..43ad184fa073 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -1,7 +1,9 @@ AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067 DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1 DIST gimp-2.99.10.tar.bz2 26782056 BLAKE2B 103e7fa2d04b1989e59fb03964a122891831d122cdc6dd3b7637f06cff28310e12d9a79678ac477b56728f4ceb53292001c53f026e94be417db76dd7e14740ab SHA512 898c1e1ffd2270ccc965db9a8263e04d95455535361b47f92256b4028808e1e91eb1924cf6cef7ff9e988194ebbc67535bd9cfbf0243159824e58551a2b91ba3 +DIST gimp-2.99.12.tar.xz 24282140 BLAKE2B 2174e1d50941071ea6e96f0e3f315484867aa90ae06cbcdc7b30914f959c1a15a7e7ea34ba22ce09a973b29acf1277e3a4519d744140c3fcabc59f31dc3ebf43 SHA512 4b87dd40eccc39c560e69a90b4042b1b19506e9ae52e5079ace442325b54bf7c47477662197da8f7655c12aad16e08bae60d11cf269684b8aa291e978d246917 EBUILD gimp-2.10.32.ebuild 5649 BLAKE2B ed0b99850166d7d0a464d16aa74faa18aea2a92e5dab1ae8680bf813e9eed1323a2fb042c08b3a6fec416fa9e5cc83c14591e785931ecf7ffaf5ab3a404cc271 SHA512 ed4a2a0a1f4c3eb0188d97cc8527996cfe5c18279cbbe7577c14435229261aeb7e77d7ec87b4295fdb9e298bb7e91d767f5bc5048ffaa9e6cb21d0b95bc4f5fd EBUILD gimp-2.99.10-r1.ebuild 6613 BLAKE2B 2883d26916fa9a54d5037c7524f141b47faeba5816dcf086e549f0c5eadcd607e591c655bce0ae8322ba9d69f14f20a7f816ad732fc7cc0ba063715e3286e1d0 SHA512 17e79ffad687a53ce0da2280c628b2309245aff2935997a6817e2297435291992216b934ece01bdbef69633744740849faf1115e6230e92053ef6c19621835f9 -EBUILD gimp-9999.ebuild 6713 BLAKE2B 9b6170cb161ff5f4db607dd7bb76e3bc7f30c696e90596d091b55a23172ad4bbe9d30d159cff1126e0a961bb7360eca103d949579b863537a80617a85ab33352 SHA512 e0520374ff0bf3670a75fed61a188dd69881a140d283df87796c384ef113a92454f4b4946e7dfd41da07248841484faac4c50aa29fa8bf5d24841006f668fd3f +EBUILD gimp-2.99.12.ebuild 6801 BLAKE2B 8e3539c9d455cf4d440aacfd5917a560c31c84158087326f69d84017b758945f36933ffa07ad7a40701f6462086043eb3f391f47d71846c752dde391708da2c3 SHA512 a2371421e9c4aac2b44ea03eefeba2e8f53dd808491d5b7d862aad2e96db1bb52af51a28de6e27532622a6a3744c9b566f18a89a5ef3967a343b60841fda7694 +EBUILD gimp-9999.ebuild 6714 BLAKE2B 027a7b3582dc93f251c6efe6150990e5a13ed4173f6923717052b9fbd28494d031af1cabb7a8bd3d6cd2b26dd403dd8d4cf1ba2ca81491017c83903b667cd54b SHA512 dda911c6d56ec16cd67387beb4199a47d9d9e7d081afb7b6cf44b2d92280f5a2e57be1dd1ad91a74a3b984ce7eb98e86dd476a8ae074ef2fb629e9d6de582536 MISC metadata.xml 646 BLAKE2B 167cb95fb064b2470cdbb6b625f7d6e24aacac57081a1177fdc9e878b4cf1a20c6b86a7e621530b45bc7db5f07e173a47829fd5be9dde6f9b9fcf54a39f24236 SHA512 9f6501b6a14f860be69e29baaace61fe4c964413b8c43882bf06144406333f4d69d6adaa315503dc83fbdb467cd47e3d752ed6abe4b78bd5cb32fb9f3be1ac1d diff --git a/media-gfx/gimp/gimp-2.99.12.ebuild b/media-gfx/gimp/gimp-2.99.12.ebuild new file mode 100644 index 000000000000..5a97b3f4724a --- /dev/null +++ b/media-gfx/gimp/gimp-2.99.12.ebuild @@ -0,0 +1,250 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( luajit ) +PYTHON_COMPAT=( python3_{8..11} ) +VALA_MIN_API_VERSION="0.50" +VALA_USE_DEPEND=vapigen + +inherit lua-single meson python-single-r1 vala xdg + +DESCRIPTION="GNU Image Manipulation Program" +HOMEPAGE="https://www.gimp.org/" +SRC_URI="mirror://gimp/v2.99/${P}.tar.xz" + +LICENSE="GPL-3 LGPL-3" +SLOT="0/3" + +IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python test udev unwind vala vector-icons webp wmf xpm" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +RESTRICT="!test? ( test )" + +# media-libs/{babl,gegl} are required to be built with USE="introspection" +# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir} +COMMON_DEPEND=" + >=app-text/poppler-0.90.1[cairo] + >=app-text/poppler-data-0.4.9 + >=dev-libs/appstream-glib-0.7.16 + >=dev-libs/atk-2.34.1 + >=dev-libs/glib-2.68.0:2 + >=dev-libs/json-glib-1.4.4 + dev-libs/libxml2:2 + dev-libs/libxslt + >=gnome-base/librsvg-2.40.21:2 + >=media-gfx/mypaint-brushes-2.0.2:= + >=media-libs/babl-0.1.96[introspection,lcms,vala?] + >=media-libs/fontconfig-2.12.6 + >=media-libs/freetype-2.10.2 + >=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?] + >=media-libs/gexiv2-0.14.0 + >=media-libs/harfbuzz-2.6.5:= + >=media-libs/lcms-2.9:2 + media-libs/libjpeg-turbo + >=media-libs/libmypaint-1.6.1:= + >=media-libs/libpng-1.6.37:0= + >=media-libs/tiff-4.1.0:0 + net-libs/glib-networking[ssl] + sys-libs/zlib + >=x11-libs/cairo-1.16.0 + >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] + >=x11-libs/gtk+-3.24.16:3[introspection] + >=x11-libs/pango-1.44.7 + aalib? ( media-libs/aalib ) + alsa? ( >=media-libs/alsa-lib-1.0.0 ) + heif? ( >=media-libs/libheif-1.9.1:= ) + javascript? ( dev-libs/gjs ) + jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) + jpegxl? ( >=media-libs/libjxl-0.6.1:= ) + lua? ( + ${LUA_DEPS} + $(lua_gen_cond_dep ' + dev-lua/lgi[${LUA_USEDEP}] + ') + ) + mng? ( media-libs/libmng:= ) + openexr? ( >=media-libs/openexr-2.3.0:= ) + postscript? ( app-text/ghostscript-gpl ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}] + ') + ) + udev? ( >=dev-libs/libgudev-167:= ) + unwind? ( >=sys-libs/libunwind-1.1.0:= ) + webp? ( >=media-libs/libwebp-0.6.0:= ) + wmf? ( >=media-libs/libwmf-0.2.8 ) + X? ( x11-libs/libXcursor ) + xpm? ( x11-libs/libXpm ) +" + +RDEPEND=" + ${COMMON_DEPEND} + x11-themes/hicolor-icon-theme + gnome? ( gnome-base/gvfs ) +" + +DEPEND=" + ${COMMON_DEPEND} + test? ( x11-misc/xvfb-run ) + vala? ( $(vala_depend) ) +" + +# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now +BDEPEND=" + >=dev-lang/perl-5.30.3 + dev-util/gdbus-codegen + >=sys-devel/gettext-0.21 + doc? ( + app-text/yelp-tools + dev-libs/gobject-introspection[doctool] + dev-util/gi-docgen + ) + virtual/pkgconfig +" + +DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" ) + +pkg_setup() { + use lua && lua-single_pkg_setup + + if use python; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + default + + sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' meson.build || die #737794 + + # Fix (typo) MMX and SSE support detection + sed -i -e "s/'-mmx'/'-mmmx'/" -e "s/'-sse'/'-msse'/" meson.build || die + + # Fix Gimp and GimpUI devel doc installation paths + sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp/meson.build || die + sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp-ui/meson.build || die + + # Fix pygimp.interp python implementation path. + # Meson @PYTHON_PATH@ use sandbox path e.g.: + # '/var/tmp/portage/media-gfx/gimp-2.99.12/temp/python3.10/bin/python3' + sed -i -e 's:@PYTHON_PATH@:'${EPYTHON}':' plug-ins/python/pygimp.interp.in || die +} + +_adjust_sandbox() { + # Bugs #569738 and #591214 + local nv + for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do + # We do not check for existence as they may show up later + # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 + addwrite "${nv}" + done + + addwrite /dev/dri/ # bugs #574038 and #684886 + addwrite /dev/ati/ # bug #589198 + addwrite /proc/mtrr # bug #589198 +} + +src_configure() { + _adjust_sandbox + + use vala && vala_setup + + local emesonargs=( + -Denable-default-bin=true + + -Dcheck-update=no + -Denable-multiproc=true + -Dappdata-test=disabled + -Dbug-report-url=https://bugs.gentoo.org/ + -Dlibbacktrace=false + -Dwebkit-unmaintained=false + $(meson_feature aalib aa) + $(meson_feature alsa) + $(meson_feature doc gi-docgen) + $(meson_feature heif) + $(meson_feature jpeg2k jpeg2000) + $(meson_feature jpegxl jpeg-xl) + $(meson_feature mng) + $(meson_feature openexr) + $(meson_feature postscript ghostscript) + $(meson_feature test headless-tests) + $(meson_feature udev gudev) + $(meson_feature vala vala-plugins) + $(meson_feature webp) + $(meson_feature wmf) + $(meson_feature X xcursor) + $(meson_feature xpm) + $(meson_use doc g-ir-doc) + $(meson_use javascript) + $(meson_use lua) + $(meson_use python) + $(meson_use unwind libunwind) + $(meson_use vector-icons) + ) + + meson_src_configure +} + +src_compile() { + export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 + meson_src_compile +} + +# for https://bugs.gentoo.org/664938 +_rename_plugins() { + einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' + local prename=gimp-org- + ( + cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1 + for plugin_slash in $(ls -d1 */); do + plugin=${plugin_slash%/} + if [[ -f ${plugin}/${plugin} ]]; then + # NOTE: Folder and file name need to match for Gimp to load that plug-in + # so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg" + mv ${plugin}/{,${prename}}${plugin} || exit 1 + mv {,${prename}}${plugin} || exit 1 + fi + done + ) +} + +src_install() { + meson_src_install + + if use python; then + python_optimize + fi + + # Workaround for bug #321111 to give GIMP the least + # precedence on PDF documents by default + mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die + + find "${D}" -name '*.la' -type f -delete || die + + # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) + mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die + + # Create symlinks for Gimp exec in /usr/bin + dosym "${ESYSROOT}"/usr/bin/gimp-2.99 /usr/bin/gimp + dosym "${ESYSROOT}"/usr/bin/gimp-console-2.99 /usr/bin/gimp-console + dosym "${ESYSROOT}"/usr/bin/gimp-script-fu-interpreter-3.0 /usr/bin/gimp-script-fu-interpreter + dosym "${ESYSROOT}"/usr/bin/gimp-test-clipboard-2.99 /usr/bin/gimp-test-clipboard + dosym "${ESYSROOT}"/usr/bin/gimptool-2.99 /usr/bin/gimptool + + _rename_plugins || die +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index 0f655ffb58a9..04935142f351 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -4,12 +4,11 @@ EAPI=8 LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{8..10} ) -GNOME2_EAUTORECONF=yes +PYTHON_COMPAT=( python3_{8..11} ) VALA_MIN_API_VERSION="0.50" VALA_USE_DEPEND=vapigen -inherit git-r3 gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx +inherit git-r3 lua-single meson python-single-r1 vala xdg DESCRIPTION="GNU Image Manipulation Program" HOMEPAGE="https://www.gimp.org/" @@ -18,7 +17,7 @@ SRC_URI="" LICENSE="GPL-3 LGPL-3" SLOT="0/3" -IUSE="aalib alsa aqua doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" +IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python test udev unwind vala vector-icons webp wmf xpm" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -39,10 +38,10 @@ COMMON_DEPEND=" dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= - >=media-libs/babl-0.1.92[introspection,lcms,vala?] + >=media-libs/babl-0.1.96[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 - >=media-libs/gegl-0.4.36:0.4[cairo,introspection,lcms,vala?] + >=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 @@ -55,11 +54,9 @@ COMMON_DEPEND=" >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2[introspection] >=x11-libs/gtk+-3.24.16:3[introspection] - x11-libs/libXcursor >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) - aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) @@ -83,6 +80,7 @@ COMMON_DEPEND=" unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) + X? ( x11-libs/libXcursor ) xpm? ( x11-libs/libXpm ) " @@ -94,20 +92,22 @@ RDEPEND=" DEPEND=" ${COMMON_DEPEND} - >=dev-lang/perl-5.30.3 - dev-util/gdbus-codegen - dev-util/gtk-update-icon-cache - >=dev-util/intltool-0.51.0 - >=sys-devel/autoconf-2.54 - >=sys-devel/automake-1.11 - >=sys-devel/gettext-0.21 - >=sys-devel/libtool-2.4.6 - doc? ( dev-util/gi-docgen ) + test? ( x11-misc/xvfb-run ) vala? ( $(vala_depend) ) " # TODO: there are probably more atoms in DEPEND which should be in BDEPEND now -BDEPEND="virtual/pkgconfig" +BDEPEND=" + >=dev-lang/perl-5.30.3 + dev-util/gdbus-codegen + >=sys-devel/gettext-0.21 + doc? ( + app-text/yelp-tools + dev-libs/gobject-introspection[doctool] + dev-util/gi-docgen + ) + virtual/pkgconfig +" DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" ) @@ -120,19 +120,18 @@ pkg_setup() { } src_prepare() { -# sed -i -e '/validate/s:${GIMP_TESTING:--no-net ${GIMP_TESTING:' desktop/test-appdata.sh.in || die # Bug 685210 (and duplicate 691070) - - sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794 - - sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 - sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144 + default - gnome2_src_prepare # calls eautoreconf + sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' meson.build || die #737794 - sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 - grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test + # Fix Gimp and GimpUI devel doc installation paths + sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp/meson.build || die + sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp-ui/meson.build || die - export CC_FOR_BUILD="$(tc-getBUILD_CC)" + # Fix pygimp.interp python implementation path. + # Meson @PYTHON_PATH@ use sandbox path e.g.: + # '/var/tmp/portage/media-gfx/gimp-2.99.12/temp/python3.10/bin/python3' + sed -i -e 's:@PYTHON_PATH@:'${EPYTHON}':' plug-ins/python/pygimp.interp.in || die } _adjust_sandbox() { @@ -154,78 +153,67 @@ src_configure() { use vala && vala_setup - local myconf=( - GEGL="${EPREFIX}"/usr/bin/gegl-0.4 - GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen - - --enable-default-binary - - --disable-check-update - --enable-mp - --with-bug-report-url=https://bugs.gentoo.org/ - --with-pdbgen - --with-xmc - --without-appdata-test - --without-libbacktrace - --without-webkit - --without-xvfb-run - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable doc gi-docgen) - $(use_enable vector-icons) - $(use_with aalib aa) - $(use_with alsa) - $(use_with !aqua x) - $(use_with heif libheif) - $(use_with javascript) - $(use_with jpeg2k jpeg2000) - $(use_with jpegxl) - $(use_with lua) - $(use_with mng libmng) - $(use_with openexr) - $(use_with postscript gs) - $(use_with python) - $(use_with udev gudev) - $(use_with unwind libunwind) - $(use_with vala) - $(use_with webp) - $(use_with wmf) - $(use_with xpm libxpm) + local emesonargs=( + -Denable-default-bin=true + + -Dcheck-update=no + -Denable-multiproc=true + -Dappdata-test=disabled + -Dbug-report-url=https://bugs.gentoo.org/ + -Dlibbacktrace=false + -Dwebkit-unmaintained=false + $(meson_feature aalib aa) + $(meson_feature alsa) + $(meson_feature doc gi-docgen) + $(meson_feature heif) + $(meson_feature jpeg2k jpeg2000) + $(meson_feature jpegxl jpeg-xl) + $(meson_feature mng) + $(meson_feature openexr) + $(meson_feature postscript ghostscript) + $(meson_feature test headless-tests) + $(meson_feature udev gudev) + $(meson_feature vala vala-plugins) + $(meson_feature webp) + $(meson_feature wmf) + $(meson_feature X xcursor) + $(meson_feature xpm) + $(meson_use doc g-ir-doc) + $(meson_use javascript) + $(meson_use lua) + $(meson_use python) + $(meson_use unwind libunwind) + $(meson_use vector-icons) ) - gnome2_src_configure "${myconf[@]}" + meson_src_configure } src_compile() { export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - gnome2_src_compile + meson_src_compile } # for https://bugs.gentoo.org/664938 _rename_plugins() { einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prepend=gimp-org- + local prename=gimp-org- ( cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1 for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg" - mv ${plugin}/{,${prepend}}${plugin} || exit 1 - mv {,${prepend}}${plugin} || exit 1 - fi + plugin=${plugin_slash%/} + if [[ -f ${plugin}/${plugin} ]]; then + # NOTE: Folder and file name need to match for Gimp to load that plug-in + # so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg" + mv ${plugin}/{,${prename}}${plugin} || exit 1 + mv {,${prename}}${plugin} || exit 1 + fi done ) } -src_test() { - virtx emake check -} - src_install() { - gnome2_src_install + meson_src_install if use python; then python_optimize @@ -240,13 +228,20 @@ src_install() { # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die + # Create symlinks for Gimp exec in /usr/bin + dosym "${ESYSROOT}"/usr/bin/gimp-2.99 /usr/bin/gimp + dosym "${ESYSROOT}"/usr/bin/gimp-console-2.99 /usr/bin/gimp-console + dosym "${ESYSROOT}"/usr/bin/gimp-script-fu-interpreter-3.0 /usr/bin/gimp-script-fu-interpreter + dosym "${ESYSROOT}"/usr/bin/gimp-test-clipboard-2.99 /usr/bin/gimp-test-clipboard + dosym "${ESYSROOT}"/usr/bin/gimptool-2.99 /usr/bin/gimptool + _rename_plugins || die } pkg_postinst() { - gnome2_pkg_postinst + xdg_desktop_database_update } pkg_postrm() { - gnome2_pkg_postrm + xdg_desktop_database_update } diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest index c74339978c51..7723480091dd 100644 --- a/media-gfx/gmic/Manifest +++ b/media-gfx/gmic/Manifest @@ -1,8 +1,9 @@ AUX gmic-3.0.0_ipa-sra.patch 665 BLAKE2B d1b47e2f0e8e63251172ee6cbc2c5b1bd86d100904a3d7bb0c5df39c051769b8b6c0aa0bb1f81010fd9ca195886a0dbce41528d31a811627ee28d1af58a83432 SHA512 4677fc93e72ed5e71a91197d364a04e1f8c6c13bb3f5b6eb5402a03c0d6ab395b54788669e028b932e207986121138419a58ed5f4333c0a45cbe6c0b9638ed96 AUX gmic-3.0.1-openexr-3-imath.patch 1051 BLAKE2B 03d1cd6be5c5af76b6ecb071b46ee20abc4bd05d055fcd3ee21943ae5821c8c41e080b20d054b2f5e53cfbeb7326b8af6fa599182cdfd5e47679a57b47fa2f1d SHA512 83e9ec847328eef9f275f747ca6d2ac1071151cc7eb62ad70fa9de121d790e45d60514993274a44fe980537a793eaa56d397da5e207355fa2c9723bdafe7ff88 -AUX gmic-3.1.5-makefile_automagic.patch 5378 BLAKE2B 161a06be29e9dc4ac9d4f6234d0da70831c2fd4be4f5f849a16957afee8b4436644591f0f5aecfdfb2b3b33b8ac4f65b8daa966afeb4ee97d340290fce83bfda SHA512 79157c017566e4d0b277169e9356dfaf71c2b46b7e70aa6c6bcc81c664006524bc8b2a86be83e88a1128c3dc527e294b5ea2a685d924975b8a22161e9adc6df0 +AUX gmic-3.1.6-makefile_automagic.patch 5378 BLAKE2B 161a06be29e9dc4ac9d4f6234d0da70831c2fd4be4f5f849a16957afee8b4436644591f0f5aecfdfb2b3b33b8ac4f65b8daa966afeb4ee97d340290fce83bfda SHA512 79157c017566e4d0b277169e9356dfaf71c2b46b7e70aa6c6bcc81c664006524bc8b2a86be83e88a1128c3dc527e294b5ea2a685d924975b8a22161e9adc6df0 +AUX gmic-3.1.6-relative_rpath.patch 400 BLAKE2B 0f457f585d7efde1b05937f1baa240f6fd4590a3c05c2d988e88d8ee62e79c8ac39adb92bee247dcb999ef7654bf9c558802781e9933cb6de4b078cfe7b06ab9 SHA512 1c7da7542005d76f67a553ddec1d9291e34ff99adad3aae6c9761dde8aa93bba8f79eb388072fd43976ae4e45bae066d4726d642698bce36aafbca5dbae009b0 DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a -DIST gmic_3.1.5.tar.gz 10782647 BLAKE2B 9334f61b4309dec31d5dd0c52b87a97628bfa819602f3bac03cbc74c26a65dc660c0f4ae5c84d2aba5062ebc2869ae3d656e6fc2b2f9c9d0565d07762a920d21 SHA512 7e27856db8b68fde33e50f09a9d07479b67843388a98edc891deab51828d922200af20afee163984e0c7660e46387d1fe514d35ac3e3d9c8ebe02b0aa89cbc96 +DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775 EBUILD gmic-3.0.1-r1.ebuild 4192 BLAKE2B e9da6acf816933b7a0e7becbe3f78dce521a05838ca397fc5e1d29154fa975eaa60cc9ca3fcd8c6287b1eac442382792dc4c1acf66a4376e7aa21968e74b1a9e SHA512 db4b500e695e6cc80b1b5b0df04659acf60e7018cf50f2c6a97fa325b070e20bdf180aaa46e1a693cab485cc00a1823cce1943306f4b9ed97d261bc490464684 -EBUILD gmic-3.1.5.ebuild 2567 BLAKE2B 307837ecf74743536e6094c599ffa217d6f968327652d50bc09dab81ae4d676d84b549771ba2fec71f9c32a464838b4ee3d225d9d9574fe332ceee2f22957c42 SHA512 3f176c15d09d0b3ca12a002291e538841e10cf3456dc7043c3fe9b66974e6c37ade6fe42e3862af54dbe8233e98a2ebae30e9bddc9cf93895936c989763ef570 +EBUILD gmic-3.1.6.ebuild 3471 BLAKE2B 3160f9ad8eaff999ebbf215bb5e94edaad9dec21effb257491dec57555895658287a90335a15064eb8cb94264b9d2ca84a045499d49e26803097688ee6550b82 SHA512 7400b70db9ea9f4a769a9be3ab045582627bc127aeb59011102531ca120327793604e58a7765228b14aef2de6e945cfa84376086de4fdd1ab014d2a6607bb259 MISC metadata.xml 466 BLAKE2B aef1ab7a346d34ebdba8f6e09298d1bd96ed2771307fbd3e3cc15ed0774da1c29be9a3b260b9a7c287ce904685f708e56d59953fb92bf4d93d52227614f3c148 SHA512 755bfb920c6baa950716dff8a345540a730b1c6d179837d81ce1e1a3dcdc826665b61f9da8dcd007c44893f3310ace5dfe2a976a80926ab96170cb84a3f3555c diff --git a/media-gfx/gmic/files/gmic-3.1.5-makefile_automagic.patch b/media-gfx/gmic/files/gmic-3.1.6-makefile_automagic.patch index 8dbe50d6e194..8dbe50d6e194 100644 --- a/media-gfx/gmic/files/gmic-3.1.5-makefile_automagic.patch +++ b/media-gfx/gmic/files/gmic-3.1.6-makefile_automagic.patch diff --git a/media-gfx/gmic/files/gmic-3.1.6-relative_rpath.patch b/media-gfx/gmic/files/gmic-3.1.6-relative_rpath.patch new file mode 100644 index 000000000000..e2da793f31a8 --- /dev/null +++ b/media-gfx/gmic/files/gmic-3.1.6-relative_rpath.patch @@ -0,0 +1,11 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -187,7 +187,7 @@ + ifndef NO_SRIPDLIB + MANDATORY_CFLAGS += -std=c++11 -pedantic + endif +-MANDATORY_LIBS += -L. -L$(USR)/$(LIB) -Wl,-rpath,. ++MANDATORY_LIBS += -L. -L$(USR)/$(LIB) + ifdef IS_GCC + MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label + GCC_VER_GTEQ5 = $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 5) diff --git a/media-gfx/gmic/gmic-3.1.5.ebuild b/media-gfx/gmic/gmic-3.1.6.ebuild index 4555221810cb..06ca0c8a4cc3 100644 --- a/media-gfx/gmic/gmic-3.1.5.ebuild +++ b/media-gfx/gmic/gmic-3.1.6.ebuild @@ -24,9 +24,6 @@ REQUIRED_USE=" qt5? ( png fftw X ) " -# No test suite, hand-crafted Makefiles barf out on 'emake check' -RESTRICT="test" - MIN_QT_VER="5.2.0" QT_DEPEND=" >=dev-qt/qtcore-${MIN_QT_VER}:5 @@ -61,12 +58,16 @@ RDEPEND="${DEPEND} " BDEPEND=" virtual/pkgconfig - gimp? ( dev-qt/linguist-tools:5 ) + gimp? ( + dev-qt/linguist-tools:5 + media-gfx/gimp:0/2 + ) qt5? ( dev-qt/linguist-tools:5 ) " PATCHES=( - "${FILESDIR}"/${PN}-3.1.5-makefile_automagic.patch + "${FILESDIR}"/${PN}-3.1.6-makefile_automagic.patch + "${FILESDIR}"/${PN}-3.1.6-relative_rpath.patch ) pkg_pretend() { @@ -79,6 +80,12 @@ pkg_setup() { gmic_emake() { emake -j1 -C src \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ + STRIP="/bin/true" \ + LIB="$(get_libdir)" \ + OPT_CFLAGS="${CXXFLAGS}" \ + OPT_LIBS="${LDFLAGS}" \ GMIC_USE_CURL=$(usex curl) \ GMIC_USE_EXR=$(usex openexr) \ GMIC_USE_FFTW=$(usex fftw) \ @@ -94,14 +101,36 @@ gmic_emake() { } # FIXME: -# - do not pre-strip binaries -# - honour user LDFLAGS on lib{,c}gmic.so -# - fix multilib-strict violation on same -# - nuke relative DT_RUNPATH on same -# - GIMP plug-in dir should only be created if USE=gimp, otherwise it ends up being just /plug-ins +# - honour user CFLAGS while building C binaries (i.e. 'use_libcgmic') src_compile() { gmic_emake lib libc use cli && gmic_emake cli_shared use gimp && gmic_emake gimp_shared use qt5 && gmic_emake gmic_qt_shared } + +src_install() { + # See below for why this has to name a directory even if USE=-gimp + local gimp_plugindir="/deleteme" + if use gimp; then + if type gimptool &>/dev/null; then + gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins" + elif type gimptool-2.0 &>/dev/null; then + gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" + elif type gimptool-2.99 &>/dev/null; then + gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins" + else + die "Cannot find GIMP plugin directory" + fi + fi + + gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install + + # Upstream build scripts create PLUGINDIR and write some files to it + # regardless of whether the GIMP plug-in has been built or not, or even + # when they haven't been able to execute gimptool to get the base path. + use gimp || rm -rf "${ED}/${gimp_plugindir}" + + # These are already gzipped in the source tarballs + find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die +} diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index dcc78facfd6b..3622b0c9d25d 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -3,7 +3,7 @@ AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274 AUX graphicsmagick-1.3.38-configure-bashism.patch 1203 BLAKE2B 0aa4a6cccd1f7e392446db33446b706df0e5a82b77abba3901ea7e8190ed592a4ce17b0544f08b59900cd48b3e57e029862ef94120ceca75536959fba15b9f7f SHA512 e45bc482381e4c58cd854d9d28b8a3a7bf83bc707f5d3a6290f28b1b333c84778c5e185f0a637348a2fbaac56790d6b9ddee1f2ee660ba67912300039d872330 DIST GraphicsMagick-1.3.38.tar.xz 5958352 BLAKE2B 132c8b2303690dbe84b0e9ab33db0c0861845ef0260915e33197912dbcae02ae70c27bce634cfe0ab6b739ef6f3e828cbea9043fc90be993fb2c4a5e33e20ee9 SHA512 478f9e2907d4cb1099b0cbd1a73e4ab58aef94edf6cb1636ce48a378084ec1671599fd4f369455e5af898e94d1386f7149f6933b7c668027a6f6952bc763ec3a DIST GraphicsMagick-1.3.38.tar.xz.sig 119 BLAKE2B 166b7bb6de30af22d1f2317812f76dee43dd69c5557613deea35de3767624466c07001fe029ec9d33d0c61ed2fe5ca3f48bf435853374c722963a1293bfaa7a1 SHA512 c6dfee7e4b63b646460f9045ca5c8f3105d1a761ec3cd3471b53293178ed9a963884539c8026d934ce1915654d517a9b30232d7260a13f6d7dbeb5a592485b09 -EBUILD graphicsmagick-1.3.38-r2.ebuild 3900 BLAKE2B 39c9db8e20b5b640bebab2a1f8c16d1cd6bc70f0e95e5c0efd4251da1193ab48df7881c04637768526045edcf040b99956698182a2f3630ad9f3ad87da761f59 SHA512 88bd009a0f72b428e78c74f357b2129191ff916bf88e2bf913e766b93be1eb5c9fe5b2aea69aaf12808483aa75ce13739907c6fadfbd1d2a35fffef37b7df172 +EBUILD graphicsmagick-1.3.38-r2.ebuild 3899 BLAKE2B 5fe2b2e0ba13f0abad75a5d3e7cd0d3d5fe7961ae1eb69aaa6cc2cd6f08a38c8040f80ee5f7067b5c51ced031a6937615a185770de988e54f2c20df256a748b5 SHA512 8d60e395f9c89559038b372e766339f58534b7e3964198d8f0153e82eba76e155dacecc34aa7181d5409df1bd85a5abc66168b0e5ca755c896a0a17a3e86c485 EBUILD graphicsmagick-1.3.38.ebuild 3638 BLAKE2B 7e1d36212824ba42e77ec729b79002f566c667ee4a8e17e6c8d205485d976eee5b07308116f06aecb2cfa9763d47380acacd1796d3082f1e424bdcaef38cc562 SHA512 eeeda1a6e9cf3f8e038355249147f63444e009a7ca8b2432e6f6d76f12bb39ec4916ce4e2d98a68a2e0e9d2af68dc9471d23514dc30c86a724fb588bcb7b0882 EBUILD graphicsmagick-9999.ebuild 3863 BLAKE2B de21652d2106509ffd3ba88039f2a8eb71d33a5dab2a8b7a715bed7c9c15fc1c8577a8eb2749c15a39421cd0f7a61635e9c0a601084f00a427300b3756c4a046 SHA512 7ed019f0b6991cd17bd64ac9df5af809b2a0f1381a5fbf965ef3982b17d87974829dce568ac633b1cf9337ee87082b11a0e9c458c9bc1ac7b70734625cdb8693 MISC metadata.xml 1354 BLAKE2B 06f26407c7bbdbea6bb6ed510c3f497960a3ce8bf2ec296d3ff69eea8377774b7f7a1b37cb43eb63f7e7a31c4f74d978bb1ef863db9f87dba8d769aeca5e80c5 SHA512 9caa2359b6b15b397ce6108ebe941fd029e6b3d371c779a7bb3df5e0276b681067502aa10d12f5ab3eb427679818fdaa525dfdfba09c1fccf2511e23156aef7c diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild index 3bada7096c9f..1fe3f2eda5e8 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild @@ -19,7 +19,7 @@ else SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.sig )" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )" fi diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest index 7e200b1abdfb..4146c026432b 100644 --- a/media-gfx/openscad/Manifest +++ b/media-gfx/openscad/Manifest @@ -9,6 +9,6 @@ AUX openscad-2021.01-Fix-build-issue-with-overloaded-join.patch 3336 BLAKE2B c92 AUX openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch 775 BLAKE2B eed37277c3e7ea84635c0b8cd02cc4ffde7abea78400ee39e67bcc782800197c57dae07a82084df47705951ced8968be78243a1d0e14a551783b8adcb669d43f SHA512 94306e68e53b01e799a5feb6f16a8f44c965a4b653b60227833013712f23648d20ac8272a7bfe38bde201af42946f91fe17231f120adfbe5b16e42b07d9f8d10 DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128 EBUILD openscad-2021.01-r3.ebuild 2235 BLAKE2B b25634d8dfcefc9ba34f3a41033a95384a932147760d3f0c905d686a150188bbbc0b9d17958bb1d309785ecee2dd3d50228261431401a672f1ab68e8e3518e95 SHA512 4b7a65b0e9c32ce2d1d58b6850d06ff40564c1ed70e2ca832ff1dea86bb8b3503dd0b006a38962cdab3ae664f4686973d7136dfaa03021510c09a7ec071b8d9f -EBUILD openscad-2021.01-r4.ebuild 2695 BLAKE2B 16401f595a6a25bf848feefd97f52b016ba913f6ab68c9ef346bfb1644f5e8de0b73cbf91a47fa79ea9761d762fd4476937f3e5f1ceaaed43d423d394c261af7 SHA512 20766e6ce4d7ca0fda36299f8e6286f281d1c36460aa8c5c146212af8599f19ad245a6238264e4063471ba7ba6f8771016884309c00ec1b56f3ebca3c750aa8e +EBUILD openscad-2021.01-r4.ebuild 2749 BLAKE2B 8636fe2d543ab71c7b8e6952d28ba6aeb12bf7c693ab7d0d743e95c4c915e611da6aff313b61ac26249f264bc6b311743c910be423d6d50afd52a562b427bcf3 SHA512 502159ef50394ee7b4f7ee164bb1d053994622cec2487d8831f3466a09651f39fec53eecd663f4e9d0afc57b58d9a15ee0fde49e60f79be89833e50092e68239 EBUILD openscad-9999.ebuild 2508 BLAKE2B f3842eee85e9da815b3dda59c553f4cd97193bd7732d2bd65820b7283a2e8699c352cf8643b67fc3c4e8e411628b2262998d65ede1ca1154c4c0cec3edcd4f5c SHA512 a214cdebcb5be8a052b78b9b34741cf0680d262ce07a740803ee9a351a63d0e0f03fd733d754c4cdc161ffa35e6713eb8cd2ffe7627014e0851d647360eeb418 MISC metadata.xml 1348 BLAKE2B b15a74a20ef94a6a47de57826c5279a4e8c388a52bf9d1058a1ba0b347fcd77e0c8b79a42515f5411d0991fb8fb71c604f792dd2a2addaaca78bc85dbfc7a611 SHA512 fea109a00324f0bdcaae855e18fba456a449bb8192e633cfd5806fa1040fe3bba24f75493e0012d54afe8828073fc4d02ae01533b45648e05c575777b23572d1 diff --git a/media-gfx/openscad/openscad-2021.01-r4.ebuild b/media-gfx/openscad/openscad-2021.01-r4.ebuild index 9b67272f4c26..1ce925d70618 100644 --- a/media-gfx/openscad/openscad-2021.01-r4.ebuild +++ b/media-gfx/openscad/openscad-2021.01-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz - LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="emacs" # tests are not fully working and need cmake which isn't yet # officially supported. @@ -78,7 +78,8 @@ src_configure() { } src_compile() { - default + # We have random parallel build issues, bug #856430 + emake -j1 if use emacs ; then elisp-compile contrib/*.el diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest index e38409963f19..f3e004a02690 100644 --- a/media-gfx/pngquant/Manifest +++ b/media-gfx/pngquant/Manifest @@ -1,6 +1,7 @@ AUX pngquant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef +AUX pngquant-2.17.0-fix-test-version.patch 388 BLAKE2B 1b1543b9431f56fc9135147ed8317a5c2fe2cf378f1af0b1a0a8e706fab1933e8cfe150177a63a032387632337baf2b7a9a340245ffa3109962d8bc9d9908ea7 SHA512 dbc386e9ca1975dd1167e3e077dfbbc94432452f192802614ff0d9f77f17f0730314c28fef1baed01a9255a4afbfbfecdc450f4c9d07578cc1d424db34cb2d13 DIST pngquant-2.12.6.tar.gz 69074 BLAKE2B 3573d54d94b0085de9ffd4dd34a8fd46c49a1e02d0a6419271c17bc7ac7ab6c05d811336a3a8a8ab21d4dea774c93ee1baae141b42c255838fb1eef9cdb1a871 SHA512 8ffff346df67edf1000c71b6d26371826bc4d236b3f57ef1ec73b3b61668cff9c3ca7d541417c39bc6c89e00176c91eb28867b7a91945ac84292ca0ac54984e9 DIST pngquant-2.17.0.tar.gz 71209 BLAKE2B 0f625b6c27bc621fd5e1d9b4c5d3cbb7eda960a7afa8e6c6813c5d74e6f48055572dfacfcc93c694dc2d3fd8a107064c2a24c0845fc5339c0289b8527056d39a SHA512 7054cb6bdc547a6e00be1ab2363e2fa5367598593359ef23a91f3af8ff210b281e10f8721bc74d86f208f45336cd61292946c17dc5f26d292998eba95978dc0b EBUILD pngquant-2.12.6.ebuild 1488 BLAKE2B bdd86897fe7715fba56857380e2c97d9a80dbbbc98461ffd7c9f3021269b2ee6ff814262af7abca121cf288c8bd62ee2cde6bd4b11b91c1a893e88c45a3a02de SHA512 025a85d645fc680236a456286cc1c6e336679f05972d1fec8caf5adb55d2f39b779e6b0f1ad07564d0a19a2f643949ec10b09927fac7555cd99296a874ec7f9c -EBUILD pngquant-2.17.0.ebuild 1495 BLAKE2B d18c3c4afe534fa7920b02f93aa540e71a26c1840c05b1684f49793ddd9c70ea488cb472d4df2610c6a3347d427235794b29020d9461b88a44a9901cc24a5feb SHA512 bd36743a2f1f0d8a1b9c183938296e99c1432aa325e476279012fe0716c5c7bc84494aa60e435bea24efc92ef0b04dfbfa65cceb0f2ca4ecc3096ed51ec71c27 +EBUILD pngquant-2.17.0.ebuild 1547 BLAKE2B 33b3b503ac7c94bc95ad0c056df106c8b06975b5dae7ab5614a5c8ae9393d1e1d5d89e02ba050ddebf9ed5598eab0f1adab46881a26d86c09c00d3a455fd10b8 SHA512 c7d50b9e5252b92d987294e999cdc3f580d7d5cadbc0fc1054b7d72781648ecc6d980d83a115e5679b093b8632fa23a2e84bd19fdb7dbe25292a7e9e7be13aad MISC metadata.xml 261 BLAKE2B e57c0c3e4a59fdb630d23ae9d96afed10307c5308bace0cf58c22f41cbbf22fc82c5cd0d041800498570b1490a39f6c47547acfbb2766e21735820ae1c39bf8f SHA512 212dbdf6e688804621cd0ee28e47d3b9696182fe4850a87569e0727e5e811b7c4193807c2ecec65005e1689d4c0ba2c88fb67b29cc89928649e23d23a94d724b diff --git a/media-gfx/pngquant/files/pngquant-2.17.0-fix-test-version.patch b/media-gfx/pngquant/files/pngquant-2.17.0-fix-test-version.patch new file mode 100644 index 000000000000..6b7fe013e5dc --- /dev/null +++ b/media-gfx/pngquant/files/pngquant-2.17.0-fix-test-version.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/867760 + +Drop check which looks at version as with newer libimagequant, +it becomes 4.0.0. +--- a/test/test.sh ++++ b/test/test.sh +@@ -9,7 +9,6 @@ BIN=$2 + TESTBIN=$3 + PATH=.:$PATH # Required, since BIN may be just 'pngquant' + +-$BIN --version 2>&1 | fgrep 2. + $BIN --help | fgrep -q "usage:" + + $BIN 2>/dev/null && { echo "should fail without args"; exit 1; } || true diff --git a/media-gfx/pngquant/pngquant-2.17.0.ebuild b/media-gfx/pngquant/pngquant-2.17.0.ebuild index 39b969796e38..95adcc0f4890 100644 --- a/media-gfx/pngquant/pngquant-2.17.0.ebuild +++ b/media-gfx/pngquant/pngquant-2.17.0.ebuild @@ -27,7 +27,10 @@ BDEPEND="virtual/pkgconfig" RESTRICT="!test? ( test )" -PATCHES=( "${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch + "${FILESDIR}"/${PN}-2.17.0-fix-test-version.patch +) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index 52f94dc45df0..51663f927fd4 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -1,8 +1,9 @@ AUX prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch 1601 BLAKE2B 0c30817c51c1cf2a914b1faad9923109cbae111e8538d6c7257885ab29b5944bdb97b0927ced972133ffd8fe12d2fe36f0826bb9839e3cbedd716719b0d26881 SHA512 21377080026fa43bf23dc06c4925decd6c6e7827599caebc2ba2e7b3f4f4428fcd6fe4044f3bc3d0f059cf2ede043cafe2928622046bf9443bdd3f21f1ff6c59 AUX prusaslicer-2.5.0_alpha2-boost-fixes.patch 3836 BLAKE2B 92bd4d4e43eceb67a1356552ee75431d05d61f5983986d109f6601b3fb86b195a39d18f26add58426fa535200af778864ff643a38d6771cb5e7de6a3a91f0192 SHA512 3a13e2e0fb0fd53571ea2b44403c810729b80c715a8fcaa5c596f680eb9c67e9f86c2194e09af4de54baa5bd95023b32f27cb475ccfe9ac71ea583b5ab02aba5 -AUX prusaslicer-2.5.0_rc1-cereal-1.3.1.patch 1691 BLAKE2B e8886bdd4a22ac215203422cd9dcc88972d61fcd522f65506a206f23849204175bf56b537f9984bc82b38528b3f08ee9f62020ee0fcb817f237a6b1b33a11be5 SHA512 d8b32d653bc1a21bf12dd75449ee018f04063536d0a519409bf520913b8e89ef3acd185a5351ec7a1225188f2d669d1cfcaf9a2552c509689d24d605aac56209 +AUX prusaslicer-2.5.0_rc1-cereal-1.3.1.patch 1384 BLAKE2B 080b05c64f181759616557ebe6d83f91dd9a7b45f0f3833f9c3fa7f3d74df3d3399b353898967a51597b0422a611e8a86f85a8825de1a8fe818b389384e70373 SHA512 c325f7fed4bcdb380221c3b63ad525a53d26bab8baf7c7347035c8d22474ab38af944e445fc58da7f7979d9ec53f61b17a9edc1e7d86c65ac796e479a0316ce6 +AUX prusaslicer-2.5.0_rc1-fix-tests.patch 363 BLAKE2B 49c2dd3da996148497ab09854421cadd5054d06d5d78c2fd973f274857817c4fa0da7dfdb5efed03125422c2cab432d0f946f0f84929e08756ca3180bebd6709 SHA512 952958b687bf1b0d454ed921799d283b08fe56acaccbd909c41269243839cd5c02b1aca594d1fa947aff73c853ef6dcfd52e938f4f39a54396ec32d2e9cb284b DIST prusaslicer-2.5.0_alpha2.tar.gz 48053741 BLAKE2B 161462ee4dc061ee1816c165b0e85688bcce1ee010451f3d6d724a71526ccea4eb006c9610124ec006ff19b030af2fcb74993016658069222d98152f29660c7e SHA512 8c29d79349e834df284374131659b863d1df592ee5304f2bae7cdbe1825feac465eaf78e0932d4184f4077a44d6add3194db31f12c5202cb064020fbaf4beecd -DIST prusaslicer-2.5.0_rc1.tar.gz 48525654 BLAKE2B 7853246d9fbc0709bc88cf3693b088edf70da9adf3d1015f79248f7edbed03b1fff21a396bea485812f08a0927e86797d77c30f150c550665ff2bf0fd660619d SHA512 5a5c2afa3f245ae6fb2486cee72ac78c6905be3e322cbdbd552de88c5220f6b18ae9db03a8e7e5c6e85e5639474d5e564c1b9a63d1e7ad9268fd8f579ba14b90 +DIST prusaslicer-2.5.0_rc2.tar.gz 48596343 BLAKE2B 41df2c34929ee6797604f87d5444f252c6f751cef1de2f5275b67d675217ff2fe7bf98ecad3a551528be1f18bf926d3660cddce2ab07911a3f8c154499dd918e SHA512 94ce4b335cc89ce7c8949cdc35013bd6166ed09aa8bda556328630d7977be5d293e6ba7a143af2d1485ea7a6f6b613514ed874287793e7edcaba3453d63e37f3 EBUILD prusaslicer-2.5.0_alpha2-r1.ebuild 1752 BLAKE2B 439d0db2496b075d674bfa74e8284b347bdb170b1b1d0f60fda0ec40c9bb0c578d93bb2a2307e4f077b6b1820bdb5ad830ede7066ee96a5761eecae0f1b19db6 SHA512 2bfd12ae34d061a0c0f8545813361a980929e0997064307ec791ea8b33e0ea26800f975a5da672947c465e8f6fcce4c186ddd2280230b79eaa3f3430307e26e6 -EBUILD prusaslicer-2.5.0_rc1.ebuild 1748 BLAKE2B 29aed6919880bee74596c4b3fdf8f3dedbf37a734d4218a8857bff4618dc1eddc9f68eebf2d8047eaf6086c0406932f0342ba0a8eacfef422db6b846f3fea402 SHA512 d31946306e37652d027deaad4751fa47588d0fcc47b7b0e4aa3c97cbe4f248e5eb5b4dfad4b317cb1dd2ce120db5775347fab4326bcc2b697b0630a37e748a9e +EBUILD prusaslicer-2.5.0_rc2.ebuild 1970 BLAKE2B a1714b2f38d960ad45ff1c5e0abeb6bac88832ecf40d496180bfed10b8448e2d919e4a416704dff0786793098823ffdd490e1116dabbf0665e8a5e17400399bb SHA512 cf24b0b9acd4696a3a707c4e9a4155487579c47cb2b3e32847005e719503b29ea9c37f9f1ff5b052fd431daef1f36aa8af5fb13440cb4ee27bf0a1b8ddfad6f5 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512 diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch index 29e01422b41f..056c6150a7b0 100644 --- a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch +++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch @@ -1,38 +1,38 @@ ---- a/src/CMakeLists.txt (revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd) -+++ b/src/CMakeLists.txt (date 1661704655632) +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -127,7 +127,7 @@ set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer") endif () -target_link_libraries(PrusaSlicer libslic3r cereal) -+target_link_libraries(PrusaSlicer libslic3r cereal::cereal) ++target_link_libraries(PrusaSlicer libslic3r libcereal) if (APPLE) # add_compile_options(-stdlib=libc++) ---- a/src/slic3r/CMakeLists.txt (revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd) -+++ b/src/slic3r/CMakeLists.txt (date 1661704724566) +--- a/src/slic3r/CMakeLists.txt ++++ b/src/slic3r/CMakeLists.txt @@ -260,7 +260,7 @@ encoding_check(libslic3r_gui) -target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) -+target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) ++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) if (MSVC) target_link_libraries(libslic3r_gui Setupapi.lib) ---- a/src/libslic3r/CMakeLists.txt (revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd) -+++ b/src/libslic3r/CMakeLists.txt (date 1661704699199) +--- a/src/libslic3r/CMakeLists.txt ++++ b/src/libslic3r/CMakeLists.txt @@ -395,7 +395,7 @@ target_link_libraries(libslic3r libnest2d admesh - cereal -+ cereal::cereal ++ libcereal libigl miniz boost_libs ---- a/CMakeLists.txt (revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd) -+++ b/CMakeLists.txt (date 1661704556468) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -446,6 +446,12 @@ # Find the Cereal serialization library diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch new file mode 100644 index 000000000000..c86c585926ab --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch @@ -0,0 +1,14 @@ +--- a/tests/fff_print/test_data.cpp ++++ b/tests/fff_print/test_data.cpp +@@ -4,10 +4,9 @@ + #include "libslic3r/GCodeReader.hpp" + #include "libslic3r/Config.hpp" + #include "libslic3r/Print.hpp" +-#include "libslic3r/Format/OBJ.hpp" +-#include "libslic3r/Format/STL.hpp" + + #include <cstdlib> ++#include <fstream> + #include <string> + + #include <boost/nowide/cstdio.hpp> diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc2.ebuild index f99c7d8cc487..a7890eb5a290 100644 --- a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc2.ebuild @@ -29,18 +29,18 @@ RDEPEND=" dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= - dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= + media-libs/libjpeg-turbo:= media-libs/libpng:0= media-libs/qhull:= sci-libs/libigl sci-libs/nlopt + =sci-libs/opencascade-7.6*:= >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= - virtual/glu virtual/opengl x11-libs/gtk+:3 x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] @@ -51,13 +51,17 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch" - "${FILESDIR}/${P}-cereal-1.3.1.patch" + "${FILESDIR}/${PN}-2.5.0_rc1-cereal-1.3.1.patch" + "${FILESDIR}/${PN}-2.5.0_rc1-fix-tests.patch" ) S="${WORKDIR}/${MY_PN}-version_${MY_PV}" src_prepare() { sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die + + sed -i -e 's/find_package(OpenCASCADE 7.6.2 REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \ + src/occt_wrapper/CMakeLists.txt || die cmake_src_prepare } diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest index 2e45170c68e6..0ad61fb0a069 100644 --- a/media-gfx/xfig/Manifest +++ b/media-gfx/xfig/Manifest @@ -6,6 +6,6 @@ AUX xfig-3.2.8b-Fix-build-with-flto.patch 1577 BLAKE2B 538e4db451dab09dadb96563f AUX xfig-3.2.8b-app-defaults.patch 508 BLAKE2B 1d36345fd7b203a7dff8b13a73ae5abf298fc3b7ecfdfbc74068c626002c4b09d9278bafa5ed2b062757097b5fceb75e2baa4f5d6e7bc00505114b147f7bd893 SHA512 fb2e9113740dd93e25d9fbe0afea10538660059318eec0794d300a8fc5c8c9cda9a29302c2d5f285c38a5927994a96b96b68fb231f0f668ba1490fe87b888643 DIST xfig-3.2.7b.tar.xz 5059984 BLAKE2B a22465e16019e9887e302ea308e250ad5d7ba0c49aec8f554a73d3b4489d803a05041cb7d267c543a7c0d3b78eac25077c628283f82767932afcc9d9750ce883 SHA512 f3396ebf8a5961909e58b05b60117fd7bbc8c24fabbd47f108eaea9586f4180af572faffe077b1a5dcbf669ebd69b1c2791f302c126dea62a44aa1592de66f73 DIST xfig-3.2.8b.tar.xz 5382524 BLAKE2B 94963d165664c6451776fcbc3e332a7933c00d4b43e3d4196f15883a9873171f7a0791e6fa41cbb6e8d07958f9ddcceb9578a62a9893cf2f436c07dcbe3e7f37 SHA512 5cc5e61977f97956baca77bf4bce09d0f47ea6fafb10055d0523f7cccd72d7af80e706daa62ae16df3fc54338b4f6cd4a6b71dc460311e65be749ec84fa662b3 -EBUILD xfig-3.2.7b.ebuild 1267 BLAKE2B 6b70670f3c179b7168b65dc97dd2e798b9e1f86a84a4d8dd30c0a8218436637789103cc26ab974cac6391b730df825aeac71d743a57b1b7e7026fa64a7a0a5d1 SHA512 3d6efc8fe4c814f8bfdf27fe27c6bcaa97ac74e79d1b2c8fd89bbc651db18663fddd847877a82eef91a3b897c06f1daa9db1574b34bd6ca0930db3c46d2eb1f7 +EBUILD xfig-3.2.7b-r1.ebuild 1281 BLAKE2B 079eb43d9f1e771c69c11f7b9b75dedf929b52258d298154cb87ebd60772132e089e219f3acfa138a3f03110b6de13c656d81b009cce82362650d279ccb3db81 SHA512 93e6e35b336d8f365c62adad0f46183bc6c36128fe23e52435d45891ecdb91579496ec086e847297d1305ddba9e98668b3c0b4faaffac6c9af2edd2a13fb6a9d EBUILD xfig-3.2.8b.ebuild 1318 BLAKE2B cbd2a7f49e3fe5727f6804b8fc183ba199aff0e6a5cd17c1fee73dc1c02d31840f8a4fadfd46e8091146c0da5dd5113ac84d46f7a43018837e8f31902cd658fc SHA512 7d516d1cd61b5a02b4006180ce14ea53e1c462a3f438477451e940a42d82f237be6ad2951ea2d1c0f237df60e5c0e5c8da55a7b3b7f4ac4c19378bb33fdf29eb MISC metadata.xml 239 BLAKE2B 7318d5b7bc5c4e143cab638973eb637b4d3b5e7d8ff039231251371b0574f12e318412fd306c2bcf7b6b3d5b04a7b103ca5e74c4f8088f944fa79b15f271a51f SHA512 f6816d8f304e955fa8f8e188f0ea7f0e20c2a13f19e5f5832d1e7ec7dda03c644196b762e5b76de6c19efc02fbafc4fc7add41627d36bcce537f7ec877a0ce3b diff --git a/media-gfx/xfig/xfig-3.2.7b.ebuild b/media-gfx/xfig/xfig-3.2.7b-r1.ebuild index 1a13e62e0058..4f24ee215a3e 100644 --- a/media-gfx/xfig/xfig-3.2.7b.ebuild +++ b/media-gfx/xfig/xfig-3.2.7b-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,8 +24,8 @@ RDEPEND=" media-fonts/urw-fonts >=media-gfx/transfig-3.2.5-r1 media-libs/netpbm - jpeg? ( virtual/jpeg:0= ) - nls? ( x11-libs/libXaw3d[unicode] ) + jpeg? ( media-libs/libjpeg-turbo:= ) + nls? ( x11-libs/libXaw3d[unicode(+)] ) postscript? ( app-text/ghostscript-gpl ) " DEPEND="${RDEPEND} |