diff options
Diffstat (limited to 'media-gfx')
318 files changed, 7180 insertions, 3983 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 298fe343896e..de2c31f28597 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/aewan/Manifest b/media-gfx/aewan/Manifest index 1265da783271..96eb59865287 100644 --- a/media-gfx/aewan/Manifest +++ b/media-gfx/aewan/Manifest @@ -3,6 +3,5 @@ AUX aewan-1.0.01-fix-incompatible-function-pointer-types.patch 1236 BLAKE2B 6222 AUX aewan-1.0.01-fix-warnings.patch 1131 BLAKE2B a944dbfe8d1a2115ec51d00fa5570fcc4f7b639b7d22e26c1cfcd383e277b1b347a5c78cec8d26914c42c7df818332c4f32a83b08f59daad6cc59dd2af3f9990 SHA512 49cdc45e6d91f8d03b7039240de7ab908ec170acccb36972a50393c3906827a004e7ab5af60013a2aade7658912eb1661885a848711498deb9b1601016bc1b69 AUX aewan-1.0.01-tinfo.patch 546 BLAKE2B 5b2ff040df207cc9b9810ea0e733d4e4113acba1473a68a4c01eb0dca15fe7125dc8bfafb36af56c20260d41060d4450127df9c27415babe94f1ff3cc29988e0 SHA512 226780e4176490798f82e8f8184c0d8a44df8958c793925bbd7ccc87a4640e8ea1a09f47a7bdb90f7b94ef6abdda55d8ec4ad2623da26c4ac6cab11838e93277 DIST aewan-1.0.01.tar.gz 122880 BLAKE2B 396b7d6111e889ac30140b5bf7097c8d83b05c956a86fdf50651800371356862ab580e7afb1b68cc9f119339b68c786e81666cdd04f8cfc0bf02866dcaef9560 SHA512 8c7e81ed3e2c4d0848e36ed60922c920471c7bc46a7127f529be3f5a9c3c66a6e0dff06bca7b5cb21eb0a93d03ba31fd4ef07fc48e2e39f2224956801fe322f3 -EBUILD aewan-1.0.01-r1.ebuild 570 BLAKE2B 525e3753b1cfcf86a299c58003542aae4d11c7d8f8cd47ca4b59a52eae2b7e25e8a6d08bd856632b537b3e826a298830b2151c454f8e024a99b55009a0a9e950 SHA512 1d677e483ea3f8da690208c1ad2828d4a811c438109da2fd376c6c3c355364b5947db9510d6ddcb5811d1c1b50836aa55d93985cc5829b5d771c54ee3af06480 EBUILD aewan-1.0.01-r2.ebuild 697 BLAKE2B f48fce89fc34417f936a99c525631066c3f7a83b25df033f667ba9c88b4f6151f51e596eb2f8669b094426d306e501640bbb820e18ebfd158f5812c519dff814 SHA512 075d88b983efb1f4abf9d60aa03de4c76605389a2a9187475b1491fd5e68d79e1f158a467e79535d85e36d0efeefa397e860a84a803a1555c30eed1f41ea9c60 MISC metadata.xml 472 BLAKE2B 84df69cd7f2a501828a66fa5a66e8626ba1b6f7d3262b53fbda4ab8e392ec108aa3a7170f630571b28acbf3a6089c5f7e733923f13a1493340b81a2adac7ea59 SHA512 1ca859452592ed3f5d936ea418a99668eb7bdc84a8eeeebd4c644197368ecb36e0e9aa4fe0e2dbfa0c705b721213531bd89deb00e6a28b16b6e64f1f5be3c714 diff --git a/media-gfx/aewan/aewan-1.0.01-r1.ebuild b/media-gfx/aewan/aewan-1.0.01-r1.ebuild deleted file mode 100644 index f0234388da34..000000000000 --- a/media-gfx/aewan/aewan-1.0.01-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="A curses-based editor for ASCII art" -HOMEPAGE="https://aewan.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -DOCS=( CHANGELOG README TODO ) - -DEPEND="sys-libs/zlib - >=sys-libs/ncurses-5.0:0=" - -RDEPEND="${DEPEND}" - -src_prepare() { - default - eapply \ - "${FILESDIR}/${P}-debug_aewl-warnings.patch" \ - "${FILESDIR}/${P}-tinfo.patch" - eautoreconf -} diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest index 262f4f1c16a8..ed7a558d27d1 100644 --- a/media-gfx/argyllcms/Manifest +++ b/media-gfx/argyllcms/Manifest @@ -1,10 +1,5 @@ -AUX argyllcms-2.1.2-fno-common.patch 5132 BLAKE2B 5398d60a364a36ea24d6cce682330db177aaaec874a39e4f2a9c754a8862504938471851a14ce0871bb7863a9fd9a794f7ede2144090e1f44718f001344032e8 SHA512 d60f0eb9bd6d32b85d8ac88aa32558d1446357c6643fbdb393e90eba08f8f701ba8185741879b2320bda73e08ed14989cc1a16ffd4d2996d5e9afb05774e4e76 -DIST Argyll_V2.1.2_src.zip 13837056 BLAKE2B cf6181549e37b1deda11bdd4a63b27e101180a1e82b132ea8dca5af6830a74d5e2f940633f5aecf9a8d62fe8c2b0cdce8f2af44124ce7432b33d2a1bdbaa2c21 SHA512 f49b588c5f0a39edcc30a068a8bde8c7b74611d3feb15d07d4a61b205ed1231c288629f65e1a5a60a3921d552a28e075667ada555401a0d9694fd882bddd4b06 -DIST Argyll_V2.3.1_src.zip 14098636 BLAKE2B 0f215d5852c3ad383833dd643d78729a03e178b2bfad1a955a4ca8108a7b33b5a98507436c2a3bfa9f030ad968787e933e50940a0a7cc045b1082f4c8d519c6a SHA512 a8c2b02638569727015ad8e6e16999e398214fa5d11656bae0a9fe0b3268e81674621e3a7de96b727c578c5fc612ada39b37a94ca8b62f4221c56917654a22e8 -DIST Argyll_V3.1.0_src.zip 14671869 BLAKE2B a2cf0fa2f4d7924d847c56a6a30b5751576d9298736b751bb644317952c366f9f9be40668d5855417c3852dd39ba3dcfffeed5384b187a3164f1d9485ad8d8aa SHA512 a39e107327c89af46af3101a58ab796bc5e37ca979b93626f635ec66e32e099d0d1ebc14559133a804c0b4898fa4a93cbc25b5c5cf06ea7963025a1946ab619d DIST Argyll_V3.2.0_src.zip 14690714 BLAKE2B a2bd45883c213c0906ce94be525f6d7fa6e7378925ad08cb8577819fb2d1b5f6a16b6600a9d4b15972df6048323726fbe8fd16a23010c4dc7461007e45f20362 SHA512 17e73e74d0581bf2c0bab17598bcaf8c2cc556e675e944a315cccc9ddf8c3a0b946c7d88f87b1e4d29d9edba222bc76a497f570affe1d15d08c5ceec2b1b995d -EBUILD argyllcms-2.1.2-r3.ebuild 2120 BLAKE2B 0f7b414ceb466e2b710f4da0bb50942891f0c9c92ce55598bd4922758192bf220d4fc557bff3a4c39f1efd7df03a95c80f6b6b3f89b7dd87ac16115a789c2826 SHA512 0d85fb8555dd82d6e8995efc995796d99005dc3363ed9e0d7202f9f3b0772a4a790f3f8446a04f9c0e257976f4741c581469b786651ff5f72a300fc758e9ce7b -EBUILD argyllcms-2.3.1-r1.ebuild 2226 BLAKE2B 7847ca2064b2504be0322c146d21f390b971bd5ee235abe94ebfca29808afa44985ea11ae4b5d5fbb639987fbd2acd687fb518f6a065366d872661313a9bfdb4 SHA512 305ad5bb1feacfdd4166bf8bae5992171fe258a2f42ac0de456af5739b6f278bf81bebe44ac94f5321c0110b6f816e3ead2d3ecde3842ea8d1d28e71dd16e833 -EBUILD argyllcms-3.1.0.ebuild 2113 BLAKE2B f797decc319584451498e0b9a012c3205987ebf8c28804aa86dd43981be7f77dd0b981d1e710d19f52b86bc4efa1d7a12955cc16205b789c8784e7174b94dc02 SHA512 f850af284f8860179dc298e621775f42a726875109659005da025e357f719f90ae46328245959831971d05c729eaa4b8ae98f24f54fec0785ab818a9e184584b -EBUILD argyllcms-3.2.0.ebuild 2112 BLAKE2B eebf1e90d90c36126f1ae7b312005af8916101de80599b35eb211cbb42437084c9e192475f49cecd197aede42b2275b22773a2a75d179886aa01bd6fa3c45541 SHA512 71c3e73313fbc6ea16bba83950436f8b4e3fd63f833767cd4b13a18f61125d316fff8921de2e51b83925845f21e70a80d994ecf4163dfaffb963f0d8ef078e22 +DIST Argyll_V3.3.0_src.zip 14761699 BLAKE2B 2ae04cbc973b9613f33f3b4ef4498a88a9bab8db4b26165e6bbb59478e3a8094a05714cdf4ac4aa7a41c65406596579e9ab33e59bbd7bbd5b38f4082542ee512 SHA512 96e9aeaec991ae005ea7156a691c1cff508fa1cad538261b1a128bceb763d641b93ab86b586eaa8b89eb37334f3eaaf97ac412db51b116690a9228232361651d +EBUILD argyllcms-3.2.0.ebuild 2109 BLAKE2B a132bd6147e3fa90fc2997e98f41ebc04afce2177551f964ed03c7ce668a3133bdfe2d2f07cce7ad270d0c1427c6067985bd11dc20cbac5829b836c21d77733e SHA512 38df7fa7507f8042db4fbb1d08dfedae7c2c67a76a8178ef4c1bc758590dde2dd3890e3cba02bacbf3699a2d7eca2c8ec42df93211ea32bd63805d7ca1c1fd14 +EBUILD argyllcms-3.3.0.ebuild 2112 BLAKE2B eebf1e90d90c36126f1ae7b312005af8916101de80599b35eb211cbb42437084c9e192475f49cecd197aede42b2275b22773a2a75d179886aa01bd6fa3c45541 SHA512 71c3e73313fbc6ea16bba83950436f8b4e3fd63f833767cd4b13a18f61125d316fff8921de2e51b83925845f21e70a80d994ecf4163dfaffb963f0d8ef078e22 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a diff --git a/media-gfx/argyllcms/argyllcms-2.1.2-r3.ebuild b/media-gfx/argyllcms/argyllcms-2.1.2-r3.ebuild deleted file mode 100644 index b5f8e47cfd60..000000000000 --- a/media-gfx/argyllcms/argyllcms-2.1.2-r3.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multiprocessing toolchain-funcs udev - -MY_P="Argyll_V${PV}" - -DESCRIPTION="Open source, ICC compatible color management system" -HOMEPAGE="http://www.argyllcms.com/" -SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="amd64 arm64 ~hppa x86" -IUSE="doc" - -RDEPEND=" - media-libs/libjpeg-turbo:= - media-libs/tiff:= - sys-libs/zlib - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libXScrnSaver - dev-libs/openssl:= -" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/unzip - dev-util/ftjam" - -PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) - -S="${WORKDIR}/${MY_P}" - -src_compile() { - # Make it respect LDFLAGS - echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop - - # Evil hack to get --as-needed working. The build system unfortunately lists all - # the shared libraries by default on the command line _before_ the object to be built... - echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop - - append-cflags -DUNIX -D_THREAD_SAFE - - sed \ - -e 's:CCFLAGS:CFLAGS:g' \ - -e "s:ar rusc:$(tc-getAR) rusc:g" \ - -i Jambase || die - - tc-export CC RANLIB - - jam -dx -fJambase "-j$(makeopts_jobs)" || die -} - -src_install() { - jam -dx -fJambase install || die - - rm bin/License.txt || die - - pushd bin > /dev/null - local binname - for binname in * ; do - newbin ${binname} argyll-${binname} - done - popd > /dev/null - - dodoc log.txt Readme.txt ttbd.txt notes.txt - if use doc; then - docinto html - dodoc doc/*html doc/*jpg doc/*gif - fi - - insinto /usr/share/${PN} - doins -r ref - - udev_dorules usb/55-Argyll.rules -} - -pkg_postinst() { - elog "If you have a Spyder2 you need to extract the firmware" - elog "from the CVSpyder.dll of the windows driver package" - elog "and store it as /usr/share/color/spyd2PLD.bin" - echo - elog "For further info on setting up instrument access read" - elog "http://www.argyllcms.com/doc/Installing_Linux.html" - echo -} diff --git a/media-gfx/argyllcms/argyllcms-2.3.1-r1.ebuild b/media-gfx/argyllcms/argyllcms-2.3.1-r1.ebuild deleted file mode 100644 index cb9dd790126a..000000000000 --- a/media-gfx/argyllcms/argyllcms-2.3.1-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic multiprocessing toolchain-funcs udev - -MY_P="Argyll_V${PV}" - -DESCRIPTION="Open source, ICC compatible color management system" -HOMEPAGE="http://www.argyllcms.com/" -SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~mips ~riscv ~x86" -IUSE="doc" - -RDEPEND=" - dev-libs/openssl:= - media-libs/libjpeg-turbo:= - media-libs/tiff:= - sys-libs/zlib - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXxf86vm -" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/unzip - dev-util/ftjam" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - sed -e "s/static eset/static int eset/" -i spectro/i1d3.c || die -} - -src_compile() { - # Make it respect LDFLAGS - echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop - - # Evil hack to get --as-needed working. The build system unfortunately lists all - # the shared libraries by default on the command line _before_ the object to be built... - echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop - - append-cflags -DUNIX -D_THREAD_SAFE - - sed \ - -e 's:CCFLAGS:CFLAGS:g' \ - -i Jambase || die - - tc-export CC RANLIB - export AR="$(tc-getAR) ruscU" - - jam -dx -fJambase "-j$(makeopts_jobs)" || die -} - -src_install() { - jam -dx -fJambase install || die - - rm bin/License.txt || die - - pushd bin > /dev/null - local binname - for binname in * ; do - newbin ${binname} argyll-${binname} - done - popd > /dev/null - - dodoc log.txt Readme.txt ttbd.txt notes.txt - if use doc; then - docinto html - dodoc doc/*html doc/*jpg doc/*gif - fi - - insinto /usr/share/${PN} - doins -r ref - - udev_dorules usb/55-Argyll.rules -} - -pkg_postinst() { - udev_reload - - elog "If you have a Spyder2 you need to extract the firmware" - elog "from the CVSpyder.dll of the windows driver package" - elog "and store it as /usr/share/color/spyd2PLD.bin" - echo - elog "For further info on setting up instrument access read" - elog "http://www.argyllcms.com/doc/Installing_Linux.html" - echo -} - -pkg_postrm() { - udev_reload -} diff --git a/media-gfx/argyllcms/argyllcms-3.2.0.ebuild b/media-gfx/argyllcms/argyllcms-3.2.0.ebuild index daa1311058c2..b8979f958b6a 100644 --- a/media-gfx/argyllcms/argyllcms-3.2.0.ebuild +++ b/media-gfx/argyllcms/argyllcms-3.2.0.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~mips ~riscv ~x86" +KEYWORDS="amd64 arm64 ~hppa ~loong ~mips ~riscv x86" IUSE="doc" RDEPEND=" diff --git a/media-gfx/argyllcms/argyllcms-3.1.0.ebuild b/media-gfx/argyllcms/argyllcms-3.3.0.ebuild index 9830286f0e37..daa1311058c2 100644 --- a/media-gfx/argyllcms/argyllcms-3.1.0.ebuild +++ b/media-gfx/argyllcms/argyllcms-3.3.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 @@ -10,6 +10,7 @@ MY_P="Argyll_V${PV}" DESCRIPTION="Open source, ICC compatible color management system" HOMEPAGE="http://www.argyllcms.com/" SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip" +S="${WORKDIR}/${MY_P}" LICENSE="AGPL-3" SLOT="0" @@ -34,8 +35,6 @@ DEPEND="${RDEPEND}" BDEPEND="app-arch/unzip dev-util/ftjam" -S="${WORKDIR}/${MY_P}" - src_compile() { # Make it respect LDFLAGS echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop @@ -68,7 +67,7 @@ src_install() { done popd > /dev/null - dodoc log.txt Readme.txt + dodoc log.txt ReadMe.txt if use doc; then docinto html dodoc doc/*html doc/*jpg doc/*gif diff --git a/media-gfx/argyllcms/files/argyllcms-2.1.2-fno-common.patch b/media-gfx/argyllcms/files/argyllcms-2.1.2-fno-common.patch deleted file mode 100644 index 36bf87d12550..000000000000 --- a/media-gfx/argyllcms/files/argyllcms-2.1.2-fno-common.patch +++ /dev/null @@ -1,134 +0,0 @@ -argyllcms: Fix compilation with GCC 10 - -A common mistake in C is omitting extern when declaring a global variable -in a header file. If the header is included by several files it results -in multiple definitions of the same variable. In previous GCC versions -this error is ignored. GCC 10 defaults to -fno-common, which means a -linker error will now be reported. To fix this, use extern in header -files when declaring global variables, and ensure each global is defined -in exactly one C file. As a workaround, legacy C code can be compiled -with -fcommon. - - int x; // tentative definition - avoid in header files - extern int y; // correct declaration in a header file - -References: -https://bugzilla.opensuse.org/show_bug.cgi?id=1160244 -https://bugzilla.opensuse.org/show_bug.cgi?id=1160256 - -In case of vinflate.c and inflate.c, both files define local variables -with the same name as global. It is no more possible with GCC 10. To -prevent sharing variables across files, add "static" to all local -variables. - -Index: Argyll_V2.1.2/gamut/gamut.h -=================================================================== ---- Argyll_V2.1.2.orig/gamut/gamut.h -+++ Argyll_V2.1.2/gamut/gamut.h -@@ -36,7 +36,7 @@ - #define MAXGAMN 10 /* Maximum gamut point neighbors returned */ - #define NSLOTS 6 /* Number of maximum direction slots */ - --struct _vrml *wrl; /* Declared in vrml.h, which may be #included after this */ -+struct _vrml; /* Declared in vrml.h, which may be #included after this */ - - /* ------------------------------------ */ - #define NODE_STRUCT \ -Index: Argyll_V2.1.2/spectro/vinflate.c -=================================================================== ---- Argyll_V2.1.2.orig/spectro/vinflate.c -+++ Argyll_V2.1.2/spectro/vinflate.c -@@ -92,7 +92,7 @@ int vinflate(void); - */ - - #define WSIZE 0x8000 --unsigned int wp; /* current position in slide */ -+static unsigned int wp; /* current position in slide */ - uch slide[32768]; - - static int vflush_output(unsigned int w) { -@@ -160,8 +160,8 @@ static ush cpdext[] = { /* Extra - the stream. - */ - --ulg bb; /* bit buffer */ --unsigned bk; /* bits in bit buffer */ -+static ulg bb; /* bit buffer */ -+static unsigned bk; /* bits in bit buffer */ - - ush vmask_bits[] = { - 0x0000, -@@ -230,8 +230,8 @@ ush vmask_bits[] = { - */ - - --int vlbits = 9; /* bits in base literal/length lookup table */ --int vdbits = 6; /* bits in base distance lookup table */ -+static int vlbits = 9; /* bits in base literal/length lookup table */ -+static int vdbits = 6; /* bits in base distance lookup table */ - - - /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */ -@@ -239,7 +239,7 @@ int vdbits = 6; /* bits in base - #define N_MAX 288 /* maximum number of codes in any set */ - - --unsigned hufts; /* track memory usage */ -+static unsigned hufts; /* track memory usage */ - - /* Given a list of code lengths and a maximum table size, make a set of - tables to decode that set of codes. Return zero on success, one if -Index: Argyll_V2.1.2/spectro/inflate.c -=================================================================== ---- Argyll_V2.1.2.orig/spectro/inflate.c -+++ Argyll_V2.1.2/spectro/inflate.c -@@ -49,7 +49,7 @@ typedef unsigned int ulg; - the next table, which codes e - 16 bits, and lastly e == 99 indicates - an unused code. If a code with e == 99 is looked up, this implies an - error in the data. */ --struct huft { -+static struct huft { - uch e; /* number of extra bits or operation */ - uch b; /* number of bits in this code or subcode */ - union { -@@ -87,7 +87,7 @@ int inflate(void); - /* unsigned wp; current position in slide */ - - #define WSIZE 0x8000 --unsigned int wp; /* current position in slide */ -+static unsigned int wp; /* current position in slide */ - uch slide[32768]; - - static int flush_output(unsigned int w) { -@@ -155,8 +155,8 @@ static ush cpdext[] = { /* Extra - the stream. - */ - --ulg bb; /* bit buffer */ --unsigned bk; /* bits in bit buffer */ -+static ulg bb; /* bit buffer */ -+static unsigned bk; /* bits in bit buffer */ - - ush mask_bits[] = { - 0x0000, -@@ -201,8 +201,8 @@ ush mask_bits[] = { - */ - - --int lbits = 9; /* bits in base literal/length lookup table */ --int dbits = 6; /* bits in base distance lookup table */ -+static int lbits = 9; /* bits in base literal/length lookup table */ -+static int dbits = 6; /* bits in base distance lookup table */ - - - /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */ -@@ -210,7 +210,7 @@ int dbits = 6; /* bits in base - #define N_MAX 288 /* maximum number of codes in any set */ - - --unsigned hufts; /* track memory usage */ -+static unsigned hufts; /* track memory usage */ - - - static int huft_build(b, n, s, d, e, t, m) - diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 986167220b26..5f155b022dd0 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -8,16 +8,24 @@ AUX blender-4.0.1-openvdb-11.patch 3236 BLAKE2B e749db26f88b1e5329741a09c306ddd1 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.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 13726 BLAKE2B 8641e7d81d4d5ae7647a58bf5dce2f031c043714608501d4b4c1febae164741330467dc1253ea521fc4534b9323f2ee5ad043321674d13cd53ba2548193ab2b3 SHA512 ec16526c86f685824629a9a5f97e4a1f44439101781a07179f28f30b4502537d14c469dd83f474fe544cf8e1ae363b3f7d9810f346d94b32d83fb67f2642d0ea EBUILD blender-3.3.8.ebuild 13722 BLAKE2B 12465f59bb137aaa869216b623df34fb8758a742bc517cd467865ecfbff6856429c7fda725b6a3e14d1581964b22adb27956e0b74838c1da5e9a573560269fdf SHA512 8d985d8efd20233d111b7efe2aaa0b8fe486d3de36d676575347d66b24a7fd14904c04d9edfcfc1e03c34956419dc3ec06c4e20175749254f120ae52e79a1396 +EBUILD blender-3.6.15.ebuild 14133 BLAKE2B 97030e2d089b2bd7cc7e8a3e0c4b8b302c168f3b12be5e18366493776095fd4b95b2107691f467f67fb95e006b3d5ad5442dddff8e39fa53044dbaf263f79216 SHA512 3d90056f798ce49c5028ff860296e1c18201d44fea9056c59150b6b6815d3ac98e03e9b1ba2aa985e883996e7755dec6ef27a9799e889c21bd6d539940fe858c EBUILD blender-3.6.8.ebuild 14127 BLAKE2B 1de13a7ef689f16a899698c7262bf0a59a9d6ca1a9ed27c446e11b1cfc4b39b94231f08d96b17323f2049b1ec05a28319718402c083061a2b805838ca90931ad SHA512 0647e31bef93c125c407611a690437de86c710beb5b7771801e27e2e561c3d7bfbc350e67fe0275bcbe4a5f049e87c3e600b95bcef9013f156677624b1ce445c -EBUILD blender-4.0.2-r1.ebuild 17318 BLAKE2B 010552261087bdb8c937a5f081d0316e11ee5cb4809a43e0eed8292be7062e070eb0643c91582b89b0aaebffef20aba3e07c30ec73203fefc7e81f7ebb9d78a5 SHA512 e15eb447924b6c1048c5cf0af8770d1f916d7dbcce0f1f9b00482f8d56b31b0e98834c160bc996a8afd3393f58443b2de0e8783075bd3ee3812bb7b9eef31e52 -EBUILD blender-4.1.1-r2.ebuild 17223 BLAKE2B 9a18bd4d7fdca8959a30de975c43a121e5e8d623d5405f45c0ba0658309e30f4537cafdce7187ea373fe2e649e5a09d0bdd77efec7c028230314c51023ce0db8 SHA512 39566662e531ff1a35e895c9b7201b81b75cb6334e8802f359cc1eece944bad38a4e6d813884cc045497a09aae5bd00a9916ae13ffe8ed578ec8d861640cf8fb +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-9999.ebuild 17224 BLAKE2B 49f70034df58751a0ec4994a7b7aa7f7b74a2eb8163c9317c61b9147e413bec90a33c88dc2d6d42bee60570b61692a5fca5ced71800d5adff7306dcab1fee0aa SHA512 8c9137ee3bfbec89b124b2c12e730081e3b2de73b43d530bc5855ddaf76d7bf2156c7c433f0eb4bf85f0a4f04b5db9e6656ead9e98711262e7721071ef3c3155 +EBUILD blender-4.2.1.ebuild 17468 BLAKE2B 6c4dc64995717956cc7dbbcca9e1420920d4ed0cfa4c484ab4eb38a27ba7d03b25b4987c067f88c214506baacbab24c8cee6c2a9a89969ec0a8df7a265781389 SHA512 e1c1ce5f0178b47c894610773e08991ea5affab1abb72b6b0a9085ae90c1cd577b272cb6b9dae794c0cd5544b954dad4eb8e69c659309acc8fd5593c9593f510 +EBUILD blender-9999.ebuild 17468 BLAKE2B 6c4dc64995717956cc7dbbcca9e1420920d4ed0cfa4c484ab4eb38a27ba7d03b25b4987c067f88c214506baacbab24c8cee6c2a9a89969ec0a8df7a265781389 SHA512 e1c1ce5f0178b47c894610773e08991ea5affab1abb72b6b0a9085ae90c1cd577b272cb6b9dae794c0cd5544b954dad4eb8e69c659309acc8fd5593c9593f510 MISC metadata.xml 3679 BLAKE2B cca8c2f8568be6c83244cf5a90b2db0df11faffa4f55820692990e02ce0bfd84cf3e6c2fdb146af9e6c8e09d1c72fe297c73f126e04ad918e709dc9064908aca SHA512 ac8bdbc0e00442f56d9d077d7d8c97deba90121e7dd34aac9d51b7ae6348bbaa875d2fcd01fe20ff7e9b1c3bf332a5cde63fd0b406a1e29c3f4de323225a17a9 diff --git a/media-gfx/blender/blender-3.3.21.ebuild b/media-gfx/blender/blender-3.3.21.ebuild new file mode 100644 index 000000000000..66c872c02cea --- /dev/null +++ b/media-gfx/blender/blender-3.3.21.ebuild @@ -0,0 +1,432 @@ +# 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.6.15.ebuild b/media-gfx/blender/blender-3.6.15.ebuild new file mode 100644 index 000000000000..698ccf250f72 --- /dev/null +++ b/media-gfx/blender/blender-3.6.15.ebuild @@ -0,0 +1,447 @@ +# 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://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 )" + 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 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 ) + 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 +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/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:= ) + 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[cxx] ) + 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 ) + 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?] + 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 ) + 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} + 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 ) + wayland? ( + dev-util/wayland-scanner + ) +" + +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 + + 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 + #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|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 +} + +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 + blender_get_version + + 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_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=$($(use X || use wayland) && echo OFF || echo ON) + -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_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_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-4.0.2-r1.ebuild b/media-gfx/blender/blender-4.0.2-r1.ebuild index 79149721f474..ae693845b6b7 100644 --- a/media-gfx/blender/blender-4.0.2-r1.ebuild +++ b/media-gfx/blender/blender-4.0.2-r1.ebuild @@ -83,7 +83,7 @@ RDEPEND="${PYTHON_DEPS} embree? ( media-libs/embree:=[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) - gmp? ( dev-libs/gmp ) + gmp? ( dev-libs/gmp[cxx] ) gnome? ( gui-libs/libdecor ) hip? ( >=dev-util/hip-5.7:= ) jack? ( virtual/jack ) diff --git a/media-gfx/blender/blender-4.1.1-r2.ebuild b/media-gfx/blender/blender-4.1.1-r2.ebuild index 3de02e47f35d..b39222330cbf 100644 --- a/media-gfx/blender/blender-4.1.1-r2.ebuild +++ b/media-gfx/blender/blender-4.1.1-r2.ebuild @@ -4,8 +4,9 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..12} ) -# matches media-libs/osl +# 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 @@ -83,7 +84,7 @@ RDEPEND="${PYTHON_DEPS} embree? ( media-libs/embree:=[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) - gmp? ( dev-libs/gmp ) + gmp? ( dev-libs/gmp[cxx] ) gnome? ( gui-libs/libdecor ) hip? ( llvm_slot_17? ( @@ -102,7 +103,7 @@ 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.7:= @@ -186,6 +187,8 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.0.2-FindClang.patch" "${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch" + "${FILESDIR}/${PN}-4.1.1-FindLLVM.patch" + "${FILESDIR}/${PN}-4.1.1-numpy.patch" ) blender_check_requirements() { @@ -343,9 +346,7 @@ src_configure() { -DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)" -DWITH_FFTW3=$(usex fftw) -DWITH_GHOST_WAYLAND=$(usex wayland) - -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}" -DWITH_GHOST_WAYLAND_DYNLOAD="no" - -DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)" -DWITH_GHOST_X11=$(usex X) -DWITH_GMP=$(usex gmp) -DWITH_GTESTS=$(usex test) @@ -393,6 +394,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" ) @@ -420,6 +428,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 diff --git a/media-gfx/blender/blender-4.2.1.ebuild b/media-gfx/blender/blender-4.2.1.ebuild new file mode 100644 index 000000000000..88bb85849015 --- /dev/null +++ b/media-gfx/blender/blender-4.2.1.ebuild @@ -0,0 +1,608 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 + +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="https://www.blender.org" + +if [[ ${PV} = *9999* ]] ; then + EGIT_LFS="yes" + inherit git-r3 + EGIT_REPO_URI="https://projects.blender.org/blender/blender.git" + EGIT_SUBMODULES=( '*' '-lib/*' ) + RESTRICT="!test? ( test )" +else + SRC_URI=" + https://download.blender.org/source/${P}.tar.xz + " + # test? ( + # https://projects.blender.org/blender/blender-test-data/archive/blender-v$(ver_cut 1-2)-release.tar.gz + # ) + # " + KEYWORDS="~amd64 ~arm ~arm64" + RESTRICT="test" # the test archive returns LFS references. +fi + +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 +otf +pdf +potrace +pugixml pulseaudio + renderdoc sdl +sndfile +tbb test +tiff valgrind vulkan wayland +webp X +" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + alembic? ( openexr ) + cuda? ( cycles ) + cycles? ( openexr tiff tbb ) + fluid? ( tbb ) + gnome? ( wayland ) + hip? ( cycles ) + nanovdb? ( openvdb ) + openvdb? ( tbb openexr ) + optix? ( cuda ) + osl? ( cycles pugixml ) + test? ( color-management )" + +# Library versions for official builds can be found in the blender source directory in: +# build_files/build_environment/cmake/versions.cmake +RDEPEND="${PYTHON_DEPS} + app-arch/zstd + 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/libepoxy:= + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/libsamplerate + >=media-libs/openimageio-2.5.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:= ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + embree? ( media-libs/embree:=[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] ) + gnome? ( gui-libs/libdecor ) + 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= ) + ndof? ( + app-misc/spacenavd + dev-libs/libspnav + ) + nls? ( virtual/libiconv ) + openal? ( media-libs/openal ) + oidn? ( >=media-libs/oidn-2.1.0[${LLVM_USEDEP}] ) + oneapi? ( dev-libs/intel-compute-runtime[l0] ) + openexr? ( + >=dev-libs/imath-3.1.7:= + >=media-libs/openexr-3.2.1:0= + ) + openpgl? ( media-libs/openpgl:= ) + opensubdiv? ( >=media-libs/opensubdiv-3.5.0 ) + openvdb? ( + >=media-gfx/openvdb-11.0.0:=[nanovdb?] + dev-libs/c-blosc:= + ) + optix? ( dev-libs/optix ) + osl? ( + >=media-libs/osl-1.13:=[${LLVM_USEDEP}] + media-libs/mesa[${LLVM_USEDEP}] + ) + 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 ) + wayland? ( + >=dev-libs/wayland-1.12 + >=dev-libs/wayland-protocols-1.15 + >=x11-libs/libxkbcommon-0.2.0 + dev-util/wayland-scanner + media-libs/mesa[wayland] + sys-apps/dbus + ) + vulkan? ( + media-libs/shaderc + dev-util/spirv-tools + dev-util/glslang + media-libs/vulkan-loader + ) + otf? ( + media-libs/harfbuzz + ) + renderdoc? ( + media-gfx/renderdoc + ) + X? ( + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + ) +" + +DEPEND="${RDEPEND} + dev-cpp/eigen:= + vulkan? ( + dev-util/spirv-headers + dev-util/vulkan-headers + ) +" + +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 ) + wayland? ( + dev-util/wayland-scanner + ) + X? ( + x11-base/xorg-proto + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.2-FindClang.patch" + "${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch" + "${FILESDIR}/${PN}-4.1.1-FindLLVM.patch" + "${FILESDIR}/${PN}-4.1.1-numpy.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 + + 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() { + if use osl; then + llvm-r1_pkg_setup + fi + + blender_check_requirements + python-single-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} = *9999* ]] ; then + if ! use test; then + EGIT_SUBMODULES+=( '-tests/*' ) + fi + git-r3_src_unpack + else + default + + if use test; then + mkdir -p "${S}/tests/data/" || die + mv blender-test-data/* "${S}/tests/data/" || die + fi + fi +} + +src_prepare() { + use cuda && cuda_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|" \ + -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" \ + -e "s|blender.desktop|blender-${BV}.desktop|" \ + -e "s|org.blender.Blender.metainfo.xml|blender-${BV}.metainfo.xml|" \ + -i source/creator/CMakeLists.txt || die + + sed \ + -e "s|Name=Blender|Name=Blender ${BV}|" \ + -e "s|Exec=blender|Exec=blender-${BV}|" \ + -e "s|Icon=blender|Icon=blender-${BV}|" \ + -i release/freedesktop/blender.desktop || die + + sed -e "s|\${CMAKE_INSTALL_PREFIX}/\${BLENDER_BIN}|${T}/usr/\${BLENDER_BIN}|g" -i source/creator/CMakeLists.txt || die + + mv \ + release/freedesktop/icons/scalable/apps/blender.svg \ + "release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die + mv \ + release/freedesktop/icons/symbolic/apps/blender-symbolic.svg \ + "release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die + mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die + mv release/freedesktop/org.blender.Blender.metainfo.xml "release/freedesktop/blender-${BV}.metainfo.xml" + mv release/freedesktop/org.blender.Blender.appdata.xml "release/freedesktop/blender-${BV}.appdata.xml" + + 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|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/testing.cmake || die + fi + + if use vulkan; then + sed -e "s/extern_vulkan_memory_allocator/extern_vulkan_memory_allocator\nSPIRV-Tools-opt\nSPIRV-Tools\nSPIRV-Tools-link\nglslang\nSPIRV\nSPVRemapper/" -i source/blender/gpu/CMakeLists.txt || 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 + blender_get_version + + local mycmakeargs=( + -DWITH_LIBS_PRECOMPILED=no + -DBUILD_SHARED_LIBS=no + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DPYTHON_VERSION="${EPYTHON/python/}" + -DWITH_ALEMBIC=$(usex alembic) + -DWITH_BOOST=yes + -DWITH_BULLET=$(usex bullet) + -DWITH_CODEC_FFMPEG=$(usex ffmpeg) + -DWITH_CODEC_SNDFILE=$(usex sndfile) + -DWITH_CPU_CHECK=no + + -DWITH_CYCLES=$(usex cycles) + + -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda) + -DWITH_CYCLES_CUDA_BINARIES="$(usex cuda $(usex cycles-bin-kernels))" + -DWITH_CYCLES_DEVICE_OPTIX=$(usex optix) + + -DWITH_CYCLES_DEVICE_HIP="$(usex hip)" + -DWITH_CYCLES_HIP_BINARIES=$(usex hip $(usex cycles-bin-kernels)) + + -DWITH_CYCLES_DEVICE_ONEAPI="$(usex oneapi)" + -DWITH_CYCLES_ONEAPI_BINARIES="$(usex oneapi $(usex cycles-bin-kernels))" + + -DWITH_CYCLES_HYDRA_RENDER_DELEGATE="no" # TODO: package Hydra + -DWITH_CYCLES_EMBREE="$(usex embree)" + -DWITH_CYCLES_OSL=$(usex osl) + -DWITH_CYCLES_PATH_GUIDING=$(usex openpgl) + -DWITH_CYCLES_STANDALONE=no + -DWITH_CYCLES_STANDALONE_GUI=no + + -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" + -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 + -DWITH_IMAGE_OPENEXR=$(usex openexr) + -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) + -DWITH_IMAGE_WEBP=$(usex webp) + -DWITH_INPUT_NDOF=$(usex ndof) + -DWITH_INSTALL_PORTABLE="no" + -DWITH_INTERNATIONAL=$(usex nls) + -DWITH_JACK=$(usex jack) + -DWITH_MATERIALX="no" # TODO: Package MaterialX + -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_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=no + -DWITH_PYTHON_INSTALL_NUMPY=no + -DWITH_PYTHON_INSTALL_ZSTANDARD=no + -DWITH_RENDERDOC="$(usex renderdoc)" + -DWITH_SDL=$(usex sdl) + -DWITH_STATIC_LIBS=no + -DWITH_STRICT_BUILD_OPTIONS=yes + -DWITH_SYSTEM_EIGEN3=yes + -DWITH_SYSTEM_FREETYPE=yes + -DWITH_SYSTEM_LZO=yes + -DWITH_TBB=$(usex tbb) + -DWITH_USD="no" # TODO: Package USD + -DWITH_VULKAN_BACKEND="$(usex vulkan)" + -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" ) + else + mycmakeargs+=( -DWITH_BUILDINFO="no" ) + fi + + if use cuda; then + mycmakeargs+=( + -DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)" + ) + fi + + if use hip; then + mycmakeargs+=( + -DROCM_PATH="$(hipconfig -R)" + -DHIP_HIPCC_FLAGS="-fcf-protection=none" + ) + fi + + if use optix; then + mycmakeargs+=( + -DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix + -DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix + ) + 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 + + append-cflags "$(usex debug '-DDEBUG' '-DNDEBUG')" + append-cppflags "$(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=no + -DWITH_LINKER_LLD=no + ) + # Ease compiling with required gcc similar to cuda_sanitize but for cmake + use cuda && use cycles-bin-kernels && mycmakeargs+=( -DCUDA_HOST_COMPILER="$(cuda_gccdir)" ) + fi + + if tc-is-clang || use osl; then + mycmakeargs+=( + -DWITH_CLANG=yes + -DWITH_LLVM=yes + ) + fi + + if use test ; then + local CYCLES_TEST_DEVICES=( "CPU" ) + if use cycles-bin-kernels; then + use cuda && CYCLES_TEST_DEVICES+=( "CUDA" ) + use optix && CYCLES_TEST_DEVICES+=( "OPTIX" ) + use hip && CYCLES_TEST_DEVICES+=( "HIP" ) + fi + mycmakeargs+=( + -DCYCLES_TEST_DEVICES:STRING="$(local IFS=";"; echo "${CYCLES_TEST_DEVICES[*]}")" + -DWITH_COMPOSITOR_REALTIME_TESTS=yes + -DWITH_GPU_DRAW_TESTS=yes + -DWITH_GPU_RENDER_TESTS=yes + ) + 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!" + + if use cuda; then + cuda_add_sandbox -w + addwrite "/dev/dri/renderD128" + addwrite "/dev/char/" + fi + + if use X; then + xdg_environment_reset + fi + + addwrite /dev/dri + + 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_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_11 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}/${BV}/cache/" + ewarn "It may contain extra render kernels not tracked by portage" + ewarn "" +} diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index 77eb9876c615..88bb85849015 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -4,8 +4,9 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..12} ) -# matches media-libs/osl +# 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=" @@ -36,7 +36,7 @@ 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 + 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 " @@ -83,7 +83,7 @@ RDEPEND="${PYTHON_DEPS} embree? ( media-libs/embree:=[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) - gmp? ( dev-libs/gmp ) + gmp? ( dev-libs/gmp[cxx] ) gnome? ( gui-libs/libdecor ) hip? ( llvm_slot_17? ( @@ -102,7 +102,7 @@ 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.7:= @@ -186,6 +186,8 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.0.2-FindClang.patch" "${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch" + "${FILESDIR}/${PN}-4.1.1-FindLLVM.patch" + "${FILESDIR}/${PN}-4.1.1-numpy.patch" ) blender_check_requirements() { @@ -233,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 @@ -318,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) @@ -343,9 +343,7 @@ src_configure() { -DWITH_EXPERIMENTAL_FEATURES="$(usex experimental)" -DWITH_FFTW3=$(usex fftw) -DWITH_GHOST_WAYLAND=$(usex wayland) - -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}" -DWITH_GHOST_WAYLAND_DYNLOAD="no" - -DWITH_GHOST_WAYLAND_LIBDECOR="$(usex gnome)" -DWITH_GHOST_X11=$(usex X) -DWITH_GMP=$(usex gmp) -DWITH_GTESTS=$(usex test) @@ -393,6 +391,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" ) @@ -420,6 +425,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 @@ -488,6 +500,8 @@ src_test() { xdg_environment_reset fi + addwrite /dev/dri + cmake_src_test # Clean up the image directory for src_install diff --git a/media-gfx/blender/files/blender-4.1.1-FindLLVM.patch b/media-gfx/blender/files/blender-4.1.1-FindLLVM.patch new file mode 100644 index 000000000000..e8e1c349b956 --- /dev/null +++ b/media-gfx/blender/files/blender-4.1.1-FindLLVM.patch @@ -0,0 +1,38 @@ +From: =?UTF-8?q?Jannik=20Gl=C3=BCckert?= <jannik.glueckert@gmail.com> +Date: Fri, 23 Aug 2024 13:17:34 +0200 +Subject: [PATCH] fix FindLLVM lookup + +find out our installed libnames and use that in the lookup + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +diff --git build_files/cmake/Modules/FindLLVM.cmake build_files/cmake/Modules/FindLLVM.cmake +index 4c7cc5f..21c760e 100644 +--- a/build_files/cmake/Modules/FindLLVM.cmake ++++ b/build_files/cmake/Modules/FindLLVM.cmake +@@ -54,16 +54,21 @@ if(NOT LLVM_LIBPATH) + set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path") + mark_as_advanced(LLVM_LIBPATH) + endif() ++if(NOT LLVM_LIBNAMES) ++ execute_process(COMMAND ${LLVM_CONFIG} --libnames ++ OUTPUT_VARIABLE LLVM_LIBNAMES ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ set(LLVM_LIBNAMES ${LLVM_LIBNAMES} CACHE PATH "Name of the LLVM libraries") ++ mark_as_advanced(LLVM_LIBNAMES) ++endif() + + if(LLVM_STATIC) + find_library(LLVM_LIBRARY +- NAMES LLVMAnalysis # first of a whole bunch of libs to get ++ NAMES ${LLVM_LIBNAMES} + PATHS ${LLVM_LIBPATH}) + else() + find_library(LLVM_LIBRARY +- NAMES +- LLVM-${LLVM_VERSION} +- LLVMAnalysis # check for the static library as a fall-back ++ NAMES ${LLVM_LIBNAMES} + PATHS ${LLVM_LIBPATH}) + endif() + diff --git a/media-gfx/blender/files/blender-4.1.1-numpy.patch b/media-gfx/blender/files/blender-4.1.1-numpy.patch new file mode 100644 index 000000000000..bd76da8b5959 --- /dev/null +++ b/media-gfx/blender/files/blender-4.1.1-numpy.patch @@ -0,0 +1,26 @@ +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Fri, 23 Aug 2024 13:19:21 +0200 +Subject: [PATCH] fix numpy lookup + +use cmake config for find_package() + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +--- a/build_files/cmake/platform/platform_unix.cmake ++++ b/build_files/cmake/platform/platform_unix.cmake +@@ -463,13 +463,13 @@ if(WITH_BOOST) + endif() + list(APPEND __boost_packages system) + set(Boost_NO_WARN_NEW_VERSIONS ON) +- find_package(Boost 1.48 COMPONENTS ${__boost_packages}) ++ find_package(Boost 1.48 CONFIG COMPONENTS ${__boost_packages}) + if(NOT Boost_FOUND) + # try to find non-multithreaded if -mt not found, this flag + # doesn't matter for us, it has nothing to do with thread + # safety, but keep it to not disturb build setups + set(Boost_USE_MULTITHREADED OFF) +- find_package(Boost 1.48 COMPONENTS ${__boost_packages}) ++ find_package(Boost 1.48 CONFIG COMPONENTS ${__boost_packages}) + endif() + unset(__boost_packages) + if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU) diff --git a/media-gfx/crwinfo/Manifest b/media-gfx/crwinfo/Manifest index d1293fac02ae..3505f454ef42 100644 --- a/media-gfx/crwinfo/Manifest +++ b/media-gfx/crwinfo/Manifest @@ -1,4 +1,4 @@ AUX crwinfo-0.2.patch 1009 BLAKE2B 0d4ac95f748b9a0c82d9819a951cefa97c6a1bef06f7495623bc2e3b245ef32e63e8fa9d387d4408c136f58e9606a1b591d802bf3cb76c27ea7079df59d7a711 SHA512 b02efcaf211603b5901b316d286ba0baf7e74776a2f92d6f321b154c8713a7fe653b5652137de8ae25d7a9f9eca6f217a4bab1c6839e7bb144ac5fdd804c001b DIST CRWInfo-0.2.tar.gz 10717 BLAKE2B fce230c1913cd924b554697bb1a26661671ec2ec274fbb5f8918f2f5bdb8923897dd1f9b3a4a844f8d0f380f39f50ee08418c6d3cfac39fe7a3e50255aa0632d SHA512 54e386266570460dd43f5a6d4b0eea7d6c37d9327dca8ffc1fa10462f97e23fc080404159723ce6558c3dc6c77eccba6ede628097d95f699a47f57a114e1eb0a -EBUILD crwinfo-0.2.ebuild 596 BLAKE2B 2e948a0873510fc6e296a0480a2b58ecc93453aeeedb9f54b3e30df68821aa08ee20c51b4baa6d27a89ceb66ebd705380a132c93ec8c42db11cb3ede612ea345 SHA512 efbd17d4e327fdbc6b1ffa43a396d39fdf57fb79fb332370fd5135675f9c094e4ba37e2bc11bd70bb03177abd3739b2e662be6980920a5e970e0fe331c9101b1 +EBUILD crwinfo-0.2.ebuild 590 BLAKE2B 817a9fcba56c32b5bccff306e629bf3103e127e7dd2cbf42e679ca109fd44ec3c72cff3c4d545ef173e2ac89b7132d2b0698cf4931feca374a8e4a136461effc SHA512 14659ee47527a82ee0f699d68ddebd277a5b6fe11cf2082e26bb8630384c96f8e62352973deae7a0b55cc47f31373888b4e17a7460af7fd919c0aeb98f8593a8 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/media-gfx/crwinfo/crwinfo-0.2.ebuild b/media-gfx/crwinfo/crwinfo-0.2.ebuild index 399e3208c0fb..7e9513ab11d6 100644 --- a/media-gfx/crwinfo/crwinfo-0.2.ebuild +++ b/media-gfx/crwinfo/crwinfo-0.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://neuemuenze.heim1.tu-clausthal.de/~sven/crwinfo/CRWInfo-${PV}.tar LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86" S="${WORKDIR}/CRWInfo-${PV}" diff --git a/media-gfx/curtail/Manifest b/media-gfx/curtail/Manifest index 2060b36de2e2..43e256a4ba0f 100644 --- a/media-gfx/curtail/Manifest +++ b/media-gfx/curtail/Manifest @@ -1,5 +1,7 @@ DIST curtail-1.10.0.tar.gz 205428 BLAKE2B 7a9d1c56542648cd1c4c6fe1355276896bea96a8f054d03c2e4a174e392867db05c3a6548897d31f078b2416eac8b3695cafd3977236f0b66fd10f3020e35d3a SHA512 6bd76b4cefd693199e25db112e90acaa990d2a8dbc2016bd9d55e8d1857bd9c6e94f9164691855231afeff65ae3b070c646a8dc8b446591a08509683dd4a9fb7 -DIST curtail-1.9.1.tar.gz 199785 BLAKE2B 689aa8f61f3c48ed51a85c35bbc6bee136a20064cd2d03c48f630fd80c8c85b64421e77327a71a41f266bd8f9d6f0dcdc197c15657159ae74056e1b52cc8ef12 SHA512 7ff0ff10068c5ff2694f6674376edf84957759b6274740d47d11a584943b026183b13a59b777c27569b6997c3cb358694fa93c55a1136b9d1fab08e768d1a1a4 +DIST curtail-1.11.0.tar.gz 208900 BLAKE2B b1f9fdff8d974ba20345100b24b783c72f241e8612c28468eec424dbe8781affd88523953299a7f5d90575db7c6727e6fa7a4a1e7439dcb94c47806fb77412cf SHA512 eb5bf7400fa97d14d67a0eecaeee2c3cc6b3407b882a5ae42bb517df98429997fe4448a7852c55a39177f035764e4e544f13fb89d7a55e5b6a01a549acc71ecb +DIST curtail-1.11.1.tar.gz 208910 BLAKE2B 6a8ed78ba5e09242d0ae497541d41e310b18c6a26cdc5292503d15c003b1e265ee79e6ca057964aac0782041efcbf2beeb16912802aff534465ea0e96c0a750d SHA512 d59bcad4e774a9aa1d195f6b18964d05e41b47e81cd6fcdd86638488c0a63702c0c2ee97e20712eed4e81a0de562b7218df5519573707ace53191c14ac875b86 EBUILD curtail-1.10.0.ebuild 1318 BLAKE2B 273f62277284e309bdc4faab09b34ff2a9caa2ee39dfbf8c2283bdb9aa255527421878ef87a506757aac118e15b882aac740366ca0b9ae18d19f22d3e1576b36 SHA512 20418b1be77b65f02639e21c4dc773d9da885688bc77593a0082276e60e575d72c772a69afa803890077a21b427dcda4b62ac7f76bb166ae081c51ecba4f29fa -EBUILD curtail-1.9.1.ebuild 1308 BLAKE2B 32b03b1e5cfd3fecbb26da094e2e2014494aaf443cde54a960d73a315d5977c79431b77b2d4883bea9d39936ba3dafb12c94c85b4143b269372855463ee58685 SHA512 786684d07b13960900f45419595ab8d217411d32d652521ef7a1b36e11c2666da887b266bfb6ca1f2de57de7dba92565dd1b68439f5d4f2ed9f4a68ebb7bc254 +EBUILD curtail-1.11.0.ebuild 1319 BLAKE2B 132a30b13ac64d23700d239815535dc6c46a9f77b9ef12f447610ba0ea079bbc4077eeef67b21d70b3f9f1a9a4d7f44dfc8981c7bb5e9e6110b2a37b0d93ca30 SHA512 952bc4042afc4eb286a9c688e2984f2bd682f17d561150def81dbf19fa4c6c54f0cac31a71a69049c1974fc4c2783d3f2f0493fe3bff57041a0dd6db4999533f +EBUILD curtail-1.11.1.ebuild 1319 BLAKE2B 132a30b13ac64d23700d239815535dc6c46a9f77b9ef12f447610ba0ea079bbc4077eeef67b21d70b3f9f1a9a4d7f44dfc8981c7bb5e9e6110b2a37b0d93ca30 SHA512 952bc4042afc4eb286a9c688e2984f2bd682f17d561150def81dbf19fa4c6c54f0cac31a71a69049c1974fc4c2783d3f2f0493fe3bff57041a0dd6db4999533f MISC metadata.xml 817 BLAKE2B ea01ae4c58024699aae770d6e7f21a03adfc8da5f5f658a0b1708824bfda730a2fce4557de4fbccbc079c66a11ab08d6faef020bf897d47870f6581b5e0d68e6 SHA512 3d573feda8c750a08903203c1d2f2e1385e17242356c6f319e29944e530b2199a27e4e432a806dfe1f2c8c783dd67c4fe347d5160d4df99911f67623a3168eee diff --git a/media-gfx/curtail/curtail-1.9.1.ebuild b/media-gfx/curtail/curtail-1.11.0.ebuild index 036a248fd7e7..8db3728be1ae 100644 --- a/media-gfx/curtail/curtail-1.9.1.ebuild +++ b/media-gfx/curtail/curtail-1.11.0.ebuild @@ -3,33 +3,36 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit gnome2-utils meson python-single-r1 xdg DESCRIPTION="Image compressor, supporting PNG, JPEG and WebP" HOMEPAGE="https://github.com/Huluti/Curtail/" -if [[ ${PV} == *9999* ]] ; then +if [[ "${PV}" == *9999* ]] ; then inherit git-r3 + EGIT_REPO_URI="https://github.com/Huluti/${PN^}.git" else SRC_URI="https://github.com/Huluti/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P^}" - KEYWORDS="amd64 ~x86" + KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-3+" SLOT="0" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="test" # Just desktop / schema / appstream file validation (fails). +RESTRICT="test" # Just desktop / schema / appstream file validation (fails). RDEPEND=" ${PYTHON_DEPS} gui-libs/gtk:4[introspection] - $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') " BDEPEND=" ${RDEPEND} @@ -47,7 +50,7 @@ RDEPEND+=" DOCS=( CHANGELOG.md README.md ) src_prepare() { - sed -i "s|@PYTHON@|${PYTHON}|" "${S}"/src/${PN}.in || die + sed -i "s|@PYTHON@|${PYTHON}|" "${S}/src/${PN}.in" || die default } diff --git a/media-gfx/curtail/curtail-1.11.1.ebuild b/media-gfx/curtail/curtail-1.11.1.ebuild new file mode 100644 index 000000000000..8db3728be1ae --- /dev/null +++ b/media-gfx/curtail/curtail-1.11.1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..13} ) + +inherit gnome2-utils meson python-single-r1 xdg + +DESCRIPTION="Image compressor, supporting PNG, JPEG and WebP" +HOMEPAGE="https://github.com/Huluti/Curtail/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/Huluti/${PN^}.git" +else + SRC_URI="https://github.com/Huluti/${PN^}/archive/${PV}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}/${P^}" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="test" # Just desktop / schema / appstream file validation (fails). + +RDEPEND=" + ${PYTHON_DEPS} + gui-libs/gtk:4[introspection] + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + ${RDEPEND} + dev-libs/appstream-glib + dev-util/desktop-file-utils +" +RDEPEND+=" + >=gui-libs/libadwaita-1.3.1 + media-gfx/jpegoptim + media-gfx/oxipng + media-gfx/pngquant + media-libs/libwebp +" + +DOCS=( CHANGELOG.md README.md ) + +src_prepare() { + sed -i "s|@PYTHON@|${PYTHON}|" "${S}/src/${PN}.in" || die + + default +} + +src_install() { + meson_src_install + python_optimize +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index 868c09b0961b..941095c1ae3b 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -12,5 +12,5 @@ DIST darktable-usermanual-4.6.en.pdf 26844087 BLAKE2B 5bdb5e012cd8ba7bace7330061 DIST darktable-usermanual-4.6.uk.pdf 27013345 BLAKE2B 4c0da0038576e8ea97da88a4481e1afdf4e5b5df6b8a52475d18b488ac10066db4ef679681a38a194dd84771e340f58beea0450ec60726abd19d600e73fc40f1 SHA512 6e2f036e3f845791aa8b6eb565230136bfb6ae7f9b1ee56a9201cd25bb09391fd2ec45ba7fa1ddd11b4c193ab6b097fae32107af6c11b6cd6eeada60b002d4b3 EBUILD darktable-4.6.0.ebuild 5785 BLAKE2B 564d6a22f7ea68d29164d9b64b026183557469c1c0c2d387522f1c32c905cb44698506df084eb8e24d7730d4a6cb4d9e8b85924001a09f5a439d866af0689349 SHA512 1814f05967b57c9511cc9d07a7e1896ff1bf894029b1c5e063a3576eaeb0a4370a9e0d4b9b8f1e2f1050587664da822f307418042d89a93b333c54fc3926a3a8 EBUILD darktable-4.6.1.ebuild 5900 BLAKE2B f2e7c0dfc905193fb4caac74365a32954e5ef27037b05823fc229f308d8538e3957aa2be23f20be1e4b3e7aea4b2869d26b7ef2815e8645e2312ae921e16c7d9 SHA512 90c7866efa1204b966f8186ff9ff16cd9d4f8705a019ad5324991b0c1be174f969da12b9b794db1ea71eaf8ae2f47424a705db94704a319615801e06915e0018 -EBUILD darktable-4.8.0.ebuild 5895 BLAKE2B 591b7d195ccf6643eb3fc9e75b3449d0cef390618eebf89bd92c96d71cdd57df77cdf0382b23e4caac69f00603fefa9b131adcc14f853cb18a08b7633f0685f0 SHA512 49c2df019fb1946e978372cecded21f917be17c58a54c4b019c80aeaa623ec35a9cfbe9f5e32082bcbeab6be9b768baab6a07d39cb8109c955cb7cfa31a40ce9 +EBUILD darktable-4.8.0.ebuild 5894 BLAKE2B a51122ab23f81573affe8b99e0ee4dd185bf04bccf90af79eea86d0873834fb2f7c48bd0a9e6bfe1578960d8ad525f07f7247d16a00460808f39dd95b36fcba5 SHA512 cf0bbdbff7d844fd7a8916453d31da3ed28628ec06fc6b50f2766202fda0cbfae72e460c35cc7341fcf8db4bd807ee16efcedb2c0a54bddeb2a91ddacbfcba44 MISC metadata.xml 911 BLAKE2B ae7f5d92e5a9bfd96ff14f531d7a54db3db85c6c310a97e9fde57e74dcb6940192d35f98c7ff17d44f627b53252106b5f917dd2123fa80b1d668b6e0f6865081 SHA512 a7bcb43a1859d366eb557c468b23eb60ed4ef250cc0179fa9c823b3d27347ef3692134ef336836b01ebfc9b53165c60ac88f28d6452b9bcfa6a94b32b5b6177d diff --git a/media-gfx/darktable/darktable-4.8.0.ebuild b/media-gfx/darktable/darktable-4.8.0.ebuild index 7d5982a7686d..b3eeef397175 100644 --- a/media-gfx/darktable/darktable-4.8.0.ebuild +++ b/media-gfx/darktable/darktable-4.8.0.ebuild @@ -33,7 +33,7 @@ else ) )" - KEYWORDS="~amd64 ~arm64 -x86" + KEYWORDS="amd64 ~arm64 -x86" LANGS=" cs de es fi fr hu it ja nl pl pt-BR ru sl sq uk zh-CN zh-TW" fi diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest index 68c12172c81f..96f7e75d9845 100644 --- a/media-gfx/dcraw/Manifest +++ b/media-gfx/dcraw/Manifest @@ -1,13 +1,10 @@ AUX conversion-examples.txt 545 BLAKE2B 4bda8339c0ae2f427ae0432b09da54aa5c194318b5cc0d3131c2e96f2b26ed0f91f6f419f0830fc773ab9be543019143755e039866146c6ce0eb361f9172ae4c SHA512 47213effb868ac4754075e43a6194ccbbe3e1431ef47280a670ad7e843cf727ad63ebf76849210672a72a79b1f702ca112aeece12284191f11c859a54fc090a9 AUX dcraw-9.28.0-fix-LC_CTYPE-undeclared.patch 377 BLAKE2B 91587f7f388b490cd4a9df193ce7602bf8dd6e60068c93f8e372cacd4c234ec905a02036a3942057dcca3f91efb7cb3c095449b34a4e48997874fff7d86fcfd3 SHA512 278fd2fc0d526dfe6f7b23f367dd398cf44c990266722f2878b3f86af7ef175b078df8217574b5bc718d381fff83550cab66d9d9684e19da5692e4ff5742057b -AUX dcraw-9.28.0-fix-memmem-wrong-return-type.patch 373 BLAKE2B 767ebce05bff02c33a23ae4fc3ead18bf6be03c144a52688d31974cfd915a77833842f0d6e9c88a33ba51c60bb4d6acd0ded008bddd81dd79311ec69b0193728 SHA512 76c0ffbb94596d12afdb9400c52919d002464882389d49bff72266a19fefc030304b0a6eb377e93742b346e47a2f263a0badca61f0315ca74e168f65a5fe4f21 AUX dcraw-9.28.0-gimp-2.10.patch 1182 BLAKE2B 25a71d36fe20ea97b17f13a65e09fbbe786bffb4c57ea398adc83933bb8cdae27a5db8f0b12cc1e51671aa70e2da14755e5aefa2f035060d08da99c7d51e23bf SHA512 e237cf9e917f451bb141dc86dd80c4a78eeb7b42ccda28eabb94b2516dff4ef7148b97a34b61ab27fb9743b3a40f81ab2e416ff0950ffdffdae3a98925896c0c AUX dcraw-9.28.0-glibc-2.38.patch 800 BLAKE2B 5b6836b85060c786e1d83acc9584959c5df0384f100b7dba2c20262284b4bb7254fcf1ff12cbaa950cd6146bdc67e6fb808c90e7fb63ccbcea8277215f800028 SHA512 eb3815ec13e8fa9b8aba282f12ef70d1c412f6829e29460fe8858bc719efe7c55b04073604926e218b33aa1b4d80a3fb6991f9749ebad352d1132be8569e29f8 AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7b7767d45b88d7c139bb038816448c50a682c6645095f79be9d2836c6f896e27a8ffc20c SHA512 ba872972125a5394e8d29bf6e5b612959b228265885218061eeff6a17f87dd1891e33876c49fd4071a76517843b6709d16f1fa976994c49c9357d7dc7211af9e DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56 -EBUILD dcraw-9.28.0-r2.ebuild 2962 BLAKE2B 90a57136615f9b9b6345174a51f0beed8105afca5e1ce4bbcc321fb6e4b7ff87432e59401f3b75f49ce7e6614aec77530ea77bbe24a8477ffa570502c9b8651e SHA512 c7b51592fb736d9e3e76ee0a420ea99db898fca7c1c1efc06bd67bfa7709c0c60df9c84bfa85f47ae15d39ee2bd50b9efe8dbe21d87cf1fad18337edb595678f -EBUILD dcraw-9.28.0-r3.ebuild 3515 BLAKE2B 19940b4dcccf16588dc487bfd97314c052b543c579c505f2da139b77326323d19b68f090ebc39774a57a834b4304363dc52211e5f22cda1040146034e44287fa SHA512 cc33a1af42dca687c86daae3269c8ac9d57c9808ec901733d4a6b429cf264fa31d0e64c885850facf65ee355f8ae7a334690918fde5d1badc498635e6ce961fd -EBUILD dcraw-9.28.0-r4.ebuild 3472 BLAKE2B 61ac9a4e0643907c439cb97b6e1f3010aa8944521623ac63b23d4aeb7a4853b28a578417f14921bc229df6cf32c39738fbb7c8b9855f88f07ddb5ffa46aaf34f SHA512 bbdb1fdeb89b9dcefa0366fa1afadd4326ef1e85992fbf655ffaf742e76f9976e1bd605920304e40704797c851a499f8ee6b0290d7a6e0c467e8174c9b31b94e +EBUILD dcraw-9.28.0-r4.ebuild 3466 BLAKE2B b5974e4bb56ec5a135037ab70cbddd6444588f69098efe8e306be37d8869a569548ea732cb998e15c08619ea724cd0a678c1ac1eb29af68e99d47e9a1f4ffc31 SHA512 f532ac811cb48636f0b277f05edc9448612f3774f1655faf4a991e4b5e9d03f93f9c055ae6c1b95475d86fb933ac3a1e0f8eb485d94b6bf86186b7f85d20e07e MISC metadata.xml 610 BLAKE2B 1546712a5da3c3f29a1f1e632a8f3c7d600ce72d90fc05bfd54e5921d6047e60561cde7be1b110f0151c05220b3b1b8f2287e8330c0a65f523c5ce8d8fd00036 SHA512 a175c151e37ff8eaf827e0ecdf41a35761c44ed816f17b37f40bc0b3fefc9bbaf41bab44da907c4eecf512b55cf86792f8610bbfe2a54130c44c2d85c8b0c090 diff --git a/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild deleted file mode 100644 index 607282673bfd..000000000000 --- a/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit readme.gentoo-r1 toolchain-funcs - -DESCRIPTION="Command-line decoder for raw digital photos" -HOMEPAGE="https://www.cybercom.net/~dcoffin/dcraw/" -SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz - mirror://gentoo/parse-1.73.tar.bz2 - gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW" -IUSE="nls gimp jpeg lcms" - -COMMON_DEPEND=" - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - gimp? ( media-gfx/gimp:0/2 ) -" -DEPEND="${COMMON_DEPEND}" -BDEPEND=" - nls? ( sys-devel/gettext ) - gimp? ( virtual/pkgconfig ) -" -RDEPEND="${COMMON_DEPEND} - media-libs/netpbm -" - -S="${WORKDIR}/dcraw" - -DOC_CONTENTS=" - See conversion-examples.txt.gz on how to convert - the PPM files produced by dcraw to other image formats.\n - - \nThe functionality of the external program 'fujiturn' was - incorporated into dcraw and is automatically used now.\n - - \nThere's an example wrapper script included called 'dcwrap'. - This package also includes 'dcparse', which extracts - thumbnail images (preferably JPEGs) from any raw digital - camera formats that have them, and shows table contents. -" - -run_build() { - einfo "${@}" - ${@} || die -} - -src_prepare() { - default - - # Support gimp-2.10, bug #655390 - use gimp && eapply "${FILESDIR}"/${PN}-9.28.0-gimp-2.10.patch - - rename dcraw_ dcraw. dcraw_*.1 || die "Failed to rename" -} - -src_compile() { - local ECFLAGS="-O2 -DNO_JASPER=yes" # Without optimisation build fails - local ELIBS="-lm" - - use lcms && ELIBS="-llcms2 ${ELIBS}" || ECFLAGS+=" -DNO_LCMS=yes" - use jpeg && ELIBS="-ljpeg ${ELIBS}" || ECFLAGS+=" -DNO_JPEG=yes" - use nls && ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\"" - - run_build $(tc-getCC) ${ECFLAGS} ${CFLAGS} ${LDFLAGS} -o dcraw dcraw.c ${ELIBS} - - run_build $(tc-getCC) -O2 ${CFLAGS} ${LDFLAGS} -o dcparse parse.c - - # rawphoto gimp plugin - if use gimp; then - run_build $(tc-getCC) ${CFLAGS} ${LDFLAGS} \ - $($(tc-getPKG_CONFIG) --cflags gimpui-2.0) rawphoto.c -o rawphoto \ - $($(tc-getPKG_CONFIG) --libs gimpui-2.0) - fi - - if use nls; then - for lang in ${LANGS}; do - has ${lang} ${LINGUAS-${lang}} \ - && run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po - done - fi -} - -src_install() { - dobin dcraw dcparse - dodoc "${FILESDIR}"/{conversion-examples.txt,dcwrap} - - # rawphoto gimp plugin - if use gimp; then - insinto "$($(tc-getPKG_CONFIG) --variable=gimplibdir gimp-2.0)/plug-ins" - insopts -m0755 - doins rawphoto - fi - - doman dcraw.1 - - if use nls; then - for lang in ${LANGS}; do - if has ${lang} ${LINGUAS-${lang}}; then - [[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1 - insinto /usr/share/locale/${lang}/LC_MESSAGES - newins dcraw_${lang}.mo dcraw.mo - fi - done - fi - - readme.gentoo_create_doc -} diff --git a/media-gfx/dcraw/dcraw-9.28.0-r3.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r3.ebuild deleted file mode 100644 index a56277206cec..000000000000 --- a/media-gfx/dcraw/dcraw-9.28.0-r3.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit readme.gentoo-r1 toolchain-funcs - -DESCRIPTION="Command-line decoder for raw digital photos" -HOMEPAGE="https://www.dechifro.org/dcraw/" -SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz - mirror://gentoo/parse-1.73.tar.bz2 - gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW" -IUSE="nls gimp jpeg lcms" - -COMMON_DEPEND=" - jpeg? ( media-libs/libjpeg-turbo:0 ) - lcms? ( media-libs/lcms:2 ) - gimp? ( - dev-libs/atk - media-gfx/gimp:0/2 - media-libs/harfbuzz - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - x11-libs/pango -) -" -DEPEND="${COMMON_DEPEND}" -BDEPEND=" - nls? ( sys-devel/gettext ) - gimp? ( virtual/pkgconfig ) -" -RDEPEND="${COMMON_DEPEND} - media-libs/netpbm -" - -S="${WORKDIR}/dcraw" - -DOC_CONTENTS=" - See conversion-examples.txt.gz on how to convert - the PPM files produced by dcraw to other image formats.\n - - \nThe functionality of the external program 'fujiturn' was - incorporated into dcraw and is automatically used now.\n - - \nThere's an example wrapper script included called 'dcwrap'. - This package also includes 'dcparse', which extracts - thumbnail images (preferably JPEGs) from any raw digital - camera formats that have them, and shows table contents. -" - -PATCHES=( "${FILESDIR}/${P}-fix-memmem-wrong-return-type.patch" - "${FILESDIR}/${P}-fix-LC_CTYPE-undeclared.patch" -) - -run_build() { - einfo "${@}" - ${@} || die -} - -src_prepare() { - default - - # Support gimp-2.10, bug #655390 - use gimp && eapply "${FILESDIR}"/${PN}-9.28.0-gimp-2.10.patch - - rename dcraw_ dcraw. dcraw_*.1 || die "Failed to rename" -} - -src_compile() { - local ECFLAGS="-O2 -DNO_JASPER=yes " # Without optimisation build fails - local ELIBS="-lm" - local RP_ECFLAGS="-I/usr/include/gtk-2.0/ -I/usr/include/glib-2.0/ \ - -I/usr/$(get_libdir)/glib-2.0/include -I/usr/include/cairo \ - -I/usr/include/pango-1.0 -I/usr/include/harfbuzz \ - -I/usr/lib64/gtk-2.0/include -I/usr/include/gdk-pixbuf-2.0 \ - -I/usr/include/atk-1.0" - - use lcms && ELIBS="-llcms2 ${ELIBS}" || ECFLAGS+=" -DNO_LCMS=yes" - use jpeg && ELIBS="-ljpeg ${ELIBS}" || ECFLAGS+=" -DNO_JPEG=yes" - use nls && ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\"" - - run_build $(tc-getCC) ${ECFLAGS} ${CFLAGS} ${LDFLAGS} -o dcraw dcraw.c ${ELIBS} - - run_build $(tc-getCC) -O2 ${CFLAGS} ${LDFLAGS} -o dcparse parse.c - - # rawphoto gimp plugin - if use gimp; then - run_build $(tc-getCC) ${RP_ECFLAGS} ${CFLAGS} ${LDFLAGS} \ - $($(tc-getPKG_CONFIG) --cflags gimpui-2.0) rawphoto.c -o rawphoto \ - $($(tc-getPKG_CONFIG) --libs gimpui-2.0) - fi - - if use nls; then - for lang in ${LANGS}; do - has ${lang} ${LINGUAS-${lang}} \ - && run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po - done - fi -} - -src_install() { - dobin dcraw dcparse - dodoc "${FILESDIR}"/{conversion-examples.txt,dcwrap} - - # rawphoto gimp plugin - if use gimp; then - insinto "$($(tc-getPKG_CONFIG) --variable=gimplibdir gimp-2.0)/plug-ins" - insopts -m0755 - doins rawphoto - fi - - doman dcraw.1 - - if use nls; then - for lang in ${LANGS}; do - if has ${lang} ${LINGUAS-${lang}}; then - [[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1 - insinto /usr/share/locale/${lang}/LC_MESSAGES - newins dcraw_${lang}.mo dcraw.mo - fi - done - fi - - readme.gentoo_create_doc -} diff --git a/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild index 4271ab7d0680..bcb1dbb29da1 100644 --- a/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild +++ b/media-gfx/dcraw/dcraw-9.28.0-r4.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW" IUSE="nls gimp jpeg lcms" diff --git a/media-gfx/dcraw/files/dcraw-9.28.0-fix-memmem-wrong-return-type.patch b/media-gfx/dcraw/files/dcraw-9.28.0-fix-memmem-wrong-return-type.patch deleted file mode 100644 index 93f299e4d2aa..000000000000 --- a/media-gfx/dcraw/files/dcraw-9.28.0-fix-memmem-wrong-return-type.patch +++ /dev/null @@ -1,17 +0,0 @@ -Memmem returns void* - -# Pascal Jäger <pascal.jaeger@leimstift.de> (2023-09-22) - -Bug: https://bugs.gentoo.org/911753 - ---- a/parse.c -+++ b/parse.c -@@ -965,7 +965,7 @@ void parse_phase_one (int base) - } - } - --char *memmem (char *haystack, size_t haystacklen, -+void *memmem (char *haystack, size_t haystacklen, - char *needle, size_t needlelen) - { - char *c; diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index ff2d87343fef..4f932b77b3ab 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,8 +1,6 @@ AUX digikam-8.3.0-cmake-addressbook.patch 1245 BLAKE2B 22365de2072c5ce5e2eac3bc1d7138e820166b977e5894f29addcdb00ae3329c47965b2b7930a4725b01789add63b4416083e6e358ca6ffb4a0d60f3e80ad52c SHA512 a872aed53811642407c98e20f423cf5381a117e96d4e95d309da6f116a13aa2584671ef20af3e1059c3ed7e09fec178fdb77e7afecde21077252bb2c8f116158 AUX digikam-8.4.0-cmake.patch 7429 BLAKE2B 20d79867086e390c2a571bae76f2023e4ec5f26bdc137f28be6ec8eff54ba2c5e84ec15191ceed83eb8e9415a522165f5931cf6d972e1537806cbb6d7e22bbf0 SHA512 fd38773ce49a31d3fcd0d477c5e180b42d1a2ea586b41534b7dd3d08653fea4020af30bce3b20ba14c4a2710cde3fecbd13fbe8fcfd33bdca6b82989cf431214 -AUX digikam-8.4.0-fix-find_libheif-regex.patch 856 BLAKE2B 5b2f2bea0c4a7cae5aed2d385123082576c95fd7ea66521c7245db844af0bb86422279674a3f46ba56075547ff161d1bfbf30c37fb57efcfd15e10b55c255b36 SHA512 bedcc963511afd0037ab1dbfa05b06e72c0b6785b222a33f15dbe84535e62820d9b1e437a3cb11a3fffe5c6e4f474609e63dcc515482a14b09e98a5fa5dd34f6 DIST digiKam-8.4.0.tar.xz 58025616 BLAKE2B 33441e023cd9d6edba2e7c01e482a6eea7a6b1972b6bad0fc804fb3e94f97cc62e2663690137b2445fb7043789b7e942d830b71209385de77ccffe57d22d09ff SHA512 4342d18a7c04ab239821de3cf908f8e7d676598778f0174164aa336e8cfdc0a76327d31c64e6c4e47dcf0d6fbef46b01918312e4622ce3359888a9a94948a22b DIST digikam-8.4.0-patchset.tar.xz 11904 BLAKE2B 6ab167cae66710505eb81bb538fde2a81458b6580bf8c70d0c28500ca81a3c9c9b9e0a12ca288a4dc6f39ae1a175f7b2bd09e4d94624337348084c228eafcc38 SHA512 df1199d3aaecc0afc032090424af69c031e95afba1fed70b00cf61c5ef52fa2a7c3d97918592c167f9ea918dd2823e4cc52f12a470a9eede815b3ff43314001b -EBUILD digikam-8.4.0-r11.ebuild 4033 BLAKE2B 5e5c262e2ff5a56dc1a744d7acdeb0c3a840dc20867419eaa9a33c4aa486d7fbe33552848e48cb77bc18fdb2ed35e51f9932f7a034b67db5b9b79051d909a11d SHA512 d333537e818eb1f6a89afd6dfaa2557dd0ee2905d108fd02ba937e292c9998ad78daff87b94356ae1312cbfb10683999c1ac396ab6b35430ba203ff47e6595b2 -EBUILD digikam-8.4.0.ebuild 4317 BLAKE2B 451131ac82a5507fb0f563c2795176bf74d8481ee73b7b1686ef7bf00c092d8002e99af431fb4d5c5547fdc54d2d43c38c05f23ede974e614e92c288fa848c0f SHA512 38d03dbd4b924c2e92d593a79a9be6fe45b03057f51a2448265723f59a2bbd249bd1ded30da0e41d768af3f10632ce43b890489528390935d289cc6c64c7ccf8 +EBUILD digikam-8.4.0-r11.ebuild 4032 BLAKE2B bd5b43030acb8f92ee1dd9c09af52b38f6752daadfeeaba92e54f2242d87063d7baa726ffea7429008a20fc341afc38e5d15a24bcd5e8c756deafa77f8739f4d SHA512 96bd118cd133c5f34c6a2988ddcadc2952a1bcea7626717ee6028b3688b46928fa09caab442eb5e9dabe0f093b7549863b4ba14bdff71ad1790c038fb31a3f22 MISC metadata.xml 981 BLAKE2B 1c1494b9c7fd7207550ea214baafcab17aa12ecb93f08885dd7c873a15114d826341027b8a37e36138cf89d1ba1451c8fff247d9fde18c235bee062f3cda1ab9 SHA512 7f4602eafde8e22b18b7abc1a071eb27369d2ab7df01554253f142614577209828698b39614666fd6d4688ff44b3c1dc3d4820ec3398a6f8228710343ef65f85 diff --git a/media-gfx/digikam/digikam-8.4.0-r11.ebuild b/media-gfx/digikam/digikam-8.4.0-r11.ebuild index b5e242ad01f2..ab9884b9b338 100644 --- a/media-gfx/digikam/digikam-8.4.0-r11.ebuild +++ b/media-gfx/digikam/digikam-8.4.0-r11.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/digiKam-${PV/_/-}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="amd64 ~arm64" IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql openmp +panorama scanner semantic-desktop spell video" # bug 366505 diff --git a/media-gfx/digikam/digikam-8.4.0.ebuild b/media-gfx/digikam/digikam-8.4.0.ebuild deleted file mode 100644 index b3d5ace50bc3..000000000000 --- a/media-gfx/digikam/digikam-8.4.0.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.115.0 -QTMIN=5.15.12 -inherit ecm kde.org toolchain-funcs - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - TARNAME="digiKam-${PV/_/-}" - if [[ ${PV} =~ beta[0-9]$ ]]; then - SRC_URI="mirror://kde/unstable/${PN}/${TARNAME}.tar.xz" - else - SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz" - fi - KEYWORDS="amd64 ~arm64 ~x86" -fi - -DESCRIPTION="Digital photo management application" -HOMEPAGE="https://www.digikam.org/" - -LICENSE="GPL-2" -SLOT="5" -IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql opengl openmp +panorama scanner semantic-desktop spell" - -# bug 366505 -RESTRICT="test" - -COMMON_DEPEND=" - dev-libs/expat - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[-gles2-only] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtnetworkauth-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5[mysql?] - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=dev-qt/qtxmlpatterns-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=media-gfx/exiv2-0.27.1:=[xmp] - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/liblqr - media-libs/libpng:= - >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d] - media-libs/tiff:= - x11-libs/libX11 - addressbook? ( - >=kde-apps/akonadi-contacts-23.08.3:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - ) - calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) - gphoto2? ( media-libs/libgphoto2:= ) - heif? ( - media-libs/libheif:= - media-libs/x265:= - ) - imagemagick? ( media-gfx/imagemagick:= ) - jpegxl? ( media-libs/libjxl:= ) - lensfun? ( media-libs/lensfun ) - opengl? ( - >=dev-qt/qtopengl-${QTMIN}:5 - virtual/opengl - ) - panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) - scanner? ( >=kde-apps/libksane-23.08.3:5 ) - semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) - spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - dev-libs/boost - addressbook? ( >=kde-apps/akonadi-23.08.3:5 ) -" -RDEPEND="${COMMON_DEPEND} - media-libs/exiftool - mysql? ( virtual/mysql[server(+)] ) - panorama? ( media-gfx/hugin ) -" -BDEPEND=" - sys-devel/gettext - panorama? ( - app-alternatives/lex - app-alternatives/yacc - ) -" - -PATCHES=( - "${FILESDIR}/${P}-cmake.patch" - "${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch" - "${FILESDIR}/${P}-fix-find_libheif-regex.patch" # bug 936507 -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_pretend -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_setup -} - -# FIXME: Unbundle libraw (libs/rawengine/libraw) -src_configure() { - local mycmakeargs=( - -DBUILD_WITH_QT6=OFF # KF6 not stable upstream yet - -DBUILD_TESTING=OFF # bug 698192 - -DENABLE_APPSTYLES=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON - -DENABLE_MEDIAPLAYER=OFF # bug 758641; bundled as of 8.0, KDE-bug 448681 - -DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0 - -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) - $(cmake_use_find_package calendar KF5CalendarCore) - -DENABLE_GEOLOCATION=$(usex geolocation) - $(cmake_use_find_package gphoto2 Gphoto2) - $(cmake_use_find_package heif Libheif) - $(cmake_use_find_package imagemagick ImageMagick) - $(cmake_use_find_package jpegxl Libjxl) - $(cmake_use_find_package lensfun LensFun) - -DENABLE_MYSQLSUPPORT=$(usex mysql) - -DENABLE_INTERNALMYSQL=$(usex mysql) - $(cmake_use_find_package opengl OpenGL) - $(cmake_use_find_package panorama KF5ThreadWeaver) - $(cmake_use_find_package scanner KF5Sane) - $(cmake_use_find_package spell KF5Sonnet) - -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) - ) - - ecm_src_configure -} diff --git a/media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch b/media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch deleted file mode 100644 index cd18ea3ed475..000000000000 --- a/media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a3ff8ad14c1373f7a7d3c1c9aee4e80954e1859e Mon Sep 17 00:00:00 2001 -From: Maik Qualmann <metzpinguin@gmail.com> -Date: Tue, 23 Jul 2024 12:33:13 +0200 -Subject: [PATCH] escape the input from REGEX MATCHALL CCBUGS: 490690 - ---- - core/cmake/modules/FindLibheif.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/cmake/modules/FindLibheif.cmake b/core/cmake/modules/FindLibheif.cmake -index fdaf73a4b9e..38876ecc38a 100644 ---- a/core/cmake/modules/FindLibheif.cmake -+++ b/core/cmake/modules/FindLibheif.cmake -@@ -54,7 +54,7 @@ else() - if(HEIF_INCLUDES_DIR) - - file(STRINGS "${HEIF_INCLUDES_DIR}/libheif/heif_version.h" TMP REGEX "^#define LIBHEIF_VERSION[ \t].*$") -- string(REGEX MATCHALL "[0-9.]+" HEIF_VERSION ${TMP}) -+ string(REGEX MATCHALL "[0-9.]+" HEIF_VERSION "${TMP}") - - endif() - --- -GitLab - diff --git a/media-gfx/displaycal-py3/Manifest b/media-gfx/displaycal-py3/Manifest index 89fcdaaa4a10..e88ee088a199 100644 --- a/media-gfx/displaycal-py3/Manifest +++ b/media-gfx/displaycal-py3/Manifest @@ -1,4 +1,7 @@ AUX displaycal-py3-3.9.10-python-3.11.patch 3134 BLAKE2B 3110f39ecab47eff46a97389c2164bfbb2b44f80fd30bb848856dae050738cd6590905b2b9ce603eb9d919f2811674b378b1562396b1437bea8247798868313f SHA512 98bb7ea8a0b29ffbb455f8666183489d1571bdcd1829398ce4535c7581f797582ed7c1a5035b2bdf9a0d19397ef14e5f8068ec2baf5078f64b614c901be48f33 +AUX displaycal-py3-3.9.13_pre20240925-Fix-build.patch 1802 BLAKE2B 54113c2ed486f35efc338843ce58ab4425d845dddacd38e7a017ae01acb1bb1d384503d6aec2c3ee551e9b13d0191231ded357d82b326617fc0def8a1e992dfc SHA512 253f6dfed9b3851df53a05035313f85c933bfdd96d7b14af1214f5f3005990710196a98d32fee2e8cb192520b1f5b32cfa9116ca7eb779bdea03164e55a02fbd DIST DisplayCAL-3.9.10.tar.gz 10676033 BLAKE2B 94bfa3ac95bfc16788421fa5b9a31920c40da66d2875e4037b3b20b6792a1005ee9fea11b5325a94ffae845f56583647e42de9d4d7d96d149264a86e6d1158a6 SHA512 fc1b981925c6f4660557d8f0935a62d0112b39664b0c74cdb1a907e0e7b7e3f61ec76986fa2072f8ada1d105ebfa61bb116df75dc10f902ff545db3368634fc5 +DIST DisplayCAL-3.9.13_pre20240925.tar.gz 14027557 BLAKE2B 915ef1b74e26da9efdb2dbb70ac0920fdb773868d7cbfc9ef7be5e4d60b300fe22ff54a7d762e3ef901c0ea70e0ba073881df055fecfec38afc8df873879064b SHA512 82993dd4f922b2316954f29ec976851aecc263acbe0e01c1cc158013e04d829c0387b5440092a78bd61743cee416a3bc3cde905843dce9c8233eb18f68915184 EBUILD displaycal-py3-3.9.10-r3.ebuild 1635 BLAKE2B 21a1b93ab0c78fc50824f49e1e6a2e4704e9e4fcc6db91eef854c9d119528e5ddfbebafa597e614540aa8143d732925c311211a5d25b24f77d60f69d2c397fd7 SHA512 e85c78550a5eb370d14532aaaa33f2055f657856754b3067c83a51ea48ae5665405f067e0b979956aa5e56d689de819764858b26a76d60699189a1333791f752 -MISC metadata.xml 790 BLAKE2B aa3f32f061f4840bbc0e29c36e6154cc37b85a9fa76a92e7f69a32ccadef16fa5a9680266c35b51c3351c4f4d65e2e1659515550e2366c9c9516e8c26c049694 SHA512 d4fad45e53ac19ede7f26709878ff36b55906a4c642b1ce7ce2e49ef56a1285582700d07170f702263a3a99ea0bfa2c2cfbc842978f565291d3322fb9a6a5c0d +EBUILD displaycal-py3-3.9.13_pre20240925.ebuild 1903 BLAKE2B 90056c7e089bfa9e1d6b76b235af17b0fa5a958f382a32808c5ef044d0eb0f8febd11925637569436dc37e5042ab1b9c7923f7d3db2f73eb0aa416f4e13a18f8 SHA512 1ba9bd07b13f211e5562758fa63fc001d3e40cf344e697b5acfa45be1934e7813c855c6d466e6b7fce8d20b064128a8930bcf03f876ecbaf04d0e7bea50f9557 +MISC metadata.xml 791 BLAKE2B 23150c53c4e023fea7070ada4b1dcc415000fa909a61a895825df1c2e56798ab44bdf50d916d7ce3de3e6f8cf909bda94125d057551959d287c164ac0b7139eb SHA512 d62e573f9b9334dcf90522a18b0402948fdf7adb7c4175aa8cdb3888c77fc736ffd80339ab0916d7e7dccfb85f4254a356be3c26c612995dc0e8440881aa4af5 diff --git a/media-gfx/displaycal-py3/displaycal-py3-3.9.13_pre20240925.ebuild b/media-gfx/displaycal-py3/displaycal-py3-3.9.13_pre20240925.ebuild new file mode 100644 index 000000000000..8602a8c66ea1 --- /dev/null +++ b/media-gfx/displaycal-py3/displaycal-py3-3.9.13_pre20240925.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 xdg + +DESCRIPTION="Modernize the DisplayCAL code including Python 3 support" +HOMEPAGE="https://github.com/eoyilmaz/displaycal-py3" + +MY_PN="DisplayCAL" +MY_P="${MY_PN}-${PV}" +MY_COMMIT="eda424388be5dc18f76b02f8d015d6b2ddafa174" +SRC_URI="https://github.com/eoyilmaz/displaycal-py3/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz" + +LICENSE="GPL-3" + +SLOT="0" +KEYWORDS="~amd64" + +RESTRICT="test" + +PATCHES="${FILESDIR}/${P}-Fix-build.patch" + +DEPEND=" + dev-python/build[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pychromecast[${PYTHON_USEDEP}] + dev-python/send2trash[${PYTHON_USEDEP}] + dev-python/zeroconf[${PYTHON_USEDEP}] + >=dev-python/wxpython-4.2.0[${PYTHON_USEDEP}] + dev-python/installer[${PYTHON_USEDEP}] + dev-python/certifi[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + media-gfx/argyllcms + x11-libs/libXxf86vm" + +RDEPEND="${DEPEND}" + +src_unpack() { + default + # Upstream build system is very sensitive to the build folder name + mv "${WORKDIR}/${PN}-${MY_COMMIT}" "${S}" || die +} + +src_prepare() { + sed -e 's/license_file/license_files/g' -i setup.cfg || die + + # remove dependency only imported if `sys.platform in ("darwin", "win32")` + sed -e '/certifi/d' -i setup.cfg || die + + # Remove x-world MIME + sed -i 's|x-world/x-vrml;||g' \ + misc/displaycal-vrml-to-x3d-converter.desktop || die + + distutils-r1_src_prepare +} + +src_install() { + distutils-r1_src_install + + # Use Gentoo package name for doc folder + mv "${ED}/usr/share/doc/${MY_P}" "${ED}/usr/share/doc/${PF}" || die +} + +pkg_postinst() { + xdg_pkg_postinst +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/media-gfx/displaycal-py3/files/displaycal-py3-3.9.13_pre20240925-Fix-build.patch b/media-gfx/displaycal-py3/files/displaycal-py3-3.9.13_pre20240925-Fix-build.patch new file mode 100644 index 000000000000..6d7ad881054b --- /dev/null +++ b/media-gfx/displaycal-py3/files/displaycal-py3-3.9.13_pre20240925-Fix-build.patch @@ -0,0 +1,57 @@ +diff --git a/DisplayCAL/__version__.py b/DisplayCAL/__version__.py +new file mode 100644 +index 00000000..28eceb81 +--- /dev/null ++++ b/DisplayCAL/__version__.py +@@ -0,0 +1,7 @@ ++# generated by setup.py ++ ++BUILD_DATE = "2022-11-21T22:56:25Z" ++LASTMOD = '2022-11-21T22:55:57Z' ++VERSION = (3, 9, 13) ++VERSION_BASE = (3, 9, 13) ++VERSION_STRING = '3.9.13_pre20240925' +diff --git a/DisplayCAL/setup.py b/DisplayCAL/setup.py +index 27425a18..43b6143b 100644 +--- a/DisplayCAL/setup.py ++++ b/DisplayCAL/setup.py +@@ -384,9 +384,12 @@ def get_data(tgt_dir, key, pkgname=None, subkey=None, excludes=None): + data = [] + for pth in files: + if not [exclude for exclude in excludes or [] if fnmatch(pth, exclude)]: +- normalized_path = os.path.normpath(os.path.join(tgt_dir, os.path.dirname(pth))) +- safe_path = [relpath(p, src_dir) for p in safe_glob(os.path.join(src_dir, pth))] +- data.append((normalized_path, safe_path)) ++ data.append( ++ ( ++ os.path.normpath(os.path.join(tgt_dir, os.path.dirname(pth))), ++ safe_glob(os.path.join(src_dir, pth)), ++ ) ++ ) + return data + + +@@ -659,20 +662,6 @@ def setup(): + ) + ) + +- # metainfo / appdata.xml +- data_files.append( +- ( +- os.path.join(os.path.dirname(data), "metainfo"), +- [ +- relpath( +- os.path.normpath( +- os.path.join(pydir, "..", "dist", f"{appstream_id}.appdata.xml") +- ), +- source_dir, +- ) +- ], +- ) +- ) + + if sys.platform not in ("darwin", "win32") or do_py2app or do_py2exe: + # Linux/Unix or py2app/py2exe +-- +2.45.2 + diff --git a/media-gfx/displaycal-py3/metadata.xml b/media-gfx/displaycal-py3/metadata.xml index 6ee5175df506..9a7eb4b74544 100644 --- a/media-gfx/displaycal-py3/metadata.xml +++ b/media-gfx/displaycal-py3/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sarnex@gentoo.org</email> diff --git a/media-gfx/ditaa/Manifest b/media-gfx/ditaa/Manifest index fba02463b60b..e22a9a795c8b 100644 --- a/media-gfx/ditaa/Manifest +++ b/media-gfx/ditaa/Manifest @@ -68,5 +68,5 @@ DIST xml-apis-ext-1.3.04.jar 85686 BLAKE2B 8ab0f8e8ff2c944765261155fe26aae84807a DIST xml-apis-ext-1.3.04.pom 1837 BLAKE2B a1db75a095c5a007fe95088428aa84efc6d94ced3702470e24e324e7cee89aceb4508cbfad79486e2b2eecbf0453266c652c825e2e048919fc938ff92fc97721 SHA512 f5c4cc21a9b8f359e610c5661f866c2bbbe4f6e887dd678bee9036dd5ec0e6f771a7e0f302f00d10f7f454d1c7376f3813e880a3ad733449fc81927cd2384e17 DIST xmlgraphics-commons-2.6.jar 674607 BLAKE2B fe2702760b6b2fb633254dbee49e9c72dc721db47d904e1297145ae8bdaec3006abcd1f2205da61ba89742cee7b97c2b2f35500bb74ec8596a8c23c1202ef448 SHA512 7df1eb0cd5a73ad78259f4905b8363610711cc660f3590133da8376f771ec5990e8dbea1b4d7e3a8264df17c632713a66610538916291a3ce91506de6d3a023c DIST xmlgraphics-commons-2.6.pom 3480 BLAKE2B 0185976d3673122b8f86fade7a1f965480ada78b54fbd1640690bcb5c7c20bd22dd141402d12209c8389ce1812ef0b694c1ecb402d6672cb84d3527f7b0ea65c SHA512 1a601a75035a19ba8c17ca4df936cfd891528a64093004b36dd373ad94c47c51a6deaf68c4c35d8cfd95309666049a25b9dd317df6f70ea3312c0ba130ec9091 -EBUILD ditaa-0.11.0-r1.ebuild 8040 BLAKE2B a8605dfb5911db9baa765cc73cf19cc111476171c6b8b305f65bf7ed7cd2bdfc0c49a011caa45379af27e363222a7b4696269ff39a98761e85c8881374267fe6 SHA512 de0dd1f965326b5e386a4f4fa6676fd411d7aae2ae83453b8e3a659ac240565263e5d796393bc146c5ff4ad03b13c55ad54dbf55f5d2a6b39bb62896789a63d8 +EBUILD ditaa-0.11.0-r1.ebuild 8035 BLAKE2B 449223376647c1fbe69fedd81a82a6782a633065a90ec9d5377252eb9725dbf96b45985340acdaa3fb4d74fdc4dee091ab5f266326c7174920e553b273773274 SHA512 66a5bef1d87393a3f4bd82f4f837360658d01c3660ef8bd533a7b2b447fd42c51e5f767208d74cd28c87b484888c4b78254426453f76e063ccd0b5606a8a1ea8 MISC metadata.xml 354 BLAKE2B 5a0b871f04047f94815dd840bebd1a68bc776965a70d9f346751681914edb5920c564a66df694d44cbd454477f53d046905e30fe45612149a8c5c9408b506b10 SHA512 98c30a65e92092662dc310d46570023bcf3e4a2069d9989cb425dc0053c908759e013c493811858cbee924334a52cadbb1d8073fb47bce95f955f89165787d0f diff --git a/media-gfx/ditaa/ditaa-0.11.0-r1.ebuild b/media-gfx/ditaa/ditaa-0.11.0-r1.ebuild index 9c7d804181c5..bc595391d871 100644 --- a/media-gfx/ditaa/ditaa-0.11.0-r1.ebuild +++ b/media-gfx/ditaa/ditaa-0.11.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/stathissideris/${PN}/archive/v${PV}.tar.gz -> ${P}.t LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="amd64 arm64 ~x86" +KEYWORDS="amd64 arm64" IUSE="" DEPEND="dev-java/leiningen-bin diff --git a/media-gfx/ebdftopcf/Manifest b/media-gfx/ebdftopcf/Manifest index 65ec747b319b..2281d086fef9 100644 --- a/media-gfx/ebdftopcf/Manifest +++ b/media-gfx/ebdftopcf/Manifest @@ -1,3 +1,3 @@ DIST ebdftopcf-2.tar.bz2 7774 BLAKE2B 4dc1bde62b796f441332511e1b9206f9eadd216ab66dc1a6858dc467f9dfbbaaeb4a7de494eaae4584d8a57d59a0eb96f69047d1a57bd007cbb8e2f7aaccd1c6 SHA512 4631f1591290e0ddc778d5c557aff1e698d8dd7e5ac7e659fda7752642034fbabb091c840dcfad5695e9fc19909203a7fdc0b7a69d57a162ce6bb8fe710ef0f4 -EBUILD ebdftopcf-2-r1.ebuild 613 BLAKE2B 7552a2f6d7ee130176369d7361a9999a4b6dc28acc7ededa46111487cc1883d742b25864b1ce6e7b6965b784f17b5366f34792f1e41c0d29f8cd2ef6260daff5 SHA512 6cdd08f865457773228c4f5d89cad07b480a75bf4e534e02468dcc3b373dff68fd6e9333fd8700283c25e6f7ad9d308843e807d78136c1aeb755508b823304b0 +EBUILD ebdftopcf-2-r1.ebuild 607 BLAKE2B 9ce5971ce6196764b3fcb0b0fea7d2bc40aeaad5784285376a5ddc3084946a60ab211bfb9c10e4d74b18dac4dc63235a393b8898504456180fbaa5890247c7ac SHA512 432ea88511ddb22fe2d435113c60ebe869716cdaf9069d06338e44ffb610c453994920eb9385b001bdda97295632bc8b54439dff57fff7e69cf53761f9e216da MISC metadata.xml 318 BLAKE2B 2387c47086bae1b1a5cb1122d7dd7f94fd93d872699be57d10daddc963c1118a09f3b2bfdd9491e2db795be3211b1247ee5dc210d508b8ac14bced1ba5485722 SHA512 e0585b332a03dce7407bcc19144a40e2648c137dedab1334ce68df011e624f1707c8a47038a1fd643482bf552190cc1e077a65b8f79cebcb282a84efdaedd803 diff --git a/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild index a98815fff2bd..61705816f7a7 100644 --- a/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild +++ b/media-gfx/ebdftopcf/ebdftopcf-2-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" # these apps are used at runtime by ebdftopcf RDEPEND=" diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest index 1020d6405521..0405a67f33ca 100644 --- a/media-gfx/enblend/Manifest +++ b/media-gfx/enblend/Manifest @@ -1,10 +1,7 @@ -AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f849cfb9cb2e7e9ae2a10b2fcd4b56cd7b27888047567c3b95b40e3a8feefe7ee9209db49688800986cc895731e0949acd3bae1c SHA512 a22730295c44da4f9feb3d541b17f298adf98f0328cf01d6a85206087c782e1aebac6509968d1a5433efb5fc3d72e48301ec3d5a2516f01c1f6d923d5032ab03 AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300dbc3eaeb7c2ffe6bcacb19baeb8a24180450f2912310ae9584f450899ececca11636304d36631f8c57f6d4b7c2450043d6f147 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0 AUX enblend-4.2.0_p20161007-doc-scaleable-fonts.patch 650 BLAKE2B 633ae86947cfcb6d4f83c4aaf55a2056fc571ee3973379327f6416a4667b7c5d1d94a5e6b26bfc49a0207608d3b5de0d99cd6678d298de605d6eae5ec731c874 SHA512 b2c3e5367d83bd1b2e0053dd41d92737834045969db32fd9e07f294a8cd5ca120fa913f9fc4fab70abea893d974d8e92fd1ace38845cd1324d21c2455c961ab4 AUX enblend-4.2.0_p20161007-gcc-10.patch 312 BLAKE2B bbc8521bb1c2b9f3f67dedffdbcab952628fc252d2ed81c37e469f06596f2cb9ab5907c7fc97de1dbfe408e29312c55d08b189b8e6f46215540e64354fbfd60a SHA512 9ed03b22237e1bf297db0daca2b5dd6aa7ad5cd9bf333e507160b7bbf24eb37be173c79314ce1cff7a7df10ba262266ca54f52c8ec6d85a7a411b78bef76d91e AUX enblend-4.2.0_p20240424-doc-install-dir-fix.patch 1977 BLAKE2B bb747bd4d98f0d27d7930d0376ddcfef02186c998e869a0f3843e9fa32c2bf39fedb8074abdaa09d4a8425d2fb066ed2483ede75a3fddcba2d86f95042de3b25 SHA512 3c76b3fad97e918ac3849204d067c64c03e03dbbb61d4b4f35e5a7f0f895080f23518797d98050ca12fe101cde6f7476438fa59f89f736f84df23e1b9b5ecd1e -DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3 DIST enblend-4.2.0_p20240424.tar.xz 505928 BLAKE2B 49a9cfd2cb332573a1d3882ce6d50513008ee71d7235f69bb7920fc9b71f6c0c6e5e7ae88de4c5879d4cb2ee94d437b1752d6c13117c07ad81a6832b45985684 SHA512 1eed2cac0dd6d0ddec41097c4d21ebbad01981e6abbb5fe3db69fc4ef50728ce997faad73dc17255997e8eee9af9d540e38bc2bdf106eb6ca338ef1650680894 -EBUILD enblend-4.2.0_p20161007-r6.ebuild 1896 BLAKE2B 4fefdf5984d6fe55a3dcf0e241b2bd60dbc2d671980b047ec35c236de101587b74be6c26dfb86bb091bf6de5353292cdf2980a5f0b59f8d6239cd50c451fe968 SHA512 6509c2e7d4e97f79be3b65f452c0211fb09dbf3327b943515acab7212476f353f91fc8a2ec48eb48e1591c749e416ad9d4bf8b5e8b82c2ee965da0c67d622b9b -EBUILD enblend-4.2.0_p20240424.ebuild 1994 BLAKE2B b0265a0000b0f71ea0f3433fcdd54d27a2afd772cd941712f430b20346de82ac5c8a9091fcf0a2e426dae83f92e5a74f7266ad9bbe6c8749967640088330cc45 SHA512 4d4e47af88feaca19ef724abacecb97a1fdc6b2b994328dc0308f755148b2f6c0f040403da5aabf82838a5cb0ee6f6319fb79e1c17902efbdd82cf1b985ef391 +EBUILD enblend-4.2.0_p20240424.ebuild 1991 BLAKE2B 3848672da03b6b0bbda2f8cce23883328e9fba773b78e63043ca751d5be44c6bb980c3fe52525e10430a102f789245da0adccc2b4ce9884e337580682dfe2d82 SHA512 11540f7baa057d8ad2611d15a1ba6fcc0c700d270f8d58f5f27c618f9e24469c73e5dbba43d789db1dda812c7072d03516953808a8f5d17a8f32b5cacddeb6b3 MISC metadata.xml 438 BLAKE2B 6e1f7ffb0f56a8e668608a97c02e045546c76b90c18777a77c031a94f23ce59abd2df8b6688973b509872e9cca867d16d6b0c201e06f4e8026dcde7c1eb1632f SHA512 86a9f0ca54ad8c9f1409957d4bdbe7aec7b1992e4272ab5e9e3734442e4ca7fc599bafc0e1e55d30ef0220dbaaa3d4f38e7fc8e4dbe4972fb392c4b2a86e6181 diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r6.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r6.ebuild deleted file mode 100644 index 76a89f6ab151..000000000000 --- a/media-gfx/enblend/enblend-4.2.0_p20161007-r6.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Image Blending with Multiresolution Splines" -HOMEPAGE="http://enblend.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz" - -LICENSE="GPL-2+ FDL-1.2+" -SLOT="0" -KEYWORDS="amd64 arm64 x86" -IUSE="cpu_flags_x86_sse2 debug doc openmp tcmalloc" - -REQUIRED_USE="tcmalloc? ( !debug )" - -BDEPEND=" - sys-apps/help2man - virtual/pkgconfig - doc? ( - app-text/ghostscript-gpl - app-text/texlive - dev-lang/perl - dev-perl/Readonly - dev-tex/hevea - gnome-base/librsvg - media-gfx/graphviz - >=media-gfx/fig2dev-3.2.9-r1 - sci-visualization/gnuplot[cairo,gd] - virtual/imagemagick-tools[tiff] - ) -" -RDEPEND=" - media-libs/lcms:2 - media-libs/tiff:= - media-libs/vigra[openexr] - sci-libs/gsl:= - debug? ( dev-libs/dmalloc[threads] ) - tcmalloc? ( dev-util/google-perftools ) -" -DEPEND="${RDEPEND} - dev-libs/boost - media-libs/libpng:0 - media-libs/libjpeg-turbo:= -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.2-doc-install-dir-fix.patch - "${FILESDIR}"/${P}-cmake.patch - "${FILESDIR}"/${P}-gcc-10.patch - "${FILESDIR}"/${P}-doc-scaleable-fonts.patch -) - -src_prepare() { - cmake_src_prepare - - sed -i -e "s:share/doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DENABLE_SSE2=$(usex cpu_flags_x86_sse2) - -DENABLE_DMALLOC=$(usex debug) - -DDOC=$(usex doc) - -DENABLE_OPENMP=$(usex openmp) - -DENABLE_TCMALLOC=$(usex tcmalloc) - ) - if use doc; then - mycmakeargs+=( - -DINSTALL_HTML_DOC=ON - -DINSTALL_PDF_DOC=ON - ) - fi - - cmake_src_configure -} - -src_compile() { - # To allow icon resizing with renderers (no way to disable) - addpredict /dev/dri - - # To compile fonts in the temp directory - export VARTEXFONTS="${T}/fonts" - - # forcing -j1 as every parallel compilation process needs about 1 GB RAM. - cmake_src_compile -j1 -} diff --git a/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild index 8dfc5ef79971..109b429e2424 100644 --- a/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild +++ b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR}/enblend LICENSE="GPL-2+ FDL-1.2+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" IUSE="cpu_flags_x86_sse2 debug doc openmp tcmalloc" REQUIRED_USE="tcmalloc? ( !debug )" diff --git a/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch b/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch deleted file mode 100644 index c952eeb7780a..000000000000 --- a/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch +++ /dev/null @@ -1,66 +0,0 @@ -* Remove the CMAKE_BUILD_TYPE conditional code, in order to build using CMAKE_BUILD_TYPE=Gentoo -* Install html files in html subdir of doc dir - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,9 +11,6 @@ - set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) - - project(enblend) --IF(NOT MSVC) -- SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" FORCE) --ENDIF(NOT MSVC) - # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ - # is checked - # For now, reuse the hugin modules directory -@@ -130,7 +127,6 @@ - ENDIF() - - IF(CMAKE_COMPILER_IS_GNUCXX) -- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -DNDEBUG -Wall") - IF(APPLE AND CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 5) - ## Add needed Compiler and Linker flags for OSX - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flat_namespace -undefined suppress") -@@ -154,20 +150,6 @@ - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") - ENDIF(CMAKE_CL_64) - -- # compile everything for the static C runtime -- FOREACH(TYPE C CXX) -- # makefiles use blank configuration -- FOREACH(CFG "_DEBUG" "_MINSIZEREL" "_RELEASE" "_RELWITHDEBINFO") -- #MESSAGE("Replacing CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") -- SET(NEW_FLAGS "${CMAKE_${TYPE}_FLAGS${CFG}}") -- # fix up static libc flags -- STRING(REPLACE "/MD" "/MT" NEW_FLAGS "${NEW_FLAGS}") -- # *FORCE* to override whats already placed into the cache -- SET(CMAKE_${TYPE}_FLAGS${CFG} "${NEW_FLAGS}" CACHE STRING -- "CMAKE_${TYPE}_FLAGS${CFG} (overwritten to ensure static build)" FORCE) -- #MESSAGE("New CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") -- ENDFOREACH(CFG) -- ENDFOREACH(TYPE) - # link only with the static C runtime !! THIS IS A MUST !! - SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") - # ensure that the flags are not duplicated on subsequent runs ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -406,7 +406,7 @@ - "${CMAKE_BINARY_DIR}/doc/enfuse.html" - ${ENBLEND_PNGFILES} - ${ENFUSE_PNGFILES} -- DESTINATION ${DocumentsDirectory} -+ DESTINATION ${DocumentsDirectory}/html - ) - endif() - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -102,7 +102,7 @@ - endif(OpenMP_CXX_FLAGS AND NOT MSVC) - target_link_libraries(enblend ${common_libs} ${additional_libs}) - target_link_libraries(enfuse ${common_libs} ${additional_libs}) --install(TARGETS enblend enfuse DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel) -+install(TARGETS enblend enfuse DESTINATION bin) - - if(NOT WIN32) - # create enblend.1 and enfuse.1 diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest index 5be4f001814a..d5bdea41c8df 100644 --- a/media-gfx/entangle/Manifest +++ b/media-gfx/entangle/Manifest @@ -1,4 +1,4 @@ AUX entangle-3.0-fix-meson-0.61-build.patch 810 BLAKE2B 4b4eac6fbddba41e6f6cdd2afa4f0db1b603bc96b1c281fde415cd71826ae15cb839b267a138229dd59e280459f7cc3cd1538e32357b0bab74b1a5a9507a9caa SHA512 fb2196fc1ec125c6b8ba237c74e9495d8e0e22bd584948a385d3ee906fd32ad9887d02093b3c690e5de90fa19e7d7e538aed9e1f8ede433e15bdd6ad80639ff1 DIST entangle-3.0.tar.xz 518808 BLAKE2B fe2bf4b114bc04fdc56792f984ae7387b70d693fa82f8deaa2023de71a8bba72bc95d4bfc430cdfaf5244e9114b4f7e8bb2e17f3b86de6529037519fa3877899 SHA512 8c6d7e067f88a770c63b76fde2a6ae71894aae95477fcf66b4670697889fdf7939d3f95532626d6f4ca7ae75841d8f247f6bcf78a1ce195b540989f1bfe5ebdd -EBUILD entangle-3.0-r3.ebuild 1700 BLAKE2B 2e97f166c0de255ae010cf4ffcfe6c3cd8eef26e2b850bdce4bfb9d6215e7bcf5a7ca8a764da111b03b15ebc71e3972851eaf16bc6e87cd8488e47eb3265d105 SHA512 79395c199f0426db64ca909798db5b39049e67430d7da81a7e31a95da61dc9110caaccf3c5864836010e52cfecb4b01bcf9c9dfa6160817c2a2c34bb20d7af58 -MISC metadata.xml 529 BLAKE2B ba406d65b63eb495962182c821cb2ad6498b3b67402f92891b7aa22d89ec76915cad324a2b25d41067f3345e75a5d993529e9be2de74443e3342cd0761f9e40e SHA512 db363ca3c2def3556bfb2e01e873b544cbc9c1ecba9ce15ee2de5decd7bbdf300357a5b722ee643454036d3eaaf6e1f29c0dc0cd379943408ceb1012520c5c16 +EBUILD entangle-3.0-r3.ebuild 1742 BLAKE2B 8920e7fa0880eb38d038bec6de172fa7f4239ee7e4b062445c01755ce6fc270beb94c273bd7117b23acfa1dc1a7559da4cbc3e02d2e387a3d0b094670b8a0033 SHA512 bef5a1942d338b1e09b088834505ca10d24a85d2e13b59a17aaf228042fa1ccb497a2a6382e89ccf4edbce62260d34af3935efb15a2771053a65e4ca314d634b +MISC metadata.xml 529 BLAKE2B 044afc2ddf07e5d4b99c865e88396aab898773b83c8409e108de4ee11ff096d9ca72ce7165bd4adc8966d73bfbe67db922d4ed4fb3b88aadb5205bb1a2d81482 SHA512 b5556dcb7a0ba3a9c716b29fab18e01e9d56d5a5d43aedd97dbe4315485b8441a6f52d94bded8205b59ae1a1d2baf9e35a1fde5ee944395f4591a55b8646bc61 diff --git a/media-gfx/entangle/entangle-3.0-r3.ebuild b/media-gfx/entangle/entangle-3.0-r3.ebuild index 575c7d78c119..d604ff90b1f6 100644 --- a/media-gfx/entangle/entangle-3.0-r3.ebuild +++ b/media-gfx/entangle/entangle-3.0-r3.ebuild @@ -8,7 +8,10 @@ PYTHON_COMPAT=( python3_{10..12} ) inherit gnome2-utils meson python-single-r1 xdg-utils DESCRIPTION="Tethered Camera Control & Capture" -HOMEPAGE="https://entangle-photo.org/" +HOMEPAGE=" + https://entangle-photo.org/ + https://gitlab.com/entangle/entangle/ +" SRC_URI="https://entangle-photo.org/download/sources/${P}.tar.xz" LICENSE="GPL-3+" diff --git a/media-gfx/entangle/metadata.xml b/media-gfx/entangle/metadata.xml index 60c98605ee19..52f8c5722568 100644 --- a/media-gfx/entangle/metadata.xml +++ b/media-gfx/entangle/metadata.xml @@ -13,6 +13,6 @@ <name>Gentoo Video project</name> </maintainer> <upstream> - <remote-id type="github">entangle/entangle</remote-id> + <remote-id type="gitlab">entangle/entangle</remote-id> </upstream> </pkgmetadata> diff --git a/media-gfx/entice/Manifest b/media-gfx/entice/Manifest index 4a57413f3108..dd4a3df08b4d 100644 --- a/media-gfx/entice/Manifest +++ b/media-gfx/entice/Manifest @@ -1,5 +1,3 @@ DIST entice-0.0.1.tar.xz 3994332 BLAKE2B 38f225a0464b0fcc956b32b02afd0ca9b0923bf0cf70688fe87ee29ef67ef6eda5d81eff957c68927e660f09f2d5b9592c6a5659aa5303a3b8ee88a4af523394 SHA512 2e2dbb24ed1ed97c20683bf93bf4d89afae7d18ed891025fe15a3f70f77e18cefbc5e1430c88cb06a89990def2088a414751407d60227ddbf9a2cb9dfa0609aa -DIST entice-0_pre20220809.tar.gz 7940222 BLAKE2B 8fb23d904e66894f60db94e64f5d9f0f00b82d6409c3c5e3439ecb8cd7835d2aadd7e52280eed4fc81fd0ac92fc02c9ad58c32d263f3081d93986bf21037c04e SHA512 2f6d549d87ca39be3b2d2fa15b488c6ddf0a31fc5164d90e7b4c37343af2fe44c674330b3764f100b048f94da003c7807e28b95ab059e3c04632026e53e5b96b EBUILD entice-0.0.1.ebuild 1433 BLAKE2B a73ab00a056312e66f761774cc07b6f68f9c2dea7493bfd18eb764fa90cfb3a808c27b2e7d119ef05ff7ae3a6fa5207d9c18530e8423b82a5bb5778f0674eb1b SHA512 7c8bd7b0bf8ff2cb889984698c86d5f750427e58a1987f047c76549b71778ed857914dd848fd471fb15818175a7322b64451d18d62c1b31d6672d77ed40c358a -EBUILD entice-0_pre20220809.ebuild 1502 BLAKE2B 76c3c9e7b5b01f735b8e710293ec6db2d258cc4ec7953d57ab572210691238c2298f5557286e839b69e75ed058e4bc3e9e0e8a86de667137d2086c4145030878 SHA512 99aa4a2c65ff69f2c7da8ded57cb4b14fce5792b1fd6f43d09ba376b829cfa5bf3cad1759498e1119e92ff945ccbcd2ca25b7c3ad7dd11f99a6a015dcaa1199e -MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362 +MISC metadata.xml 337 BLAKE2B 7d08e929f5da51d9237f40c85984eee679ca90cdd00d5df811573ce225424811f51a3644bf9fe1248fb1b68c00779782c17715c65c6550968baecab456efa09b SHA512 cd0687ddf467ef47ab1aae35d043fdb73225f496bc78446f73b2c922ea6381e43f78ebe930265c191547508fa92c5826af5e4dccee601d8953edb28a1c751ee0 diff --git a/media-gfx/entice/entice-0_pre20220809.ebuild b/media-gfx/entice/entice-0_pre20220809.ebuild deleted file mode 100644 index 92a9440ef6d1..000000000000 --- a/media-gfx/entice/entice-0_pre20220809.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson optfeature xdg - -MY_COMMIT="5122896d812a2db0fd2c536f047ac340fd1d12e5" - -DESCRIPTION="A simple image viewer based on EFL" -HOMEPAGE="https://git.enlightenment.org/vtorri/entice https://github.com/vtorri/entice" -SRC_URI="https://github.com/vtorri/entice/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] ) - media-libs/libexif" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/entice-${MY_COMMIT}" - -pkg_postinst() { - xdg_pkg_postinst - - optfeature_header "Image format support:" - optfeature "avif support" dev-libs/efl[avif] - optfeature "bmp,wbmp support" dev-libs/efl[bmp] - optfeature "dds support" dev-libs/efl[dds] - optfeature "gif support" dev-libs/efl[gif] - optfeature "heif support" dev-libs/efl[heif] - optfeature "ico,cur support" dev-libs/efl[ico] - optfeature "jp2k support" dev-libs/efl[jpeg2k] - optfeature "pdf support" dev-libs/efl[pdf] - optfeature "pmaps support" dev-libs/efl[pmaps] - optfeature "psd support" dev-libs/efl[psd] - optfeature "raw support" dev-libs/efl[raw] - optfeature "svg,rsvg support" dev-libs/efl[svg] - optfeature "tga support" dev-libs/efl[tga] - optfeature "tgv support" dev-libs/efl[tgv] - optfeature "tiff support" dev-libs/efl[tiff] - optfeature "webp support" dev-libs/efl[webp] - optfeature "xcf support" dev-libs/efl[xcf] - optfeature "xpm support" dev-libs/efl[xpm] -} diff --git a/media-gfx/entice/metadata.xml b/media-gfx/entice/metadata.xml index a1fbf3c0c993..c9765eba6379 100644 --- a/media-gfx/entice/metadata.xml +++ b/media-gfx/entice/metadata.xml @@ -5,4 +5,7 @@ <email>juippis@gentoo.org</email> <name>Joonas Niilola</name> </maintainer> + <upstream> + <remote-id type="github">vtorri/entice</remote-id> + </upstream> </pkgmetadata> diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest index 6cb6ac0d6183..70f04dcd8bc6 100644 --- a/media-gfx/eog/Manifest +++ b/media-gfx/eog/Manifest @@ -1,5 +1,5 @@ DIST eog-45.3.tar.xz 4656744 BLAKE2B ceebd9890da926ec7caea916ce2e4483fb398f1b5270f0a210bfc97fb844669ca8416a10cc020f145f8e0b1d2e5e2fd85dcaa4d948312e42b40c0850d657f988 SHA512 21693d659a5eb25bdec968266d7e6a1a6988bcec0bf5c3d914b098001ed4a8e64d7ff628181072fb1aabec1b89b56ed5e7c85e3b06ec79be1c9d7cf1c57d3145 DIST eog-45.4.tar.xz 4657420 BLAKE2B 422e9d9cfffe81fdd3af4948f371c11fcd6a2fba50df78469267747314cdcc840763a7057566c5e43c6eee9a0175e9dfaa1916736cfbef6d879076b9f2c11fcc SHA512 eb49d9c78b6e3d66eb20a714c2ebf5aad5c5547c2ca86e5c51e4b7f3c4c3bae5c4c356cec4c5815cc11d91c38ace58c00ea25c406de8cd9bf39a0ec65188baf8 -EBUILD eog-45.3.ebuild 1752 BLAKE2B d1e2cd597d68c4129627838e9205ebe76c04382084623bc7e923710eab51164e605cea69d2b02a800bd246292b072656fbfff42fe237f5ab574aaf5928f1f7f0 SHA512 9d5bbc1124b06ebabf8756c06c37a68660790e7a77a7ff54353a61ba722f168ccd34c83638901310c6d5ea34d02a1be28686ff7fbbcf1b09ad5309a89d610b7b -EBUILD eog-45.4.ebuild 1716 BLAKE2B 41b9e90cc0a19143cd1c99ecec988d75a5a81a3444d1f01007f2a50f1f2c57a747207f6a0729550cf0c1228746c6f680c5cb6c5f5301de2a9004a4e6a309667e SHA512 225673ab7ca23b82f1a3523943393f4758c27794ff51717482e8a65044975aa8bfba93645526e60771e5fdc39ccf301cf104976662407e3889cb5eddd9b6a2cd +EBUILD eog-45.3.ebuild 1746 BLAKE2B 6e7aa0579e4a1b5af66cad95f4ba62cdf26e7934339b8f7f68605246a174dd0f1fbe178f240ca55f22028c4dfa33ab1a23eebc227a25b10a18566e4c36a8e60e SHA512 cf7c3e6c6c368738c3d31f4930301fd761af7b8af360fbac1a4addd7970245b74aa73e08e56791482ee6af7f5c223f4d4c2a636866f1e6e989d2d56b94e43dca +EBUILD eog-45.4.ebuild 1710 BLAKE2B fa5ecfef1a9e3bde23541de405423b56061331a4a0af1090a8f6cc2e8ba50578d6e7773a3658242af9965397b9116c3f248ed4e613c5df987f2d391db7666ebc SHA512 26e3da4650886f76e3d989f0d03efefed55720d629eeb4f2889381a8709e9c7473c90d073528324ae758800ee47e8d03e7cf10d8297f5def705ae6999914cf98 MISC metadata.xml 580 BLAKE2B 7d6bf08b37ed06abb82e92621725ab2cbc9d0b28e5c50cd9dd25e449e98212da4911da450d5e80f6d2efd3cb65981b2726e69f48ae54fc7a0dd4363c896b9086 SHA512 3ae60a59ef2e07fd78b836eb828c0b9e37e49ea6115c52215b86dafff9cb6990567659a31cfb1e06e58890cf598c98065df1e473dc7994fef0ae950081c27a54 diff --git a/media-gfx/eog/eog-45.3.ebuild b/media-gfx/eog/eog-45.3.ebuild index 486256a73ca9..d200bb7d2e69 100644 --- a/media-gfx/eog/eog-45.3.ebuild +++ b/media-gfx/eog/eog-45.3.ebuild @@ -17,7 +17,7 @@ REQUIRED_USE=" gtk-doc? ( introspection ) " -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" RDEPEND=" >=dev-libs/glib-2.73.2:2 diff --git a/media-gfx/eog/eog-45.4.ebuild b/media-gfx/eog/eog-45.4.ebuild index c36318a5952a..827642bb01f7 100644 --- a/media-gfx/eog/eog-45.4.ebuild +++ b/media-gfx/eog/eog-45.4.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/eog" LICENSE="GPL-2+" SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff" REQUIRED_USE=" diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest index 7fe6a6c40a81..85804f2e353d 100644 --- a/media-gfx/eom/Manifest +++ b/media-gfx/eom/Manifest @@ -1,6 +1,4 @@ -AUX eom-1.26.1-libxml2-2.12.patch 1191 BLAKE2B 232908830b3fec40b694c4a4f24d69a44077346a44c68a87d98e2a1a741efb3f7e9f58a1cc1560e58ccab6306639dab0ac070f9d5e007f58a90a282b789d034b SHA512 3570a3c6ba5760c7fd926221a19794442b2d75aad3ec945d831457a3c68f7b73e7023be254d2c467c1b7b4915a2a9d7a6f4464ee0e94b969b3e0a4fb81da5d2c -DIST eom-1.26.1.tar.xz 2512024 BLAKE2B 2aa50d144a4c703d61acee8e0078a8a7ce7e41ffc8e79a0064057b78119e81cc85da0481ee55064702981683e0b34a93dd7a9fce2a6c03fa7fa65e6653d9796d SHA512 263eb6a843577f3ba399fa27b6a9087246053dffd963090933f6bb11b762e1049fdc7b0fd52a6987f40fb57be76d68f6964413a0c12437fb00b8766dc17b7648 DIST eom-1.28.0.tar.xz 2046292 BLAKE2B dec9915ddd63758f6a36eef094e13cdfddc6bb6d333369ff240cb4afa745b814a807fd69d0ed949924fff0337073a6467ec6f5b8037bb9b1e356e029ad2e06f6 SHA512 e500915f9e4b5aa8774645e0bf6735d7592fb9c33d6cca7a94011814ac414816d5ead8dae26a875f054249ca880f306f998c0150c9800df8143dd25a270c239f -EBUILD eom-1.26.1-r1.ebuild 1706 BLAKE2B 822c5c4ec67660574158bcd3c7bbb74b2ab68e60cb4a76b51dad4b4bf4bbdab5c8cdfc55c4eb6bf4527a52d7d9bfdbb23ea6d5c1d3c37bb6332dd1cd6b469b26 SHA512 32714522e31e4fb7861c9851feaa3b71e50cf99979b4f5b5726882a38949d8285fef480420abe29b4f92e638f20a0153d3ea77333cb62606b74a30aed1e1a0a5 -EBUILD eom-1.28.0.ebuild 1675 BLAKE2B 3ae045eacd65637c2d0a6386157743202e868f0bbeb7a6ba6d903525c5f4e8e1281a8a6982aece1b96b30502c9d00c715b0dc95e3ca24fb7ed7cbeb870f76683 SHA512 bbcc5b7bb3cd75d6dce98d277c8438489f652f7214e23ef1e62093dd2d58e9bd293cf5f2133018b0a0b626a75dfd7935831b8dc8f513133fcb43f6f0e7293141 +EBUILD eom-1.28.0-r2.ebuild 1803 BLAKE2B 7b625840106bc511bd2888891ffc4a3c5dc1ace907ce185c6c561df26fcfcc559835ccd6e1c67fab7579753d4192e536f4bc2dc5d13e4e5392ec8a82a92188cc SHA512 74580e7ef9718d5c638eaa011fc0c9028054eb7e1db2275cfbfb4bf2c098f57aad075b57fa02753ff2cd3b9475e82f5390cfe8cb3b50b061569efbf94ca9db33 +EBUILD eom-1.28.0.ebuild 1683 BLAKE2B c2bb4b17747f8310da1cd7c65d4c7f15e0797a63d14ae59e5667403202cb2f4df85236e964df6efdd1803f0ab24562b7ae6517d0e29c5421df1ec76b832a57f7 SHA512 5843240e5460387f531a3aa4099405b98e10ced6d00e30fdf5a0de7f8d5c4335893bcc853ee95181727b30104f41b67ad78e13627fea733203b18c80be960377 MISC metadata.xml 617 BLAKE2B beb6f065da7476b012d7b972d02ab4a7af91b4d105fa281bd2264c08903d6f84ee735b187fb569c37f0b0223f750e66d3a2b18e0f4e0d100f77048ec318e2aaa SHA512 9f74f1f8062baa57d1ff7253c75fcc9b157e2bbfb82e3da61364334aa258305f0d0ce5e06ba48fad4e3e2243623c97671a3f807b836445300b5cf9c3b51c391d diff --git a/media-gfx/eom/eom-1.26.1-r1.ebuild b/media-gfx/eom/eom-1.28.0-r2.ebuild index 20c1013dee46..10c964ed3f26 100644 --- a/media-gfx/eom/eom-1.26.1-r1.ebuild +++ b/media-gfx/eom/eom-1.28.0-r2.ebuild @@ -3,10 +3,11 @@ EAPI=8 -inherit mate +inherit gnome2 mate optfeature -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" +MINOR=$(($(ver_cut 2) % 2)) +if [[ ${MINOR} -eq 0 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" fi DESCRIPTION="The MATE image viewer" @@ -21,7 +22,7 @@ COMMON_DEPEND=" >=dev-libs/libpeas-1.8.0:0[gtk] >=dev-libs/libxml2-2:2 gnome-base/dconf - >=mate-base/mate-desktop-1.17.0 + >=mate-base/mate-desktop-$(ver_cut 1-2) sys-libs/zlib x11-libs/cairo >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?] @@ -53,10 +54,6 @@ BDEPEND="${COMMON_DEPEND} virtual/pkgconfig " -PATCHES=( - "${FILESDIR}"/${PN}-1.26.1-libxml2-2.12.patch -) - src_configure() { mate_src_configure \ --enable-thumbnailer \ @@ -73,3 +70,8 @@ src_configure() { $(use_with svg librsvg) \ $(use_with xmp) } + +pkg_postinst() { + gnome2_pkg_postinst + optfeature "webp support" gui-libs/gdk-pixbuf-loader-webp +} diff --git a/media-gfx/eom/eom-1.28.0.ebuild b/media-gfx/eom/eom-1.28.0.ebuild index 931fc3ee8522..5e369e19dfda 100644 --- a/media-gfx/eom/eom-1.28.0.ebuild +++ b/media-gfx/eom/eom-1.28.0.ebuild @@ -22,7 +22,7 @@ COMMON_DEPEND=" >=dev-libs/libpeas-1.8.0:0[gtk] >=dev-libs/libxml2-2:2 gnome-base/dconf - >=mate-base/mate-desktop-1.17.0 + >=mate-base/mate-desktop-$(ver_cut 1-2) sys-libs/zlib x11-libs/cairo >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?] diff --git a/media-gfx/eom/files/eom-1.26.1-libxml2-2.12.patch b/media-gfx/eom/files/eom-1.26.1-libxml2-2.12.patch deleted file mode 100644 index 7bf2c65154ca..000000000000 --- a/media-gfx/eom/files/eom-1.26.1-libxml2-2.12.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugs.gentoo.org/917514 -https://github.com/mate-desktop/eom/commit/ace46747000807d975b58101353302f34c75ef49 -https://github.com/mate-desktop/eom/commit/d00fc0b68e9419ccdefbf2831ad2537bed8f35f4 - -From ace46747000807d975b58101353302f34c75ef49 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tomasz=20K=C5=82oczko?= - <31284574+kloczek@users.noreply.github.com> -Date: Sat, 25 Nov 2023 20:25:29 +0000 -Subject: [PATCH] fix building with new libxml 2.12.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Added include <libxml/xmlsave.h> to allow build with libxml 2.12.0. - -Signed-off-by: Tomasz Kłoczko <kloczek@github.com> - -* fix building with libxml 2.12.0 - -Co-authored-by: Colomban Wendling <hypra@ban.netlib.re> - ---------- - -Signed-off-by: Tomasz Kłoczko <kloczek@github.com> -Co-authored-by: raveit65 <mate@raveit.de> -Co-authored-by: Colomban Wendling <hypra@ban.netlib.re> ---- a/cut-n-paste/toolbar-editor/egg-toolbars-model.c -+++ b/cut-n-paste/toolbar-editor/egg-toolbars-model.c -@@ -27,6 +27,8 @@ - - #include <unistd.h> - #include <string.h> -+#include <libxml/globals.h> -+#include <libxml/parser.h> - #include <libxml/tree.h> - #include <gdk/gdk.h> - - diff --git a/media-gfx/evoluspencil/Manifest b/media-gfx/evoluspencil/Manifest index 2c6a2aafd351..aba344aadae0 100644 --- a/media-gfx/evoluspencil/Manifest +++ b/media-gfx/evoluspencil/Manifest @@ -1,6 +1,4 @@ AUX pencil.desktop 202 BLAKE2B bb588b85ed8e8e9fbed0425f3a6a88dabe77d42a1c6efbe9cfc32017d2373015b8f64899c5ca0f8992278debeeff73ca8c0985038f21342e25198eefa059c251 SHA512 101e4f9a205b71ae3a2ee084b40108a05acf210b78d54dad2d35c6fc215468d8fad10a963aee2a7dffd0406b56a98b61a0e28cf8b9ee563a78f66b9fd20e620c DIST Pencil-3.1.1.ga.x86_64.rpm 80453349 BLAKE2B c95d1a9722cde0396833da3e06e984e5d9ddfc9febdb4b65c8defad8aef131a7ea5444f8d05acea6ddbcb13782ab457498406cfba83585685100dc25dfb5a2b1 SHA512 3d438a390e9047230f31540066eafe87ce56dae58db84e2a8dd48dbfd29e5dcb630432f6eb4933bbba4df47460d70273b8e1cf5539cf4c7c6defda18c105582e -DIST evoluspencil-3.1.0-1.rpm 88059338 BLAKE2B 905f37968815be8daf37f60197f33636094c1007553d917f4098e09de9943bbd027bb21cf216df64145206ac968b48fff7a91fcb3acbb1b5d01a897375e31e99 SHA512 3a9a451563f499d918b36b48482a13107e18de0f7fcb786b20a88ffd8f487cf07cfdc279bcf6d4db3b8bbde89a424352d7e1fa1d8eeaa4972d830ec22883a15f -EBUILD evoluspencil-3.1.0-r2.ebuild 1639 BLAKE2B cdedff38018f702916ce41fcc9cafe0a2ddc8485b07c0ea3055fdfc4a77d6e7a56d7c22e497371cd826ca3a82e727d77c8890d7b9c8d139ede50e146d948fe3d SHA512 4fb8ce531319008295cc67e18fe204d0fdc7b79e2b262902b01ed5e763192e1c2b9e19ab9810c8fe2b71fb6f717df68671ec78abae04021767d184aa0c128d08 EBUILD evoluspencil-3.1.1.ebuild 1540 BLAKE2B 9f839c5da3220b3a3d8e3375631399017e367799b5cbef501eb8ba78fa35f6b5f6b073b1381efd56df31f8b172b1a85d54603e0c96382fab8f12b6852b33dd1d SHA512 9347f75261508ab31517fc7a89e879088ff27c4b4933afeb82098dd434bf7dc6e5e8074e8ec5bfa1cba11abad339045a6cbafb989d788cfebf73ae6e11170f99 MISC metadata.xml 246 BLAKE2B 024897eef5e0c70ec011ae2eb8ad27593e7610d8ae358cb39cda715c44d26c932115f83404c54189bff783b098defeba583ea50ccdffc34b8d10c7afacccb5c4 SHA512 79f1b01a467d2fd97d8703a48c2f72ede7b3b5c4ca538401b32602352d62f7a4e2493df9c3c7c613bf08b6a811a14d62cdaa411bd2d1e2fd3965ae317e9c1f1b diff --git a/media-gfx/evoluspencil/evoluspencil-3.1.0-r2.ebuild b/media-gfx/evoluspencil/evoluspencil-3.1.0-r2.ebuild deleted file mode 100644 index 4c1c4625a566..000000000000 --- a/media-gfx/evoluspencil/evoluspencil-3.1.0-r2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit rpm xdg-utils desktop - -MY_PN="${PN/evolus/}" -MY_PV="${PV}.ga" - -DESCRIPTION="A simple GUI prototyping tool to create mockups" -HOMEPAGE="https://pencil.evolus.vn/" -SRC_URI="https://pencil.evolus.vn/dl/V${MY_PV}/${MY_PN}-${MY_PV}-1.x86_64.rpm -> ${P}-1.rpm" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) - dev-libs/expat - dev-libs/glib - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - net-print/cups - sys-apps/dbus - sys-apps/util-linux - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - x11-libs/pango -" - -S="${WORKDIR}" - -# bug 703602 -RESTRICT="splitdebug" - -QA_PREBUILT=" - opt/${MY_PN}/*.so - opt/${MY_PN}/chrome-sandbox - opt/${MY_PN}/pencil -" - -src_prepare() { - default - rm opt/${MY_PN}-${MY_PV}/${MY_PN}.desktop || die -} - -src_install() { - insinto /opt/${MY_PN} - doins -r opt/${MY_PN}-${MY_PV}/* - - fperms 755 /opt/${MY_PN}/${MY_PN} - dosym ../../opt/${MY_PN}/${MY_PN} /usr/bin/evoluspencil - - domenu "${FILESDIR}"/${MY_PN}.desktop - - mkdir -p "${D}"/usr/share/icons/hicolor/256x256/apps/ || die - mv "${D}"/opt/${MY_PN}/${MY_PN}.png "${D}"/usr/share/icons/hicolor/256x256/apps/ || die -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest index 18b9fa070cd6..0b67736de69d 100644 --- a/media-gfx/exact-image/Manifest +++ b/media-gfx/exact-image/Manifest @@ -2,8 +2,9 @@ AUX exact-image-1.0.2-dcraw.patch 496 BLAKE2B d9d86facb3b0f9721d3f5791d4744bbf71 AUX exact-image-1.0.2-g++.patch 936 BLAKE2B 6ab787c1393228bb1671c8a2d7b76969fcd11d26f0c14ca08a95cee7241422205d8cb398f2a6b711e884c476cba662718705848a818b1944428b2a207133fede SHA512 44fafd62c713bc59c1cb774924394ad32a13c33b79696a4762e3730108650ccd3033f554fc8b0d7cf9b71126367bce5b90074f2c954ca57c8389975b57eac5e1 AUX exact-image-1.0.2-gcc6.patch 2795 BLAKE2B 17282b91baa020b94654c92d87611001584f82360303a56e70cb8f081caf400394a367982e115bff094dfe11a0798503a606de106f1bf6427b57a9ede1cd6ed5 SHA512 ef42fccab6d0958df2dcf86578f9df1f84254515c2bea611f256e23227b9d6dc917467f2d8f54230f9386e9726152c6bbe4ab4f3d117e0da5a3e99b00e93e348 AUX exact-image-1.2.1-gcc6.patch 1874 BLAKE2B 46b1dbaad49a1588c1957f48fef6e9a3abd7859b715a71dfbc3ef85356c5c9ae7d6ef01c3455b6c08d4d2e07434ddf387fec80ba51ba5d11d0200e5b5f2d5e96 SHA512 14a3209ffb091ee53eb0c0f4c4a41333ddeb8953f36ccc64b5ef2c653efd4f60191b3ffce628eb20aacf2bbf9fb18f5be42298fb0d58d9813ba47d522d1dfcd1 +AUX exact-image-1.2.1-libjxl-9.patch 522 BLAKE2B 96f1967d0fb0cab93f3b55c9b185f9ba4c55ce00a51cbebaa97e082393795bc2d80a36d98f293b538eb818dcceff7caae7e2947b138c17cea54ffbc270954482 SHA512 a37916cf971bfc48038adeb347723cef230ba79c618398690a009631aea7af4ab908fce7efd9be09e803507454e5c340df204c03cd1079964e4467d19db04c77 DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B 67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9 SHA512 8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65 DIST exact-image-1.2.1.tar.bz2 320849 BLAKE2B 615884f2501b3e9ff00410d3569c8aa7d0131610f990591eb77a11cf6d7249342b4a2ece0f2dd62ea7a1cdd213ae1a98bf6da0817b74d8c8e78cbca5b8e67e33 SHA512 34af0575d8564dd5942f0e3ec5b6fe7fb234a96e621a737359406a2571ed8ac2c15ef2e7655a7d260b37b68138e071342583f47ad7ef0e3b3511e5ebc1a873a8 EBUILD exact-image-1.0.2-r8.ebuild 2529 BLAKE2B ba0ee3fadcf7c780b20847064f993ce5c9fec51953488b92f3fe5677ac9f0e924ed809bf5a5d6877c9a5167ea29ccb70fdc0ee6e962387a69a31e73c926e4ff9 SHA512 b2a37c8a265078a5ee42434b467434c6347720eb95b6ac8f40c6838776ec8d7ad24ae407c64eae04a56ed04ae775e3f93e69b1cf047564d3d4b6bfa54a818a2e -EBUILD exact-image-1.2.1-r1.ebuild 2242 BLAKE2B 642f483e0582edcb94001c310b5b1631b8488cbc7b6dae234811a8ae05dd3148d10ae14b404f07e0ef42b38a95bea117d5a6dfa09c3f71b8e2320a5ada4d7bba SHA512 8cbc0bba01326f80a4dc19d7aa29c39d08d7e6425f8ea7c1f3f7350c442c5390d879f3fefb6bfc5e6238a9f7623c651a459a85dd94750de260d52d7cc809ec8e +EBUILD exact-image-1.2.1-r2.ebuild 2272 BLAKE2B fb48f269b8bb08f9a47ed1fe0c09fe6646ac6d8a2228336d9549b04ace9a14d24e991a4f6b96dc022107310497b3fc1afaa97e2098de40f48d5cca87ed1fc78e SHA512 a61b6e0c9696659aeda0eb2e57acffbb3c5639ad262f0c4fc520c1021ca57c297ec9fd05896d82faf5316fb53137c518f0f674b8cc6f903506b81a5a4704f630 MISC metadata.xml 330 BLAKE2B 468dfd9c9bc2687f285c5a7496aa989843c32929b4c410253f1d046df2e2416604f6ff8b1cb4622e85e27f13f26cede91825d04b7748cb4f74fdff13478046c1 SHA512 01bc80b3dc7ed3ff2f3402ecd3214793d18267be1e1e4c4b42718b6f6a4982404e243771917fbbae7a1bd6b12a1cd80534d9738149ec9b2a88bbc1ad62fcdf14 diff --git a/media-gfx/exact-image/exact-image-1.2.1-r1.ebuild b/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild index 7480e98e5c79..09f63e97b42e 100644 --- a/media-gfx/exact-image/exact-image-1.2.1-r1.ebuild +++ b/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} luajit ) @@ -24,7 +24,7 @@ RDEPEND=" sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( media-libs/libjpeg-turbo:= ) - jpegxl? ( <media-libs/libjxl-0.9:= ) + jpegxl? ( media-libs/libjxl:= ) lua? ( ${LUA_DEPS} ) openexr? ( media-libs/openexr:= ) perl? ( dev-lang/perl ) @@ -47,6 +47,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-gcc6.patch "${FILESDIR}"/${PN}-1.0.2-g++.patch + "${FILESDIR}"/${P}-libjxl-9.patch ) src_prepare() { diff --git a/media-gfx/exact-image/files/exact-image-1.2.1-libjxl-9.patch b/media-gfx/exact-image/files/exact-image-1.2.1-libjxl-9.patch new file mode 100644 index 000000000000..520300b85146 --- /dev/null +++ b/media-gfx/exact-image/files/exact-image-1.2.1-libjxl-9.patch @@ -0,0 +1,11 @@ +--- a/codecs/jpegxl.cc 2024-10-06 17:58:07.684805110 +0200 ++++ b/codecs/jpegxl.cc 2024-10-06 17:58:23.929604759 +0200 +@@ -186,7 +186,7 @@ + } + + if (JXL_ENC_SUCCESS != +- JxlEncoderAddImageFrame(JxlEncoderOptionsCreate(enc.get(), nullptr), ++ JxlEncoderAddImageFrame(JxlEncoderFrameSettingsCreate(enc.get(), nullptr), + &pixel_format, image.getRawData(), + image.stride() * image.h)) { + std::cerr << "JxlEncoderAddImageFrame failed" << std::endl; diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest index db95ccae2491..95a579e0b5dd 100644 --- a/media-gfx/exif/Manifest +++ b/media-gfx/exif/Manifest @@ -1,4 +1,4 @@ AUX exif-0.6.22-empty-string-check.patch 1272 BLAKE2B ea6d3c4f2c3dd75ca1d9c75433a830282b252197c5b9885278823ed70dcd1ab0e319536c9f012d093da32f7af345280f7004b5b78f0e7800ede9ea4e16de46e2 SHA512 bce1a58033f7597219f2be2edbc4b8b821b1fb6f4de591d3b94010806f278d0bad20af24d7e05aff00b02057ed70ecea548f848ac8412748312eca3a6e6d6682 DIST exif-0.6.22.tar.xz 369152 BLAKE2B 11cfda3d504860c418863449ba986d64553c3ac8354f99bd2af33b3bcb324a237b3bf89110bbd08b8ef5e4f0ac293107afdaac8abc1f4607d3a0544f18686430 SHA512 f1e2c56b9e72a606c90d53733c1f2b310f7be16a3929595bbf9d5d10a128ef3f6582f547554fc106f449e94d626a137a0a5e4c99391c9253d677abd5ae7fc333 -EBUILD exif-0.6.22-r1.ebuild 719 BLAKE2B 2655c050303b8a6249bbfa88200271a3adf6b28cc93340d834e20be9546e4fb8636157a0c4866657b450deb65ad84d24e7d4032ed56e6e4fec907aed1b912404 SHA512 4d6009bf2ed7bc26ea269e22591b869de2618c360e5cd47a7a8cb16db47608b792602f6000674fb40628e567e5d484101984a7de5d0a142b22f91f053063b0c1 +EBUILD exif-0.6.22-r1.ebuild 713 BLAKE2B bc27c0c0478863dc049be2778655a1f1fc9a52b69ba34d7d3962798ad1add0bcf06c2984573760cbc5128c5b1e1eb3e96fb357d0af247a9de75337ad4c268ba1 SHA512 d5fabb10f7b1cddd35bc90abe3731be70ceb2dfbbe22c965e3263757600354018cc093a97306a4f5fb1a336e2ed7d8df894a6cfb9bcb613db76b0e947b82835b MISC metadata.xml 304 BLAKE2B 5b55e98ca12d4776b75f3f3c1be0791a297344b7cc27b127f75e645e1fff1df04a85c5de371378b25366a0af1920470aa3d182572b6202d6cd320522664f17ab SHA512 b56b08cbbf054a85288f63e75342d65cc851d628d70f6fa27a8ba30a869464554af50903a4b89fcc901e0c872d65a074a7c9c087a18228d22e1329f56189fd9c diff --git a/media-gfx/exif/exif-0.6.22-r1.ebuild b/media-gfx/exif/exif-0.6.22-r1.ebuild index 230ebd275c1a..5d2f5b841801 100644 --- a/media-gfx/exif/exif-0.6.22-r1.ebuild +++ b/media-gfx/exif/exif-0.6.22-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/releases/download/${PN}-${PV//./_}-re LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="nls" BDEPEND=" diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index dc516a412588..bd142f75681b 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -1,6 +1,3 @@ -AUX exiv2-0.28.2-errors-localisation.patch 835 BLAKE2B af7821671a1f852d3169eb1577814f390e5943165fff73ea568906e71253a381c72ebe5b3fc623668a7d37f6bfd988e7eff3b505e04f0fb8f6f95b3a8398cc20 SHA512 d228eed586b257e992566d1ebb655753a7bec6ce6ab56773dc7feeb93fa479b4f98a1db4ac64e95eed2447ed27ee434eed40d9c4a230be6fe6f8788fa9d5ed7f -DIST exiv2-0.28.2.tar.gz 45224206 BLAKE2B 9d1d05c99804032dfb9b740e543d1e3cceae011b17853c8565ccad87e726ce1d0f410c13bf4fa8839bc8e0fecdf170a3acac568f14aad4628b3b844f6c21dd7e SHA512 197cc607c0271b5731714713283756250031cef81ba7ed5d9c3e222b4c2397966cc2bbdbceaae706598329dde6f8a9729597d0ae4c36ac264c76546942e4e37b DIST exiv2-0.28.3.tar.gz 46480702 BLAKE2B 73ebdca376d69514a89261d2f78604c5d7ccbc6e73e5c5d61f8caa596fd6b60dd4d06df19cb9f93e402d9a76f1511955f77cfd74b407310a13952092ecfbf0ef SHA512 c8338a118feefa104d73932890c732247c884ab9ce1d170c43a22ab5884517a0e2a7fd1febde7705b8290fbbbc29e64738610404816e4db2b56a70fc444ca049 -EBUILD exiv2-0.28.2-r1.ebuild 3325 BLAKE2B 01f01b3ed583f8cfc25103dcb0b2707516c359d7bbbf6f0e6cc2009ea775bf8cc91ff747bbbf640337079389a2b217071fc8415f1683c9a48ac6d1e0e8a450c4 SHA512 96424c74c1e3e594f4d9dc819a21a91ec7d5428d2de52720df4d5a388fe8e4ce86ec066d3dbc9b92d9c71b3273bb2ff9cd54e3f84f1aac8f027169ad5fc8b969 -EBUILD exiv2-0.28.3.ebuild 3268 BLAKE2B 5cd93130f5fe7c490bb66266fc63809e83857a35a5404caa1226935cb9d488fc0379572b8ed5d15876e56a590c658f78fffddcd0ee28652aa7f3c2cc6e0e10cf SHA512 d5c5fb622f339a41192139e61bc640433bb3371061ac38924eebe8d59cf7221fad3c8d432431fd17e842cfdaec3f6122ba87de4583cac0c97b9c23102118532d +EBUILD exiv2-0.28.3.ebuild 3261 BLAKE2B 6801c92f63122d21fc5c93e5a65f1c260ce458e12967e6362a51ddba454b757a7da1aeea0b229fe9ef3eca3b0a4906ca0be4bea16079e9c288ad21dbf53e12c0 SHA512 642977da6b3cb8963e350bcbb7a48be4e75042b72e333858b89ac932bf682ce0034384c5ec07977ebfc689a446f02717eb1ec5361067a94e773e082d1324ca9a MISC metadata.xml 686 BLAKE2B 2d1079660cf4268216f8835d1ae6655ebafc99d5402872bb05dac6342034a28a07dcff587fc616a5eedc8c538ea3e43e013711d39c2541295e89629e39a244ee SHA512 40f9225a42386fa6f03bf9436d675bb01bd6eb859974bfed22d1316536ceaf40752fabffdab20b439e87c57f65d193d8d249e5aa022584de3f869f4162660b4e diff --git a/media-gfx/exiv2/exiv2-0.28.2-r1.ebuild b/media-gfx/exiv2/exiv2-0.28.2-r1.ebuild deleted file mode 100644 index 2bb992bdcaab..000000000000 --- a/media-gfx/exiv2/exiv2-0.28.2-r1.ebuild +++ /dev/null @@ -1,130 +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 cmake-multilib python-any-r1 - -DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" -HOMEPAGE="https://exiv2.org/" - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git" - inherit git-r3 -else - SRC_URI="https://github.com/Exiv2/exiv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" -fi - -LICENSE="GPL-2" -# Upstream hope to have stable ABI in 1.0. Until then, go off ${PV}. -# We may be able to change it to $(ver_cut 1-2) once e.g. -# https://github.com/Exiv2/exiv2/pull/917 is merged. -SLOT="0/$(ver_cut 1-2)" -IUSE="+bmff doc examples jpegxl nls +png test webready +xmp" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/inih[${MULTILIB_USEDEP}] - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - jpegxl? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) - png? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) - webready? ( net-misc/curl[${MULTILIB_USEDEP}] ) - xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest ) -" -BDEPEND=" - doc? ( - ${PYTHON_DEPS} - app-text/doxygen - dev-libs/libxslt - media-gfx/graphviz - virtual/pkgconfig - ) - test? ( ${PYTHON_DEPS} ) - nls? ( sys-devel/gettext ) -" - -DOCS=( README.md doc/ChangeLog doc/cmd.txt ) - -PATCHES=( "${FILESDIR}/${P}-errors-localisation.patch" ) - -pkg_setup() { - if use doc || use test ; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - # FIXME @upstream: - einfo "Converting doc/cmd.txt to UTF-8" - iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die - mv -f doc/cmd.txt.tmp doc/cmd.txt || die - - cmake_src_prepare - - sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die -} - -multilib_src_configure() { - local mycmakeargs=( - -DEXIV2_BUILD_SAMPLES=NO - -DEXIV2_ENABLE_BROTLI=$(usex jpegxl) - -DEXIV2_ENABLE_NLS=$(usex nls) - -DEXIV2_ENABLE_PNG=$(usex png) - -DEXIV2_ENABLE_CURL=$(usex webready) - -DEXIV2_ENABLE_INIH=ON # must be enabled (bug #921937) - -DEXIV2_ENABLE_WEBREADY=$(usex webready) - -DEXIV2_ENABLE_XMP=$(usex xmp) - -DEXIV2_ENABLE_BMFF=$(usex bmff) - - # We let users control this. - -DBUILD_WITH_CCACHE=OFF - # Our toolchain sets this by default. - -DBUILD_WITH_STACK_PROTECTOR=OFF - - $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO) - $(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc)) - $(multilib_is_native_abi && echo -DEXIV2_BUILD_UNIT_TESTS=$(usex test)) - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html - ) - - if use doc || use test ; then - mycmakeargs+=( - -DPython3_EXECUTABLE="${PYTHON}" - ) - fi - - cmake_src_configure -} - -multilib_src_compile() { - cmake_src_compile - - if multilib_is_native_abi; then - use doc && eninja doc - fi -} - -multilib_src_test() { - if multilib_is_native_abi; then - cd "${BUILD_DIR}"/bin || die - ./unit_tests || die "Failed to run tests" - fi -} - -multilib_src_install_all() { - use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) - - einstalldocs - find "${D}" -name '*.la' -delete || die - - if use examples; then - docinto examples - dodoc samples/*.cpp - fi -} diff --git a/media-gfx/exiv2/exiv2-0.28.3.ebuild b/media-gfx/exiv2/exiv2-0.28.3.ebuild index 4e25ebc1088c..644c3b5b5904 100644 --- a/media-gfx/exiv2/exiv2-0.28.3.ebuild +++ b/media-gfx/exiv2/exiv2-0.28.3.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/Exiv2/exiv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" fi LICENSE="GPL-2" diff --git a/media-gfx/exiv2/files/exiv2-0.28.2-errors-localisation.patch b/media-gfx/exiv2/files/exiv2-0.28.2-errors-localisation.patch deleted file mode 100644 index 7799232d74a8..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.28.2-errors-localisation.patch +++ /dev/null @@ -1,23 +0,0 @@ -From a3985001b13132ce4841bf1170626f7ef8f9dae7 Mon Sep 17 00:00:00 2001 -From: Jim Easterbrook <jim@jim-easterbrook.me.uk> -Date: Thu, 15 Feb 2024 16:41:35 +0000 -Subject: [PATCH] Restore localisation of error messages/exceptions - -Signed-off-by: Jim Easterbrook <jim@jim-easterbrook.me.uk> ---- - src/error.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/error.cpp b/src/error.cpp -index c4ce1f2e01..135f4730d8 100644 ---- a/src/error.cpp -+++ b/src/error.cpp -@@ -163,7 +163,7 @@ const char* Error::what() const noexcept { - } - - void Error::setMsg(int count) { -- std::string msg{errList.at(static_cast<size_t>(code_))}; -+ std::string msg{_(errList.at(static_cast<size_t>(code_)))}; - auto pos = msg.find("%0"); - if (pos != std::string::npos) { - msg.replace(pos, 2, std::to_string(static_cast<int>(code_))); diff --git a/media-gfx/fbgrab/Manifest b/media-gfx/fbgrab/Manifest index 22abbe22b3b5..74f46f36f680 100644 --- a/media-gfx/fbgrab/Manifest +++ b/media-gfx/fbgrab/Manifest @@ -1,3 +1,3 @@ DIST fbgrab-1.5.tar.gz 37010 BLAKE2B aff706ef46664216ac1846d0e8fe37646fcb900cce1d451560d024edf3aab4c1817739cb26cae4d9491ae98c5e2d3fda96509f539514b701b7c7ae54ee9a8d02 SHA512 475d377480b9e67f618e19967d4bae5890a78aa00236583914b4ac81f468d8282e1767d85009101f6b03ddc091da8416dcbae451b191a79013e1632d91155c23 -EBUILD fbgrab-1.5.ebuild 690 BLAKE2B 48ba372f5f08ec1d04dc1029f4822b6bd42cb0f87b21ef2b8691ac438c6673a2402d4a3ad9886c3944867fa834e4cb7432ae587ab346c2aaaa6efb20b966ace6 SHA512 52f1ede2b33ab0c93a0dce65991f142165efb1a01a02ef14a008770c494f6dcd8cff3a662923c8bbda8605071e5a8332917414933f126bd6d18db06550126229 +EBUILD fbgrab-1.5.ebuild 684 BLAKE2B 3c994c8b43313aaa0f0d119585b3278fc0a20da763d416849c8d04c27ab6d73572d31b9d3b13fa40875595a12552f73421b4bc5f76524a3fc3b54ef1deaf54b0 SHA512 ab3507d157dc7b8c63d9e4e4531887096e224c73c5cf2b04f3957356c70a556bc60a4dd1c9e44e7f64b6c4f41a956e589275e6454d77c8b9e1c64b1b5933b578 MISC metadata.xml 252 BLAKE2B 2c016d4f49d7c3ad7898fc7f3af422425bdd657fc26c934a77624a5f960198f11df101381ed34506fc96e53d6f598dcb8eb380c57d13cff9b8b36e4493fae798 SHA512 a0c3bbc14f2863aaaff7f5c9b76a7609bc9f5412f504df01788ffd6f319d30854b298bd15d811fc42db349ca061ee5025777e27b13ef8d9507255a2f925c841c diff --git a/media-gfx/fbgrab/fbgrab-1.5.ebuild b/media-gfx/fbgrab/fbgrab-1.5.ebuild index 78374979eb1b..dde459d9e098 100644 --- a/media-gfx/fbgrab/fbgrab-1.5.ebuild +++ b/media-gfx/fbgrab/fbgrab-1.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/GunnarMonell/fbgrab/archive/${PV}.tar.gz -> ${P}.tar LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ~ppc64 ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ~ppc64 ~s390 ~sparc x86" RDEPEND="media-libs/libpng:= sys-libs/zlib" diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest index 416efd8ad542..3dc5af75fb77 100644 --- a/media-gfx/fbida/Manifest +++ b/media-gfx/fbida/Manifest @@ -5,6 +5,6 @@ AUX fbida-2.14-fno-common.patch 1148 BLAKE2B 108c21e732afaebe6183835732341b814b1 AUX ida-desktop.patch 384 BLAKE2B 627319b163e62af11acc2c0957254cc671145b9df22f27af8988e5f0bcdf383f7cf2ad4fa7b7c97acfbba3181081ee1c025c4b3c82e99bfd7fe4efe69edd59c0 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737 DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 -EBUILD fbida-2.14-r6.ebuild 2531 BLAKE2B 0536af7e7531b37e6523cde15c9897c2a600ceb00e2db4d1a33f409c9eb45ddc0d2881537b0f44b02523aee420ea5a3a4b6a1a650cc07186272232d475524297 SHA512 61b6346aade1fff5c03d5763e87c6730c910a4a1e8085a6531df9ddbee553e94b4cc4ae891606c321b6448d28af510b38e0b85e6ed4af951d121463e61997f51 +EBUILD fbida-2.14-r6.ebuild 2525 BLAKE2B eca890df02f1531ea82beaf11ab51e2eb9aa4465ad3bbbfe5ba9549187684efeab304f6e47db14cf23e8854170aaae45156b268cdb490611df678a6ec21669f7 SHA512 96f9f02b271cf255d48b037150477492f80477992cfe74e3c1ac0791b5c0bedf397cca7164f2cdb154e4d6b4ba4869ed0d58dc29e1ad41888b7f39d81959dfa0 EBUILD fbida-9999.ebuild 1355 BLAKE2B 8f634fe0c8640b90c8bdd892fe9aa0063b70178a51fcb7958ff599b098ba434ece589a978ab27d4a913b7776c712146bc31c653edd808bc8810c3d45258e0473 SHA512 67b1feb4d1f34777a819a44e6f7884df389102f47e1e1a52b0a470a02476e5a058b5d53c2379a24b856c980ae308b30a7cac504d829f9d6a2fd408953e58d924 MISC metadata.xml 482 BLAKE2B c4b1c0587475e24e1d70cd93aa6033d8d9f8c32e009905023da27d793bf7847d8d595d3640148e3955314ee1de5ab3d353e113373b19b564fbb377a5c0e6d4f7 SHA512 7ca481f281fd758dfd9ff025bdb8242e15e68cbc7ad05884b14c89371cb91c1a3deaf451ea1665ae4fedd1904d6218f2a4f5f556145ec0e06332f857cc299b39 diff --git a/media-gfx/fbida/fbida-2.14-r6.ebuild b/media-gfx/fbida/fbida-2.14-r6.ebuild index 3620d12eb513..5023e37831a2 100644 --- a/media-gfx/fbida/fbida-2.14-r6.ebuild +++ b/media-gfx/fbida/fbida-2.14-r6.ebuild @@ -12,7 +12,7 @@ SRC_URI=" " LICENSE="GPL-2 IJG" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp" REQUIRED_USE=" ghostscript? ( tiff ) diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest index b64d677e4164..0469bd2693f5 100644 --- a/media-gfx/feh/Manifest +++ b/media-gfx/feh/Manifest @@ -2,5 +2,5 @@ AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4 DIST feh-3.10.2.tar.bz2 2113183 BLAKE2B 0f4662068917628be6046d3f2ebd8177b7cc1699d693de31229d2ebc6188cc7a5170202188a426ec2e3d900f2c8fb34007395aecc151f8f034e5461d287f058f SHA512 698501347224887162631397bb3b6c5da81b88993876f001407dea87fdc4f458290272d75b400aea6c0927d3c53f290483b6a89cd2cb426f56957a4fe6267797 DIST feh-3.10.3.tar.bz2 2113623 BLAKE2B 052848b222babbcb6a0d9b6c109c7a382052072c03482f47c7784e4b923fba470039d2f75db663b2d70515eb73234141c2871858825489044febea4bf1693b20 SHA512 60f29d463486eca9308037648a1b91b093051878aa2a8671166fd685ac05c217cd46ad2c7df2fde09b5f1d6cd8b3ee2b8f32fbbf6d3b2e4abc4c50b36f237977 EBUILD feh-3.10.2.ebuild 1541 BLAKE2B 6bd62dbd6bc420ac828c1da5572483f63121a277e0462e54d9c89be01b8ea1d773923b4e947b45983a794bbbc81c6cab1da3efe44d425f3b0dcaec1a3a77c398 SHA512 b6790d6c01feebc5117039c4a077f566eb1b8c59ef51869e2693ab8a8fa0072947e95e83356015d6289fe698aae052a4e8925ab77dad39051679359464745541 -EBUILD feh-3.10.3.ebuild 1546 BLAKE2B a5ee7b6e42d8906231a0af66548291423b78e99e3f06c514c30b886f7bad3d046ad7231e317ce163a4a72d8c1fc3a0b8a57d7efdd0a8ca9f1213c13d9fa82bd9 SHA512 292732c1e005744bcd6b4d7aa2ffe20a6237715db0e9fcc11da529ec8bb20c778b27aede5abfaca5bfee024474eec7843560322ede9be379ba79d6611497aa67 +EBUILD feh-3.10.3.ebuild 1541 BLAKE2B 6bd62dbd6bc420ac828c1da5572483f63121a277e0462e54d9c89be01b8ea1d773923b4e947b45983a794bbbc81c6cab1da3efe44d425f3b0dcaec1a3a77c398 SHA512 b6790d6c01feebc5117039c4a077f566eb1b8c59ef51869e2693ab8a8fa0072947e95e83356015d6289fe698aae052a4e8925ab77dad39051679359464745541 MISC metadata.xml 559 BLAKE2B 074f2a1c4a912ebf99cde3c7791ffccee8c19fe53e98794557d7807647d3c465e31fd95d855d7bfa43759d73c6deba365b24420624211355413bd13fe20bed1e SHA512 b811d6991505e777e858d88c26588d4e766a871895da586203565c7486d360d72d3514944caa483fe37c56211ea4a33a16313e1983a515aaf39b349935c73ddf diff --git a/media-gfx/feh/feh-3.10.3.ebuild b/media-gfx/feh/feh-3.10.3.ebuild index 7996c229ccea..112ee958f69c 100644 --- a/media-gfx/feh/feh-3.10.3.ebuild +++ b/media-gfx/feh/feh-3.10.3.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2" LICENSE="feh" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv x86" IUSE="debug curl exif test xinerama inotify" RESTRICT="test" # Tests are broken. diff --git a/media-gfx/fig2dev/Manifest b/media-gfx/fig2dev/Manifest index e2c199cf0123..017ba8b2943b 100644 --- a/media-gfx/fig2dev/Manifest +++ b/media-gfx/fig2dev/Manifest @@ -1,5 +1,5 @@ DIST fig2dev-3.2.9.tar.xz 529892 BLAKE2B d6b4f84f89f85b282e2e02a3a4129ab8c9f67b3376b670fb553fc89347bf2552bfc3b3bfc4d4a4a35da7f9e5659f6f6fdf5a1fb4f82fb87d140dc09d079d9ffa SHA512 4a92539d79027c73cd9fa53d7e960db40ae5616d3197023a98346de4727cd70b28cd7d64ba33063dbe3dcacada7e97bb0e0c595547781a4244aea8c75d43f406 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980 -EBUILD fig2dev-3.2.9-r2.ebuild 2299 BLAKE2B e52d451f49bfa3ecb700caf594e6218bc65b1398aff300baef91d49dff581a7819836d9c5c60d3760b99c3b37d050c73e39960248bab685553d09e23be880d74 SHA512 4375637aeb94840774f820512624753845252ccc0dbf93d4ac6dbdde7d05c0b07e5fe286b212bc5612ecf12c80f4cc3a1b69e1f4b041808f81dedcb04d534bbf -EBUILD fig2dev-3.2.9-r5.ebuild 2420 BLAKE2B 0ec2968f64e2ba315496d5e5f65df7675a6f76ed2520a34aef69b53c4b8bc238f0682bec68998f809317aaade31b370edfb3599b3e984ba97864b28230d6525e SHA512 14598c4fc2f3ffa50578ef051a9eecdac925d7113816848c621ed61a77d4e4f9d63977237cdf95b3878b32f64b273ac02d3e9593dae97aa031a0f42b4527439f +EBUILD fig2dev-3.2.9-r2.ebuild 2293 BLAKE2B a04ef4523e3381f84ed89030e2b3e8e4d1b9a1e881705737dcb1b202d769350126caa5a8233b07a9bc9136a12b56d4d76d7252693bb53b00a7884761f69b0ece SHA512 395af4038ec057d080e49453e54c80cbc34c720b6f691456c068390f4029be86548fde26cbe6fdbe6fd25de7c2109c52d3947d40885b69c2d381c4b4dc2ec5c0 +EBUILD fig2dev-3.2.9-r5.ebuild 2414 BLAKE2B b782b79dc1f5f1ca6a769b00959a77dbd12d2263d01231326920be167392227c045411697513fc1cfe6df0158fc68761e4841e9d55e6f1d913dd4db3b553566d SHA512 c0d7560409fb556a5ef2c919b009d7d9a4471473c9fdbe8a0284c6707fc0ed9c4d49bbb3eb81df0a83a61342b9989c6a8db38bbcf924b42689475f949f20e561 MISC metadata.xml 609 BLAKE2B f4f19f0cb2281cf5cddbdf11ac59b3c5c4881b04943e3a4c5d0ff0e5c7f66ffe7d066fc7cd9fb07f7db4f1ef727bcbe7d2033415681d619580a3bed3630474e5 SHA512 0bf3ae4eac46bd373650dfd16ba5b4abaf7f17352a1b59255352e2e9dba56cca03a3192ec99b2b0da6586d86349784de0df25628bf4b35f1e1b37bf38e0ccd6b diff --git a/media-gfx/fig2dev/fig2dev-3.2.9-r2.ebuild b/media-gfx/fig2dev/fig2dev-3.2.9-r2.ebuild index d8dda8e975c8..5ba39f14e9c8 100644 --- a/media-gfx/fig2dev/fig2dev-3.2.9-r2.ebuild +++ b/media-gfx/fig2dev/fig2dev-3.2.9-r2.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/mcj/${P}.tar.xz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" media-libs/libpng diff --git a/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild b/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild index 68d2d6c66ecb..8a78d35dbbac 100644 --- a/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild +++ b/media-gfx/fig2dev/fig2dev-3.2.9-r5.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/mcj/${P}.tar.xz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+ghostscript" RDEPEND=" diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest index f8840e211c90..cbcf2f758d9e 100644 --- a/media-gfx/fontforge/Manifest +++ b/media-gfx/fontforge/Manifest @@ -3,6 +3,6 @@ AUX fontforge-20230101-python3.12-distutils-no-more.patch 988 BLAKE2B ea666805ea AUX fontforge-20230101-workaround-broken-translations.patch 5219 BLAKE2B 17ead2e7c178911b48de35c6c86ce60b486a000c05ea5d11e79094851b9e4e68e32335a33ef2b49aeaf0fb161b3823e35f1b281feae426b9b69baabb35c5e02c SHA512 250850a8345511b222faeb7cf6209d412611491a5c9d83f7ad14408b1936059c4fe52cbe834b5d26579281539156b93e692bd8873aea445f23b5d78a0e1684f8 AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674 DIST fontforge-20230101.tar.xz 13761728 BLAKE2B 69e79e7c5d8b551a847ba8706157b0f559ae2a85f61711f50e4855eb6a177bbfb25de2650caf9bc8a7dd1d6af074ca5063519b2f3c151d8c784c4750c6ddc1d8 SHA512 7684a2824d5199e230d2e0a654c2119cef422a57b64e6dd75afde6ba623abed6581f596fd5b7509e03f3b3ad3cf69629aafd4c85aeda64fa91a9e1ab88c9b418 -EBUILD fontforge-20230101-r2.ebuild 3017 BLAKE2B faaf55afb8aceb26886fde3d1ff1b5edd06a53b281b0e2432a847d975fa6d0cd689e9f6ca9ec1ea255f25fc993eb625c48456b144f8a1c48481ae01983e89b82 SHA512 b4c2c1191ab197886bdc594bd163f9b62913f0c1d9d963628993f315e2c4135e556648dab42a6c44de94941edad17b4bdd5c42d586552c0f5421c3ec63b86834 -EBUILD fontforge-20230101.ebuild 2877 BLAKE2B 838d3272eaca260bd5728ecdb6a5f69c3ce5fdbb18432529ff2f536951265d646f7c7ca39bad7c5bb7ec57aaeb312492d7537013d466f263efcd2eedb235bdb3 SHA512 f75fd950ed8e356d09467a6b46980dfba2351239b111a8bf89d17d59167172c5ae3eb0f0254ec86831a4b90dbb9157dd4ef30a154f4b1158bb53e8ed7de2c0c9 +EBUILD fontforge-20230101-r2.ebuild 3011 BLAKE2B be0f4d007a19bb20ece36d998f7ab7d5739f985b26b9b3bf41700cdb5cad9a30aee799f99e38b9774abf98561bd80ef77ec55ee27d6a983a73fc18986fe49261 SHA512 2486be3232837798faff918101d0a1e1300856eaa403276c05ccef3ff4050b4b8dd7bdafb64d98688f25af116991e1bf1dda65b20896afc471f2a9658d000779 +EBUILD fontforge-20230101.ebuild 2871 BLAKE2B 73222de5952852ae971d0fc098b13463a8803ee7caad2c8394e797e1d694b9d2641b5b24402482237aea904daffa7e7f1b0fee05a6269dd4435c4fae2838f7b8 SHA512 ee15b4f0ed8449d106caf9d3f04319f354ed0c6de8f1587cfc2f5c929c18e5bebf5d5bdd7cc43231f087bf1613a28834f2cb347c023f958c42acaeaead024686 MISC metadata.xml 863 BLAKE2B 6a87762712128bf3d57122277839008c4ef057491ae1c1680a166194037ed00e66816f2c0c09be8a17909843ad49b807c06405b95332684dbee3b8d60d30d7ae SHA512 8f33c7d38f031fbf85c82b9743db80c2a3c85ddddeb4deb631fbb911a8e6c2e97b43560b82539ac93df0c577abe74ef743fd4ca1a3e2e2f978b7edfd94cba280 diff --git a/media-gfx/fontforge/fontforge-20230101-r2.ebuild b/media-gfx/fontforge/fontforge-20230101-r2.ebuild index 91ed53a3dcba..543f2c60b461 100644 --- a/media-gfx/fontforge/fontforge-20230101-r2.ebuild +++ b/media-gfx/fontforge/fontforge-20230101-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit python-single-r1 xdg cmake DESCRIPTION="postscript font editor and converter" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar LICENSE="BSD GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/media-gfx/fontforge/fontforge-20230101.ebuild b/media-gfx/fontforge/fontforge-20230101.ebuild index f9af4d4aad6b..6f28a05358ee 100644 --- a/media-gfx/fontforge/fontforge-20230101.ebuild +++ b/media-gfx/fontforge/fontforge-20230101.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar LICENSE="BSD GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/media-gfx/fotema/Manifest b/media-gfx/fotema/Manifest index 1274f4d91b48..ed7ba3f789d2 100644 --- a/media-gfx/fotema/Manifest +++ b/media-gfx/fotema/Manifest @@ -1,3 +1,7 @@ -DIST fotema-1.10.0.tar.xz 78681568 BLAKE2B 8956415b4e605b6c4cac12e8cd3d3179bace74ea0b5bc17bbede1d3ccc87c321cca09e6d42794c2568e2840c80333df54174d37f70368732e75657ee28d54e37 SHA512 28e1780a34f6bb655a7add708088ec4b6e42207f55055dd1011c6da9b5ea52407040cb5d02c4dff5d2ec2531ec94d02191d02ed1d29cebe64ff8a8e85f9cd0d7 -EBUILD fotema-1.10.0-r1.ebuild 1624 BLAKE2B 0af80a7e91b43f88773068321ec1a51a35f546027a64226fc9fe38256f9bcec990595ccb4f7f02a76d98eb6ad1854a9e159ece920d329bfc96faee9bd851a709 SHA512 4d998dbf5307594653f118e35bcd3fc8e7271b3941be622458c4b9cd551e264d90143ff5a1140d33381cb169a60448f012476d47ae7a8c19529135f802750c33 +DIST fotema-1.14.2.tar.xz 78468972 BLAKE2B 59974a873381dd40cf80f274bb2fcd3763fbf946f168491e25f76f56c1646754b7cf49dd174a25726133fd774d04a9cee370c81d3c01f9d276e588d42b232f82 SHA512 27d96b0a47e312b2a7674f140646f24785dbfae47ea1bde74630fbb979946f23b1e1f5fab5ba20edb38ef91790003e138dcf4043ff371e3bf458c691dfd2db56 +DIST fotema-1.14.3.tar.xz 78412372 BLAKE2B 821ebb70e14e3e0d1a72ab712ecfe50da2299c2050593af0d6c64a2fc04ae904d56a4448fbcc022e9c7b1604e7a7ed8e55d8cba34aae4f1e6023fdea221a1c6d SHA512 461b84de9b4636cfed2d4e5132e18c831341cbddf8decfc856f85fa18fa7e4ead9d4d210a6795e077f7b7532aca51fc7835cd648cd9d7f7d8f9cc17e18b1f7e6 +DIST fotema-1.14.4.tar.xz 78458268 BLAKE2B 4f8cc8f1ba3df27eca16b41e11ae947fe15b83321bc2da23f01a16012d862999a0cf6572353bc74cf2868a91404b199712b4f4d9df63ed87970469d57bb5be16 SHA512 189638c8d7e4466b1318ec06324cd1bfb3eaa36b9b7116b7e44a654d4cd09fb38961c0a5fa02469180f66844614555773e2306becd590eb7b8ba8fb074e9c3cc +EBUILD fotema-1.14.2-r1.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf +EBUILD fotema-1.14.3.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf +EBUILD fotema-1.14.4.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf MISC metadata.xml 326 BLAKE2B 4ae1a2fadba80e1886d73fb01d493fbbaabae2b97dbffaa10d46e0dbec690e3cb6f8e604675aeb9d0167e50d53cb3f1ffcc2d2ec6c6aed14c36acfe8d6bc31bb SHA512 1f8f3199af710dd344962c425a5af0936be2f52cb41123bee1aba249c356c5c0cb74f3ac6ff7f0fdf71a7e6f8552269abb20cda7d6685e3f21fd5e95436bf552 diff --git a/media-gfx/fotema/fotema-1.10.0-r1.ebuild b/media-gfx/fotema/fotema-1.14.2-r1.ebuild index 5bf1f9cab059..34219ad68ea2 100644 --- a/media-gfx/fotema/fotema-1.10.0-r1.ebuild +++ b/media-gfx/fotema/fotema-1.14.2-r1.ebuild @@ -53,7 +53,10 @@ QA_FLAGS_IGNORED="/usr/bin/fotema" src_prepare() { default - sed -i -e "/i18ndir =/s:'i18n':'share' / 'fotema' / &:" meson.build || die + + # patch the dependency on flatpak-spawn out (sigh) + find "${S}"/{core,src} -name '*.rs' \ + -exec sed -i -e '/FlatpakSpawn/d' {} + || die } src_configure() { diff --git a/media-gfx/fotema/fotema-1.14.3.ebuild b/media-gfx/fotema/fotema-1.14.3.ebuild new file mode 100644 index 000000000000..34219ad68ea2 --- /dev/null +++ b/media-gfx/fotema/fotema-1.14.3.ebuild @@ -0,0 +1,89 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cargo gnome2-utils meson xdg-utils + +DESCRIPTION="Photo gallery for Linux" +HOMEPAGE="https://github.com/blissd/fotema" +SRC_URI=" + https://github.com/blissd/fotema/releases/download/v${PV}/${P}.tar.xz +" + +# see LICENSES/ +LICENSE=" + CC-BY-2.0 CC-BY-4.0 CC-BY-NC-SA-4.0 CC-BY-SA-4.0 CC0-1.0 + FDL-1.3+ GPL-3+ MIT +" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + >=dev-libs/glib-2.66:2 + >=gui-libs/gtk-4.0.0:4 +" +# indirect deps via crates +DEPEND+=" + dev-libs/openssl:= + gui-libs/libadwaita + media-libs/fontconfig + media-libs/graphene + media-libs/lcms:2 + media-libs/libshumate:= + media-libs/opencv:=[contribdnn] + media-video/ffmpeg:= + sci-libs/onnx + sys-libs/libseccomp + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/pango +" +RDEPEND=" + ${DEPEND} + media-libs/glycin-loaders +" +BDEPEND=" + dev-libs/glib:2 +" + +ECARGO_VENDOR=${S}/vendor + +QA_FLAGS_IGNORED="/usr/bin/fotema" + +src_prepare() { + default + + # patch the dependency on flatpak-spawn out (sigh) + find "${S}"/{core,src} -name '*.rs' \ + -exec sed -i -e '/FlatpakSpawn/d' {} + || die +} + +src_configure() { + cat >> "${ECARGO_HOME}/config.toml" <<-EOF || die + + [source."git+https://github.com/blissd/rust-faces.git?branch=patch"] + git = "https://github.com/blissd/rust-faces.git" + branch = "patch" + replace-with = "gentoo" + EOF + + local emesonargs=( + -Dprofile=$(usex debug development default) + ) + + meson_src_configure + ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die + + export ORT_STRATEGY=system +} + +pkg_postinst() { + gnome2_schemas_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_icon_cache_update +} diff --git a/media-gfx/fotema/fotema-1.14.4.ebuild b/media-gfx/fotema/fotema-1.14.4.ebuild new file mode 100644 index 000000000000..34219ad68ea2 --- /dev/null +++ b/media-gfx/fotema/fotema-1.14.4.ebuild @@ -0,0 +1,89 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cargo gnome2-utils meson xdg-utils + +DESCRIPTION="Photo gallery for Linux" +HOMEPAGE="https://github.com/blissd/fotema" +SRC_URI=" + https://github.com/blissd/fotema/releases/download/v${PV}/${P}.tar.xz +" + +# see LICENSES/ +LICENSE=" + CC-BY-2.0 CC-BY-4.0 CC-BY-NC-SA-4.0 CC-BY-SA-4.0 CC0-1.0 + FDL-1.3+ GPL-3+ MIT +" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + >=dev-libs/glib-2.66:2 + >=gui-libs/gtk-4.0.0:4 +" +# indirect deps via crates +DEPEND+=" + dev-libs/openssl:= + gui-libs/libadwaita + media-libs/fontconfig + media-libs/graphene + media-libs/lcms:2 + media-libs/libshumate:= + media-libs/opencv:=[contribdnn] + media-video/ffmpeg:= + sci-libs/onnx + sys-libs/libseccomp + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/pango +" +RDEPEND=" + ${DEPEND} + media-libs/glycin-loaders +" +BDEPEND=" + dev-libs/glib:2 +" + +ECARGO_VENDOR=${S}/vendor + +QA_FLAGS_IGNORED="/usr/bin/fotema" + +src_prepare() { + default + + # patch the dependency on flatpak-spawn out (sigh) + find "${S}"/{core,src} -name '*.rs' \ + -exec sed -i -e '/FlatpakSpawn/d' {} + || die +} + +src_configure() { + cat >> "${ECARGO_HOME}/config.toml" <<-EOF || die + + [source."git+https://github.com/blissd/rust-faces.git?branch=patch"] + git = "https://github.com/blissd/rust-faces.git" + branch = "patch" + replace-with = "gentoo" + EOF + + local emesonargs=( + -Dprofile=$(usex debug development default) + ) + + meson_src_configure + ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die + + export ORT_STRATEGY=system +} + +pkg_postinst() { + gnome2_schemas_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_icon_cache_update +} diff --git a/media-gfx/fotocx/Manifest b/media-gfx/fotocx/Manifest index c60a496f9873..175cfc151c04 100644 --- a/media-gfx/fotocx/Manifest +++ b/media-gfx/fotocx/Manifest @@ -1,10 +1,6 @@ AUX fotocx-24.20-documentation.patch 1373 BLAKE2B ac442711ae3eea89f1fa7a272004a0eda1857f4b4fd2f4045d794093bcfb81c16702039b578bef9768e9af503a126cabb62ed91bda384f64a4765efa73666f26 SHA512 17090677f4f726d6b0d5f2c14b76963e9090dffcd3773b02f66e6a87a6c7f9afe6f2c7060f2e375fb37a191c1846287b37f482f8efa78a84c2d381a50fcda751 -DIST fotocx-24.21-source.tar.gz 16618357 BLAKE2B 43029d080cc843a03475b474c0807e0f2192bc6c64d20c5d41e90218f0b1f88db48aefb7622e8b521f06792a57a9d685d9c57107a309becc39d710ff5aa720a3 SHA512 2945fbaab800a115a1e0c718019ee1e66816cadf794a01db4f8238e7ba74ea033b6e9f24b4e42fe8105242f6df8861de7b00d32e81aae73577f5aa7f38c07f7f -DIST fotocx-24.30-source.tar.gz 16103870 BLAKE2B 3261b9f4fb0345b37b146e443216e21d57ab9b11a1b77be9b9d94247cc8ae74442b75219fbf3d12f67ba16cee0cf772d3ba83d9e2b5ae38ddbbfd5bd42ea9c52 SHA512 39a4c8526e8fe7e49f4c85953e843243577b9a5b34b89030c452336f51c0ca6e381c38ba60ee39e6ee58b528d824240a821487e5e95a04dd44dabfe38e43f131 -DIST fotocx-24.40-source.tar.gz 16036394 BLAKE2B 570adb3b8579650caa985417008f8eb840b2a29c5355ae3ecb3b2a8e58432ec6688da72d3d3eed98d7f5c046d1cf1fc56049684db5ccd9de6fb3f2dee789ea4f SHA512 28211fa50d48eaee4f4bcaa80a07a34113e3020e8b0e3ef2fe983b93000c2397b41fabb1824dd1921e964d03acd348ef5479e584268052ade120e23639f138ed DIST fotocx-24.50-source.tar.gz 16197289 BLAKE2B 468a3cd7ef2cee5a65d2a06283732e0994f9eeb823ed2fd02e319c68f7cb4686a33fbc61e85eaeb8bdd2c7455d1cebada49d0da6004007ad15333b1c39050768 SHA512 3f30b4efb43313980a1be8b92e66c8260484e10a3e50c5351d5462004fe6e5685ecd39be263fbd85bde495a5f1c539bd262124478516d8ddcd40420fa6de699e -EBUILD fotocx-24.21-r1.ebuild 2288 BLAKE2B ab74c6ef40f963dc17b665783e0bfb9b72db4d2d2aa3aedd3d9c11f01cbd6c9bc06edbfdb7e7b060b4a2e9967ef6cf500e568ee0b13f0e77ab4b772d550ec075 SHA512 e4908a812733f629ee52d4116e9784205517992fb18f419e5eb8013614f8ce054ba36f190117c48b0114d658d93c634556ed3b0ab98d28394bc165ee2b23ba0b -EBUILD fotocx-24.30.ebuild 2290 BLAKE2B ac644a95e6ef44d930373708544b28a9d75b00358c3e77be36bfaac5e8140f86a3815778e39efce0cb0676bda2d0bfb3d0a3edf8d58494c0f4391dee155e251a SHA512 bfa7e82236c754371ff92bdfa4db7804bb685b26bee97852d38c6be8b3f43e95ecb1f925ca30629470bebeaf0aa9e0eafee54975cefab45aadce7371621f998a -EBUILD fotocx-24.40.ebuild 2288 BLAKE2B ab74c6ef40f963dc17b665783e0bfb9b72db4d2d2aa3aedd3d9c11f01cbd6c9bc06edbfdb7e7b060b4a2e9967ef6cf500e568ee0b13f0e77ab4b772d550ec075 SHA512 e4908a812733f629ee52d4116e9784205517992fb18f419e5eb8013614f8ce054ba36f190117c48b0114d658d93c634556ed3b0ab98d28394bc165ee2b23ba0b -EBUILD fotocx-24.50.ebuild 2290 BLAKE2B ac644a95e6ef44d930373708544b28a9d75b00358c3e77be36bfaac5e8140f86a3815778e39efce0cb0676bda2d0bfb3d0a3edf8d58494c0f4391dee155e251a SHA512 bfa7e82236c754371ff92bdfa4db7804bb685b26bee97852d38c6be8b3f43e95ecb1f925ca30629470bebeaf0aa9e0eafee54975cefab45aadce7371621f998a +DIST fotocx-24.60-source.tar.gz 15771741 BLAKE2B 89ab212cdaeb414637ad0b3c9833b0caea6c805422e3fccdd027912f1d32ed141cedaeb5826212e36e5b40591e40c85816ecc5d3cff7915693e11e78b962b890 SHA512 6a04e0d749865000b67497b897f691a5882c0d63dda8c64ffe824215582db051f9cc0ca528490112f26db41a58f1673affe2e2e55c90dbb9e6f24cef77e4d5d6 +EBUILD fotocx-24.50.ebuild 2288 BLAKE2B ab74c6ef40f963dc17b665783e0bfb9b72db4d2d2aa3aedd3d9c11f01cbd6c9bc06edbfdb7e7b060b4a2e9967ef6cf500e568ee0b13f0e77ab4b772d550ec075 SHA512 e4908a812733f629ee52d4116e9784205517992fb18f419e5eb8013614f8ce054ba36f190117c48b0114d658d93c634556ed3b0ab98d28394bc165ee2b23ba0b +EBUILD fotocx-24.60.ebuild 2290 BLAKE2B ac644a95e6ef44d930373708544b28a9d75b00358c3e77be36bfaac5e8140f86a3815778e39efce0cb0676bda2d0bfb3d0a3edf8d58494c0f4391dee155e251a SHA512 bfa7e82236c754371ff92bdfa4db7804bb685b26bee97852d38c6be8b3f43e95ecb1f925ca30629470bebeaf0aa9e0eafee54975cefab45aadce7371621f998a MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9 diff --git a/media-gfx/fotocx/fotocx-24.21-r1.ebuild b/media-gfx/fotocx/fotocx-24.21-r1.ebuild deleted file mode 100644 index ace12ae77268..000000000000 --- a/media-gfx/fotocx/fotocx-24.21-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit optfeature xdg-utils - -DESCRIPTION="Program for improving image files made with a digital camera" -HOMEPAGE="https://kornelix.net/fotocx/fotocx.html" -SRC_URI="https://kornelix.net/downloads/downloads/${P}-source.tar.gz" -S="${WORKDIR}/${PN}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" - -# For required dependencies read doc/README, for required tools read -# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an -# alternative to firefox and chromium-browser. `grep '"which ' * -R` -# is helpful to report some required tools run via the shell. - -DEPEND=" - media-libs/clutter - media-libs/clutter-gtk - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/tiff:= - media-libs/libchamplain[gtk] - x11-libs/gtk+:3" -RDEPEND=" - ${DEPEND} - media-gfx/dcraw - media-libs/exiftool - x11-misc/xdg-utils -" - -PATCHES=( "${FILESDIR}/${PN}-24.20-documentation.patch" ) - -DOCS=() -HTML_DOCS=() - -src_prepare() { - sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die - sed -i -e "/^Icon/ s/\.png$//" ${PN}.desktop || die - default -} - -src_install() { - # For the Help menu items to work, *.html must be in /usr/share/doc/${PF}, - # and README, changelog, copyright, license, etc. must not be compressed. - emake DESTDIR="${D}" PREFIX="/usr" install - rm -f "${D}"/usr/share/doc/${PF}/*.man || die - docompress -x /usr/share/doc -} - -pkg_postinst() { - optfeature "HEIC & AVIF file support" media-libs/libheif - optfeature "additional RAW file support" media-gfx/rawtherapee - optfeature "additional RAW file support" media-gfx/darktable - optfeature "video thumbnails & playback" media-video/ffmpeg - optfeature "copying images to optical media" app-cdr/dvd+rw-tools - optfeature "WEBP file support" media-libs/libwebp - - elog - elog "Please read the Help > User Guide for details. The source location is" - elog "/usr/share/fotocx/data/userguide and after running fotocx a copy will" - elog "be placed at /home/<user>/.fotocx/userguide." - elog - elog "To play videos, in Tools > Preferences set 'Video File Play Command'." - elog - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/media-gfx/fotocx/fotocx-24.40.ebuild b/media-gfx/fotocx/fotocx-24.40.ebuild deleted file mode 100644 index ace12ae77268..000000000000 --- a/media-gfx/fotocx/fotocx-24.40.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit optfeature xdg-utils - -DESCRIPTION="Program for improving image files made with a digital camera" -HOMEPAGE="https://kornelix.net/fotocx/fotocx.html" -SRC_URI="https://kornelix.net/downloads/downloads/${P}-source.tar.gz" -S="${WORKDIR}/${PN}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" - -# For required dependencies read doc/README, for required tools read -# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an -# alternative to firefox and chromium-browser. `grep '"which ' * -R` -# is helpful to report some required tools run via the shell. - -DEPEND=" - media-libs/clutter - media-libs/clutter-gtk - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/tiff:= - media-libs/libchamplain[gtk] - x11-libs/gtk+:3" -RDEPEND=" - ${DEPEND} - media-gfx/dcraw - media-libs/exiftool - x11-misc/xdg-utils -" - -PATCHES=( "${FILESDIR}/${PN}-24.20-documentation.patch" ) - -DOCS=() -HTML_DOCS=() - -src_prepare() { - sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die - sed -i -e "/^Icon/ s/\.png$//" ${PN}.desktop || die - default -} - -src_install() { - # For the Help menu items to work, *.html must be in /usr/share/doc/${PF}, - # and README, changelog, copyright, license, etc. must not be compressed. - emake DESTDIR="${D}" PREFIX="/usr" install - rm -f "${D}"/usr/share/doc/${PF}/*.man || die - docompress -x /usr/share/doc -} - -pkg_postinst() { - optfeature "HEIC & AVIF file support" media-libs/libheif - optfeature "additional RAW file support" media-gfx/rawtherapee - optfeature "additional RAW file support" media-gfx/darktable - optfeature "video thumbnails & playback" media-video/ffmpeg - optfeature "copying images to optical media" app-cdr/dvd+rw-tools - optfeature "WEBP file support" media-libs/libwebp - - elog - elog "Please read the Help > User Guide for details. The source location is" - elog "/usr/share/fotocx/data/userguide and after running fotocx a copy will" - elog "be placed at /home/<user>/.fotocx/userguide." - elog - elog "To play videos, in Tools > Preferences set 'Video File Play Command'." - elog - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/media-gfx/fotocx/fotocx-24.50.ebuild b/media-gfx/fotocx/fotocx-24.50.ebuild index 8eee122865a7..ace12ae77268 100644 --- a/media-gfx/fotocx/fotocx-24.50.ebuild +++ b/media-gfx/fotocx/fotocx-24.50.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" # For required dependencies read doc/README, for required tools read # data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an diff --git a/media-gfx/fotocx/fotocx-24.30.ebuild b/media-gfx/fotocx/fotocx-24.60.ebuild index 8eee122865a7..8eee122865a7 100644 --- a/media-gfx/fotocx/fotocx-24.30.ebuild +++ b/media-gfx/fotocx/fotocx-24.60.ebuild diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index 4089309a177d..cef7b3f91e4d 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -11,6 +11,10 @@ AUX freecad-0.21.2-vtk9.3-fix.patch 1065 BLAKE2B d0fccb7c19dc9a5efedb5691a74c6ba AUX freecad-9999-Gentoo-specific-don-t-check-vcs.patch 350 BLAKE2B e1b612ac81f73546a3a7ae93e447aba6e3f28dea1292f5d308f567307c8c6146b8dfdcc1cef946c64991d41c41fa9c8949f56e2e8573833bad2a3826bab960ba SHA512 f96678dbfe13668a9f65131996ddc5eb2cbe80296b7eb2cc7d248e3ee1d991bea95568b0241da8387106812aac5762c330afb1d8c38b2281c3ee2600db120627 AUX freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch 469 BLAKE2B 23e56fbc49b3c3d5ede85e6ec15d26c88c93590fce105e0b75e8b0bd3fee125c500cd59d8db0144c610edb371df318396e056333ec7a411f7647b38d18006efc SHA512 82737af95603ff1f667bf49ee43b85b411eeeb5fd9b577ad7fca6e02bcbfda5c3bbb6c70386e5f69d2181d6226574f82cb68b7e66dfe8f4bb14d946f594582cf DIST freecad-0.21.2.tar.gz 66124278 BLAKE2B 84a4f8008192cd1a2ee1737b537b2668a8c028aa8c8645e6e412ab9ef79bf3bdd2cb73d96fcfd2dbcff613cdcc59cbab95821406acdc9cd7d4eb4636c081be78 SHA512 bd7e9029b24d49ac0955797bcdbea1fd0826bdf9ab246135366dfc35b427004f103acccfc66d008e3ab3928f99e04200e335908a03166545554e2d3e969ae0f5 +DIST freecad-1.0_rc1.tar.gz 88552055 BLAKE2B 3e2607d87da86edd35c05abba0d7085bed7fc42f9831c7e2451e028b3ce267c7a1e44b82c9a51bdfc736b5c98198030aafb81a7ae5df158ae17bc5afe2df44e0 SHA512 1d0a0d131c35ee03b435a0b901cb56c8e98ce2dd62ff5102856b3777dfc6d3bfba6ff4ea87e8c8949640bd14fdb775db3e9eb9a8b6530dd1f86a903037c95dba +DIST freecad-1.0_rc2.tar.gz 88511772 BLAKE2B e1ef1ca08dee75d05a0044443712cda1b0c6d53b69d2d7fbe28987427678fe2a721f45bc9a844b8b733542214015265244649d772e7d94cd438d7e25f340c970 SHA512 b9187d7f677896fdd6b18d92c97a02975e313d255a1dbac54525be013e332eebf617c15a50be9736c2c382be8f37e04a6b9877ad0c56fa4b8a58ea585ee721cf EBUILD freecad-0.21.2-r3.ebuild 12437 BLAKE2B c9c9a77f7b7b0aadee67b3fb2aa6ac13da06bcc790e4291e6413826b246a92052f535962c974654646c79a481378b99582d2499b134d57b76cbcad4056fc2fc7 SHA512 c68c9f9a7d106ac48ddf280f716cd73398693e058e8c475d912e61d43466e80041d60847efa2cd5d022d1ac59d1057c14c61943c2eb3ce68032d232b29469c08 -EBUILD freecad-9999.ebuild 11973 BLAKE2B 9befb852d6d7b8f5310c0692c5175ddb87a45260eddbe31a3376362218136a2e27b5cc5fbeff8269558c02b4448bdc553a68772ad9b565d19d3e2aa34dbb6fd8 SHA512 bf284186d32f598ab85fab40c7cdd67f185d8147e5951681ad86c030c523453049365c6cfc2a503268f82cf3ce0a5387e61541f765ca1fbffeee18cb5b875d1e -MISC metadata.xml 3190 BLAKE2B 5f8776248055147c9b2a308913e1d3476ad27b5a3b7795b4fdf15b4d7f10451d6f5ce16ab1ef691daedd74f02fa12efb6341a7ec10456786c427d7707948fdbc SHA512 2163a91c7f7ec97acf81e7c4a2481667388fb43f60ee48d40a09c9bebfebffa8a807ff275385d8dcbefefe16c51bc9de3c07c84d92344f968985693117007042 +EBUILD freecad-1.0_rc1-r1.ebuild 12190 BLAKE2B ebf30aa49c035b2f28c47aa7c3605a385362be05c4b41f0b28263ca4d767ac163fa060d9233807da74a9e0e34f5fee89a2caeb2ff667f7e57886bb70abba162b SHA512 f24586c3a0649e858b3ba207bc4e1e296923dbb395a9f3485ce7d2397452378bf0794a52d5328ea3f085e5488f4bf440d7a738c92c175fe03fd0462a49beba9e +EBUILD freecad-1.0_rc2.ebuild 12190 BLAKE2B ebf30aa49c035b2f28c47aa7c3605a385362be05c4b41f0b28263ca4d767ac163fa060d9233807da74a9e0e34f5fee89a2caeb2ff667f7e57886bb70abba162b SHA512 f24586c3a0649e858b3ba207bc4e1e296923dbb395a9f3485ce7d2397452378bf0794a52d5328ea3f085e5488f4bf440d7a738c92c175fe03fd0462a49beba9e +EBUILD freecad-9999.ebuild 12031 BLAKE2B 78658e5e82277458b1ac79e9f440ee2f916b4c83eb53d63d488716593bb912f6cd5221257f2dac1f5831afe03ffd4a4909a9b53a0c56978dace9da420934b51c SHA512 78f72d0af06c4292ea48e715ac406a01b99f9ebc645840ef76594c584a92e3a5d0489b865689f195e677c8f26cbe6c5a2fcddb3ff11f8c844dc6e629738205b6 +MISC metadata.xml 3255 BLAKE2B d9504bdcdbf11f8475f764ef03927314f2d57d69d1229cb5aab93872d28686d13ad6c8e5a680b49af9e63c7352d0fd2b93f798761d67b30bee2450e0fec052f9 SHA512 f030e226befb1a66723275cbff560d528915d0a749fe70a04ab73ba9016bcdc0127f4e3c9543a0f72bf0d59f624eda88d93a3968af112b20338b9d2c03903b34 diff --git a/media-gfx/freecad/freecad-1.0_rc1-r1.ebuild b/media-gfx/freecad/freecad-1.0_rc1-r1.ebuild new file mode 100644 index 000000000000..5d2b39ba14a5 --- /dev/null +++ b/media-gfx/freecad/freecad-1.0_rc1-r1.ebuild @@ -0,0 +1,394 @@ +# 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 +MY_PV="${PV/_/}" + +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/${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/FreeCAD-${MY_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 +qt6 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 + !qt6? ( + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 + ) + qt6? ( + 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? ( + !qt6? ( sci-libs/vtk:=[qt5,rendering] ) + qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) + ) + gui? ( + >=media-libs/coin-4.0.0 + virtual/glu + virtual/opengl + !qt6? ( + dev-qt/designer:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwebengine:5[widgets] + 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,webengine,${PYTHON_USEDEP}] + dev-python/shiboken2:=[${PYTHON_USEDEP}] + ' python3_{10..11} ) + ) + qt6? ( + 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 + dev-qt/qtwebengine:6[widgets] + 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,webengine,${PYTHON_USEDEP}] + dev-python/shiboken6:=[${PYTHON_USEDEP}] + ' ) + ) + ) + netgen? ( media-gfx/netgen[opencascade] ) + openscad? ( media-gfx/openscad ) + pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) + smesh? ( + !qt6? ( sci-libs/vtk:=[qt5] ) + qt6? ( 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}]') + !qt6? ( dev-qt/qttest:5 ) + ) +" +BDEPEND=" + app-text/dos2unix + dev-lang/swig + test? ( + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + !qt6? ( 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? ( qt6 ) ) +" +# There is no py3.12 support planned for pyside2 + +PATCHES=( + "${FILESDIR}"/${PN}-9999-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 + -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" + + # 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 qt6; 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/freecad-1.0_rc2.ebuild b/media-gfx/freecad/freecad-1.0_rc2.ebuild new file mode 100644 index 000000000000..5d2b39ba14a5 --- /dev/null +++ b/media-gfx/freecad/freecad-1.0_rc2.ebuild @@ -0,0 +1,394 @@ +# 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 +MY_PV="${PV/_/}" + +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/${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/FreeCAD-${MY_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 +qt6 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 + !qt6? ( + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 + ) + qt6? ( + 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? ( + !qt6? ( sci-libs/vtk:=[qt5,rendering] ) + qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) + ) + gui? ( + >=media-libs/coin-4.0.0 + virtual/glu + virtual/opengl + !qt6? ( + dev-qt/designer:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwebengine:5[widgets] + 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,webengine,${PYTHON_USEDEP}] + dev-python/shiboken2:=[${PYTHON_USEDEP}] + ' python3_{10..11} ) + ) + qt6? ( + 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 + dev-qt/qtwebengine:6[widgets] + 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,webengine,${PYTHON_USEDEP}] + dev-python/shiboken6:=[${PYTHON_USEDEP}] + ' ) + ) + ) + netgen? ( media-gfx/netgen[opencascade] ) + openscad? ( media-gfx/openscad ) + pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) + smesh? ( + !qt6? ( sci-libs/vtk:=[qt5] ) + qt6? ( 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}]') + !qt6? ( dev-qt/qttest:5 ) + ) +" +BDEPEND=" + app-text/dos2unix + dev-lang/swig + test? ( + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + !qt6? ( 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? ( qt6 ) ) +" +# There is no py3.12 support planned for pyside2 + +PATCHES=( + "${FILESDIR}"/${PN}-9999-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 + -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" + + # 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 qt6; 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/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 250c1a1dbbf7..b323eccffe9b 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -26,12 +26,12 @@ fi # 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 qt6 test" +IUSE="debug designer +gui +qt6 test" FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl" FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material - openscad part-design path points raytracing robot show surface - techdraw tux" + openscad part-design path points raytracing robot show smesh + surface techdraw tux" for module in ${FREECAD_STABLE_MODULES}; do IUSE="${IUSE} +${module}" @@ -45,12 +45,14 @@ 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 !qt6? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 @@ -87,14 +89,13 @@ RDEPEND=" dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] 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,webengine,${PYTHON_USEDEP}] + dev-python/pyside2:=[gui,svg,webchannel,${PYTHON_USEDEP}] dev-python/shiboken2:=[${PYTHON_USEDEP}] ' python3_{10..11} ) ) @@ -104,12 +105,11 @@ RDEPEND=" dev-qt/qttools:6[widgets] dev-qt/qtbase:6[gui,opengl,widgets] dev-qt/qtsvg:6 - dev-qt/qtwebengine:6[widgets] 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,webengine,${PYTHON_USEDEP}] + dev-python/pyside6:=[gui,svg,webchannel,${PYTHON_USEDEP}] dev-python/shiboken6:=[${PYTHON_USEDEP}] ' ) ) @@ -117,6 +117,10 @@ RDEPEND=" netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) + smesh? ( + !qt6? ( sci-libs/vtk:=[qt5] ) + qt6? ( sci-libs/vtk:=[-qt5,qt6] ) + ) $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] @@ -124,9 +128,9 @@ RDEPEND=" fem? ( dev-python/ply[${PYTHON_USEDEP}] ) ') " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND} >=dev-cpp/eigen-3.3.1:3 + dev-cpp/ms-gsl test? ( $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') !qt6? ( dev-qt/qttest:5 ) @@ -138,6 +142,7 @@ BDEPEND=" test? ( $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') !qt6? ( dev-qt/qttest:5 ) + dev-cpp/gtest ) " @@ -194,10 +199,13 @@ src_configure() { # 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 # deprecated + -DBUILD_ASSEMBLY=OFF # Requires OndselSolver -DBUILD_CLOUD=$(usex cloud) -DBUILD_COMPLETE=OFF # deprecated -DBUILD_DRAFT=ON @@ -227,7 +235,7 @@ src_configure() { -DBUILD_ROBOT=$(usex robot) -DBUILD_SHOW=$(usex show) -DBUILD_SKETCHER=ON # needed by draft workspace - -DBUILD_SMESH=ON + -DBUILD_SMESH=$(usex smesh) -DBUILD_SPREADSHEET=ON -DBUILD_START=ON -DBUILD_SURFACE=$(usex surface) @@ -253,7 +261,6 @@ src_configure() { -DFREECAD_USE_PCL=$(usex pcl) -DFREECAD_USE_PYBIND11=ON -DFREECAD_USE_QT_FILEDIALOG=ON - -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" # install python modules to site-packages' dir. True only for the main package, # sub-packages will still be installed inside /usr/lib64/freecad @@ -333,14 +340,13 @@ src_install() { # https://github.com/coin3d/coin/issues/451 : \${QT_QPA_PLATFORM:=xcb} export QT_QPA_PLATFORM - exec /usr/$(get_libdir)/${PN}/bin/FreeCAD \${@} + 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" - use test && (rm -r "${ED}"/usr/include/${PN}/{gmock,gtest} || die) 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 diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml index b934f4a2b2de..0787a07fc30c 100644 --- a/media-gfx/freecad/metadata.xml +++ b/media-gfx/freecad/metadata.xml @@ -78,6 +78,9 @@ <flag name="show"> Build the show module, a helper module for visibility automation </flag> + <flag name="smesh"> + Build the Salome SMESH module + </flag> <flag name="surface"> Build the surface module and workbench </flag> diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 2a85538d271a..6cf49749027e 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,6 +1,10 @@ AUX geeqie-2.3-test-ancillary.patch 630 BLAKE2B a997e60c3fd6fe78b72019babbf2ad7d9f4fccea275cc95903925ed7ed1e0486da2d82e76e0afd43f82932c123ee03891878bf68d0ef5d714528806f206db45a SHA512 69aa64bf6945f6cd11b6ccd93052c5589f332f55d3e022e5b23b0e5eee0fada4764c54b7dffa75b8e5432f5c7d4c27384992cdd61a18c779feede4827f2be5ff +AUX geeqie-2.5-test-ancillary.patch 1167 BLAKE2B 7cb4efca931ad6ff462c849a2b45148749707334e11f9bf9d5ed16e53b87e89cc9fcf7068518b71fbdfdeda5d7267988b19015f6fb7c393eac0944de9b9421ea SHA512 2624da46d98c6e7fc4bd9b3360dca5c40a67b535952edffb1703c56e20cbc1cbbc6cca2ed1f93b0eb10ee0211b2475269dcd7e56b95fb45f62908aa56a2b9d36 DIST geeqie-2.4-docs.tar.xz 364536 BLAKE2B 688720808c8e4543455259966aef726bf56a821890a78e4757d9d1fd02ce67217461808d9697b331b2a94841bf3581b25242a7e5c9c9a3f5b02209a566b09c16 SHA512 07bca33c347f448ee853ea60daf22c9cdace458b6ce6b3f4ced9b343a965370c51d7a872d5279852b7a83a1de51c8529a668f7d62a031bcec1fdde8b9bfbf9cb DIST geeqie-2.4.tar.xz 2178572 BLAKE2B df24f0b5d443cbd2033c0b382fe0d846c9073e8966aa736f647e34930e44083b9e44252c554578548a13c12c1b1a5a48bb7795f2fda8b8688a63ef402a257334 SHA512 7e0f5dff21e38a41adf0a793bd82652c5d639e84ab49403517f4b1dae042bfc5f4d02e54b54928e04a2397300acb04b130347df0be5637ee48634f5865ad346b +DIST geeqie-2.5-docs.tar.xz 395716 BLAKE2B 177130f3a5afbf5791372fc2550f4443456a2bb3aad755774cf337362c38b1b20183eda311e245493a0ad9b8975747721ec5639d46135a9ee3f27318db360126 SHA512 0b8f6b165ec0feb38c2479054b1fa079bd08f053cf439cf19e0419f11b1fa3ba533adbb781022f401f599f9d83aca44e8613d63b82b6848f14fc7076736b9d1a +DIST geeqie-2.5.tar.xz 2224492 BLAKE2B 911ea2e338c470255c70e83257b693c51b1171ed24f4b737d291cfd5ff20d8b7b39ba69e46f831ede33ce30d41945bb3de754b2a1c245dcff98f16633f31e562 SHA512 c1be6c5d9f7f7609dfab97320d79a4830eb866f000c3c52ea8ab2b69a1ba793b322dbab3f614572e1d6fc815d64bfeaf3ddd39dd633a5c87d7008b6afe35be21 EBUILD geeqie-2.4.ebuild 3209 BLAKE2B 16b1aae2c54429c4e1af9c2f5be74cfdbb5fcb239fffc1f75117b1e7e4676e6a50ce012d59fa7586802acc56440661f83b7fc8c712d1248a350a9d7b8719478c SHA512 f82daf07a212d749746d9f4c062ed35697a715f07cf3a39b6c885600feaf90bc7202720f5f8460c2e57b22b955b77820a88f3841ab7534b7aeca3b1add7df238 +EBUILD geeqie-2.5.ebuild 3211 BLAKE2B fafc9c9115f8328c78ab1d09e113315cc94c9fe4a864573a2ad3b8c0d6a3f96255fc721b42cc180c2e7adc4117f0dc29a8af40d555e0a59ce01fbeb8c4e351ac SHA512 513706a9b1ffde05f317fadeb785fbc75f124e7df47826c7eeff094b900539624f1f74f85dbe361b3c9bb0f4be71ed70f60b26a0a63022afa04062f85a688037 EBUILD geeqie-9999.ebuild 2924 BLAKE2B f39a8c772b143a21a168778d5a6b465c8459218019c4724f42b9e2d101452f371b3b5fb8e297a60701c62d3bfbf9ee27bb27622c611ab6542e3b2067dcb80d62 SHA512 5417a817179e1bbc1d3b51ae39056b5d3a8d94149b0a7bdf812202baaac726065e9399f23f5dcc13e087f831482f9eab7c463782bce8ef3c2c403850986f31e9 MISC metadata.xml 816 BLAKE2B ed50c576f068626d95d99899b17508b7c48567707ff020988dc611be9b482893f008f904ce460565ed0f263c76f2e274640f6e662f827d0879de5a59a93e8c3b SHA512 45458e31201d1baee61f48fe452c3577bcb74fea6569d1afdd8787aff6714d3400f501d1dc6b3de31ea1d5151326d48593f5bb219ec5cfed603cfe8835690dcd diff --git a/media-gfx/geeqie/files/geeqie-2.5-test-ancillary.patch b/media-gfx/geeqie/files/geeqie-2.5-test-ancillary.patch new file mode 100644 index 000000000000..ce0802d418ca --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-2.5-test-ancillary.patch @@ -0,0 +1,27 @@ +diff -Naur geeqie-2.5.orig/meson.build geeqie-2.5/meson.build +--- geeqie-2.5.orig/meson.build 2024-09-21 17:11:19.000000000 +0200 ++++ geeqie-2.5/meson.build 2024-09-25 09:30:11.624093709 +0200 +@@ -844,12 +844,6 @@ + summary({'lua' : ['Test runs:', false]}, section : 'Testing', bool_yn : true) + endif + +-# Ancillary files test +-test_ancillary_files_sh = find_program('test-ancillary-files.sh', dirs : scriptsdir, required : true) +-test('Ancillary files', test_ancillary_files_sh, args: [meson.current_source_dir()], timeout: 100, suite : 'analysis') +- +-summary({'Ancillary files' : ['Test runs:', true]}, section : 'Testing', bool_yn : true) +- + # Unit tests + if conf_data.get('ENABLE_UNIT_TESTS', 0) == 1 + test('Unit tests', isolate_test_sh, args: [geeqie_exe.full_path(), '--run-unit-tests'], suite : 'unit') +diff -Naur geeqie-2.5.orig/scripts/untranslated-text.sh geeqie-2.5/scripts/untranslated-text.sh +--- geeqie-2.5.orig/scripts/untranslated-text.sh 2024-09-21 17:11:19.000000000 +0200 ++++ geeqie-2.5/scripts/untranslated-text.sh 2024-09-25 09:30:44.567101060 +0200 +@@ -68,6 +68,7 @@ + MonoSpace + N_( + NikonTag ++Néstor + Pause + PixbufRenderer + PluginsMenu diff --git a/media-gfx/geeqie/geeqie-2.5.ebuild b/media-gfx/geeqie/geeqie-2.5.ebuild new file mode 100644 index 000000000000..8b572c0532f3 --- /dev/null +++ b/media-gfx/geeqie/geeqie-2.5.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +LUA_COMPAT=( lua5-{3,4} ) + +inherit lua-single meson optfeature xdg + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="https://www.geeqie.org" +SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz" +# Doc build: +# clone git at matching tag +# mkdir build; ./gen_changelog.sh . build; +# pandoc README.md -o build/README.html + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" + +RDEPEND="gnome-extra/zenity + virtual/libintl + x11-libs/gtk+:3 + djvu? ( app-text/djvu ) + exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + heif? ( >=media-libs/libheif-1.3.2 ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpegxl? ( >=media-libs/libjxl-0.3.7:= ) + lcms? ( media-libs/lcms:2 ) + lua? ( ${LUA_DEPS} ) + map? ( media-libs/clutter-gtk + media-libs/libchamplain:0.12[gtk] ) + pdf? ( >=app-text/poppler-0.62[cairo] ) + raw? ( >=media-libs/libraw-0.20:= ) + spell? ( app-text/gspell ) + tiff? ( media-libs/tiff:= ) + webp? ( gui-libs/gdk-pixbuf-loader-webp:= ) + zip? ( >=app-arch/libarchive-3.4.0 )" +DEPEND="${RDEPEND}" +BDEPEND=" + || ( dev-util/xxdi app-editors/vim-core ) + dev-util/glib-utils + sys-devel/gettext + virtual/pkgconfig" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +PATCHES=( "${FILESDIR}"/${PN}-2.5-test-ancillary.patch ) + +pkg_setup() { + # Do not require setting LUA_SINGLE_TARGET if lua is not used + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + + # Disable doc build - not useful most of the time per upstream + sed -e "/subdir('doc')/d" -i meson.build || die +} + +src_configure() { + local emesonargs=( + -Dgq_helpdir="share/doc/${PF}" + -Dgq_htmldir="share/doc/${PF}/html" + $(meson_use debug) + $(meson_feature djvu) + $(meson_feature exif exiv2) + $(meson_feature ffmpegthumbnailer videothumbnailer) + $(meson_feature heif) + $(meson_feature jpeg) + $(meson_feature jpeg2k j2k) + $(meson_feature jpegxl) + $(meson_feature lcms cms) + $(meson_feature lua) + $(meson_feature map gps-map) + $(meson_feature pdf) + $(meson_feature raw libraw) + $(meson_feature spell) + $(meson_feature tiff) + $(meson_feature zip archive) + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + # Manually generated ChangeLog + dodoc "${WORKDIR}"/${P}-docs/* + + # The application needs access to some uncompressed doc files. + docompress -x /usr/share/doc/${PF}/AUTHORS + docompress -x /usr/share/doc/${PF}/ChangeLog + docompress -x /usr/share/doc/${PF}/README.md +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2 + optfeature "Lens ID plugin" media-libs/exiftool + optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick" + optfeature "Image rotate plugin (JPEG)" media-gfx/fbida + optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick + optfeature "Print preview functionality" app-text/evince +} diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 9744fa9ba357..2ae292fac28c 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -4,14 +4,15 @@ AUX gimp-2.10.36_fix_strict-aliasing.patch 1077 BLAKE2B 02bfb2b0836a4c8e31caac44 AUX gimp-2.10_fix_configure_GCC13_implicit_function_declarations.patch 583 BLAKE2B 5c7feb3e666b496ea718d63cd3e8d415604397d0e78c95e4449812b48d7548c3b81d194c955555d7ad516c46012826475191786486140e0516c91bac56df027c SHA512 d90e6bc41bc91114ee8068e2d2cdd8c83e707b30eba876aa7b369c44d0ee125953b387a8f041dd5cb521d0eb16824bb8496a9751595c75c5a76b4cc0b3251cc3 AUX gimp-2.10_fix_musl_backtrace_backend_switch.patch 535 BLAKE2B 374433568330a4b5167e6f32bd9ecbe44e9ceb4004cce9504586b73dc31c7613d2766ae5615d74b2a51a05ff3592add2e7585b7d63eb43b219ebe6b37193edca SHA512 df0b9b357d085463ac3b791b6131dabfdd33d12e7b77f45f496379d08da1b0e8ae787b9b4b260ec221c22e3302d54b17493175db55514ec3e705782fdb80ec18 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067 +AUX gimp-2.10_libheif-1.18_unconditional_compat.patch 820 BLAKE2B 4e75ebc639bc6f985776861de119b85dd7bde2be3a2e385cb6c61bd6e44b29d80c9ff84736a7e518b76f092c72295c1bb7e2ed58eccbd52a54b7bc4c769b12e6 SHA512 4233e2d8c50222b4700e9f7c6b2e5a41e1d5b685899f4cb0db61aa96b9eba4a0538fcc74fe9fe77265932062ea4dc94e13036d381a96338a470bf00b5a53b437 DIST gimp-2.10.34.tar.bz2 31405329 BLAKE2B 0b2d3a81abf89684bb90e2101896db3479a25c5da76738543dba8d0378e64608eee9aeb24888e15f5e347f72fa1df3e9b82aa27e503ee61d1c4d45d44fa7bddc SHA512 4802ce3758daba868570f1ac97a3f1cb41e1130fcc6376f9bf4c999441f8fd25937aa71b6f726d82d7c780f4153b11d2595bb76bc2356a42266909fbcc0bd34a DIST gimp-2.10.36.tar.bz2 31532334 BLAKE2B d033cd1407df3399b5968b7e3f7838d288143080b516476a5dd46599b6a84ac2efca591521368cef7a1c3d9935b45ed3262fb469e1ae36ccf60a1199f5cfa44d SHA512 dbe6152ea6ff99cca59bbf2c88a64fb4ff6b529d98ace7723eadf5dfb0e10d9cbaf2de1e0d5251e9ecf9abca73da9ae1a501f229997802fd4077fb9594f4ba66 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d SHA512 343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa DIST gimp-2.99.18.tar.xz 25418968 BLAKE2B ccb76bb5c375925d4d71505f3e1546f05ba0e20533859b1b6250a4d9054efb6bec4927a5e0c525272fa24d5a6bdf4fb7881d60a1d34b1210ee38b90e661ef707 SHA512 151ccd0322601e76ed0198b40832ab0b6c138428f2e75806dd558e29c9b3437d9226a243142bf4a86113fa5ea4f5965b99cf7cd0ab0ecb7bdfc48036de35a9c6 -EBUILD gimp-2.10.34-r2.ebuild 5882 BLAKE2B 67a9b4c0707f3027f34ba6276b8ac6fd2709e09f7416be0b05b9cc56ec58e27bfea86d4bf726588db9d927ede4b5549c2068e8a30c8d95c34ba269aad0f665bf SHA512 f058ba4ddaeebb02a4bb8cef3e8f5ac867df776f8750e2470c8695647538520984f072e9b5f9a0f3bbce6c3695098e0028c2ead31dd188df3b8221fc6be8b51f -EBUILD gimp-2.10.36-r2.ebuild 6001 BLAKE2B e2b78361ae0d4703479e8b9c1a62e99f7099b80a9267ad6b056a15f30a0bba79da7b697af38d76e736ecc01aca6b0a331b90fc7f20060e6872c1854ac56d9ec1 SHA512 cdc970e8766da37a2103010214313a6dd54ce1acfb9bc390aad47474914801884dbff8900ae62107d1c1780a9ccae3803abea10a72827816dff9b72572aab97d -EBUILD gimp-2.10.36.ebuild 5854 BLAKE2B 811d0ea7218ec368006864732bf94c6f07c7cdb2eeffc1df5deda811bc8cecd76ffa4f17230dd91313fe59ae803a35dc20c6be7e53e2b2143db24ba7dbf57dc8 SHA512 8ad6430138b98b4d384f3657f45733a5e1bd59db25b9619a4593d51af35bcd7b5cfbbe54587cb4f72b54fa1dfeac32a31d4727d0ddb666154810261806188040 -EBUILD gimp-2.10.38.ebuild 6115 BLAKE2B 27cfe3d0f6dd2e208680d1a723741e16ee5abc863141b81f3b343769f7aac837c474af6603f58ffc7e92b1528da674694076b7b61dde0f6d06d7b5b0259eecb4 SHA512 0990d4f80238b84873f131a8a0eca76ae6fa958af5f4f7c2a5e03ed14ce8adac0698480d1836287fda73902e548a4f723f992db6dfd317c0ef9c6b7a45044a0e +EBUILD gimp-2.10.34-r3.ebuild 6033 BLAKE2B 1a0c57ea0892099726875dfcdeb8b75d56e6101ccc63cf6006a8d56acc55f9d8bf4edf93f6a4c1e5de3c89b0951fecb2c06cc72ea14fcbf25ccef438df7bb901 SHA512 bdc9794b0d82172436b3b164e27d2de8697f33b9bbb8ae907dc9034bc8c6550075093d515cef82d900302745eaae856d22ead356ff1a55c49f7a2b758c6250c0 +EBUILD gimp-2.10.36-r3.ebuild 6005 BLAKE2B 2df114a4355ef257bd4b88b34b578883b044327c78282aa6239d082f382128cd35adea29af326e2288cd9110100b0e2fccf8c4d3f581e4bb2166dfb4fc188ca6 SHA512 487f909ee8c34a12d662b673b40551b8c80e0a340ce663c8937b216b61c3536ff3b85337b99ca85b33b238c3cece26f875e7195f381941f1f0a472a9c61c32f2 +EBUILD gimp-2.10.36-r4.ebuild 6152 BLAKE2B b0013afb683f05ea7b5dfd1e9ced41bafb6f394a7330b51932dd9021e53bf173ebdc1000062c6d2f8cd256877819805cf70e302b3741f9ec960286ad193c3821 SHA512 ed75fb99737b0e239ba569985cde4981e82a87b6e16286886f50dbe136293a084c872dfef99d086a29df6d940e3154cf9f6d108d60565ae767d3a2ec1e745bff +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-9999.ebuild 7111 BLAKE2B 726d3e15b968938fa2fcbc66775d58c46329cf679b08b36e507c3c26524aba189c8719c78f085b4ff8d574258579ae3e9bd537296f93e7cf0724cadd378230b9 SHA512 170c006ef43c1093f705cf530a21441e8afdbeb7d454c3e9ab0eddd504e2dccdcca24707829b523f0e2eb4025f808cd00d848738b2c26d51f6205ea82f76da6c +EBUILD gimp-9999.ebuild 7257 BLAKE2B 8dc6eaded83b8ac8bca1fe6c2115e4dfc2cdb5aa3edb308211eb2e6a7df65caaa4120f4ac2cec9253c76cecbc292991b47dc33f1c617941e9b1035cf6e8f594f SHA512 9e53ec59a222f36c3d2a4992921c3ad28982c5d7a32e9a9ab054f7a4846cac02a47157c605d83b74dc96bfdb13bfa17363744a0bae89b2829502085f6e1e2c71 MISC metadata.xml 655 BLAKE2B f6628a2c5edb90b16db0f59af05446a3f31316f5558ece238d30c9350632713cf2db3d315c90b31229596659ec20859c17fde6b051f9ab8f8fe34d64902dad57 SHA512 712a259ae41d9052bde0761087928685b9b66a132db3f3b49121241d87728f51bf31a00541aa385bd03b57a2e2a03a0176356045dd4752485a8dca2bd61c5886 diff --git a/media-gfx/gimp/files/gimp-2.10_libheif-1.18_unconditional_compat.patch b/media-gfx/gimp/files/gimp-2.10_libheif-1.18_unconditional_compat.patch new file mode 100644 index 000000000000..cc1e565b6c6d --- /dev/null +++ b/media-gfx/gimp/files/gimp-2.10_libheif-1.18_unconditional_compat.patch @@ -0,0 +1,23 @@ +Gentoo issue: https://bugs.gentoo.org/940915 + +diff '--color=auto' -Naur a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -1843,13 +1843,13 @@ + can_import_avif=no + can_export_avif=no + if test "x$have_libheif" = xyes; then +- can_import_heic=`$PKG_CONFIG --variable=builtin_h265_decoder libheif` +- can_export_heic=`$PKG_CONFIG --variable=builtin_h265_encoder libheif` ++ can_import_heic=yes ++ can_export_heic=yes + if test "x$can_import_heic" = xyes; then + MIME_TYPES="$MIME_TYPES;image/heif;image/heic" + fi +- can_import_avif=`$PKG_CONFIG --variable=builtin_avif_decoder libheif` +- can_export_avif=`$PKG_CONFIG --variable=builtin_avif_encoder libheif` ++ can_import_avif=yes ++ can_export_avif=yes + if test "x$can_import_avif" = xyes; then + MIME_TYPES="$MIME_TYPES;image/avif" + fi diff --git a/media-gfx/gimp/gimp-2.10.34-r2.ebuild b/media-gfx/gimp/gimp-2.10.34-r3.ebuild index 1ca3948ad794..d1af397feaf9 100644 --- a/media-gfx/gimp/gimp-2.10.34-r2.ebuild +++ b/media-gfx/gimp/gimp-2.10.34-r3.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/" SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2" LICENSE="GPL-3+ LGPL-3+" SLOT="0/2" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" @@ -94,6 +94,10 @@ src_prepare() { 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 + if use heif ; then + has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915 + fi + gnome2_src_prepare # calls eautoreconf sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144 @@ -192,7 +196,7 @@ src_install() { # precedence on PDF documents by default mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die - find "${D}" -name '*.la' -type f -delete || die + find "${ED}" -name '*.la' -type f -delete || die # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) local gimp_app_version=$(ver_cut 1-2) diff --git a/media-gfx/gimp/gimp-2.10.36.ebuild b/media-gfx/gimp/gimp-2.10.36-r3.ebuild index 21b127bca46b..e0082d3fdfdb 100644 --- a/media-gfx/gimp/gimp-2.10.36.ebuild +++ b/media-gfx/gimp/gimp-2.10.36-r3.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/" SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2" LICENSE="GPL-3+ LGPL-3+" SLOT="0/2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" @@ -93,6 +93,10 @@ src_prepare() { 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 + if use heif ; then + has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915 + fi + gnome2_src_prepare # calls eautoreconf sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144 @@ -191,7 +195,7 @@ src_install() { # precedence on PDF documents by default mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die - find "${D}" -name '*.la' -type f -delete || die + find "${ED}" -name '*.la' -type f -delete || die # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) local gimp_app_version=$(ver_cut 1-2) diff --git a/media-gfx/gimp/gimp-2.10.36-r2.ebuild b/media-gfx/gimp/gimp-2.10.36-r4.ebuild index 84edf850eedd..1acf5d818486 100644 --- a/media-gfx/gimp/gimp-2.10.36-r2.ebuild +++ b/media-gfx/gimp/gimp-2.10.36-r4.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/" SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2" LICENSE="GPL-3+ LGPL-3+" SLOT="0/2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" @@ -96,6 +96,10 @@ src_prepare() { 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 + if use heif ; then + has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915 + fi + gnome2_src_prepare # calls eautoreconf sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144 @@ -194,7 +198,7 @@ src_install() { # precedence on PDF documents by default mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die - find "${D}" -name '*.la' -type f -delete || die + find "${ED}" -name '*.la' -type f -delete || die # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) local gimp_app_version=$(ver_cut 1-2) diff --git a/media-gfx/gimp/gimp-2.10.38.ebuild b/media-gfx/gimp/gimp-2.10.38-r1.ebuild index 3746698cb6e8..89d2bf00caac 100644 --- a/media-gfx/gimp/gimp-2.10.38.ebuild +++ b/media-gfx/gimp/gimp-2.10.38-r1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/" SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2" LICENSE="GPL-3+ LGPL-3+" SLOT="0/2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86" IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" @@ -105,6 +105,10 @@ src_prepare() { 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 + if use heif ; then + has_version -d ">=media-libs/libheif-1.18.0" && eapply "${FILESDIR}/${PN}-2.10_libheif-1.18_unconditional_compat.patch" # 940915 + fi + gnome2_src_prepare # calls eautoreconf sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144 diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index 122443176973..906f16b47136 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -15,10 +15,10 @@ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git" LICENSE="GPL-3+ LGPL-3+" SLOT="0/3" -IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript python test udev unwind vala vector-icons webp wmf xpm" +IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript test udev unwind vala vector-icons webp wmf xpm" REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) " RESTRICT="!test? ( test )" @@ -26,6 +26,10 @@ 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=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}] + ') >=app-accessibility/at-spi2-core-2.46.0 >=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 @@ -36,10 +40,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.98[introspection,lcms,vala?] + >=media-libs/babl-9999[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 - >=media-libs/gegl-0.4.48:0.4[cairo,introspection,lcms,vala?] + >=media-libs/gegl-9999[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.14.0 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.13.1:2 @@ -69,12 +73,6 @@ COMMON_DEPEND=" 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:= ) @@ -116,11 +114,12 @@ pkg_pretend() { pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - + python-single-r1_pkg_setup use lua && lua-single_pkg_setup - if use python; then - python-single-r1_pkg_setup + if has_version ">=media-libs/babl-9999" || has_version ">=media-libs/gegl-9999"; then + ewarn "Please make sure to rebuid media-libs/babl-9999 and media-libs/gegl-9999 packages" + ewarn "before building media-gfx/gimp-9999 to have their latest master branch versions." fi } @@ -177,12 +176,10 @@ src_configure() { $(meson_feature javascript) $(meson_feature jpeg2k jpeg2000) $(meson_feature jpegxl jpeg-xl) - $(meson_feature lua) $(meson_feature mng) $(meson_feature openexr) $(meson_feature openmp) $(meson_feature postscript ghostscript) - $(meson_feature python) $(meson_feature test headless-tests) $(meson_feature udev gudev) $(meson_feature vala) @@ -191,6 +188,7 @@ src_configure() { $(meson_feature X xcursor) $(meson_feature xpm) $(meson_use doc g-ir-doc) + $(meson_use lua) $(meson_use unwind libunwind) $(meson_use vector-icons) ) @@ -229,9 +227,7 @@ src_test() { src_install() { meson_src_install - if use python; then - python_optimize - fi + python_optimize # Workaround for bug #321111 to give GIMP the least # precedence on PDF documents by default diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest index ef6379ec43c2..f1b1a15c97d6 100644 --- a/media-gfx/gnofract4d/Manifest +++ b/media-gfx/gnofract4d/Manifest @@ -1,8 +1,5 @@ -AUX gnofract4d-4.3_p20221125-clang16.patch 2070 BLAKE2B fad88eb8307a3387075f2b7c58b12103474f4a807039261a323759f5c5f9579612d6ef25ab93fab317352ee49ee2c90745c92e0ee1f776721940c95c563f1f71 SHA512 0bcb83dbd5486fbbe6ea683cdd85ce057dfef96203f5f4a6cc8b45d1da07b28da2afcff4d18bb584833c06222de15f8e4851d43949fb7090c580bd45635bd391 -DIST gnofract4d-4.3_p20221125.tar.gz 18275177 BLAKE2B 24fcd71818a98a3137b485046f295b523884d05ece694e37cf871e1fdaba7b26ac870675895a7a361e5d1fe142b0ae68c720c6e39615226951e8e1af6f57c848 SHA512 75d8d12441a0e2024f0ef125fee5cbe8dcc10c4c48ba366d5529644ae743928b998f85369aafc6e737cb994a82ebdcbe941e11c916c0d0996e785a146469e359 -DIST gnofract4d-4.3_p20230717.tar.gz 18275492 BLAKE2B 0bc8834c6f3ed3ec48bf4ee49ad563ce6842485dd32eb568c580d74528d062dcad6f8da4a67434c3784497883d0a73d4fa050a346ef970ac348db58bc6e7ea39 SHA512 c427c42e75b830dcf95012346d2db3a9b63be4e5431e7eae5ec74b915f5eedd857d8fa56d5ec37e8d245c3a77dc413c72115700d614205bdd62b916e6865f749 DIST gnofract4d-4.3_p20240324.tar.gz 18274057 BLAKE2B 183bf96e0429fa676f1c6fca4ae6466c489d0fe5ffee09ae161e01d0f22b4e77165f846416702c026f5d73a27833dfebd49f5c3131c621c9b1abd2ee9fc5529d SHA512 a174683b659347e4a7203d78d309ab41971d105131d40ea60490871477e80109624405f7012e455389ccc9325e08f224a1d3ea2d4e0c23fc9c5ca4fb83f9dfaa -EBUILD gnofract4d-4.3_p20221125-r1.ebuild 1470 BLAKE2B 9316290a45026d2aae523d8e59059fcf08cecf886757c7dd49af0d8532176b6bec30f6e3f01ade36656437be6410502f9486b5f482d7b293df7cbe735d007850 SHA512 030a61800bd923a76e929312a908bc3b45634d891bb48cdd8d605ff23c5ed363293e33e1a9050f74d8e47bc67e787861597e77ee47b6c2171dcc43b056c215ef -EBUILD gnofract4d-4.3_p20230717.ebuild 1740 BLAKE2B 1fdd4739fa03dc7c5fb50f866c68238e910f5675ab487fd9c343cae1795267ec3b38973aecc371217da762415d829ea25121b29ce3154ebab9aaee41402e2e64 SHA512 71489072990eab391408b93946168cd31dd030cff20d225210d489b703197f180d5442d8222231308230707586d1cff0328b5cbf612d8bfbb652cf640f8e54d2 +DIST gnofract4d-4.3_p20240821.tar.gz 18274253 BLAKE2B edfbd9a21b81f0fb051bbe6aef5ff97c77271985b7ecd0d3900ec70b208b1f2e5b75935d6213a761f555b2d4fe973e71b7859a56f2c2547f09321c6e75cc6981 SHA512 50abc3b5e9168308cbcff963a5aee00cd1f9a5a7a679d23023e6b21e82a1e04fc5fe8b55a10df39b1f71a85450824a75b2661abce9988746b9643acb78fa02e5 EBUILD gnofract4d-4.3_p20240324.ebuild 1807 BLAKE2B ac4416bd07fdd91545cfa2da18dbec010e0a5a4ef482bb9a414d82ad0a651b8f9a9fa59d5e5433e775e12f356ad926633ba623ba3e81cb6d58746029ae8d3aa2 SHA512 84789c4544eab3b22f281a13ca97c45cbfedf3d391ac6443c2749e5bdefb4e5a580c8bfb46d09d8e815cebb1090ea9c9fd716902f7099631f260308394bc69c7 +EBUILD gnofract4d-4.3_p20240821.ebuild 1809 BLAKE2B 031d19050dca3c592cbc00183711a081014b4b185090084e1ed3d4bb929e2d80fea647a5bc9345f999b041e0ff94b30e023d18397d3825ab6b45ef5c23dcc02f SHA512 79cfd0794dbfd7e7fa9360adbd6c87e11fdc5e85cd9f2863098f1a4e5657dc2fc177cdc608235fde864fa039983d46b88a14f0043c91179790f07fac5504a15b MISC metadata.xml 474 BLAKE2B 6dcdd891ae9b2b69a1f7a2e3de6bc867894444743825642abddac1701d75bd2ec1542a5e6d4c86b76b2e209ccdc4db53e680692a0e6c7c99c280ff96fe6a13a2 SHA512 7b815ce8a870b158e39845840082ea3a87738d1f7c63b6aee869758deb3475f7f2c1c1f1831bfdc8af911c1f7825c514cf26c76af5bb32464e9fa2a308ba8a05 diff --git a/media-gfx/gnofract4d/files/gnofract4d-4.3_p20221125-clang16.patch b/media-gfx/gnofract4d/files/gnofract4d-4.3_p20221125-clang16.patch deleted file mode 100644 index 3ca2ae35911a..000000000000 --- a/media-gfx/gnofract4d/files/gnofract4d-4.3_p20221125-clang16.patch +++ /dev/null @@ -1,44 +0,0 @@ -https://github.com/fract4d/gnofract4d/pull/254 - -From dd92a4bf2c6e68352203c511f465846e5c96407b Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Fri, 14 Apr 2023 09:33:28 +0200 -Subject: [PATCH] Declare image_lookup, gradient in fract_stdlib.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This avoids test failures in generated code with C compilers -that do not support implicit function declartions: - -> raise fracttypes.TranslationError( - "Error reported by C compiler:%s" % output) -E fract4d_compiler.fracttypes.TranslationError: Error reported by C co -mpiler:/tmp/fract4d_4tueiy9c/gnofract4d-cache/fract4d_9ebc1853081db2ea5eb7cce846 -42cd4e.c: In function ‘pf_calc’: -E /tmp/fract4d_4tueiy9c/gnofract4d-cache/fract4d_9ebc1853081db2ea5eb7c -ce84642cd4e.c:282:1: error: implicit declaration of function ‘image_lookup’ -E 282 | image_lookup(t__a_cf1image,z_re,z_im, &t__cf10, &t__cf11, &t -__cf12); -E | ^~~~~~~~~~~~ - - -> raise fracttypes.TranslationError( - "Error reported by C compiler:%s" % output) -E fract4d_compiler.fracttypes.TranslationError: Error reported by C compiler:/tmp/fract4d_4tueiy9c/gnofract4d-cache/fract4d_2ccc81a001cdf717973d45d4cbd12778.c: In function ‘pf_calc’: -E /tmp/fract4d_4tueiy9c/gnofract4d-cache/fract4d_2ccc81a001cdf717973d45d4cbd12778.c:323:1: error: implicit declaration of function ‘gradient’ -E 323 | gradient(t__a__gradient,t__cf09, &t__cf010, &t__cf011, &t__cf012); -E | ^~~~~~~~ ---- a/fract4d/c/fract_stdlib.h -+++ b/fract4d/c/fract_stdlib.h -@@ -52,6 +52,9 @@ extern "C" - double read_float_array_2D(void *array, int x, int y); - int write_float_array_2D(void *array, int x, int y, double val); - -+ void image_lookup(void *im, double x, double y, double *pr, double *pg, double *pb); -+ void gradient(void *grad_object, double index, double *r, double *g, double *b); -+ - #ifdef __cplusplus - } - #endif - diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20221125-r1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20221125-r1.ebuild deleted file mode 100644 index 2132a58fe933..000000000000 --- a/media-gfx/gnofract4d/gnofract4d-4.3_p20221125-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 optfeature virtualx xdg - -COMMIT="f90eb2a9c25e3f3aef65e8d4dce7d73bcb795b2d" - -DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals" -HOMEPAGE="https://fract4d.github.io/gnofract4d/" -SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND=" - media-libs/libjpeg-turbo:0= - media-libs/libpng:0=" -RDEPEND="${DEPEND} - $(python_gen_cond_dep ' - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - ') - x11-libs/gtk+:3[introspection]" -BDEPEND=" - virtual/pkgconfig - test? ( - media-video/ffmpeg[vpx,zlib] - )" - -distutils_enable_tests pytest - -S="${WORKDIR}/${PN}-${COMMIT}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.3_p20221125-clang16.patch -) - -src_prepare() { - sed -i -e "s:share/doc/gnofract4d/:share/doc/${PF}/:" setup.py || die - - distutils-r1_src_prepare -} - -python_test() { - ln -s "${BUILD_DIR}"/lib/fract4d/*.so fract4d/ || die - local EPYTEST_IGNORE=( - # test_regress.py does not provide pytest with any tests and inspecting it requires dev-python/pillow - test_regress.py - ) - TMPDIR="${T}" virtx epytest -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature "creating videos" media-video/ffmpeg[vpx,zlib] -} diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20230717.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20240821.ebuild index e1e1aa226fc2..03e0f31ababe 100644 --- a/media-gfx/gnofract4d/gnofract4d-4.3_p20230717.ebuild +++ b/media-gfx/gnofract4d/gnofract4d-4.3_p20240821.ebuild @@ -1,26 +1,25 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_EXT=1 -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_IN_SOURCE_BUILD=1 +PYTHON_COMPAT=( python3_{10..13} ) -inherit distutils-r1 multibuild optfeature virtualx xdg +inherit meson optfeature python-single-r1 virtualx xdg -COMMIT="47d2093e8f6399d1badfba0d1cb0f9867e90b326" +COMMIT="4202edc865d1f5f3ce3bd3c5fdd72b767f0b89e4" DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals" HOMEPAGE="https://fract4d.github.io/gnofract4d/" SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" -DEPEND=" +DEPEND="${PYTHON_DEPS} media-libs/libjpeg-turbo:0= media-libs/libpng:0=" RDEPEND="${DEPEND} @@ -32,21 +31,31 @@ BDEPEND=" virtual/pkgconfig test? ( media-video/ffmpeg[vpx,zlib] + $(python_gen_cond_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + ') )" -distutils_enable_tests pytest - -S="${WORKDIR}/${PN}-${COMMIT}" - src_prepare() { - sed -i -e "s:VERSION = '4.3':VERSION = '$PV':" fract4d/options.py || die - sed -i -e "s:share/doc/gnofract4d/:share/doc/${PF}/:" setup.py || die + sed -i "s:4.3:${PV}:" meson.build || die + default +} + +src_configure() { + local emesonargs=( + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + -Dstrip=false + ) + meson_src_configure +} - distutils-r1_src_prepare +src_install() { + meson_src_install + python_optimize + python_fix_shebang "${ED}"/usr/bin/gnofract4d } -python_test() { - ln -s "${BUILD_DIR}"/lib/fract4d/*.so fract4d/ || die +src_test() { local EPYTEST_IGNORE=( # test_regress.py does not provide pytest with any tests and inspecting it requires dev-python/pillow test_regress.py diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest index 77f00587b74e..13b71fc3265c 100644 --- a/media-gfx/gnome-screenshot/Manifest +++ b/media-gfx/gnome-screenshot/Manifest @@ -2,5 +2,5 @@ AUX gnome-screenshot-40.0-fix-hidpi.patch 1351 BLAKE2B a94ce580d6f4af9e7945bdb13 AUX gnome-screenshot-41.0-build-Use-GNOME-module-post_install.patch 2265 BLAKE2B 5c35e79ed0e4172cb8cefc288c84fe168b3ccd107ea09918270d5b3dcc7be67cdd06dc891296fe86ca36d7c2dd3b8ebcc90ce9a80a630e49ff928f9544b3a0ce SHA512 79a9728a33c20a683183050196509e6cfdef72b3ee4cbc8f2c6ac7485006922033d0d8e78e4227382cef0d8a80278963101fcb60e701c7c4a359978facbd6687 AUX gnome-screenshot-41.0-fix-meson-0.61-build.patch 898 BLAKE2B 9fc2ea6df76ca7db103a747df18e939e53f5ad78431e0c58fadb0826b2ef9686d4f14131fc06a4df3e98cd9b8833659d34a4c4a78c5e2db0f80d7941a40e1b90 SHA512 02020e4588b5bdcc15afce12c92ba261d0dae6d45c01b3b1a6c332f5eada34fa7c82df82aca8e0dd91e7bd66a5615266b581d76ca12bbf09fc8e06bf31132440 DIST gnome-screenshot-41.0.tar.xz 359500 BLAKE2B d3e44ab565815998327ddcbe80979acff3d690cfb0b7ae8f21910bafd21c9c7d3cd7af11e14b0522bb4d64ad2e27d5b6209c80208ea8fb03c465eb453ef8d47f SHA512 ab6c7e22cbca2739844707e59329ecd67901e04f968bd0b20a07dffff825e9772697ebf20a1ab2a920fa839ea40d0bd872d17db2b4cb7856a6f8ee4ec1426d19 -EBUILD gnome-screenshot-41.0.ebuild 1523 BLAKE2B a465793c34024a2a9a77681b16deb013c287a1af83360a67da12240f5ac3f9004cf02b1c1f87d50d79393dc068150a334ab02c1cc517fe7b02b4e9b76e88f090 SHA512 4cb0543d645e0219bb1b7441307ac036fed92eba2a0fe5098c0dfcc9be14c0b456955cc1a85aa44fb0c715e35c8b039a2b68370f093dcd03411a7a8ed9016b63 +EBUILD gnome-screenshot-41.0.ebuild 1517 BLAKE2B 8a3b5a29867be4e0d9dc75047937124a645ee23284b7a785921b6aa4650d075d6f49bd6270237509cec20a1a6c02483f5d48071ad174943fe79fa1b963cf2df3 SHA512 9233fd076873e129fd107d521424ddcf5347107015eead805fb269cab22b1a948957fc2e1191734c505f11a07cfc8f57a7d752b9a59aa0cecb5c38b51fac7d06 MISC metadata.xml 357 BLAKE2B 655de20d0e5fd6c41754e9b971523415d0ac9d0c6a3987215ecb9c075d19f719e21856c38ca52577f389f0dd3643b5f0d799a590b01a4199ba730c205aeef40b SHA512 45dadcc226d093ceaa4d8d5ceac0fd0325c48811977c9b3e74afdd7712d4653bd29d50c88edaedd0e8ebd4df530f89bc75559e7fe99e7e9514582d2fd3b66960 diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild index 068590d540d3..fe48cc3f3ce2 100644 --- a/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild +++ b/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot" LICENSE="GPL-2+" SLOT="0" IUSE="X" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" DEPEND=" X? ( diff --git a/media-gfx/gpicview/Manifest b/media-gfx/gpicview/Manifest index 7983a9932ff9..1f0721434838 100644 --- a/media-gfx/gpicview/Manifest +++ b/media-gfx/gpicview/Manifest @@ -2,6 +2,5 @@ AUX Fix-displaying-images-with-GTK3.patch 6119 BLAKE2B 84733027ba1740eb78e4d62e6 AUX gpicview-fix-animated-gifs.patch 356 BLAKE2B 8c60c06ded2f076e2edb47222f8041a2e8d7ef06f7d8a94bf4163a7ebb060b320fec577544042707e556dd4cbce4c52719056eada4aed360224f3b28e6c1af4e SHA512 d37ccd82d520b31e71bea95a877832b1511d77e36c293dbd71b3bf86c695dc367325f74f46ab5a408bc0f672ce56414820ef2cad1437188beac74e9c22b60276 AUX gpicview-main_win_open-dummy-return.patch 466 BLAKE2B 37bc66552c2b9f723a51a4d1d44125bd2dcc9121867be71e5c35ab05dc54574a0fb95cbb808f91099e6adf478bb3b108cf0360a8d492badc98a7396fdee4bafc SHA512 8a03de05bd6bf002ff416398a5df77ea67a1487a42021c645f938398d25ca8e6032e118915ba344a55fe7c021a2570047fd256782f3f7f57d03d074251af1cd2 DIST gpicview-0.2.5.tar.xz 349536 BLAKE2B c215e812693a30d55d3e606b9958d308b5d7f564ba0c3fc60e7606c492ec3ddd9997ae63f0865a6bebdf79c0a18e6a8b26a1e2c8d5dd7e2174d211130dbbe817 SHA512 afc7e67c7ae1252f9c1816ee46fe69e96ea7be9a60e03406a539f17b2e4f0e4b93a028c6f3f1c455f5433d6d7d78a58dcee2cb0ac91ea53093a21935bf454afd -EBUILD gpicview-0.2.5-r2.ebuild 595 BLAKE2B d47521663c88fec06cb88a55fa766fb6622015c986cba83134088d21c85b8f879a46b55d0d230cdc466c091102b99f4c38968ee496bb693407e742b57f1124c2 SHA512 a88126596432da7e2bbe684d4621cd479c79e13329903d210c5a8cef4486aa665a016b1a400e61c74eeb7fc6507b1da725c64ce1bfd084e57cee71b8fd589ff2 -EBUILD gpicview-0.2.5-r3.ebuild 708 BLAKE2B 3f8863250182bf6cadec13b3cb9abb9868e72f1fa5a9ebcb68cdf88ac07468f6a67c040705e191feaa4ec8667210595ffd5ef03207f5675c316ea31ba044850d SHA512 09795e0e305a95646ed7a2153abdec87946d459859b4628208faf41806ec60aa8a7820a387723cf7a22337aa2edfcb0b0a86af65f97eff39fa20c6890fb84b6e +EBUILD gpicview-0.2.5-r3.ebuild 710 BLAKE2B b3d6d43467efffba31230508229708b8fc07a76cc1c083571c5a0767615ff577727e3c9a07dfb11e9aba7570b685d2f9caa8cfcb9925e9745abb8e3dd8ecf497 SHA512 bf84c875e2ba05560357799d0f6ccbde92f882d7f24253b23448f548a58397e5fc2884390c0854cc35ef5c12329aee9488c020c605895c99dcb4aa70633133f6 MISC metadata.xml 242 BLAKE2B e8e2ce150c3abafafbde001036eb01bc36a0bd9c1466c8af433f5d0d938c7accc06d7ab9c241dea760c7e814fd553e5e1b90a15f4bfd9c6f5b6507e19b1a7be8 SHA512 7bd44c3af27abca3e957697d1050d823bf1586d010302899d15fb9b099628922f055d07bf267d2bf3e874fb4e6b19d480dc7ab495ce794e96b6524214c061ee7 diff --git a/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild deleted file mode 100644 index baef4b43f9b8..000000000000 --- a/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg - -DESCRIPTION="A Simple and Fast Image Viewer for X" -HOMEPAGE="http://lxde.sourceforge.net/gpicview" -SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ppc ~riscv x86" - -RDEPEND="virtual/jpeg:0 - x11-libs/gtk+:3" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}/Fix-displaying-images-with-GTK3.patch" ) - -src_configure() { - econf --enable-gtk3 -} diff --git a/media-gfx/gpicview/gpicview-0.2.5-r3.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r3.ebuild index 09ecbb0b6501..7cc62978f08a 100644 --- a/media-gfx/gpicview/gpicview-0.2.5-r3.ebuild +++ b/media-gfx/gpicview/gpicview-0.2.5-r3.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit xdg DESCRIPTION="A Simple and Fast Image Viewer for X" -HOMEPAGE="http://lxde.sourceforge.net/gpicview" +HOMEPAGE="https://lxde.sourceforge.net/gpicview/" SRC_URI="https://downloads.sourceforge.net/lxde/${P}.tar.xz" LICENSE="GPL-2" diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index 45017a1ad4e7..c6acb7dab84a 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -6,8 +6,11 @@ DIST GraphicsMagick-1.3.42.tar.xz 5553692 BLAKE2B f8f0d7d420375262b7db8ffcc1c9eb DIST GraphicsMagick-1.3.42.tar.xz.asc 228 BLAKE2B 723f8d1ca13bd5b32a12d69bb46f4991df6e7963f0d4c12ddaf60167a9ade4c6fa36819cce1df202437143bc55e17dd6f2cff821412dafceeb3ab5e3dbf3dc7b SHA512 de5d90c748376e7e480a066e9354ac1771f15cb2d8c6e5c9249672fd811b7bbe06f97b3348240538fa8d0d7c11150f57fb5148285214712944f7535afb943bd0 DIST GraphicsMagick-1.3.43.tar.xz 5657460 BLAKE2B caa4fa6546acb4cdaaa421030ccc5cd2b628ae723e07f84700f65e26e1f3e59039cf92fda259ee44ba1e1fa90e9c469844fb5289cc73d50c42bb50fb39358ca2 SHA512 15b4d90119f25fd45f16d50218d51d543841dd3cdaf0c585bce2c18592106bc41573ed1011d7176ff5882fa0cded8f46bfd1e639c26063571109911e22098757 DIST GraphicsMagick-1.3.43.tar.xz.asc 228 BLAKE2B cb1290af98ea92de948df0421b7de101a713f0b8ce4a07959269d5edd10eb26f088585e1a8272482a9b219ee388ae8f040fc047ca76d5f752f04a7b57987c89c SHA512 3bd62bc64dd1b6f2d7a17f1281d8dc4c67c474860b4d95bfaf5fb4be93d0ee156b54c2a6ef4166687854e5458a6e43e61816a5fd508e4702f693a9d1e43984bf -EBUILD graphicsmagick-1.3.42.ebuild 3955 BLAKE2B 7fb1f992576d85e80f859d8ae386c0ae6c1a8bce256dc4eac99f7891944d5ece5ff0bf23a1a382fd2ce9d7d8987f78c8ff58bea16fdbef49c2fdc12ff1405b50 SHA512 66784a829ca6496bb386d21507738830839c1c52998fb0520392d833b0eb35f13834bd5c9c936e40b36f9f414e773452e9b9c7ff4ebc2d557954330097d1a619 -EBUILD graphicsmagick-1.3.43-r1.ebuild 3988 BLAKE2B c290515cb17a081afee5f9462e527173ed908c64cb59c8645de84fb97486fe7cc0f1e6e54c93e30148ed559f23e635a1b5b6e81d79e050892b42ed0aeeb54a96 SHA512 1949b646fcec108b2aec05ae9ca7eed4f60a754a7e860d519f9d9833b163852c302b1dbcec102e59f9e3cbf5e2a1d99926da34f921a61e747174e900875ed5ba -EBUILD graphicsmagick-1.3.43.ebuild 3948 BLAKE2B bdb1074abfe42fd18e2ba126294b14a08c6651b52bae4463a19464e7076f554cce7d76ac58c5acf2d34aa6ab5a130d5f467af9ab88cbfc4d3227d700557899ee SHA512 055a5ffd475c5c5e8d723b8083f852c8497fb80e36dd380dcd7a1154be952f8f0fc507b5ecf9ff56dc5ba343f64d5d2ed89a346d65fe362cd10a4c947a43fecf -EBUILD graphicsmagick-9999.ebuild 3953 BLAKE2B 2f28cb9079e7262dfff660325136a75f7682aa6a0d6f2ea23f256dddced870eed14f5ba4f522ee90a617af5a17ec11787cbe3ed2f4188e00d2fcfa1166dd274c SHA512 19d5ce53b7bd3689a368f122958f08c696f44dc734f9f51452d95715d02d0c94e418dbe1af709413fa2d4d8326e21761e4b2c148cf7a6af18d5af6825d2cacb3 -MISC metadata.xml 1301 BLAKE2B 1d98e2027f597d0b9c3ae76923adf2dbcb817a439671931076766ec6bc9cb04d053f92fba520a08cc3e629a6802f75d9c4c40058daed25c1555e21516b678997 SHA512 2b1e3cc87a6f9af93fabbc31e142cf4d7206cce3cf2a0e9d70751f93ead7abb9cad7fd58f91264b26e8ea79345973f93cfff2ecd6c9c2c4b176db58c3247b5ff +DIST GraphicsMagick-1.3.45.tar.xz 5936968 BLAKE2B 55c87c518267dc3330d09c39474acf4b89f06b2deddf8e5d36d3c235f39bb1ec5bd04d90e2dd6e50563430b58ea3b78ccb526bf8cf79efa32685ae8e04a1aee5 SHA512 2c12a24198a8ee1f86b4c43bf8903d129c891ec2c27ba22287dfc8a5f65c9223b2caa67a37b9a91b10b049ba8425e757738f5d92a9ae70abee76d323af9bd1a0 +DIST GraphicsMagick-1.3.45.tar.xz.asc 228 BLAKE2B 72c7554de7d45499f90fa6534ed819e4d40b5f878f8bf0b14b026e100390ee9cabddd9df0d3945664e559350f1621239fcb9aafa9987a26e346f52b2c2ad8215 SHA512 5f49c8d1cdd20cb5bd7b76660800d22ef8ab3b13c3954dc4feb7522cb1f4d343a8e98faa91094f616ecbb01ff770bc3f4dd252c62b6b70c780318d425730c5c1 +EBUILD graphicsmagick-1.3.42.ebuild 3949 BLAKE2B 2b18247bc9cb7faa686e002dccf283b71828be75c389446fa523b691b3522fe4e95f17d9eceb0e0310b908b9f6a79023c6186bfbb62d95fbd3ab0162b4349dc5 SHA512 1cdefc13da40653d52be2133d94e466e03e1b1d37483cd5c8c8d713a49e0fc58824b19605f8a09868fa3807e129cbb9f4c90d4dd9160366a32376ba832875b92 +EBUILD graphicsmagick-1.3.43-r1.ebuild 3982 BLAKE2B 0112660a9fab648f3c988fcca6651e5e24ea6a94321ce21e0327afa3068065e977c9acce6e098665b2749d6b85b1a15b422eb1267a0d67889cdcb27236a79b4f SHA512 ed13351e5bcfd26ac095219d40dc97c5677dce5b3c9a4798e77e5255cdc74876fc5c66f1535073506066de55d571702a53a328306b25b03b4201b5d96a532ada +EBUILD graphicsmagick-1.3.43.ebuild 3942 BLAKE2B a0f6ec72235c55e0a22b81a7821df8a7eeaae9e0021f6de6974e72a4690205575771b599b7590e3e2dfa1def487615551655ad5d6b53010e08b64e6791cd1b1a SHA512 449c9787f258620040e9771ff847705e653d738d2d442867f2bdff76a7a07b430266342bc3cea28021a8045163ff584ef621a2c6599c81568270eca3154f3627 +EBUILD graphicsmagick-1.3.45-r1.ebuild 3998 BLAKE2B 01ea03505516d9aaeb4cdb8fe45b1eadde595032d894ff266c25587621fc833681eda9a85733319be9694bb40e6f9bfcd7f23eb23592bf053f68736164ee830c SHA512 b6306a3117d8e2d8360994c9273755ed47c2c0ea606a57fee1c7d8ec77bba7cc8deee85da3dbacfc290d410d0facd2ec6f583d34c48a0d85a2be9751abecf474 +EBUILD graphicsmagick-9999.ebuild 4005 BLAKE2B 84fa9aadd87c8ee5b767e1e51c196249a60db112f2933942ca00f6f1e569460bc477b0280cfaaa9bca604dc05960c59d283a38e01fe9d19892ac8dd98a9459d8 SHA512 2a6951ec2a08d10ceec04c7366ef6edfb303511f4d2e0c78da69bb56e6fcf881f54f96faad47ae28c3afd64cf849891d6b569509e23f0423bc63a01a38e790c5 +MISC metadata.xml 1405 BLAKE2B 90d9ab1c58f90a756a89b30569fab4b9fee82116f33ba21d6b5192ab6a1f0160b607477a523334b3af859daca4206b25271fe5852c8ed6772a4dcbcc8ef07551 SHA512 1a3aac139eeb22b6d1aae5c3038220c37d494fb41df591227db462d42b331f6d4ab1bdd94f7697d24e463f417a56ff4da4100c8389c815881d3bf931708ae8ae diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild index 2164e7fb17c6..c799d6fd19dc 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild @@ -20,7 +20,7 @@ else SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/${PN}/${MY_P}.tar.xz.asc )" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~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/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild index 1100b2cca2fb..073e50eeaf65 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild @@ -20,7 +20,7 @@ else SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz.asc )" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 hppa ~loong ~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/graphicsmagick/graphicsmagick-1.3.43.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.43.ebuild index 0c2ec447af58..42c6dc8039b2 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.43.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.43.ebuild @@ -20,7 +20,7 @@ else SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/${PN}/${MY_P}.tar.xz.asc )" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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/graphicsmagick/graphicsmagick-1.3.45-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r1.ebuild new file mode 100644 index 000000000000..c66edd304e19 --- /dev/null +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.45-r1.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +MY_P=${P/graphicsm/GraphicsM} +DESCRIPTION="Collection of tools and libraries for many image formats" +HOMEPAGE="http://www.graphicsmagick.org/ https://foss.heptapod.net/graphicsmagick/graphicsmagick" + +if [[ ${PV} == 9999 ]] ; then + EHG_REPO_URI="https://foss.heptapod.net/${PN}/${PN}" + inherit mercurial +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bobfriesenhahn.asc + inherit verify-sig + + SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz" + SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz.asc )" + S="${WORKDIR}/${MY_P}" + + KEYWORDS="~alpha amd64 ~arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )" +fi + +LICENSE="MIT" +SLOT="0/${PV%.*}" +IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpeg2k jpegxl lcms lzma" +IUSE+=" openmp perl postscript png q16 q32 static-libs tcmalloc tiff truetype" +IUSE+=" webp wmf X zip zlib zstd" + +RDEPEND=" + dev-libs/libltdl + bzip2? ( app-arch/bzip2 ) + fpx? ( media-libs/libfpx ) + heif? ( media-libs/libheif:= ) + imagemagick? ( !media-gfx/imagemagick ) + jbig? ( media-libs/jbigkit ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( media-libs/jasper:= ) + jpegxl? ( media-libs/libjxl:= ) + lcms? ( media-libs/lcms:2 ) + lzma? ( app-arch/xz-utils ) + perl? ( dev-lang/perl:= ) + postscript? ( app-text/ghostscript-gpl:= ) + png? ( media-libs/libpng:= ) + tcmalloc? ( dev-util/google-perftools:= ) + tiff? ( media-libs/tiff:= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + ) + zip? ( dev-libs/libzip:= ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND}" +BDEPEND+=" virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.41-flags.patch + "${FILESDIR}"/${PN}-1.3.41-perl.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local depth=8 + + use q16 && depth=16 + use q32 && depth=32 + + local myeconfargs=( + --enable-largefile + --enable-shared + $(use_enable static-libs static) + $(use_enable debug prof) + $(use_enable debug gcov) + $(use_enable imagemagick magick-compat) + $(use_enable openmp) + --with-threads + $(use_with dynamic-loading modules) + --with-quantum-depth=${depth} + --without-frozenpaths + $(use_with cxx magick-plus-plus) + $(use_with postscript gs) + $(use_with heif) + $(use_with jpegxl jxl) + $(use_with perl) + --with-perl-options=INSTALLDIRS=vendor + $(use_with bzip2 bzlib) + $(use_with fpx) + $(use_with jbig) + $(use_with webp) + $(use_with jpeg) + $(use_with jpeg2k jp2) + $(use_with lcms lcms2) + $(use_with lzma) + $(use_with png) + $(use_with tcmalloc) + $(use_with tiff) + --without-trio + $(use_with truetype ttf) + $(use_with wmf) + --with-fontpath="${EPREFIX}"/usr/share/fonts + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts + $(use_with zip libzip) + $(use_with zlib) + $(use_with zstd) + $(use_with X x) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + default + + use perl && emake perl-build +} + +src_test() { + # Some perl tests fail when DISPLAY is set + unset DISPLAY + + default +} + +src_install() { + default + + if use perl ; then + emake -C PerlMagick DESTDIR="${D}" install + + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die +} diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild index fd1d7bcb1476..015af99350f1 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild @@ -20,7 +20,7 @@ else SRC_URI+=" verify-sig? ( https://downloads.sourceforge.net/project/${PN}/${PN}-history/$(ver_cut 1-2)/${MY_P}.tar.xz.asc )" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )" fi @@ -28,8 +28,8 @@ fi LICENSE="MIT" SLOT="0/${PV%.*}" IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpeg2k jpegxl lcms lzma" -IUSE+=" openmp perl png postscript q16 q32 static-libs tcmalloc tiff truetype" -IUSE+=" webp wmf X zlib zstd" +IUSE+=" openmp perl postscript png q16 q32 static-libs tcmalloc tiff truetype" +IUSE+=" webp wmf X zip zlib zstd" RDEPEND=" dev-libs/libltdl @@ -44,8 +44,8 @@ RDEPEND=" lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) + postscript? ( app-text/ghostscript-gpl:= ) png? ( media-libs/libpng:= ) - postscript? ( app-text/ghostscript-gpl ) tcmalloc? ( dev-util/google-perftools:= ) tiff? ( media-libs/tiff:= ) truetype? ( @@ -59,6 +59,7 @@ RDEPEND=" x11-libs/libX11 x11-libs/libXext ) + zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) " @@ -103,12 +104,12 @@ src_configure() { --with-quantum-depth=${depth} --without-frozenpaths $(use_with cxx magick-plus-plus) + $(use_with postscript gs) $(use_with heif) $(use_with jpegxl jxl) $(use_with perl) --with-perl-options=INSTALLDIRS=vendor $(use_with bzip2 bzlib) - $(use_with postscript dps) $(use_with fpx) $(use_with jbig) $(use_with webp) @@ -125,6 +126,7 @@ src_configure() { --with-fontpath="${EPREFIX}"/usr/share/fonts --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts + $(use_with zip libzip) $(use_with zlib) $(use_with zstd) $(use_with X x) diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml index 99ba429c7cac..81b72dbdce7f 100644 --- a/media-gfx/graphicsmagick/metadata.xml +++ b/media-gfx/graphicsmagick/metadata.xml @@ -23,6 +23,7 @@ <flag name="dynamic-loading">Compile graphicsmagick with dynamically loadable modules</flag> <flag name="q16">Set storage quantum size to 16 (~2*memory)</flag> <flag name="q32">Set storage quantum size to 32 (~5*memory)</flag> + <flag name="zip">Build with <pkg>dev-libs/libzip</pkg> to support the OpenRaster (ORA) format.</flag> </use> <upstream> <remote-id type="sourceforge">graphicsmagick</remote-id> diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest index 89fa34a71645..76cf4441b1f2 100644 --- a/media-gfx/graphite2/Manifest +++ b/media-gfx/graphite2/Manifest @@ -6,5 +6,5 @@ AUX graphite2-1.3.14-no-libtool-file.patch 2336 BLAKE2B a349e721264de1477aee5aa3 AUX graphite2-1.3.5-fix-gcc-linking.patch 580 BLAKE2B 7ab4d1848e0b0fdbd682fc81747a426c9bee7e2d0f72991dc963c955ba910035c6246d88f7eaded9c4a742a10470fd304ab2dd3fb1750795b8b9791ccfc0cfb8 SHA512 1e01c764f72204f30c916dcdc4f5bc7a4757d73275bb2007bf0c1f2e9898f138aa6c0581addc587e125cf6cbf9d5db725cb3d8a69875978a14ab316d2d561467 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965 DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff -EBUILD graphite2-1.3.14_p20210810-r3.ebuild 3185 BLAKE2B 58c1d2d0161ffd0c6559f81c7d38a4312e2be1a71ec907edad58c4630b8ec0ead5f28d730bd813a048bdcc23d6eec61a55100c4c0fd6023326ce4306a668ceb4 SHA512 a6ecd37d05cef87a1dc57effdc024874f209dc5bfc21e27ec953407526fec068e20fd34f813fb0dffe12adebca95bd2ef730672729e53f4aa5c77d6f1e0f8ab3 +EBUILD graphite2-1.3.14_p20210810-r3.ebuild 3179 BLAKE2B 92af9cc8cf303957550bc17cac802863850e0fcd06cf2ce5e152cc00b856510fe81b03aa571c17ffa3586adc15a8bec14325982028306751bc3a079ae6d04b23 SHA512 8d50928ee83306f7b6d9e3ce6fe68ed6feb58998d9ea7f98853ddc72fc94077b09abc8638c5441553dcc70735de25081052657dd0cf0bd0e59faa297a1a1b2d3 MISC metadata.xml 393 BLAKE2B 27dcc3bcbc5a0ec32bb751ec3bb8788c2c85d5d7743f0243749a88ace9b5a3faaa10adc84731dbec3e37208efef41e3d4124de57005345927e848a7cbca6b098 SHA512 1086491557aff2d6f3552829550db85332c809d20ec1e3517bfa311fdfb2a5386cc4b624481b4fd7db7e48ab39bb5d76e048461352b74cdecf89d904ef52590b diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild index de205065cc19..2bcb0888cd67 100644 --- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild +++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild @@ -5,7 +5,7 @@ EAPI=8 COMMIT=80c52493ef42e6fe605a69dcddd2a691cd8a1380 GENTOO_DEPEND_ON_PERL="no" -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit flag-o-matic perl-module python-any-r1 cmake-multilib DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems" @@ -15,7 +15,7 @@ S="${WORKDIR}/graphite-${COMMIT}" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="perl test" RESTRICT="!test? ( test )" diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest index cd23ad259012..1bdd45f6687c 100644 --- a/media-gfx/graphviz/Manifest +++ b/media-gfx/graphviz/Manifest @@ -1,7 +1,8 @@ DIST graphviz-11.0.0.tar.xz 21306368 BLAKE2B c424b2d81180513f2a03210b5a5febfbf80e5c9912ad020d7015be69fdae6579d44108d22f99450ae3384560b610dbaac49a50fe8cac9dbd4e80b8761a8b65a8 SHA512 e95c9ed491c5f09190ca0f085aba2b9a3f6703371d62f6a275f41ddfceef7d79956e1fb0ccfda6c21f2e57afc3a88e37d7091af724911fe3e900ee90a7a811cf DIST graphviz-12.0.0.tar.xz 21279920 BLAKE2B 67d4444dcc31417fd01268b0fdc81538d86e26f961227d106ae57eb3d6d0e4a2e0ba684413a2d1b66f17340e0ad3a244ce5554c180873683e3ad4775f661739d SHA512 b5d4c8e9b565d4268fff28f169e3bfdb9ebf8b809996f7e35887430e5745aeac92c092fe2a9e15b23c9ba3364aa89fe2eeed85ab3fba61acce21634bc9632813 -DIST graphviz-9.0.0.tar.xz 21412796 BLAKE2B a1fd4e0d8d25ade263fdc0d357078cd8bb7847e88746561a0cfe07d129d193c309c7f4cb25f41cebca9549c8486aae2b1e3ebca0eaca57a41cbe2304a418dbd3 SHA512 912f31a4a90e21de9601ffcf8a85d2650d46f07e61aeb0e5124e5a91c67f444d08d40d49f15f2e4078d53d01fb9ca6f54dc9d18c1c08406da91b8ba9ad61416c -EBUILD graphviz-11.0.0.ebuild 6299 BLAKE2B f77ad2fe877badd5b45cb147c76ecedbc0329b5aaa5834b1dba175df7f96f161300b08085ffcb02c325f20ee8005a2de35052a49d32c61e05c179db9cb1c1b46 SHA512 7f9a211a7110d2f5deb0f9f1b97def604ea0ddacb1cbfcd9abd96770a504b8fd1a85611fc90b6f4cecd933a4c7ff224f7a5377ebbc5fb72734019b7e552cd363 -EBUILD graphviz-12.0.0.ebuild 6306 BLAKE2B b830a529edede32d6497a12edcf85624efc852a47ee1eaef58c992494084d7bba773865a29c06bcb8f38a789d9d62efba5e5b609048c692a1815154730e76bce SHA512 e3c0b533029af28633222d14eeeddde790f20648ecdcb3df084aa9f94833f09cae832abe3ef25da781696192e4193c0219360d5db2003b7d6c6488654997782e -EBUILD graphviz-9.0.0.ebuild 6113 BLAKE2B ce308cea23bbb5cd0cb2a619dded139726af456079f20c99e4a19a33876aafda99ecc10c83936bb0a28b4e5a4fca458e765dfbd0b5aade3ce154d9ed91938ad9 SHA512 adf8ebeea0c5e7871012d211134dad619e0b63706b787e7d2a688897cc150a3900b7091c6d331aa4c26742d1e58c271632804b8dc384f479e2dbb008d8cf1822 +DIST graphviz-12.1.2.tar.xz 20939968 BLAKE2B 4c9ad31f9ce6c68e67a48330b6693c9d6dc9ecebd4ef74e0aa250fd6cb86f02a585c8b6fe16b1322aedfa844004327f72ac4cbcca782848d55202b8e4695371d SHA512 2c31c33bcc0a912b08bf837df318152f910452e3efa5e6c19cf76c49017c64d6dad4cde719d4713bb41343c4484381d94706c2e993233aaa45a334390338cde9 +EBUILD graphviz-11.0.0.ebuild 6292 BLAKE2B cd5314ceddbf687cd310eb2e01a1db77e7c970cf27654f768e8c80079c7584ce728a3766e4ccef75eb7ca3e7d2ace353e8991751027a8aeb3c933c79032805e4 SHA512 1602d4934fd21228b046dbe6c14c5b2097d096f17409bf20e0af198e93f5d0c5a84c209af60f8cc8e89d7adde209922bfc58b243aeba7968963cce2d2be806a1 +EBUILD graphviz-12.0.0-r100.ebuild 6497 BLAKE2B 73aac1004d0acebea0a1555260980a227d810bd8f194f2c271dc09f79884c364324e1d79129ecee5ad3a90156f9a41ea32dd3002a429d60e717ca8b52baff898 SHA512 889fc6a842a87092678a8b3c16428754e2bc03a1c8ae995be1e70654295dadb00d2b71d23252146405e44d965c9f4941d294895fc350fdfd2e4857be4b4f0063 +EBUILD graphviz-12.0.0.ebuild 6293 BLAKE2B 0d88fb61096904db78bf4afa7f5166e45dc9e290dd4dd896b78b270cc7dc1143b53e0fa6bb08e0d3d36b28bb865714e5a14e4ce273470676d8ef52924cb7c5f2 SHA512 b4b08b386bc2a510d40b25e8ab84d49f236cac090bcb94896dd8e1c0f583816f7c86659f8c59c0acb986c493232b604004ed1141f81d1c58f9c793a29965fa18 +EBUILD graphviz-12.1.2.ebuild 6497 BLAKE2B 73aac1004d0acebea0a1555260980a227d810bd8f194f2c271dc09f79884c364324e1d79129ecee5ad3a90156f9a41ea32dd3002a429d60e717ca8b52baff898 SHA512 889fc6a842a87092678a8b3c16428754e2bc03a1c8ae995be1e70654295dadb00d2b71d23252146405e44d965c9f4941d294895fc350fdfd2e4857be4b4f0063 MISC metadata.xml 2309 BLAKE2B 261f100c9c78cf3bb50ffd84260594d34fa5af75f0b3789ce5640e0d633494405e64b3e9f7524e35ef87d11164c501e21fcef2cc483f60ad6ad2e350f500e3b2 SHA512 1a29d11154b72af3deeb0202136926f0871797086ce1a5a4d1fc71822e86d0e76ff789c684fabad85fac1abd5f29913a555be0916f42b90f5ce62fa395e1cbba diff --git a/media-gfx/graphviz/graphviz-11.0.0.ebuild b/media-gfx/graphviz/graphviz-11.0.0.ebuild index 40f75c59e1ce..cec1338b0d7d 100644 --- a/media-gfx/graphviz/graphviz-11.0.0.ebuild +++ b/media-gfx/graphviz/graphviz-11.0.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re LICENSE="CPL-1.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X" REQUIRED_USE=" diff --git a/media-gfx/graphviz/graphviz-9.0.0.ebuild b/media-gfx/graphviz/graphviz-12.0.0-r100.ebuild index 7dc66d7742f7..d66128a9fbcf 100644 --- a/media-gfx/graphviz/graphviz-9.0.0.ebuild +++ b/media-gfx/graphviz/graphviz-12.0.0-r100.ebuild @@ -3,8 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -inherit libtool python-single-r1 +GUILE_COMPAT=( 2-2 3-0 ) +PYTHON_COMPAT=( python3_{10..13} ) +inherit guile-single libtool python-single-r1 DESCRIPTION="Open Source Graph Visualization Software" HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/" @@ -14,11 +15,12 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re LICENSE="CPL-1.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X" REQUIRED_USE=" !cairo? ( !X !gtk2 !postscript !lasi ) + guile? ( ${GUILE_REQUIRED_USE} ) pdf? ( cairo ) python? ( ${PYTHON_REQUIRED_USE} )" @@ -45,7 +47,7 @@ RDEPEND=" x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) - guile? ( dev-scheme/guile ) + guile? ( ${GUILE_DEPS} ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) @@ -74,7 +76,7 @@ BDEPEND=" ) guile? ( dev-lang/swig - dev-scheme/guile + ${GUILE_DEPS} ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) @@ -138,11 +140,16 @@ BDEPEND=" # with flags enabled at configure time pkg_setup() { + use guile && guile-single_pkg_setup use python && python-single-r1_pkg_setup } src_prepare() { - default + if use guile; then + guile-single_src_prepare + else + default + fi elibtoolize } @@ -194,7 +201,10 @@ src_configure() { --disable-ltdl-install QMAKE=$(usev qt5 qmake5) ) - econf "${myconf[@]}" + # XXX: Temporary bash for bug #926600. It's been reverted upstream + # on master already: + # https://gitlab.com/graphviz/graphviz/-/merge_requests/3636 + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}" } src_install() { @@ -202,6 +212,8 @@ src_install() { find "${ED}" -name '*.la' -delete || die + use guile && guile_unstrip_ccache + use python && python_optimize \ "${D}"$(python_get_sitedir) \ "${ED}"/usr/$(get_libdir)/graphviz/python3 diff --git a/media-gfx/graphviz/graphviz-12.0.0.ebuild b/media-gfx/graphviz/graphviz-12.0.0.ebuild index 3b42788dde34..9b924dbf83bb 100644 --- a/media-gfx/graphviz/graphviz-12.0.0.ebuild +++ b/media-gfx/graphviz/graphviz-12.0.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re LICENSE="CPL-1.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X" REQUIRED_USE=" diff --git a/media-gfx/graphviz/graphviz-12.1.2.ebuild b/media-gfx/graphviz/graphviz-12.1.2.ebuild new file mode 100644 index 000000000000..d66128a9fbcf --- /dev/null +++ b/media-gfx/graphviz/graphviz-12.1.2.ebuild @@ -0,0 +1,230 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GUILE_COMPAT=( 2-2 3-0 ) +PYTHON_COMPAT=( python3_{10..13} ) +inherit guile-single libtool python-single-r1 + +DESCRIPTION="Open Source Graph Visualization Software" +HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/" +# Unfortunately upstream uses an "artifact" store for the pre-generated +# tarball now, which makes predictable URLs impossible. +SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz" + +LICENSE="CPL-1.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X" + +REQUIRED_USE=" + !cairo? ( !X !gtk2 !postscript !lasi ) + guile? ( ${GUILE_REQUIRED_USE} ) + pdf? ( cairo ) + python? ( ${PYTHON_REQUIRED_USE} )" + +# Requires ksh, tests against installed package, missing files and directory +RESTRICT="test" + +RDEPEND=" + >=dev-libs/expat-2 + >=dev-libs/glib-2.11.1:2 + dev-libs/libltdl + >=media-libs/freetype-2.1.10 + >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] + media-libs/libjpeg-turbo:= + >=media-libs/libpng-1.2:= + sys-libs/zlib + virtual/libiconv + cairo? ( + >=x11-libs/cairo-1.1.10[svg(+)] + >=x11-libs/pango-1.12 + ) + devil? ( media-libs/devil[png,jpeg] ) + gtk2? ( + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + ) + gts? ( sci-libs/gts ) + guile? ( ${GUILE_DEPS} ) + lasi? ( media-libs/lasi ) + pdf? ( app-text/poppler ) + perl? ( dev-lang/perl:= ) + postscript? ( app-text/ghostscript-gpl ) + python? ( ${PYTHON_DEPS} ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + ) + ruby? ( dev-lang/ruby:* ) + svg? ( gnome-base/librsvg ) + tcl? ( >=dev-lang/tcl-8.3:= ) + webp? ( media-libs/libwebp:= ) + X? ( x11-libs/libX11 )" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND=" + app-alternatives/lex + dev-build/libtool + virtual/pkgconfig + doc? ( + app-text/ghostscript-gpl + sys-apps/groff + ) + guile? ( + dev-lang/swig + ${GUILE_DEPS} + ) + nls? ( >=sys-devel/gettext-0.14.5 ) + perl? ( dev-lang/swig ) + python? ( dev-lang/swig ) + ruby? ( dev-lang/swig ) + tcl? ( dev-lang/swig )" + +# Dependency description / Maintainer info: + +# Rendering is done via the following plugins (/plugins): +# - core, dot_layout, neato_layout, gd , dot +# the ones which are always compiled in, depend on zlib, gd +# - gtk +# Directly depends on gtk-2. +# needs 'pangocairo' enabled in graphviz configuration +# gtk-2 depends on pango, cairo and libX11 directly. +# - gdk-pixbuf +# Directly depends on gtk-2 and gdk-pixbuf. +# needs 'pangocairo' enabled in graphviz configuration +# - ming +# flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's +# incomplete. +# - cairo/pango: +# Needs pango for text layout, uses cairo methods to draw stuff +# - xlib: +# needs cairo+pango, +# can make use of gnomeui and inotify support (??? unsure), +# needs libXaw for UI +# UI also links directly against libX11, libXmu, and libXt +# and uses libXpm if available so we make sure it always is + +# There can be swig-generated bindings for the following languages (/tclpkg/gv): +# - c-sharp (disabled) +# - scheme (enabled via guile) ... no longer broken on ~x86 +# - go (disabled) +# - io (disabled) +# - lua (enabled via lua) +# - ocaml (enabled via ocaml) +# - perl (enabled via perl) *1 +# - php (enabled via php) *2 +# - python (enabled via python) *1 +# - ruby (enabled via ruby) *1 +# - tcl (enabled via tcl) +# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location +# *2 = Those bindings don't build because the paths for the headers/libs aren't +# detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5) + +# There are several other tools in /tclpkg: +# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl +# tkspline, tkstubs ; enabled with: --with-tk + +# And the commands (/cmd): +# - dot, gvedit, gvpr, smyrna, tools/* :) +# sci-libs/gts can be used for some of these +# - gvedit (via 'qt5'): +# based on ./configure it needs qt-core and qt-gui only +# - smyrna : experimental opengl front-end (via 'smyrna') +# currently disabled -- it segfaults a lot +# needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut +# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png' +# with flags enabled at configure time + +pkg_setup() { + use guile && guile-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if use guile; then + guile-single_src_prepare + else + default + fi + elibtoolize +} + +src_configure() { + local myconf=( + # Speeds up the libltdl configure + --cache-file="${S}"/config.cache + --enable-ltdl + $(use_enable doc man-pdfs) + $(use_with cairo pangocairo) + $(use_with examples demos '$(docdir)/examples') + $(use_with devil) + $(use_with gtk2 gdk) + $(use_with gtk2 gdk-pixbuf) + $(use_with gtk2) + $(use_with gts) + $(use_with qt5 qt) + $(use_with lasi) + $(use_with pdf poppler) + $(use_with postscript ghostscript) + $(use_with svg rsvg) + $(use_with webp) + $(use_with X x) + --with-digcola + --with-freetype2 + --with-ipsepcola + --with-libgd + --with-sfdp + --without-ming + # New/experimental features, to be tested, disable for now + --without-ipsepcola + --without-smyrna + # Bindings + $(use_enable guile) + $(use_enable perl) + $(use_enable python python3) + $(use_enable ruby) + $(use_enable tcl) + --disable-go + --disable-lua + --disable-java + --disable-ocaml + --disable-php + --disable-python + --disable-r + --disable-sharp + # libtool file collision, bug #276609 + --without-included-ltdl + --disable-ltdl-install + QMAKE=$(usev qt5 qmake5) + ) + # XXX: Temporary bash for bug #926600. It's been reverted upstream + # on master already: + # https://gitlab.com/graphviz/graphviz/-/merge_requests/3636 + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}" +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die + + use guile && guile_unstrip_ccache + + use python && python_optimize \ + "${D}"$(python_get_sitedir) \ + "${ED}"/usr/$(get_libdir)/graphviz/python3 +} + +pkg_postinst() { + # We need to register all plugins before they become usable + dot -c || die +} + +pkg_postrm() { + # Remove cruft, bug #547344 + rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die +} diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest index bde85c73d158..291e084c6e81 100644 --- a/media-gfx/gscan2pdf/Manifest +++ b/media-gfx/gscan2pdf/Manifest @@ -2,7 +2,9 @@ AUX gscan2pdf-2.13.2-min_max.patch 919 BLAKE2B f74350243325ec05dc290afd45e45d591 AUX gscan2pdf-2.13.2-t1161.patch 512 BLAKE2B b74f51a2cc70c19ef9b242b02540fff63098a783f9a0102622844a49fd5cf60c3701255af5317450c92bec3b3a7dc784fd9a5f37e136cd4db9f16de800323602 SHA512 cc8a8c65e9cf9b1425f69ae15687cdf0983fefd1415e30510e6f6bf0d4ffe71375839e2a4355c9d2f69b7b690d1a39d8520181dadbb055576cf2cde156b72c6e AUX gscan2pdf-2.13.2-t131.patch 473 BLAKE2B 23ec073509f9b252494e677a7f90f1eb41077a7e63641b1f6a6cb06d9a1329a3b5c96189c92a78b11b515c091b8df16173a40ced65d8f563e87b7d83410c31dd SHA512 ceffdfd0e478047d5da7044e160b8feadda9a0fa09ac99c609a118b84ac45ed10cd386f04c499c832566d8626e5abee4ce5d819a9e51733eb7dc822fa162f32d AUX gscan2pdf-2.13.2-tiff2ps.patch 1490 BLAKE2B c8b85f7a21e3e03cc1621d0f65af9f6ab03e89e72ef3839dc6f585cd8d0e6cc2d10c49ff119b671bc9f6fc99cf03c6a0117402acc38e624d46fd89cd02a75058 SHA512 b6357c1ea6d6dc958b7044be062bdb9445667da3d2ff9017bbdd3b041daafa89e742d8c1c9c919d3b8b5c4ab35840db1d24ec27a573a1e75b544c0dfce40bd9b +AUX gscan2pdf-2.13.4-t3722.patch 385 BLAKE2B 7bb1b2f703e23972170be497829cb2b52d02cb3754a64e7922acb4cb50b9e7c797bfbb82b04aaa881ab8601e88a60bd34e0796abec83413dce789e17a910856a SHA512 d5770a48f70ce2337ea4332bf9eca8d21da732192cbdf449488646d968ad0a99bd871fd1eab8670b269b33c1e8f35c61dc6b5d61a3486bcdf09bd94aaa16d210 DIST gscan2pdf-2.13.2.tar.xz 507244 BLAKE2B 66ac15ddcf74ed2b04f231e24a663afa7494bd5df04ecb190b68b9822382e01953d97949174f3d6280fabc9d0a2ea1cc270c0aa333cf9992cfa2f58f645df156 SHA512 882b707b11df26310136ed72428eab6ec8e2c6cf34686675eee3b14181622f85d21be0e05cab411961f2a2441ad948e7b56c7fe24eecb558eae7a7ac6b4db9d1 +DIST gscan2pdf-2.13.4.tar.xz 510300 BLAKE2B 1a6721df5bc037abeed877a55ba5e4e1d3a6c559786a79f1196842819fa48ecf06715e29a7662db9a19e40b22d62fc69c5786213ae46b456e3252920dc2549af SHA512 19bd71b08c3be0a239e4018a50e1327b74b07cc64b03546e573ccbcbf89f3de3443ca9735740b070162c6c9f0adc7655fc81319fc082bd15a47f5e90baee6537 EBUILD gscan2pdf-2.13.2-r1.ebuild 3537 BLAKE2B 83a366fcdd9c4a8b4e40476f1fcd86df21e6e81f98f7af7a27eb49d0035e5454c404cc3207a75fce3a00f982e8c6451db9b9692deb7a8a5179dd1a5b446d2360 SHA512 455e2f6b8b2b7836571ae16a34b42e95d4df0da3345dc74f04afb0ee0d1664a0bade1d06a4001769ebbb3be24792cdff5cdd4213ae67f474a898b0596ba330c5 -EBUILD gscan2pdf-2.13.2.ebuild 3024 BLAKE2B ea848a2d53e265954eecd3df6e878c2669e65a8cbda53cd0526f84885c46bd1dcbb37fc0a99585293e6ebb75a4bfe6b37c62883131560ef2a5d446c390548fc8 SHA512 82d9fef80776516ac278b4636d16af52629f6904999370defe3dea7e23e8383ef04740218d0b4505d41e1e977caf9bf55741cb4320c9732e13ee927c7f38a59f +EBUILD gscan2pdf-2.13.4.ebuild 3123 BLAKE2B 1525e2c4131a2184a68ffe217ee4d55dda3ae171d35ba05a592c032449018c1dbd6e4d642c4d0904b2e77962aa4c0a32fc5f79d7a0fa426846cbcacb0a940b83 SHA512 8bab1e3b8e6f53bc0fa4da84f0cb6c7b021affdbd0c9a52cc0e4cda4d58abe9fe2406a54d60eb01f7e32b59622af31f390e05a3dfc251cbe649dcb3a76dd8725 MISC metadata.xml 470 BLAKE2B d9a9ad2f443b0bca02e6b8e91c96f22430543ee82fe8a1174739d4ad59225f73b975d31316fecd4dde6f26002ef6ba9fd39bf5d4adfd2bc82540d14e90d623a6 SHA512 ecd2fe9215c3a65760b8c101989772a73a7e9975dc38a1b11b0334cf6e1d001ccebfca1bc6d7631eb3b3e3e03d1736205563b0c836a2aea026fdfe552d72cbe0 diff --git a/media-gfx/gscan2pdf/files/gscan2pdf-2.13.4-t3722.patch b/media-gfx/gscan2pdf/files/gscan2pdf-2.13.4-t3722.patch new file mode 100644 index 000000000000..715dbdedf213 --- /dev/null +++ b/media-gfx/gscan2pdf/files/gscan2pdf-2.13.4-t3722.patch @@ -0,0 +1,11 @@ +--- a/t/3722_user_defined.t ++++ b/t/3722_user_defined.t +@@ -38,7 +38,7 @@ $slist->import_files( + }, + error_callback => sub { + my ( $uuid, $process, $msg ) = @_; +- is( $msg, 'error', ++ is( substr($msg, 0, 5), 'error', + 'user_defined caught error injected in queue' ); + }, + ); diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.13.2.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.13.4.ebuild index 8b113cf10656..70b55f49a590 100644 --- a/media-gfx/gscan2pdf/gscan2pdf-2.13.2.ebuild +++ b/media-gfx/gscan2pdf/gscan2pdf-2.13.4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="test" RESTRICT="!test? ( test )" @@ -47,7 +47,7 @@ RDEPEND=" virtual/perl-threads-shared media-gfx/imagemagick[png,tiff,perl] media-gfx/sane-backends - media-libs/tiff" + >=media-libs/tiff-4.7.0" BDEPEND=" test? ( @@ -58,13 +58,18 @@ BDEPEND=" app-text/djvu[jpeg,tiff] app-text/poppler[utils] - app-text/tesseract[-opencl,osd(+),png,tiff] + app-text/tesseract[-opencl(-),png,tiff] app-text/unpaper media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript,truetype] media-gfx/sane-backends[sane_backends_test] media-gfx/sane-frontends )" +PATCHES=( + "${FILESDIR}/${PN}-2.13.2-t1161.patch" + "${FILESDIR}/${PN}-2.13.4-t3722.patch" +) + PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod,169_import_scan}.t ) mydoc="History" diff --git a/media-gfx/gtkimageview/Manifest b/media-gfx/gtkimageview/Manifest index 2924049dc4eb..2ddb3b5d4b35 100644 --- a/media-gfx/gtkimageview/Manifest +++ b/media-gfx/gtkimageview/Manifest @@ -1,4 +1,4 @@ AUX gtkimageview-1.6.4-slibtool-undefined-references.patch 1038 BLAKE2B 6026cf188eb0d230f139667eadd8926eedc14bddacdcc338798ccf59422e06b48727c0a5faf172acefe03a710965a56dbf515a9ec4ffb48ceff99d9dcce33059 SHA512 0d4b3baa96c4cf7ac79623a963c2d95226858a5e06ba5eab6658f7737d9e3501fe9dd44f2716691b2a67176907010de5faf5363a6aa1d9e0981eca83412c03f4 DIST gtkimageview-1.6.4.tar.gz 1158138 BLAKE2B b59abcbac71d4bd039bf9f3fc2f25f6590f91c4cc320cea90243a4889e020f1a54a3ca5d8a843f7482551ce8da6fafe6e3ce4fbc5a5e32fd6ceb4367b5abb9db SHA512 6378c640006e73aa1ffbf92eb9d4e42570707bc159f0a657b11f027d328088f5e89fc334de170de5ab1a39bed588b0b76f4633688a894cb7def16f1dea9f8e39 -EBUILD gtkimageview-1.6.4.ebuild 1303 BLAKE2B 6019b98b10fbc5ecfe3276adb9385776facc90bd09681eef0b47742a7383563d1cf051cc67c1c3c5474f0ba1080df7c287324d4ff5d41272b86dfd7c672f8ea0 SHA512 20f8719d3fccbda73e0fcb31e120e2866d5125bf9af2de002c473621f14a0cd447fb1d0e4d3c841c39f9dd08f7586d567f8c872fabc15f29c21c18ec0877f5f1 +EBUILD gtkimageview-1.6.4.ebuild 1297 BLAKE2B 6c3dc65021b9e105a6112e1a6d9d75a74f1d54c7cb36dbc0f9ec10b3f181e4c3e57b7a4d6d7391dc6f3ea3b9e47f0cca78475cc556a78567710bb62f3937f241 SHA512 187c94193157481721e8cf2934a2a5bd0f2f3ee3f09192cc2f5bafbb054c2599f7da9efac87a8bc0d466e5164bba0b1a740c7e8a680db879f70fdad8fbf932dd MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild index 1499634d4318..920a0c51adbc 100644 --- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild +++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" IUSE="examples static-libs" # tests are severely broken, bug #483952 diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index fa85394de34a..5d2d0ade2c2e 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,5 +1,7 @@ AUX boost-1.85-932315.patch 1078 BLAKE2B 3a721b7350c843d3ff3757dd0f9e3d2e384ba11f053a7e6f4238b4db50046241781921593886b809240d38f3d5e0e913d39601b6ffaa53f29a56422c9ff3e3b9 SHA512 d8f2b17318f5223929e19f40e1a834a8ccb6b5e7f792b5762c81d2084ea62f06ef1b1bf2d38dbf5b5ad613db5ef195229a3b8401ea8e66773925070c1cd6b085 DIST hugin-2023.0.0.tar.bz2 10336322 BLAKE2B 5c35f67160d76f961e812a309a0c50bb012beac74dc888ce716e8d0e3da35dbb053ab4e5d5d043b3d3fee9885f2fc1afa962a73e794cd4df920527456d477e89 SHA512 f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8 +DIST hugin-2024.0beta1.tar.bz2 10351004 BLAKE2B 53bd8d1622ee9cc407d25cc3edcb16063689d6f949f38d4e4bf0c9afd6fa7f065bdab030dd6a2f2a2c82bb6953e8f16655d5a1f305d0b494a4a4ab8ce6dddecd SHA512 3395e00d1e895db4ce063b6e2e936f2af8aed0740d10ea15763c94549e64953da4e9c214bd6058d879435527e945c4ddfaa75d7d8efb98e7220102872c4f8305 EBUILD hugin-2023.0.0-r1.ebuild 2193 BLAKE2B acc220e65485eba96191ed6459acda962b66eadb8010d543664fb151a0f56ada5fb8aab96584ab517405f8105b307813c60e0d82f7344a5b3d43b5de7acae201 SHA512 fd18cbc43f50dca29b9574ffa7d4d8dd5c513327269602810acafac34c4b1c48630d308c28538e6cfe73bbaff019c056cd2fc7ece1030e51a8f70ad1b46d9eaf -EBUILD hugin-9999.ebuild 2210 BLAKE2B 9961fb69cdbb3e4fd63e567ad6cc96dc8a81e608b3742733ad3cc0c19be059e591ae41f2f64751dfbb4482863b97546696ac7088f5b3d74c88ec434ee50bdc7e SHA512 900b2d13e4e756b57830af1c0c6f39b7cf9dd26afeaf5d8f3ceb06be567843f8ba30ae15af032a3a7486eb6be03b6838d96d2a90f0c70e2dfe4e52044dbfbb4f +EBUILD hugin-2024.0_beta1.ebuild 2117 BLAKE2B 1bf1c8e04ad68397e95d87e5a8ae9d7a5432af2ec8139dba6fd198a29edfbcd97b4052ac5f38f45e22a0be1c2664dbb0ee640bfa2ab089e17986b2760cd9c811 SHA512 6f2da09f4f2700f9becd4c1e9da9f957ba197a5b7636faf1e1f7324d1e3a95fe75b02cf9b474dbe26fa69b586af65c9c28e90c2559b11295ac4711f0758f47d7 +EBUILD hugin-9999.ebuild 2041 BLAKE2B 68e51179017623a59c1c6dbbace836c6558c8f33fce09488b999965b2d02df3703767089a5c2fd2e7979135173982fb7af30e8570f8814219832a5e848d177c4 SHA512 40e3c43bafb40fcee31092197569a51ce5fa87b48e40a2ab676acc347ffdfec9bd818d3743fc7ee1c9bf2ee481018753f56659dce7c84527b9c71d86831b9a9d MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba diff --git a/media-gfx/hugin/hugin-2024.0_beta1.ebuild b/media-gfx/hugin/hugin-2024.0_beta1.ebuild new file mode 100644 index 000000000000..ab8ecc11df67 --- /dev/null +++ b/media-gfx/hugin/hugin-2024.0_beta1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" +PYTHON_COMPAT=( python3_{10..13} ) + +inherit python-single-r1 wxwidgets cmake xdg + +DESCRIPTION="GUI for the creation & processing of panoramic images" +HOMEPAGE="http://hugin.sf.net" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P/_/}.tar.bz2" + +S=${WORKDIR}/${PN}-$(ver_cut 1-2).0 + +LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW" +IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})" + +CDEPEND=" + dev-db/sqlite:3 + dev-libs/boost:= + >=media-gfx/enblend-4.0 + media-gfx/exiv2:= + media-libs/freeglut + media-libs/glew:= + media-libs/libjpeg-turbo:= + >=media-libs/libpano13-2.9.19_beta1:= + media-libs/libpng:= + media-libs/openexr:= + media-libs/tiff:= + >=media-libs/vigra-1.11.1-r5[openexr] + sci-libs/fftw:3.0= + sci-libs/flann + sys-libs/zlib + virtual/glu + virtual/opengl + x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl] + lapack? ( virtual/blas virtual/lapack ) + python? ( ${PYTHON_DEPS} ) + sift? ( media-gfx/autopano-sift-C )" +RDEPEND="${CDEPEND} + media-libs/exiftool + raw? ( media-gfx/dcraw )" +DEPEND="${CDEPEND} + dev-cpp/tclap + sys-devel/gettext + virtual/pkgconfig + python? ( >=dev-lang/swig-2.0.4 )" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DOCS=( authors.txt README TODO ) + +pkg_setup() { + use python && python-single-r1_pkg_setup + setup-wxwidgets +} + +src_prepare() { + sed -i \ + -e "/COMMAND.*GZIP/d" \ + -e "s/\.gz//g" \ + "${S}"/doc/CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_HSI=$(usex python) + -DENABLE_LAPACK=$(usex lapack) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + use python && python_optimize + + local lang + for lang in ${LANGS} ; do + case ${lang} in + ca) dir=ca_ES;; + ca-valencia) dir=ca_ES@valencia;; + cs) dir=cs_CZ;; + *) dir=${lang/-/_};; + esac + if ! use l10n_${lang} ; then + rm -r "${ED}"/usr/share/locale/${dir} || die + fi + done +} diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild index aec868af9672..db8dffa1c308 100644 --- a/media-gfx/hugin/hugin-9999.ebuild +++ b/media-gfx/hugin/hugin-9999.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 WX_GTK_VER="3.2-gtk3" -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit mercurial python-single-r1 wxwidgets cmake xdg @@ -14,6 +14,8 @@ SRC_URI="" EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin" EHG_PROJECT="${PN}-${PN}" +S=${WORKDIR}/${PN}-$(ver_cut 1-2).0 + LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2" SLOT="0" KEYWORDS="" @@ -56,8 +58,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DOCS=( authors.txt README TODO ) -S=${WORKDIR}/${PN}-$(ver_cut 1-2).0 - pkg_setup() { use python && python-single-r1_pkg_setup setup-wxwidgets @@ -71,10 +71,6 @@ src_configure() { local mycmakeargs=( -DBUILD_HSI=$(usex python) -DENABLE_LAPACK=$(usex lapack) - # Temporary workaround for bug #833443. Can be dropped when - # we switch to wxgtk-3.2, but complications for that remain - # w/ egl+wayland. - -DUSE_GDKBACKEND_X11=on ) cmake_src_configure } diff --git a/media-gfx/icon-slicer/Manifest b/media-gfx/icon-slicer/Manifest index 7100c95e063d..b4fe89a5946f 100644 --- a/media-gfx/icon-slicer/Manifest +++ b/media-gfx/icon-slicer/Manifest @@ -1,3 +1,3 @@ DIST icon-slicer-0.3.tar.gz 112429 BLAKE2B 4900e7d702bb45a209c165476aab5604f1623ea48081f742ce36115bde0a6a153aa5540c952013841a4853b827d1b718892006827105dd06c04e7fa892e9ee58 SHA512 09e46dca933a7c647b232d2ae8f589526e5f1cb43e07fe7056f0449cfbe812becc3a171c4f7c716bc65c0f95dc4de989a99b4f1b3566ac52e7ad67965f5be4ab -EBUILD icon-slicer-0.3-r1.ebuild 517 BLAKE2B 4045deaea03f00d32f36b0ef206e140a6a94b15abf1db8e4043d31f37675678a071d70f9eb4c5449ed2571b57ab1703036c48211b247ca6844c2fa634f8f6ea7 SHA512 fcb46942e409beb7b3f0ce2dc38a219db56223d4ba5c17fbf6b5ab3d286c5ed4424e839f5ffd938014505836fd1add691fee18ce5faa95a31db6705279e0dac2 +EBUILD icon-slicer-0.3-r1.ebuild 511 BLAKE2B 5ab6c06a441af77f22f028a5507d99f45b44d88b5b6d547a66d45edf78bcb50cb53610e5ec344acc3e629ba6f89105bf09683c417301c370e7087d1e6c3e2258 SHA512 cd2f637a1d9d5d1fdc8b5a07f7f973ec5d1c18a0c4c32a5c7eeca7a9c91f1c3849048beb385cc70a9642d30857155693533be1081d496392ab9d4c2b0973a52f MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild b/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild index 6d6308d93987..39d7ee7f434a 100644 --- a/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild +++ b/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild @@ -7,7 +7,7 @@ DESCRIPTION="Utility for generating icon themes and libXcursor cursor themes" HOMEPAGE="https://www.freedesktop.org/software/icon-slicer/" SRC_URI="https://www.freedesktop.org/software/icon-slicer/releases/${P}.tar.gz" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86" +KEYWORDS="~alpha amd64 ~hppa ppc sparc x86" LICENSE="MIT" SLOT="0" diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 8959f4660cba..4d1b18e9cb3a 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,8 +1,17 @@ +AUX imagemagick-7.1.1.38-perl-1.patch 899 BLAKE2B 0e82df3896ebfa493de365e8d97d6f9cc57e265954c072ea4cd91597f6a550241bcd9737d0664777af337f5e46b08d996970f5f5ad6226d2f1c4eab06a78520e SHA512 5cb4f64dcfd0b6805c2b1cb72ae29706480aa8ec1025b90ac7b9b65920c325ddb1635fcba608f0fea93311bf53ed2ac3a6e3a9ce2dc84dd7e1a9e67b02253378 +AUX imagemagick-7.1.1.38-perl-2.patch 930 BLAKE2B 0b8a601dbe82b47c077881721ebc69f80f156e3f1af9777b42493971ad6ff17c1036450ca11d451818446e94d1bd1f47ef04aa5828dca974d8fe02a95965c6c5 SHA512 0941425902e9f6d34e86b98835db14c9e86ea357172e77f751ceded15f74859f96c16f474d7e03a97e31f74b709ec39da3b53f6ac0e5355ba573d3447d61ff19 AUX imagemagick-9999-nocputuning.patch 327 BLAKE2B 5b9b732a434733fa5ab1b554bf7e5516260e8a8f243ab8bc61f95f6833185c3a997f5b046dc24690aeebfad925e0e180d98791aae1ad910e9aa069f0108dbd89 SHA512 647c367470deaaaa1ee14a02f80c8ed63de294ea7211a9010fad029bc9b254e27bc41c461561c28c2e24166fc17d0023238755160f8f22af641b0858e4bdceea AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57 +DIST ImageMagick-6.9.13-16.tar.xz 9613864 BLAKE2B ba6aa3cfd283e234c91e4e79a5410ba4b920cac59f1e1b23da7e899bd7b05a520bfcebd60cf3032c50da2c65bd70592a10de6a41382f9dc65eb37b1fac0f6b39 SHA512 11f3cd6a278d2af21a2bfdd5e88fe1302278b8d8a49c2b42affc5f1138f62db334fb53afc93883309904f1e6198fa4b577a5b28361e84a0c8f278873251b4e30 DIST ImageMagick-6.9.13-3.tar.xz 9616088 BLAKE2B 9682bc15c42199c266cc8d9152099a96a4e66154b9c74cd7c72993c3d9edd8aa6123d64ae6852d520c9a346a27ee27120a4d2b4f7973c279006d7570666c4080 SHA512 3e061c8a7bec0c49db9e990858257ff092500430d382bcad0c76aaa8d531bd2c13b727a52f060fc6051a0217f41f254570d23a4301c15a7af547e13f148a4ca9 DIST ImageMagick-7.1.1-25.tar.xz 10557080 BLAKE2B 833c450c87e4a1650b6d71e2d8abeea74ad6f0afa7ec6f0cba9c5bb39044cf17c6b94959d65f121a18faa8ae6ad8b8921b48700f5b6269df9d9b0e7049b22e04 SHA512 0c4a34f6ada5310af248c2e569900604c50295ecdcbc1dd7e5c4375cc68277ec9cac6786db8fa42d3783c2c68468cf88e0413fa60e4ac40d06818bfd34dcf09e -EBUILD imagemagick-6.9.13.3.ebuild 6782 BLAKE2B f2d6d70bd15dacf3607bf76d3525027641242918bd9f6881bb966aa43eab8f1ecd2cf504779da27a6130575c657000559c56c94bed570214ae7dbe85f2f59147 SHA512 0f2ae92200b8f81f118c7be15aa8d5c15e01b826d898bf5f45807f79c6bb871ae8b912d571a1836356fdcda1d8e27c8af487f52f040b587d64de7a0eb3d72b92 -EBUILD imagemagick-7.1.1.25.ebuild 7145 BLAKE2B c81405460970d982c4ce5e983ee806daf8a80813d8a32b57f7f5ad0474a1b0af35a2f4140c827a112ed024703cc910deedcf416e1dab1f5e5e69f9016b8f0e9e SHA512 07c6fea19d3e5eb6fa2195dc7cc570a7106c0be8600f3deb27546f8b0b2c112f8a6cda3cf7d96682a4719a8cf65a589c7d23b4be6216cb24e1d026818196af95 -EBUILD imagemagick-9999.ebuild 7153 BLAKE2B 33dcb5df561f77ce774e26547c2ec308cd69c497fb3f65316a0fdd7394f0b0188da2de883b6e5a2f5d7346aa20d4aa8ccfd904fc5c015102e2e96a82ae614e23 SHA512 2ea6c09e935b5a6840cff5c29e86d034e46b19f6c1ebb7055db6314f7366bace3768155e36ef6f675c4b301d425ff9c66c6c7ab9cc4009c4dd943ee110c5b3fc +DIST ImageMagick-7.1.1-38.tar.xz 10778140 BLAKE2B f8abf53fefbebb9f6d6a28396aae1898ca52be22f56e60273ca68c1f40d5bbd1ac026542422f37ba489a9e46734fe36c5dd11fc0d819ed518b2371328f1bcf0b SHA512 636e2061c11c012e2607a53a893eb227569f3a4e04e331499722f2c84dc0db3eedae63525bd530972a639e3a262ab4f61383a21ca8603f8f81e5629a29f54b89 +EBUILD imagemagick-6.9.13.16-r1.ebuild 6912 BLAKE2B f449b34e93816d707a7a60687df3ba6c2ae1c9a4afab1a3be64508b491e362230396e7c43178adcd99b1de7a21551c7a022be0df22eb55650db90c1a21d68c32 SHA512 1062cd705c8c6f6c0290aead29b8d42f60a7d3e442490f6d8eb3f1b7461377a8ed4f87c8e75f178b30282ed1865cea18c6b7d1758e9dfa36dabd16f79f19f986 +EBUILD imagemagick-6.9.13.16.ebuild 6789 BLAKE2B dc2dcb70843278acf857f0d1504409eb4375aa61b4e13fa583c5451649f9a168d10c2b5b1a0126600f32fab6683240b33734835e127ff6c110604cc6551e532a SHA512 0fe1853fd1cbf84ab4e870c4911e202bf3515b2081c4e5e6a333f7ea73a195f74efd2aecf56531f46068b805ed58738cf252100cb1936d49ba87255b256c5f13 +EBUILD imagemagick-6.9.13.3.ebuild 6781 BLAKE2B e1fcefcaad0b1c2bb90778e824cbe246d26c62edeaf059c14d7596a4bbead4a1fbd89ced09530f6e6367720cd216149ed29da1df746594a221df72ce4635bc25 SHA512 28735c63c231fd8ffe1db282f59f502a4f02f3a196668fae81a8b5c2ee67890dcec85b01c7b92ab20c00c26b4b51e223540c5588bf8998559b25dc9b5bc3a00d +EBUILD imagemagick-7.1.1.25-r1.ebuild 7273 BLAKE2B 8056189d595770d68fa628695b6cf275f056cbee9d6baec3f812187dceb742cbde81caebf66ea281f1f1dc346db35f02c0ceffb48a77b3d1f21b165bb7b64151 SHA512 53433dfc3f268e3166f3544f15a34fc913c9134905dc7a14f20149e59ac1c7691ebb82527cc1310be98291a8ee6ba6e2474380bff7df0cdd8b476a6fdc2dec6a +EBUILD imagemagick-7.1.1.38-r1.ebuild 7169 BLAKE2B 9f0f58f584dda431d1725b0fd97bb587fb4eecfd4c275c2ca97f37ed20726ea0f98acf54dd846a11a2efb8a1f5931b376d2084959d81479327d0ae913993063b SHA512 2f3f5cdf255821e783a6ade357db17521eacda8d5364967fd0c48bd7659a79ca1d9a80608efbf6e466f697b8de624e6492d1724436b9dae2a34aa0f610512f8f +EBUILD imagemagick-7.1.1.38-r2.ebuild 7292 BLAKE2B 9e8502ef474af8be78f997a7e0f7a8b56b589c9895f2e18cbb417b60b7923dbacccab57da8403cd517f8e5319ebc83b9d28bc3fab6a5eafe6fc4365678d8a955 SHA512 795a7936759a7c09789ed6808c43b76a502844dd070444a0c6281d2a6326ee954b71f17bfba1c6af5877fa0ff7992d914345ea3af9b4b705b1ab05607640c272 +EBUILD imagemagick-7.1.1.38.ebuild 7083 BLAKE2B 7e0282f0188544f0f62dc6dfceb725b05db2251f00e05b48fb12f7ba56f46eef70f2d4c85011a83ce736bb25e00dd94e5254d5698481514c6e8579aa33b23e5c SHA512 47a801f6d9c94f3a8a1e975e6c2ddedebb2a5a88da9a0661249f62f66cf68f28d326d1277e9202e20162b5cbdbd33884d454519b5842048efdbd3494c648ca5a +EBUILD imagemagick-9999.ebuild 7212 BLAKE2B 042da6a96183a3d8b674a42e4c7f38b18492d63673504ac7cbd26169f506c4ca1e4973dafdd3f121fe636de042b437601ec81278860ff41f8e79f79f876a591c SHA512 bc89a07bbba3464b7681f7e5a2938ac5b71720adaef245546b1e4b065fa134c984db206cccef64db32d4d1f25fca249cea9a595c2f27c14edc0a3baf3bcd4507 MISC metadata.xml 1140 BLAKE2B c1eee3f7686c72c0603f94e19953e81f3467bdc6192d06c61c9c7da67a39e64d81603efa0dce5fe647a47a9c8bd1568609944b7fa1c6c2547ca3badcdde7a0d4 SHA512 d89de96e346c6d46921b5b39a785ce7e584a043f7e8bc73dd8a727c5cc102b717b4226cef04a0cd8c41a97bdbe43d0eda3cacbf5e0db65b741b0c6dd577eb235 diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-1.patch b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-1.patch new file mode 100644 index 000000000000..afd45b3417eb --- /dev/null +++ b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-1.patch @@ -0,0 +1,28 @@ +From 3862ebc02771f33c309e9ee91b696aff0fbdc20e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> +Date: Sun, 8 Sep 2024 21:10:01 +0200 +Subject: [PATCH 1/2] Revert "install perl module into user-specified prefix + (#7192)" + +This reverts commit c09d35f22090585a0357ecfbd58786022a37aae7. +--- + PerlMagick/Makefile.PL.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/PerlMagick/Makefile.PL.in b/PerlMagick/Makefile.PL.in +index 902f01dc2..622a502ea 100644 +--- a/PerlMagick/Makefile.PL.in ++++ b/PerlMagick/Makefile.PL.in +@@ -223,9 +223,6 @@ WriteMakefile + # Linker flags for building a dynamically loadable module + 'LDDLFLAGS' => $LDDLFLAGS_magick, + +- # Install PerlMagick into ImageMagick prefix +- 'INSTALL_BASE' => '@PREFIX_DIR@', +- + # Install PerlMagick binary into ImageMagick bin directory + 'INSTALLBIN' => '@BIN_DIR@', + +-- +2.44.2 + diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-2.patch b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-2.patch new file mode 100644 index 000000000000..10418d8555e6 --- /dev/null +++ b/media-gfx/imagemagick/files/imagemagick-7.1.1.38-perl-2.patch @@ -0,0 +1,27 @@ +From 5e08a2474436574d7ed6de006573dd9bc036cd5c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> +Date: Sun, 8 Sep 2024 21:10:13 +0200 +Subject: [PATCH 2/2] Revert "set perl install base to that of ImageMagick's" + +This reverts commit 2d5edb26e22dd34ac1e43936b5c461bf0dbdb03a. +--- + PerlMagick/quantum/Makefile.PL.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/PerlMagick/quantum/Makefile.PL.in b/PerlMagick/quantum/Makefile.PL.in +index fabebd300..fa0bf3384 100644 +--- a/PerlMagick/quantum/Makefile.PL.in ++++ b/PerlMagick/quantum/Makefile.PL.in +@@ -220,9 +220,6 @@ WriteMakefile + # Linker flags for building a dynamically loadable module + 'LDDLFLAGS' => $LDDLFLAGS_magick, + +- # Install PerlMagick into ImageMagick prefix +- 'INSTALL_BASE' => '@PREFIX_DIR@', +- + # Install PerlMagick binary into ImageMagick bin directory + 'INSTALLBIN' => '@BIN_DIR@', + +-- +2.44.2 + diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild new file mode 100644 index 000000000000..b31c19145569 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-6.9.13.16-r1.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QA_PKGCONFIG_VERSION=$(ver_cut 1-3) +inherit flag-o-matic libtool perl-functions toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://imagemagick.org/index.php" + +LICENSE="imagemagick" +# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. +# If ABI is broken, change the bit after the '-'. +SLOT="0/$(ver_cut 1-3)-0" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" + +REQUIRED_USE=" + corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts ) +" + +RESTRICT="!test? ( test )" + +RDEPEND=" + !media-gfx/graphicsmagick[imagemagick] + dev-libs/libltdl + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:=[x265] ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:= ) + png? ( media-libs/libpng:= ) + postscript? ( app-text/ghostscript-gpl:= ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2 ) + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND="virtual/pkgconfig" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + # for Darwin modules + elibtoolize + + # For testsuite, see bug #500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + # Workaround for bug #941208 (gcc PR117100) + tc-is-gcc && [[ $(gcc-major-version) == 13 ]] && append-flags -fno-unswitch-loops + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + $(use_enable openmp) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zlib) + --without-autotrace + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + --with-gcc-arch=no-automagic + + # Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open + # For now, let's make USE=hardened do 'limited', and have USE=-hardened + # reflect the upstream default of 'open'. + # + # We might change it to 'secure' and 'limited' at some point. + # See also bug #716674. + --with-security-policy=$(usex hardened limited open) + ) + + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in ${HOME} for test suite, bug #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + dodoc {AUTHORS,README}.txt + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + # bug #472766 + doins "${T}"/99${PN} + fi + + insinto /usr/share/${PN} + doins config/*icm +} diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild new file mode 100644 index 000000000000..d5470d00ae36 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-6.9.13.16.ebuild @@ -0,0 +1,242 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QA_PKGCONFIG_VERSION=$(ver_cut 1-3) +inherit flag-o-matic libtool perl-functions toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +fi + +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://imagemagick.org/index.php" + +LICENSE="imagemagick" +# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. +# If ABI is broken, change the bit after the '-'. +SLOT="0/$(ver_cut 1-3)-0" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" + +REQUIRED_USE=" + corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts ) +" + +RESTRICT="!test? ( test )" + +RDEPEND=" + !media-gfx/graphicsmagick[imagemagick] + dev-libs/libltdl + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:=[x265] ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:= ) + png? ( media-libs/libpng:= ) + postscript? ( app-text/ghostscript-gpl:= ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2 ) + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND="virtual/pkgconfig" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + # for Darwin modules + elibtoolize + + # For testsuite, see bug #500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + $(use_enable openmp) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zlib) + --without-autotrace + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + --with-gcc-arch=no-automagic + + # Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open + # For now, let's make USE=hardened do 'limited', and have USE=-hardened + # reflect the upstream default of 'open'. + # + # We might change it to 'secure' and 'limited' at some point. + # See also bug #716674. + --with-security-policy=$(usex hardened limited open) + ) + + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in ${HOME} for test suite, bug #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + dodoc {AUTHORS,README}.txt + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + # bug #472766 + doins "${T}"/99${PN} + fi + + insinto /usr/share/${PN} + doins config/*icm +} diff --git a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild index 3ee01ea4f7df..51feb1ba7e34 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.13.3.ebuild @@ -14,13 +14,13 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" +HOMEPAGE="https://imagemagick.org/index.php" LICENSE="imagemagick" # Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild new file mode 100644 index 000000000000..52d6378e2f26 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-7.1.1.25-r1.ebuild @@ -0,0 +1,255 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QA_PKGCONFIG_VERSION=$(ver_cut 1-3) +inherit autotools flag-o-matic perl-functions toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://imagemagick.org/index.php" + +LICENSE="imagemagick" +# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. +# If ABI is broken, change the bit after the '-'. +SLOT="0/$(ver_cut 1-3)-18" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" + +REQUIRED_USE=" + corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts ) +" + +RESTRICT="!test? ( test )" + +RDEPEND=" + !media-gfx/graphicsmagick[imagemagick] + dev-libs/libltdl + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:=[x265] ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + jpegxl? ( >=media-libs/libjxl-0.6:= ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:= ) + png? ( media-libs/libpng:= ) + postscript? ( app-text/ghostscript-gpl:= ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2 ) + lzma? ( app-arch/xz-utils ) + zip? ( dev-libs/libzip:= ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-9999-nocputuning.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + #elibtoolize # for Darwin modules + eautoreconf + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + # Workaround for bug #941208 (gcc PR117100) + tc-is-gcc && [[ $(gcc-major-version) == 13 ]] && append-flags -fno-unswitch-loops + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + $(use_enable openmp) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zip) + $(use_with zlib) + --without-autotrace + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + $(use_with jpegxl jxl) + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + + # Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open + # For now, let's make USE=hardened do 'limited', and have USE=-hardened + # reflect the upstream default of 'open'. + # + # We might change it to 'secure' and 'limited' at some point. + # See also bug #716674. + --with-security-policy=$(usex hardened limited open) + ) + + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in $HOME for test suite, bug #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + if [[ ${PV} == 9999 ]] ; then + IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild + else + IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + fi + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + dodoc {AUTHORS,README}.txt + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + doins "${T}"/99${PN} #472766 + fi + + insinto /usr/share/${PN} + doins config/*icm +} diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild new file mode 100644 index 000000000000..7a411d2e2d91 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r1.ebuild @@ -0,0 +1,254 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QA_PKGCONFIG_VERSION=$(ver_cut 1-3) +inherit autotools flag-o-matic perl-functions toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://imagemagick.org/index.php" + +LICENSE="imagemagick" +# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. +# If ABI is broken, change the bit after the '-'. +SLOT="0/$(ver_cut 1-3)-18" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" + +REQUIRED_USE=" + corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts ) +" + +RESTRICT="!test? ( test )" + +RDEPEND=" + !media-gfx/graphicsmagick[imagemagick] + dev-libs/libltdl + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:=[x265] ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + jpegxl? ( >=media-libs/libjxl-0.6:= ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:= ) + png? ( media-libs/libpng:= ) + postscript? ( app-text/ghostscript-gpl:= ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2 ) + lzma? ( app-arch/xz-utils ) + zip? ( dev-libs/libzip:= ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-7.1.1.38-perl-1.patch" + "${FILESDIR}/${PN}-7.1.1.38-perl-2.patch" + "${FILESDIR}/${PN}-9999-nocputuning.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + #elibtoolize # for Darwin modules + eautoreconf + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + $(use_enable openmp) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zip) + $(use_with zlib) + --without-autotrace + --with-uhdr + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + $(use_with jpegxl jxl) + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + + # Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open + # For now, let's make USE=hardened do 'limited', and have USE=-hardened + # reflect the upstream default of 'open'. + # + # We might change it to 'secure' and 'limited' at some point. + # See also bug #716674. + --with-security-policy=$(usex hardened limited open) + ) + + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in $HOME for test suite, bug #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + if [[ ${PV} == 9999 ]] ; then + IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild + else + IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + fi + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + einstalldocs + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + doins "${T}"/99${PN} #472766 + fi + + insinto /usr/share/${PN} + doins config/*icm +} diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild new file mode 100644 index 000000000000..dded43c3ccc9 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-7.1.1.38-r2.ebuild @@ -0,0 +1,257 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QA_PKGCONFIG_VERSION=$(ver_cut 1-3) +inherit autotools flag-o-matic perl-functions toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://imagemagick.org/index.php" + +LICENSE="imagemagick" +# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. +# If ABI is broken, change the bit after the '-'. +SLOT="0/$(ver_cut 1-3)-18" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hardened hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" + +REQUIRED_USE=" + corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts ) +" + +RESTRICT="!test? ( test )" + +RDEPEND=" + !media-gfx/graphicsmagick[imagemagick] + dev-libs/libltdl + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:=[x265] ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + jpegxl? ( >=media-libs/libjxl-0.6:= ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:= ) + png? ( media-libs/libpng:= ) + postscript? ( app-text/ghostscript-gpl:= ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2 ) + lzma? ( app-arch/xz-utils ) + zip? ( dev-libs/libzip:= ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-7.1.1.38-perl-1.patch" + "${FILESDIR}/${PN}-7.1.1.38-perl-2.patch" + "${FILESDIR}/${PN}-9999-nocputuning.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + #elibtoolize # for Darwin modules + eautoreconf + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + # Workaround for bug #941208 (gcc PR117100) + tc-is-gcc && [[ $(gcc-major-version) == 13 ]] && append-flags -fno-unswitch-loops + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + $(use_enable openmp) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zip) + $(use_with zlib) + --without-autotrace + --with-uhdr + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + $(use_with jpegxl jxl) + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + + # Default upstream (as of 6.9.12.96/7.1.1.18 anyway) is open + # For now, let's make USE=hardened do 'limited', and have USE=-hardened + # reflect the upstream default of 'open'. + # + # We might change it to 'secure' and 'limited' at some point. + # See also bug #716674. + --with-security-policy=$(usex hardened limited open) + ) + + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in $HOME for test suite, bug #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + if [[ ${PV} == 9999 ]] ; then + IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild + else + IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + fi + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + einstalldocs + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + doins "${T}"/99${PN} #472766 + fi + + insinto /usr/share/${PN} + doins config/*icm +} diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild index 328808618479..45cfe4d2db47 100644 --- a/media-gfx/imagemagick/imagemagick-7.1.1.25.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.1.1.38.ebuild @@ -14,13 +14,13 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" +HOMEPAGE="https://imagemagick.org/index.php" LICENSE="imagemagick" # Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. @@ -155,6 +155,7 @@ src_configure() { $(use_with zip) $(use_with zlib) --without-autotrace + --with-uhdr $(use_with postscript dps) $(use_with djvu) --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu @@ -226,8 +227,7 @@ src_install() { DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ install - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt + einstalldocs if use perl; then find "${ED}" -type f -name perllocal.pod -exec rm -f {} + diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index 904cbdbc135e..36da9357938f 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.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,13 +14,13 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" +HOMEPAGE="https://imagemagick.org/index.php" LICENSE="imagemagick" # Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. @@ -138,6 +138,9 @@ src_configure() { [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + # Workaround for bug #941208 (gcc PR117100) + tc-is-gcc && [[ $(gcc-major-version) == 13 ]] && append-flags -fno-unswitch-loops + local myeconfargs=( $(use_enable static-libs static) $(use_enable hdri) @@ -155,6 +158,7 @@ src_configure() { $(use_with zip) $(use_with zlib) --without-autotrace + --with-uhdr $(use_with postscript dps) $(use_with djvu) --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu @@ -226,8 +230,7 @@ src_install() { DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ install - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt + einstalldocs if use perl; then find "${ED}" -type f -name perllocal.pod -exec rm -f {} + diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest index c46b8bf1dc8f..3490f1d850b4 100644 --- a/media-gfx/img2pdf/Manifest +++ b/media-gfx/img2pdf/Manifest @@ -2,5 +2,5 @@ AUX img2pdf-0.4.4-Support-imagemagick-7.1.0-48.patch 4995 BLAKE2B 401e3b144f14e6 DIST img2pdf-0.4.4.tar.gz 97796 BLAKE2B d04eae8c02490e4e73339dade92b2521ad410ed741ccc2987961543790589b14a5c8939cb9bbadcc795f5edcbb59a1a43bd522c75948f42dde1acffafb6266e0 SHA512 56943cd965b3e6b0680b7696ca4b5a2ba779474f945dd0d2648fb6f18ab18aab6d74640f9bd8e9c8683e3e641b0657cb84c691054910d84f0c9e8ad733f179e9 DIST img2pdf-0.5.1.tar.gz 104241 BLAKE2B 1ea89107654c91cea8b5f074c05c7376452dd2ebd40dafaadedb39ac3ee383c3c02c1375b130da73339e1f87eb1a6ffbe0553cdedf6ec997bc0731d1d100327f SHA512 e17a920929f6ab08f501b205c38f9cf2fd5a6bd8d41ac4819a5d7463a3cfbeb5376cd5bbee36ab303248610f1d5c8a71a38ff85b14be564e2f39c6eb537ffcaf EBUILD img2pdf-0.4.4-r1.ebuild 1366 BLAKE2B 55a6766982ecd0465ced305811b7c81f90a2907ea97eaaaa5840f2c7fc364c381c87a8de3dd95ea31a0821c7936f34801f66841ac014fc29655ba2341a27cf6a SHA512 fb52707981b5bac760b08e170d6a0188a447f6a790281d6f0885cf1bd2b5fe366275167d85b05f704d0971b3c54e4d4bc9b3919ac0e84ca1fdbd359d803b1d7d -EBUILD img2pdf-0.5.1.ebuild 1582 BLAKE2B 90489ef3c9a7a6dd9b9f53685ca65fc7e7034c41cd138fa0dd74d12040f4e48caebef22e57ab76c3e42a4a6182ccba57e7ec9e8777158b2f4aaa090f2f258572 SHA512 d87c7f843751f8129aed75440316a884b17390d73f5005ee96d5b30c067649d58bfed1d56974ab013188902447a4b1c06ca947a1a44332e467fbe23a6ed87dbf +EBUILD img2pdf-0.5.1.ebuild 1589 BLAKE2B f8d33bdce4413fec1d68978a95a2d536760b35dc55ed6de70c34e07e4bcecc4d8069b6458659eebc8fc5b3abbb9de8632b83c58a0a58f0d0133d6aea396468f0 SHA512 5579fb13cf2b1e8a5f9999cbad37fae70bab0dab543e6bec82029814c093303501ae08b97aa96b71ebfc316050432ca234df1372e311eada702aa98580c93b15 MISC metadata.xml 923 BLAKE2B fe0074db9549519b522f9d749388c5626b702dadba5a722444f652b203a60aea8e8ea5739c3c634076b42dddf24d17b4f449220de617224e59e5491893339901 SHA512 98fc799711e027afa40d2b9bf4558c38873d385920713f58d62782a986e72d1c9b04eb5591d4ec384bbf32376e2b03bf822bf5573015d003ff53ae0d4c7e6421 diff --git a/media-gfx/img2pdf/img2pdf-0.5.1.ebuild b/media-gfx/img2pdf/img2pdf-0.5.1.ebuild index 156509f263af..a6489af9714d 100644 --- a/media-gfx/img2pdf/img2pdf-0.5.1.ebuild +++ b/media-gfx/img2pdf/img2pdf-0.5.1.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="gui" BDEPEND=" diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 01f8c60e8900..92ed2587a306 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -3,7 +3,12 @@ AUX inkscape-1.3.2-cxx20.patch 3811 BLAKE2B 308f70c1fa07894af3b223f800dd514c2aff AUX inkscape-1.3.2-libxml2-2.12.patch 916 BLAKE2B 06ff8b562f6eb703ae2b88a8f0c4ce68257066a8482c1e9b05144bf2fa188512fd6521bfaed700f5fae90dd7b9d927e3382220ebc2a67fdf01614fc9db08b30c SHA512 afdd6c92b16ecc7078cc15b13c40cb19ca2b326367729341003894004ba1fd36c6df8d04f954c65fbbe213201cee14bd5dc38766d87801a4b78934a9927957a4 AUX inkscape-1.3.2-poppler-24.03.patch 2982 BLAKE2B b8ed08ef09afbab15196ae6d0f198acc01a4000bc2688d0209d53108dac0c801f9d3d1d3be78893e6268f0e82ca7f61b6975252d29aa657487fe792d42c79532 SHA512 9bd8062599fe183de837804106aa2501cb77710f76214663dfd504d9a7cb4a4bc838311c87ed2bbacca4bbcab29a2f81e0831cbd4f8c2017816a0e6fbbfe306b AUX inkscape-1.3.2-poppler-24.05.patch 2620 BLAKE2B 0fc615690c365cf1630b680f1b6c43d28667263e26c2dad7697e9f7ae56a91b05bf6457f99578ec2a8b771155349b5dbe125f00fcc28f148ba7d58c2887230a5 SHA512 8da5c3db83968a42e1e43b1dc7148724fe2b18299b8c6cf58ab8315566daaa8d2d5cc9030cdb9bc31b55cbd868410a314b7b097ae0f4bd5ccba99c073839e0dc +AUX inkscape-1.4-gcc15.patch 1088 BLAKE2B 56e9e4e14d87d20d7a03e388105ccdaa219fc26146c771c2c6942ca82abee54fb43d0807ce0ddf59cc77ec6e5184db5e628980209f5eda651ac6ee09af96f74e SHA512 b6f18c645c9946a7052c2d93df1475f1d9db626f200754b767f4372c17e056389c93fc129385d1c9ed3f0e329866696adfb8a61f6e4bc4058c23f20324287072 DIST inkscape-1.3.2.tar.xz 44720944 BLAKE2B 24120f8c671e1fb54bb6626cab95e7086e3c60fbc117bbe8017d081c799bc26812b1286e670771e7ffe88720ba25f237146c452afaf65c1ee2ee554fb07f79a2 SHA512 a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343 -EBUILD inkscape-1.3.2-r2.ebuild 5880 BLAKE2B f07c32e0321cd91a20ec4462297b1147a99a94a55ba90280b2e207731c3c7268a6e3de652a2826be11e876357ae86351cb578dd1b7f6409670b30de7d5e98c71 SHA512 edba7f70cc6200af742a68e1677bb53c88885aefe3c6d91fe2e6f03c728ed000cfc6053130e5a7769eb61bb57f0cf94dc7c5dbf3da2fce7cd790f49d5f4d58d0 -EBUILD inkscape-9999.ebuild 5619 BLAKE2B 1df847047fbf31f8957455a4783dbf50662c838832c36a979057dd6fe1fbc7a27663562b98acb972784255df578b30be9acfe4452c4c8d0337db7f8f72555b90 SHA512 37bc139d98e7c727210dff9845e61fd085c34facbc204e87d12eb6f19f978d9675469309cf93da4813bdb7ea88ea0c355b389b63348447375ec93524ed6ffaaa +DIST inkscape-1.4.tar.xz 46321868 BLAKE2B 3f21402019995122f043f5ebd8f07e1c9548c507f27c494e4214e090c46acae016c21f950609c95cef2e1b0011693e6629326d733b257402391e2d919bcd0303 SHA512 3b81306b81416597073e7eda2a103112cee63493bcf96fa737bb1edfbd682ebb329e415bbbbfda877aef2a78dc376460040ebc5c0cc2c90c0fe60db5d7d12368 +DIST inkscape-1.4beta3.tar.xz 46065140 BLAKE2B e24849462170014ee6ffd609e5f6db38694e387a5988929bc52cf3b9594d0021c63d8bdfe997dc22f6c544e1c65b9ccd78f314cb943242a860471122d32efcd8 SHA512 3c8d757eacef54742c4c8b9ce923719fee4ae1fb6d39031fecdf4d9641cfaa2e689adcfa16a7450a43aefe5795a2319f0ef5cd7304e78b2a9bff0da02106faba +EBUILD inkscape-1.3.2-r2.ebuild 5874 BLAKE2B a95355ae1c5bd7806e05314ae07f9a3b278897c03e217dffa0433ee51e7fb0e0a47f06ead4c2f1ba47ee2e8bce49f4b378d31e3de6e9b64cac96cd0c1304a0eb SHA512 229a75fd98d6be7c25443a87bdb14b792a89cf30df55158945db2f2d7c7e247e5ce39e351c41e11324fbd6d9a31f0d669985455367c870adb951b358a3c7b4a1 +EBUILD inkscape-1.4.ebuild 5504 BLAKE2B d7bbfa3756cd9eb53910bd18290cfe344dd5b7a1b04d618982057c93b0a1207a20641084f31b3468a61951867358ee15b3f7e42b9aee40aae49064650b8498df SHA512 eca85a418bfd55597d8d3e0b841ec3ac58a5dc17bc417aa7595c2caa18557a198079b59ac8d8122ccfe7edf2c01e0e865bff032f31c8f5956621d438b6eb8ace +EBUILD inkscape-1.4_beta3.ebuild 5454 BLAKE2B 9c0d873f35ae8af58329690852a05644a6a3696f1a3245ca3922c52dae0033ea9f02b8b54f0df091ad37a7f6ab77ab04d04d38a23d3cd8caad68b06b02814b17 SHA512 f93bf9f1f1b8bdc39d9a988aaf0d1cd1a583df14f909e927feb5781f531981b4eedb504d2f95491fe8120f63760ce9dafc45a46c705a2af675cb0824739efdb4 +EBUILD inkscape-9999.ebuild 5454 BLAKE2B 11e8e32147c195970e30d294cb5622748260c5d5cc1f2b4fbde7c90206c481416226a56c6cd8edd31971923b93c5f76897a5ad9eecec6f5903e1b58f5c2e41f5 SHA512 36f9f68fbef97a896250ecff86717747eb4b7be7d5ab9e465a536dee62c58db2ba80bdb549719010811685634b3cf54540f443955894b1037754004b0dc6c079 MISC metadata.xml 982 BLAKE2B f44f534865614c8dd7bf71e92ce69cff708fc08e3eb701765bf93144b433ec52df52a506b69cc98969909c695015881b60592cccdf27613c6fe82812fc50727b SHA512 2963a9b473f139d06cefd1c3231ef148045c005adb4688850522c183f39ba15a36331b7eae7752e9bf15a26e6370f2af14ec02e59735f1753246c45821c0cdbc diff --git a/media-gfx/inkscape/files/inkscape-1.4-gcc15.patch b/media-gfx/inkscape/files/inkscape-1.4-gcc15.patch new file mode 100644 index 000000000000..e27db0be34ef --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-1.4-gcc15.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/941674 +https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787 + +From eb6dadcf1a5c660167ba43f3606c8e7cc6529787 Mon Sep 17 00:00:00 2001 +From: Liam <byteslice@airmail.cc> +Date: Sat, 12 Oct 2024 05:22:29 -0400 +Subject: [PATCH] gobjectptr: fix member name + +--- a/src/util/gobjectptr.h ++++ b/src/util/gobjectptr.h +@@ -20,7 +20,7 @@ public: + GObjectPtr() = default; + explicit GObjectPtr(T *p, bool add_ref = false) : _p(p) { if (add_ref) _ref(); } + GObjectPtr(GObjectPtr const &other) : _p(other._p) { _ref(); } +- GObjectPtr &operator=(GObjectPtr const &other) { if (&other != this) { _unref(); _p = other.p; _ref(); } return *this; } ++ GObjectPtr &operator=(GObjectPtr const &other) { if (&other != this) { _unref(); _p = other._p; _ref(); } return *this; } + GObjectPtr(GObjectPtr &&other) noexcept : _p(other._p) { other._p = nullptr; } + GObjectPtr &operator=(GObjectPtr &&other) { if (&other != this) { _unref(); _p = other._p; other._p = nullptr; } return *this; } + ~GObjectPtr() { _unref(); } +-- +GitLab diff --git a/media-gfx/inkscape/inkscape-1.3.2-r2.ebuild b/media-gfx/inkscape/inkscape-1.3.2-r2.ebuild index a47b5b9d4390..d9b60c0ac627 100644 --- a/media-gfx/inkscape/inkscape-1.3.2-r2.ebuild +++ b/media-gfx/inkscape/inkscape-1.3.2-r2.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" else SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi S="${WORKDIR}/${MY_P}" diff --git a/media-gfx/inkscape/inkscape-1.4.ebuild b/media-gfx/inkscape/inkscape-1.4.ebuild new file mode 100644 index 000000000000..29117135a3c6 --- /dev/null +++ b/media-gfx/inkscape/inkscape-1.4.ebuild @@ -0,0 +1,204 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_REQ_USE="xml(+)" + +inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 + +MY_P="${P/_/}" +DESCRIPTION="SVG based generic vector-drawing program" +HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/" + +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" +else + SRC_URI="https://media.inkscape.org/dl/resources/file/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg openmp postscript readline sourceview spell svg2 test visio wpg X" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +# Lots of test failures which need investigating, bug #871621 +RESTRICT="!test? ( test ) test" + +BDEPEND=" + dev-util/glib-utils + >=sys-devel/gettext-0.17 + virtual/pkgconfig + test? ( virtual/imagemagick-tools ) +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-text/poppler-0.57.0:=[cairo] + >=dev-cpp/cairomm-1.12:0 + >=dev-cpp/glibmm-2.58:2 + dev-cpp/gtkmm:3.0 + >=dev-cpp/pangomm-2.40:1.4 + >=dev-libs/boehm-gc-7.1:= + dev-libs/boost:=[stacktrace(-)] + dev-libs/double-conversion:= + >=dev-libs/glib-2.41 + >=dev-libs/libsigc++-2.8:2 + >=dev-libs/libxml2-2.7.4 + >=dev-libs/libxslt-1.1.25 + dev-libs/popt + media-gfx/potrace + media-libs/libepoxy + media-libs/fontconfig + media-libs/freetype:2 + media-libs/lcms:2 + media-libs/libpng:0= + sci-libs/gsl:= + >=x11-libs/pango-1.44 + x11-libs/gtk+:3[X?] + X? ( x11-libs/libX11 ) + $(python_gen_cond_dep ' + dev-python/appdirs[${PYTHON_USEDEP}] + dev-python/cachecontrol[${PYTHON_USEDEP}] + dev-python/cssselect[${PYTHON_USEDEP}] + dev-python/filelock[${PYTHON_USEDEP}] + dev-python/lockfile[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/pillow[jpeg?,tiff,webp,${PYTHON_USEDEP}] + media-gfx/scour[${PYTHON_USEDEP}] + ') + cdr? ( + app-text/libwpg:0.3 + dev-libs/librevenge + media-libs/libcdr + ) + exif? ( media-libs/libexif ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + ) + jpeg? ( media-libs/libjpeg-turbo:= ) + readline? ( sys-libs/readline:= ) + sourceview? ( x11-libs/gtksourceview:4 ) + spell? ( app-text/gspell ) + visio? ( + app-text/libwpg:0.3 + dev-libs/librevenge + media-libs/libvisio + ) + wpg? ( + app-text/libwpg:0.3 + dev-libs/librevenge + ) +" +# These only use executables provided by these packages +# See share/extensions for more details. inkscape can tell you to +# install these so we could of course just not depend on those and rely +# on that. +RDEPEND="${COMMON_DEPEND} + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') + dia? ( app-office/dia ) + postscript? ( app-text/ghostscript-gpl ) +" +DEPEND="${COMMON_DEPEND} + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4-gcc15.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + python-single-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} = 9999* ]]; then + git-r3_src_unpack + else + default + fi + [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P/_/-}_202"?-??-* "${S}" || die +} + +src_prepare() { + cmake_src_prepare + sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die +} + +src_configure() { + # ODR violation (https://gitlab.com/inkscape/lib2geom/-/issues/71, bug #859628) + filter-lto + # Aliasing unsafe (bug #310393) + append-flags -fno-strict-aliasing + + local mycmakeargs=( + # -DWITH_LPETOOL # Compile with LPE Tool and experimental LPEs enabled + -DWITH_NLS=ON + -DENABLE_POPPLER=ON + -DENABLE_POPPLER_CAIRO=ON + -DWITH_PROFILING=OFF + -DWITH_INTERNAL_2GEOM=ON + -DBUILD_TESTING=$(usex test) + -DWITH_LIBCDR=$(usex cdr) + -DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled + -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick + -DWITH_GNU_READLINE=$(usex readline) + -DWITH_GSPELL=$(usex spell) + -DWITH_JEMALLOC=OFF + -DENABLE_LCMS=ON + -DWITH_OPENMP=$(usex openmp) + -DBUILD_SHARED_LIBS=ON + -DWITH_GSOURCEVIEW=$(usex sourceview) + -DWITH_SVG2=$(usex svg2) + -DWITH_LIBVISIO=$(usex visio) + -DWITH_LIBWPG=$(usex wpg) + -DWITH_X11=$(usex X) + ) + + cmake_src_configure +} + +src_test() { + CMAKE_SKIP_TESTS=( + # render_text*: needs patched Cairo / maybe upstream changes + # not yet in a release. + # test_lpe/test_lpe64: precision differences b/c of new GCC? + # cli_export-png-color-mode-gray-8_png_check_output: ditto? + render_test-use + render_test-glyph-y-pos + render_text-glyphs-combining + render_text-glyphs-vertical + render_test-rtl-vertical + test_lpe + test_lpe64 + cli_export-png-color-mode-gray-8_png_check_output + ) + + # bug #871621 + cmake_src_compile tests + cmake_src_test -j1 +} + +src_install() { + cmake_src_install + + find "${ED}" -type f -name "*.la" -delete || die + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die + + local extdir="${ED}"/usr/share/${PN}/extensions + if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then + python_fix_shebang "${ED}"/usr/share/${PN}/extensions + python_optimize "${ED}"/usr/share/${PN}/extensions + fi +} diff --git a/media-gfx/inkscape/inkscape-1.4_beta3.ebuild b/media-gfx/inkscape/inkscape-1.4_beta3.ebuild new file mode 100644 index 000000000000..eab33b71e0fe --- /dev/null +++ b/media-gfx/inkscape/inkscape-1.4_beta3.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" + +inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 + +MY_P="${P/_/}" +DESCRIPTION="SVG based generic vector-drawing program" +HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/" + +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" +else + SRC_URI="https://media.inkscape.org/dl/resources/file/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg openmp postscript readline sourceview spell svg2 test visio wpg X" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +# Lots of test failures which need investigating, bug #871621 +RESTRICT="!test? ( test ) test" + +BDEPEND=" + dev-util/glib-utils + >=sys-devel/gettext-0.17 + virtual/pkgconfig + test? ( virtual/imagemagick-tools ) +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-text/poppler-0.57.0:=[cairo] + >=dev-cpp/cairomm-1.12:0 + >=dev-cpp/glibmm-2.58:2 + dev-cpp/gtkmm:3.0 + >=dev-cpp/pangomm-2.40:1.4 + >=dev-libs/boehm-gc-7.1:= + dev-libs/boost:=[stacktrace(-)] + dev-libs/double-conversion:= + >=dev-libs/glib-2.41 + >=dev-libs/libsigc++-2.8:2 + >=dev-libs/libxml2-2.7.4 + >=dev-libs/libxslt-1.1.25 + dev-libs/popt + media-gfx/potrace + media-libs/libepoxy + media-libs/fontconfig + media-libs/freetype:2 + media-libs/lcms:2 + media-libs/libpng:0= + sci-libs/gsl:= + >=x11-libs/pango-1.44 + x11-libs/gtk+:3[X?] + X? ( x11-libs/libX11 ) + $(python_gen_cond_dep ' + dev-python/appdirs[${PYTHON_USEDEP}] + dev-python/cachecontrol[${PYTHON_USEDEP}] + dev-python/cssselect[${PYTHON_USEDEP}] + dev-python/filelock[${PYTHON_USEDEP}] + dev-python/lockfile[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/pillow[jpeg?,tiff,webp,${PYTHON_USEDEP}] + media-gfx/scour[${PYTHON_USEDEP}] + ') + cdr? ( + app-text/libwpg:0.3 + dev-libs/librevenge + media-libs/libcdr + ) + exif? ( media-libs/libexif ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + ) + jpeg? ( media-libs/libjpeg-turbo:= ) + readline? ( sys-libs/readline:= ) + sourceview? ( x11-libs/gtksourceview:4 ) + spell? ( app-text/gspell ) + visio? ( + app-text/libwpg:0.3 + dev-libs/librevenge + media-libs/libvisio + ) + wpg? ( + app-text/libwpg:0.3 + dev-libs/librevenge + ) +" +# These only use executables provided by these packages +# See share/extensions for more details. inkscape can tell you to +# install these so we could of course just not depend on those and rely +# on that. +RDEPEND="${COMMON_DEPEND} + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') + dia? ( app-office/dia ) + postscript? ( app-text/ghostscript-gpl ) +" +DEPEND="${COMMON_DEPEND} + test? ( dev-cpp/gtest ) +" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + python-single-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} = 9999* ]]; then + git-r3_src_unpack + else + default + fi + [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P/_/-}_202"?-??-* "${S}" || die +} + +src_prepare() { + cmake_src_prepare + sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die +} + +src_configure() { + # ODR violation (https://gitlab.com/inkscape/lib2geom/-/issues/71, bug #859628) + filter-lto + # Aliasing unsafe (bug #310393) + append-flags -fno-strict-aliasing + + local mycmakeargs=( + # -DWITH_LPETOOL # Compile with LPE Tool and experimental LPEs enabled + -DWITH_NLS=ON + -DENABLE_POPPLER=ON + -DENABLE_POPPLER_CAIRO=ON + -DWITH_PROFILING=OFF + -DWITH_INTERNAL_2GEOM=ON + -DBUILD_TESTING=$(usex test) + -DWITH_LIBCDR=$(usex cdr) + -DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled + -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick + -DWITH_GNU_READLINE=$(usex readline) + -DWITH_GSPELL=$(usex spell) + -DWITH_JEMALLOC=OFF + -DENABLE_LCMS=ON + -DWITH_OPENMP=$(usex openmp) + -DBUILD_SHARED_LIBS=ON + -DWITH_GSOURCEVIEW=$(usex sourceview) + -DWITH_SVG2=$(usex svg2) + -DWITH_LIBVISIO=$(usex visio) + -DWITH_LIBWPG=$(usex wpg) + -DWITH_X11=$(usex X) + ) + + cmake_src_configure +} + +src_test() { + CMAKE_SKIP_TESTS=( + # render_text*: needs patched Cairo / maybe upstream changes + # not yet in a release. + # test_lpe/test_lpe64: precision differences b/c of new GCC? + # cli_export-png-color-mode-gray-8_png_check_output: ditto? + render_test-use + render_test-glyph-y-pos + render_text-glyphs-combining + render_text-glyphs-vertical + render_test-rtl-vertical + test_lpe + test_lpe64 + cli_export-png-color-mode-gray-8_png_check_output + ) + + # bug #871621 + cmake_src_compile tests + cmake_src_test -j1 +} + +src_install() { + cmake_src_install + + find "${ED}" -type f -name "*.la" -delete || die + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die + + local extdir="${ED}"/usr/share/${PN}/extensions + if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then + python_fix_shebang "${ED}"/usr/share/${PN}/extensions + python_optimize "${ED}"/usr/share/${PN}/extensions + fi +} diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index b91ba44ceda8..57b9aef00a3d 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE="xml(+)" inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 @@ -16,8 +16,8 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" else - SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + SRC_URI="https://media.inkscape.org/dl/resources/file/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi S="${WORKDIR}/${MY_P}" @@ -38,7 +38,7 @@ BDEPEND=" COMMON_DEPEND="${PYTHON_DEPS} >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 - >=dev-cpp/glibmm-2.54.1:2 + >=dev-cpp/glibmm-2.58:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= @@ -55,7 +55,6 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0= - net-libs/libsoup:2.4 sci-libs/gsl:= >=x11-libs/pango-1.44 x11-libs/gtk+:3[X?] @@ -124,7 +123,7 @@ src_unpack() { else default fi - [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die + [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P/_/-}_202"?-??-* "${S}" || die } src_prepare() { @@ -198,7 +197,4 @@ src_install() { python_fix_shebang "${ED}"/usr/share/${PN}/extensions python_optimize "${ED}"/usr/share/${PN}/extensions fi - - # Empty directory causes sandbox issues, see bug #761915 - rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory." } diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest index dd9966b1bf65..ff970124a488 100644 --- a/media-gfx/jhead/Manifest +++ b/media-gfx/jhead/Manifest @@ -1,4 +1,4 @@ AUX jhead-3.08-fix-makefile.patch 1249 BLAKE2B ef1cab0d7141d71e374b7d1481431f8bd29fa115a45eae31556cf096b26739c1929e694532f61f0f7f739ec53744781c25af24d453eb8bc9b41c79c4bc71f1c7 SHA512 c4a04aaf34d14e758f96283dea2d347cd61d443fd99b2702e3ae80150e512ee944198e3432d2dc8c2674aee16f32cd71f7c2781f8de66442793640e256b2f8f6 DIST jhead-3.08.tgz 1146535 BLAKE2B 8e53fed1988c12be40b804fd3c8aa51d71ddaa11d97ed11479ec100f26585cc4a19b3b29249642e1cdb5afbf612b6b4281c4f0ec3ad10ad1a6e6fdffc6729740 SHA512 eb50e487eaacf2b489ce5e76f09730c8bb0c50a0e2d7c854ebe8bd204ead8f6256e052c49c72af179dc46dd5372c1eff32ff549b947637b242dc7bbe8c7b20d5 -EBUILD jhead-3.08-r1.ebuild 930 BLAKE2B 72ad80fd632f6d043be3a8a581769192b884ca26fae58112689d3343e0c8f4b43ac8d3e2a575f0b849c4103cfe8686dd79cb38269b5600cdd826868202431e24 SHA512 a4c6c4742909c094e94dee38efd330551caa212615c5949da8668f78227736f5c3157e3e76eaeec43ea18733dec489e15a4f756be78da60b5b066f79ec894a07 +EBUILD jhead-3.08-r1.ebuild 924 BLAKE2B 4870c2840eef6f60bf93fcaaef122f6db278761d56f5df551fc6872194944de1132f5d0af0c8ed5ac056a702725a7ebfe30a9c68c956e0c949d1ccb29d5a9ddc SHA512 1a8cad9e138627b8da780085732551b36689889c14f541c47cd91f31e8f324ec0c8575681fe291a547f5479493a443885308455df6457288b836135ec3272670 MISC metadata.xml 351 BLAKE2B 2fa507a18a19bd866b01af6618c21a3f3b37bd250fb9cbf3a253ae9e94cb6dae961a5f337c083511d7e939380175c613864e087cb22c75b6e5662900168ebabe SHA512 9e77e681d0453ec4ee2ffb3888b3867f0445fb4617a68e36902e1ee37ac56e0d04576c3a20447ee1a8fece62896c119b24ab5073f37c8e62f1c2ec00cf82a8da diff --git a/media-gfx/jhead/jhead-3.08-r1.ebuild b/media-gfx/jhead/jhead-3.08-r1.ebuild index 3522816be291..0d1ac8c04aa9 100644 --- a/media-gfx/jhead/jhead-3.08-r1.ebuild +++ b/media-gfx/jhead/jhead-3.08-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" PATCHES=( "${FILESDIR}"/${PN}-3.08-fix-makefile.patch diff --git a/media-gfx/jp2a/Manifest b/media-gfx/jp2a/Manifest index 2392c91f7b1c..9c38bbcb27eb 100644 --- a/media-gfx/jp2a/Manifest +++ b/media-gfx/jp2a/Manifest @@ -1,5 +1,5 @@ DIST jp2a-1.1.1.tar.bz2 525678 BLAKE2B 82e4717acb27596ca789681d288767cd602207b56e4f4afbffe5a1a107d67e0bc2b61dadd3769963eff34d3d8a1546741a069cfa7dfe40c9d3486cac6ccb29d6 SHA512 92234100e43c542f468ce586fb1c3f975c2492b80062ea5871f0eb02351b26b7f56bd5567d4d2e3bcec1ea66ebae22623d7d973c3bc794dd99c819efcae983cd DIST jp2a-1.2.0.tar.bz2 444270 BLAKE2B 819101f7df242b869de0e91b6b6fd6c7d6f7d4bfb1f69a5b0477c9d34a08a46d9f05ad79926b66c2b0fe2ad785a340250bf1493ea8832bf7e40a621cb6b6afa2 SHA512 3f523e0c369b77323d512ff14944c70011280bf75b99e9b1abc0dcfefa706bf56bf0b6bed46c78194bd22c2b98dded65c551777dc75f5f217ebb6513d0a56d60 -EBUILD jp2a-1.1.1.ebuild 648 BLAKE2B f2b77407b991500d07da2bc64e8eb02a4e4964a22f1f89c935eb5a9977bf83cffd8c78356987e8f83d68feb3613a4725126530fd9d2361e51669c4ea94fa957a SHA512 c4c106af1ca5088d87f94008fec68d2923d6189e0a383384caa60d9fc926c96c5da148047d399498dcfc0522367204dc8577e3676c2b5d52d4b7b330ed0d97f6 -EBUILD jp2a-1.2.0.ebuild 666 BLAKE2B 3a87d0833a7abdbb84ff1d6a74dfddb3e8a6c91484e323b19c17aa2b5f232ea98693aaae2f943473d57b8608b3b5a694e2c4db6d2086cf44147651a580a525d1 SHA512 bdc218948d7ac948a79fc6691287905ff506ad3c8a29f79176fdb69605fb96ce2dfee7aed8a76dfa80da3333b8db5e27d57c6910408d43d38ab01b41d1d1dcf9 +EBUILD jp2a-1.1.1.ebuild 642 BLAKE2B ddab1461fbe631e7d8eaf7057c9a959745195c8ce77fdc1bd5699ae93669bc1cc6c40085572551eed69462c8079ad382f323d8c953f6d46efa129f825ed234f2 SHA512 cd1a1530a1a5af1132cef1c8c8bbc4faefecc399382a035df540a03e56fade520e1e7d93445dd296d4c64463d1928bc30bd6944f93cc34f3d97f03fb6a096299 +EBUILD jp2a-1.2.0.ebuild 660 BLAKE2B a6f408483e0e3f2c5810370b808364d413911450ecb95d9a98300ef07d625a65c4bded2ed671d435557254ffe87e5df926bd59abd2115f238852f6050de5f45b SHA512 d34d979c8f9f4a968b2c39a405b8c02d4176de312ec726b9a839bd34c785ee055d533eba4386a02b45cf2fc9d790cddc3ff59f9e97d9808b22af55936c9b97e9 MISC metadata.xml 249 BLAKE2B 2572acca810424ee1967a908498b907de468a9fb1765d7bc11a5d1c6aa81294d962a224d7777fecc997fb3220613350618fb7edc9e65b66e9e8dc4a8d31e6313 SHA512 b13e4520e6f7e18c5b925bff00c9711a98d8e773aba54fbe527d95ba97ccd0bd6b58f91f6b01ad92f106bb56f671261de55aacf796db0086e700d9fd40a0d842 diff --git a/media-gfx/jp2a/jp2a-1.1.1.ebuild b/media-gfx/jp2a/jp2a-1.1.1.ebuild index 2696e5ec3b0f..88d5f83c05a6 100644 --- a/media-gfx/jp2a/jp2a-1.1.1.ebuild +++ b/media-gfx/jp2a/jp2a-1.1.1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/Talinx/jp2a/releases/download/v${PV}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" IUSE="curl" # TODO: restore ncurses support? diff --git a/media-gfx/jp2a/jp2a-1.2.0.ebuild b/media-gfx/jp2a/jp2a-1.2.0.ebuild index e3915d86ca7b..5644f999ab76 100644 --- a/media-gfx/jp2a/jp2a-1.2.0.ebuild +++ b/media-gfx/jp2a/jp2a-1.2.0.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/Talinx/jp2a/releases/download/v${PV}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" IUSE="curl" # TODO: restore ncurses support? diff --git a/media-gfx/kcoloredit/Manifest b/media-gfx/kcoloredit/Manifest deleted file mode 100644 index 7408d1f0d94d..000000000000 --- a/media-gfx/kcoloredit/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST kcoloredit-2.0.0_p20171121-50ac0509.tar.gz 67173 BLAKE2B 2114da34e47768113bf643380efd29e59980f5bcfd544b183db7201b6d4707b81bbdc908476c6c5d36acf8b04e68c6ba1f85aab6f2e7594124f9ce4cbc496e54 SHA512 82dd71e45121357a7da45247862f4f9679fbd132e09e8fb85c0cbef6b73069443f84fe51ec642d30b0ff9b5db10aebf34978000636375afff6c91b49089a9554 -EBUILD kcoloredit-2.0.0_p20171121-r1.ebuild 1056 BLAKE2B ee2c28eec35cb0719b2284827adb1c3fc043fbd90677d88265fd7c4beadfcb8140e00b76d12415dba16413ff3b0b1a9bc1b485870c0c9f051d4ebc62279cbbd5 SHA512 d85ddbba17a18daec1d755acc80aa429fe105db8ccfd8f494c3b0613498b9dc59c3ea0d84cec597707b409c390719ba5f88ef236915f76e7438d04ff643acb3e -MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild b/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild deleted file mode 100644 index fc192cac2c2a..000000000000 --- a/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_CATEGORY=unmaintained -KDE_ORG_COMMIT=50ac0509891343bc01a0aeffda5a44a1e65d9d04 -ECM_HANDBOOK="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Tool for editing color palettes" -HOMEPAGE="https://userbase.kde.org/KColorEdit" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-plasma/plasma-activities-${KFMIN}:5 -" -RDEPEND="${DEPEND} - !media-gfx/kcoloredit:4 -" diff --git a/media-gfx/kcoloredit/metadata.xml b/media-gfx/kcoloredit/metadata.xml deleted file mode 100644 index d925f2439758..000000000000 --- a/media-gfx/kcoloredit/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <upstream> - <bugs-to>https://bugs.kde.org/</bugs-to> - </upstream> -</pkgmetadata> diff --git a/media-gfx/kgeotag/Manifest b/media-gfx/kgeotag/Manifest index 58af2506e126..a2270a9b2eeb 100644 --- a/media-gfx/kgeotag/Manifest +++ b/media-gfx/kgeotag/Manifest @@ -1,4 +1,4 @@ AUX kgeotag-1.3.1-cmake.patch 1101 BLAKE2B 04743a3e4aa12542075bd958b558999ad17e3f88b1e275eda4ebb3ff13b96f99aa8081e9e2b3c13fcf4700450a2ad08142662ad44ff2448885cc3304dd608109 SHA512 9f6407e27ea1318f0c6cf92530eced9d0dd3b63f098018871e8f866e6dd2e5e27ed892de3270a2aca7d87b84696e48a011123515a6849c13515332bf98c2f64d -DIST kgeotag-1.5.0.tar.xz 398488 BLAKE2B 04a8139bde0295be19262ed03603b2c28ef1c828f2b8b1957be9dea4743446e9dedc1e09d81d1fcbbdce804269fed80337c3490cec0f58d33391a2aeb638e684 SHA512 d522b269ae9b57ec610f71f0e0aec30cafeec615627fb401fab4be09a2651c10ca1f9952ad790c2b9a39eb0d97f4bb190a557271f90badf9918301456f02dba6 -EBUILD kgeotag-1.5.0.ebuild 918 BLAKE2B 9575976f576a6da4d39cd48de2b3b88384c353e89022392070879734ffaf3e33bcdda1ddeeec70f8ba4a5138f34a0a20f7c272409c25a149c533e9d89cd760ae SHA512 04218b046ea0e552a7310c05d61c13bae957db51586ac8a56d6689b6cc2e32f3b1bdedfb73672be7662577a51680b011b4a2b5f02744c71f11004d78793422c9 +DIST kgeotag-1.6.0.tar.xz 421756 BLAKE2B c7095ff83d40a68ece81c2a54d2a5f3182872a69242d21341d155cf83d50d11fbb6cea8b0b354a91ff6082ae93787e24fd06981586e8bf02abf63571ab83f015 SHA512 cd2ac5e30e5c4267fec39d73a56550c22c1e9197a231e63a429dceeb692e06cd907959f97a96cb875e8d69008c6289ebdc1f1f93e876818383896e8024bde721 +EBUILD kgeotag-1.6.0.ebuild 918 BLAKE2B 9575976f576a6da4d39cd48de2b3b88384c353e89022392070879734ffaf3e33bcdda1ddeeec70f8ba4a5138f34a0a20f7c272409c25a149c533e9d89cd760ae SHA512 04218b046ea0e552a7310c05d61c13bae957db51586ac8a56d6689b6cc2e32f3b1bdedfb73672be7662577a51680b011b4a2b5f02744c71f11004d78793422c9 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/media-gfx/kgeotag/kgeotag-1.5.0.ebuild b/media-gfx/kgeotag/kgeotag-1.6.0.ebuild index ebbc9c06e6f5..ebbc9c06e6f5 100644 --- a/media-gfx/kgeotag/kgeotag-1.5.0.ebuild +++ b/media-gfx/kgeotag/kgeotag-1.6.0.ebuild diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest index f13e6c55a3a6..a91f9911c349 100644 --- a/media-gfx/kgraphviewer/Manifest +++ b/media-gfx/kgraphviewer/Manifest @@ -1,8 +1,5 @@ -AUX kgraphviewer-2.4.3-highdpi.patch 577 BLAKE2B bfe4613b9e67cc01bde9ec7f9c9a827fc823f8cb016af2f27e12e75e5865ed847d745ac022deb799946ed1b13d01eeed5c9f9ba2c57f161c2d3ef2940c95469e SHA512 886f044b18a38fd5c73b17be8837af815ebaf82b277068502d16f5e3c64b0fb19b378c9773c408c8c62df52b7d1703c33bf2a662973f5e2fc4f3666a4d7f752d -AUX kgraphviewer-2.4.3-obsolete-dep.patch 4965 BLAKE2B da1924881e582840e533eed3069274b23ea1a335975d1bbe01627970f64ed46b37f1610b0cefb2d7916b500caf1799eb5b52ee6f954c3acd8dc306affc554d2e SHA512 a43b19dbc068f03011b126b1950cd84b58b784c17464ed2b96042a40ccd36c55e7a4806a7ea5092f392db3fdb4e06777eef2dd046a191db75b3a1a207043ebcd -AUX kgraphviewer-2.4.3-set-startupwmclass.patch 1045 BLAKE2B 8e48bc5a67cf8857a5eb5a57873fbe19a5a3cc52ef70d5c01ca3674d889acfa28dc46456caccd3a6078572b876e9f73b15e483f46fe35f82bd6fcdbed5d2312c SHA512 b4005bf61e448be43f7bcc3886ec092c9f2930e475067f4c1a382db4039dfdb580ce7e2a4765480438f80dc2e905013c43c8b65711f87fb14e62de73c60bedcd -DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d -DIST kgraphviewer-24.08.0.tar.xz 1582636 BLAKE2B 0043a4a77cf202d96c9e7e0f708e8d93bb71642ba220aa32655f671a8ec92b522d2c8914bdde65187bb270117e2d60f1f7b806895d337c443d7a91860a01f9c3 SHA512 c2ba1a82240fdbbd285b4815d6cc43804e7b26f856185b2d9b3a789e30c6a32c98bd8c92676db3007a58426cbc5961d0bcbf3f4d9c9aa4aed1c58ab12f68f51e -EBUILD kgraphviewer-2.4.3-r2.ebuild 1097 BLAKE2B 312301205617180031aafc740d5749cdb436f601047e2433992d5f376c1b3e82e56dc8137a106faea8131da322dfcd6f2d6b392ad39009dcde368256d3212da7 SHA512 47208d70b25113a5d53168923bdcf16b03230758ace49fcca01fe071102f3f95b382f293c17e422c4ea6a8f6a764ea80c86e60ec5c6e107af0d106a41f00e38e -EBUILD kgraphviewer-24.08.0.ebuild 851 BLAKE2B 5c5b1dd4ff2e4c26b39bd3e26049d4cd28cc008827f96d90c970f6b2d30995db1142708214134244e624d224cb979dcc2ffb19bd79be472ef6602735fb7ee5fd SHA512 f27d6ba7343de6bf0fd924c00748122062faf7ea09771df1706e8c8d342e534e8c12bf1d26a289a5d26f55651efcef8bc2063532ea792a86bb8299116ef4f76c +DIST kgraphviewer-24.08.1.tar.xz 1583016 BLAKE2B b253ab2aa4688a5a2063ae2d62d395c16a243655ad859e6f66c92bbf79120b8c773d7b34a3ca890bf06bbfa935eb9ac5ff4386847d86439d5afde024e0a10d97 SHA512 80647c0db32997c277524b5d5520ba5a285c31441582a081f8f6c6265c7b8f2977043a81f75b62446540a91236744075543811ba274dd1a5cdd8d1b368bb2f0b +DIST kgraphviewer-24.08.2.tar.xz 1583668 BLAKE2B 89197b55b4cec83020b1fa1e2b9f79cca52c64005af6bc15fecece91762d6e940f9d4813e3f085fd3563e540ac6ec8bd6cc656136da08e64de302fc763901f57 SHA512 6c18da9c91514ecfe4112777bca3dc7aa7b387ef68ea7e4849e947e3f77768a586aa7d9f4ff1b5796a1656a9786768ece4b51cbaf51d0083ea0ac84184fa229e +EBUILD kgraphviewer-24.08.1.ebuild 856 BLAKE2B 4582fdb52e19b6b58df61b9907cc379b8ff44d7a43c06228226c9eb825f3012da511d49903d0a0bc9c42286f991f899fd9adb50ed3d28a11a665f31e7b29e29f SHA512 daa3e65d75ff9821192c5cb0256a8697589a20aeedddd547e93e3f5f6c0716be1b154396add319bf03509f3d53ff067c104cfa50f237103e58b659cf65a731dd +EBUILD kgraphviewer-24.08.2.ebuild 858 BLAKE2B 646c09a2ca50d7064248bff516f456c14467b1409de23ad93fa7b37d73bfba83c6eb6efdd0911af3cc73632804e0a646b4833071e3b8c0cea8074b8a6c50e591 SHA512 eddcaecdc7e6e39ceafe32e40370bdad0d0453bf1906dc036c49a9edc859ca2060847e08ac57bb327f2b2196e19076ab7563feb526b40183c5f2e0718206b8b1 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch deleted file mode 100644 index 8b31d40fb157..000000000000 --- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9961c92736abfc6d0aedea9c4e7c679e1fd564d2 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Mon, 7 Mar 2022 19:49:21 +0100 -Subject: [PATCH] Enable highdpi pixmaps - ---- - src/main.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/main.cpp b/src/main.cpp -index 32ad115..271e61f 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -38,6 +38,7 @@ - - int main(int argc, char **argv) - { -+ QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - QApplication app(argc, argv); - - KLocalizedString::setApplicationDomain("kgraphviewer"); --- -GitLab - diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch deleted file mode 100644 index 76fa878bc364..000000000000 --- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch +++ /dev/null @@ -1,121 +0,0 @@ -From a6f0587d8cbbb246c33423d19f2aabf6ea9d7417 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Sun, 8 May 2022 16:59:25 +0200 -Subject: [PATCH] Remove pointless/broken icons - -The distribute-horizontal-page icon doesn't serve any apparent purpose - -The portrait/landscape icons don't exist in any theme - -(cherry picked from commit 7b214252ec5f486912944d987581f207c7b03681) ---- - CMakeLists.txt | 1 - - src/part/CMakeLists.txt | 2 +- - src/part/KgvPageLayoutSize.cpp | 10 ---------- - src/part/simpleprintingpagesetup.cpp | 4 ---- - src/part/simpleprintingpagesetupbase.ui | 10 ---------- - 5 files changed, 1 insertion(+), 26 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fd715d2..238a9dd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -27,7 +27,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - DocTools - Parts - WidgetsAddons -- IconThemes - ) - - find_package(Boost 1.36 REQUIRED) -diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt -index 0e70be8..922e5c5 100644 ---- a/src/part/CMakeLists.txt -+++ b/src/part/CMakeLists.txt -@@ -64,7 +64,7 @@ ki18n_wrap_ui(kgraphviewerlib_LIB_SRCS ${kgraphviewerprinting_UI} ) - - add_library(kgraphviewerlib ${kgraphviewerlib_LIB_SRCS}) - --target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::IconThemes KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES}) -+target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES}) - - set_target_properties(kgraphviewerlib PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${KGRAPHVIEWER_SOVERSION} OUTPUT_NAME kgraphviewer ) - -diff --git a/src/part/KgvPageLayoutSize.cpp b/src/part/KgvPageLayoutSize.cpp -index bb8b3d1..4053a20 100644 ---- a/src/part/KgvPageLayoutSize.cpp -+++ b/src/part/KgvPageLayoutSize.cpp -@@ -42,7 +42,6 @@ - #include <QHBoxLayout> - #include <QGridLayout> - #include <QPixmap> --#include <KIconTheme> - #include "klocalizedstring.h" - - KgvPageLayoutSize::KgvPageLayoutSize( -@@ -148,19 +147,10 @@ KgvPageLayoutSize::KgvPageLayoutSize( - // m_orientGroup->setInsideSpacing( KDialog::spacingHint() ); - grid1->addWidget( m_orientGroup, 2, 0 ); - -- const int iconSize = KIconTheme(KIconTheme::current()).defaultSize(KIconLoader::Small); -- QLabel* lbPortrait = new QLabel( m_orientGroup ); -- lbPortrait->setPixmap( QPixmap( QIcon::fromTheme( "koPortrait" ).pixmap(iconSize, iconSize) ) ); -- lbPortrait->setMaximumWidth( lbPortrait->pixmap()->width() ); -- lay3->addWidget(lbPortrait); - QRadioButton* rbPortrait = new QRadioButton( i18n("&Portrait"), m_orientGroup ); - lay3->addWidget(rbPortrait); - m_orientButtons.addButton(rbPortrait); - -- QLabel* lbLandscape = new QLabel( m_orientGroup ); -- lbLandscape->setPixmap( QPixmap( QIcon::fromTheme( "koLandscape" ).pixmap(iconSize, iconSize) ) ); -- lbLandscape->setMaximumWidth( lbLandscape->pixmap()->width() ); -- lay3->addWidget(lbLandscape); - QRadioButton* rbLandscape = new QRadioButton( i18n("La&ndscape"), m_orientGroup ); - lay3->addWidget(rbLandscape); - m_orientGroup->setLayout(lay3); -diff --git a/src/part/simpleprintingpagesetup.cpp b/src/part/simpleprintingpagesetup.cpp -index 9882fbf..cd707b9 100644 ---- a/src/part/simpleprintingpagesetup.cpp -+++ b/src/part/simpleprintingpagesetup.cpp -@@ -57,7 +57,6 @@ - #include <QPixmap> - #include <QVBoxLayout> - #include <klocalizedstring.h> --#include <KIconTheme> - #include <iostream> - - namespace KGraphViewer -@@ -109,9 +108,6 @@ KGVSimplePrintingPageSetup::KGVSimplePrintingPageSetup( - connect(m_contents->printPreviewButton, &QPushButton::clicked, - this, &KGVSimplePrintingPageSetup::slotPrintPreview); - -- m_contents->iconLabel->setFixedWidth(32+6); -- const int iconSize = KIconTheme(KIconTheme::current()).defaultSize(KIconLoader::Small); -- m_contents->iconLabel->setPixmap(QIcon::fromTheme("distribute-horizontal-page").pixmap(iconSize, iconSize)); - m_contents->headerTitleFontButton->setText(i18n("Font...")); - m_contents->headerTitleFontButton->setWhatsThis(i18n("Changes font for title text.")); - connect(m_contents->headerTitleFontButton, &QPushButton::clicked, -diff --git a/src/part/simpleprintingpagesetupbase.ui b/src/part/simpleprintingpagesetupbase.ui -index ddc6ee0..719a7d6 100644 ---- a/src/part/simpleprintingpagesetupbase.ui -+++ b/src/part/simpleprintingpagesetupbase.ui -@@ -157,16 +157,6 @@ - </item> - </layout> - </item> -- <item> -- <widget class="QLabel" name="iconLabel"> -- <property name="text"> -- <string/> -- </property> -- <property name="alignment"> -- <set>Qt::AlignVCenter</set> -- </property> -- </widget> -- </item> - <item> - <widget class="QGroupBox" name="groupBox4"> - <property name="title"> --- -2.37.3 - diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch deleted file mode 100644 index 970bf57f2cfb..000000000000 --- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 50fea8d6413e06fcfaf0d0ca03cc6c266a1cda14 Mon Sep 17 00:00:00 2001 -From: "Friedrich W. H. Kossebau" <kossebau@kde.org> -Date: Tue, 5 Feb 2019 04:49:16 +0100 -Subject: Set StartupWMClass in desktop file - -Used by non-Plasma unixoid X-based shells to map windows to desktop files -e.g. in launcher UIs, which do not know about _KDE_NET_WM_DESKTOP_FILE and -instead expect (one of) the WM_CLASS entries to match the basename of the -desktop file by default. StartupWMClass overwrites that default. ---- - src/org.kde.kgraphviewer.desktop | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/org.kde.kgraphviewer.desktop b/src/org.kde.kgraphviewer.desktop -index bfff1bf..6b3affb 100644 ---- a/src/org.kde.kgraphviewer.desktop -+++ b/src/org.kde.kgraphviewer.desktop -@@ -41,6 +41,7 @@ MimeType=text/vnd.graphviz - Exec=kgraphviewer -qwindowtitle %c %u - Icon=kgraphviewer - Type=Application -+StartupWMClass=kgraphviewer - Categories=Qt;KDE;Graphics;Viewer;2DGraphics;DataVisualization; - X-DocPath=kgraphviewer/index.html - InitialPreference=10 --- -cgit v1.1 diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild deleted file mode 100644 index 4716b8e8e2e9..000000000000 --- a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Graphviz dot graph file viewer" -HOMEPAGE="https://apps.kde.org/kgraphviewer" -[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )" -SLOT="5" -KEYWORDS="amd64 arm64 x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=media-gfx/graphviz-2.30 -" -DEPEND="${RDEPEND} - dev-libs/boost -" - -PATCHES=( - "${FILESDIR}/${P}-set-startupwmclass.patch" - "${FILESDIR}/${P}-highdpi.patch" - "${FILESDIR}/${P}-obsolete-dep.patch" -) diff --git a/media-gfx/kgraphviewer/kgraphviewer-24.08.0.ebuild b/media-gfx/kgraphviewer/kgraphviewer-24.08.1.ebuild index 4f98c56730e6..b34f8b7fb8c1 100644 --- a/media-gfx/kgraphviewer/kgraphviewer-24.08.0.ebuild +++ b/media-gfx/kgraphviewer/kgraphviewer-24.08.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kgraphviewer/" LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" IUSE="" RDEPEND=" diff --git a/media-gfx/kgraphviewer/kgraphviewer-24.08.2.ebuild b/media-gfx/kgraphviewer/kgraphviewer-24.08.2.ebuild new file mode 100644 index 000000000000..43f762c21ad9 --- /dev/null +++ b/media-gfx/kgraphviewer/kgraphviewer-24.08.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +KFMIN=6.5.0 +QTMIN=6.7.2 +inherit ecm gear.kde.org + +DESCRIPTION="Graphviz dot graph file viewer" +HOMEPAGE="https://apps.kde.org/kgraphviewer/" + +LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=media-gfx/graphviz-2.30 +" +DEPEND="${RDEPEND} + dev-libs/boost +" diff --git a/media-gfx/kio-blender-thumbnailer/Manifest b/media-gfx/kio-blender-thumbnailer/Manifest index 6b2277400b41..94493d210191 100644 --- a/media-gfx/kio-blender-thumbnailer/Manifest +++ b/media-gfx/kio-blender-thumbnailer/Manifest @@ -1,7 +1,9 @@ DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503 -DIST kdegraphics-thumbnailers-24.08.0.tar.xz 49000 BLAKE2B 090fe8542e29e1dc4c9ec32366442a01f207557f95b8e227792c41001693cbbeb514bbced5d0aa549986c64e37c4abe8559c092281ce6d463faec47b831c9f47 SHA512 cf1310df9577cdc0a1aaa032e20c9b561253b01a05bfe363b4138012c115d1d9faf25f7340b7b702ae1c66007eb683b8e7f899c68e71ede31887c702d84fdee9 +DIST kdegraphics-thumbnailers-24.08.1.tar.xz 49016 BLAKE2B 1c29734d1371f970271e9bf0dd0750d80f5c19b78c7cdb90bc0665ee748cf4aa0414047796d96b21c207b3f6071e0e3a5fb83126d0f4f919793070f335180457 SHA512 d1b15005e080581ce31d96271bf8827a969ef95b3703ec80858b2d26fc5dd615d408471065647e0d7b7fef39b9e9af18fcf1af56594be13df5f3119fa81c2134 +DIST kdegraphics-thumbnailers-24.08.2.tar.xz 49096 BLAKE2B 3c6eddf3abe61ca55ffe04dda9e720be324078bf453b2c768ed001490e19b5c8df5d4904c14d4f82a96d9fc669cae5956f673a6aa81591044fa8f40695e594eb SHA512 0d9c536865702e0e1962cf7405373a2166656f9b63fdd03128000b2aac01fceceb1b9ddea041fbc6c66d79a744b76575929896fe1614b060941eb56ae69fa0f1 EBUILD kio-blender-thumbnailer-23.08.5.ebuild 805 BLAKE2B 6c62037055739d24ed0754228a568269fc7f18da60316caf62744a9bd0e6fa565b134ea985646c771dfaf22ddedaf5f885caeb041f20406255bf9db85a400576 SHA512 175befa64a43a078a05f3c083030b9983a4543e7f6b39ea6d9413030aa924b497e8146415514b0aa8bd2ae1ed793bc6f81c450912a644263fac535b709dcf575 -EBUILD kio-blender-thumbnailer-24.05.2.ebuild 805 BLAKE2B 7f638f3b97a4d48ed5ecfba9b3bd0f76b1b869cee6502cf6806ef65aca5049d23b6c34568d33a6f48b8048fb0ad19990364361df784d37823bcab62d4d59ded5 SHA512 2d4aa5051b588f7c39bcfd7748dcd2189e5ef9b47c764867b1ccf3beeb6ef9cc05bacd3c78a49144b879dfe2afc352670de9e6655505a626b31bdb2fbd256c93 -EBUILD kio-blender-thumbnailer-24.08.0.ebuild 805 BLAKE2B 292d33b7c285bd150248dbf6edf3d2dd008d2c4342762698d292bead779f5577a9f7af847bbb9d885b7841860b170afb0738b1549b51b3593c33f15ebe791e62 SHA512 d95417a4f56559755373742130874c1a2d18c799cad411001176d2a05e5d1cc190e94c658a9d956050e3710fe60536ed3605b59a3112c005c9bb6adfd3ecce13 +EBUILD kio-blender-thumbnailer-24.05.2.ebuild 803 BLAKE2B d08020ec80cd8a2fcbf04e2000a82018c2d8d443b09c949fee98d3f07778a5a6ce94607fed80fb3ff5fe8f85310099dd57dce475a4a7c1b9802294edaf78f9c4 SHA512 fc6b6490aeb605d9aef809ebd68f795620469ee262638852eb124baeaaa271783dd6f0e4ba8b5e693d073dda6cb3bc591e9eb4f0f9e343375fe9c17dcbc34abf +EBUILD kio-blender-thumbnailer-24.08.1.ebuild 803 BLAKE2B ab3a9cd9404387f0620fd3ff28028cad5e760a0d807d2db0506caf8a59226264550198a6db6a18f81a99ae9482ab5f7f49e79775e7909950d18f04d5efa798be SHA512 872129d73a2dedb5b6de704db0c8e80af49e0990f6d443fe0e3407c7d4e6a0db020d0bd545dec7dd8421ed5c88ee08629fe38ed977caef2dfae173d0cd7fd7b1 +EBUILD kio-blender-thumbnailer-24.08.2.ebuild 805 BLAKE2B 292d33b7c285bd150248dbf6edf3d2dd008d2c4342762698d292bead779f5577a9f7af847bbb9d885b7841860b170afb0738b1549b51b3593c33f15ebe791e62 SHA512 d95417a4f56559755373742130874c1a2d18c799cad411001176d2a05e5d1cc190e94c658a9d956050e3710fe60536ed3605b59a3112c005c9bb6adfd3ecce13 MISC metadata.xml 395 BLAKE2B e3794bfe43e720ba54df37c3174ab9754e3c09ff986b80ce66511bf6fb739344eb49d4cf1e6daae63eb13d11deb82407945f48e4dd186905477155a624dd0787 SHA512 50a4cbb59e7411ccbdf6a135877b3103bee5dd58511b9030556df9a076c806032302e02ee067d917ba6b1d7e6a8233d93b3335ac21a14c59c00240150013d6b5 diff --git a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.05.2.ebuild b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.05.2.ebuild index d89b1ff9b941..6ca172850f8b 100644 --- a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.05.2.ebuild +++ b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.05.2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" LICENSE="GPL-2+" SLOT="6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] diff --git a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.1.ebuild b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.1.ebuild new file mode 100644 index 000000000000..d3e261b661a7 --- /dev/null +++ b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_NAME="kdegraphics-thumbnailers" +KFMIN=6.5.0 +QTMIN=6.7.2 +inherit ecm gear.kde.org + +DESCRIPTION="KIO thumbnail generator for Blender files" +HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 +" +RDEPEND="${DEPEND} + !<kde-apps/thumbnailers-24.05.2-r1:6 +" + +src_configure() { + local mycmakeargs=( + -DBUILD_ps=OFF + -DDISABLE_MOBIPOCKET=ON + -DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON + ) + ecm_src_configure +} diff --git a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.0.ebuild b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.2.ebuild index 5ef7e9c0e3d1..5ef7e9c0e3d1 100644 --- a/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.0.ebuild +++ b/media-gfx/kio-blender-thumbnailer/kio-blender-thumbnailer-24.08.2.ebuild diff --git a/media-gfx/kio-mobi-thumbnailer/Manifest b/media-gfx/kio-mobi-thumbnailer/Manifest index 336628477b5b..11e763e63f08 100644 --- a/media-gfx/kio-mobi-thumbnailer/Manifest +++ b/media-gfx/kio-mobi-thumbnailer/Manifest @@ -1,7 +1,9 @@ DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503 -DIST kdegraphics-thumbnailers-24.08.0.tar.xz 49000 BLAKE2B 090fe8542e29e1dc4c9ec32366442a01f207557f95b8e227792c41001693cbbeb514bbced5d0aa549986c64e37c4abe8559c092281ce6d463faec47b831c9f47 SHA512 cf1310df9577cdc0a1aaa032e20c9b561253b01a05bfe363b4138012c115d1d9faf25f7340b7b702ae1c66007eb683b8e7f899c68e71ede31887c702d84fdee9 +DIST kdegraphics-thumbnailers-24.08.1.tar.xz 49016 BLAKE2B 1c29734d1371f970271e9bf0dd0750d80f5c19b78c7cdb90bc0665ee748cf4aa0414047796d96b21c207b3f6071e0e3a5fb83126d0f4f919793070f335180457 SHA512 d1b15005e080581ce31d96271bf8827a969ef95b3703ec80858b2d26fc5dd615d408471065647e0d7b7fef39b9e9af18fcf1af56594be13df5f3119fa81c2134 +DIST kdegraphics-thumbnailers-24.08.2.tar.xz 49096 BLAKE2B 3c6eddf3abe61ca55ffe04dda9e720be324078bf453b2c768ed001490e19b5c8df5d4904c14d4f82a96d9fc669cae5956f673a6aa81591044fa8f40695e594eb SHA512 0d9c536865702e0e1962cf7405373a2166656f9b63fdd03128000b2aac01fceceb1b9ddea041fbc6c66d79a744b76575929896fe1614b060941eb56ae69fa0f1 EBUILD kio-mobi-thumbnailer-23.08.5.ebuild 850 BLAKE2B 8c1f1669e225adcec3a770a6de72e10f83290f30f85146bb7ea14152f42359ffedaea07c3f994836ddb3ce054bb30ba9f9b39425c87ec8830c42e7bc3584c826 SHA512 365764d72aa52f97e54f7effceda8833444e2a422e45d2cb8e552ffbbda6c27061f95d456694a937612827d8df91a20535710270f6bbb12afbe6e7fc82039cad -EBUILD kio-mobi-thumbnailer-24.05.2.ebuild 849 BLAKE2B a667dfd2c60791e9f3e0b78d176b7a6f427b0306f1971a9b61910bfa32e358bc974175f5910383e28fcf82bbe54a46cdcc1ef142f22295ace438a1b84e6f4305 SHA512 e0214bf8f3312188f7ab582e10fc4e1889b2262d1ff4eb7965771e31f51ac4198c15edc958c49a706d04c7be620342dc5094ad64f50f6ae49f306f0e6aa2d919 -EBUILD kio-mobi-thumbnailer-24.08.0.ebuild 849 BLAKE2B fd575c9e28a0d947c6b29d7bb6ab4c5171740356e1b344251b14431e1147a90a0447e2202367ba058d50f5306a4be9c150a78448fc7b18979df7c667bf345750 SHA512 669682a91742a8939e0e9a0a114aa8e19e332de072da4c6b7367840003f461f17807aae73dbbcbd8157a0d818531fdbbacc70dfe1229886a4a1ecc7e6d1e2b2c +EBUILD kio-mobi-thumbnailer-24.05.2.ebuild 847 BLAKE2B 0d202715989e42197cc075d5edc57d373aced60e6d8b70aee493d7ed1df9123c3a07a1211a6d75d7fbcb3c4994efaaa32c576fd5bd8b198bc869e85f2d40e42a SHA512 110179643192c3906a307a0651d5fb12fae42f0a4aecba2fa56e4edfa774b7b40a769934a35e6c620e4d281b9268201b7efb06ab729cce2d4c54648bd88809ff +EBUILD kio-mobi-thumbnailer-24.08.1.ebuild 847 BLAKE2B ecf5b032070fb717134d4efdb74ee340d42422f5bce1888609ecc090dd068f84272bb6d68eb7968dc36de46aee8472c1d29eb07e398af9975a506fc4087090aa SHA512 887a15b96073ab7b2fcc9b5c3dc1733957a5b982c7f428bdd0e686ec3cd1ea2dcc2a0ffd97ee19c068813b70a808fcff3fe7563343ae8c1aa439b4409761c101 +EBUILD kio-mobi-thumbnailer-24.08.2.ebuild 849 BLAKE2B fd575c9e28a0d947c6b29d7bb6ab4c5171740356e1b344251b14431e1147a90a0447e2202367ba058d50f5306a4be9c150a78448fc7b18979df7c667bf345750 SHA512 669682a91742a8939e0e9a0a114aa8e19e332de072da4c6b7367840003f461f17807aae73dbbcbd8157a0d818531fdbbacc70dfe1229886a4a1ecc7e6d1e2b2c MISC metadata.xml 395 BLAKE2B e3794bfe43e720ba54df37c3174ab9754e3c09ff986b80ce66511bf6fb739344eb49d4cf1e6daae63eb13d11deb82407945f48e4dd186905477155a624dd0787 SHA512 50a4cbb59e7411ccbdf6a135877b3103bee5dd58511b9030556df9a076c806032302e02ee067d917ba6b1d7e6a8233d93b3335ac21a14c59c00240150013d6b5 diff --git a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.05.2.ebuild b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.05.2.ebuild index 0d90be2af4e2..ff9f71ee7a35 100644 --- a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.05.2.ebuild +++ b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.05.2.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" LICENSE="GPL-2+" SLOT="6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] diff --git a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.1.ebuild b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.1.ebuild new file mode 100644 index 000000000000..be481b735490 --- /dev/null +++ b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_NAME="kdegraphics-thumbnailers" +PVCUT=$(ver_cut 1-3) +KFMIN=6.5.0 +QTMIN=6.7.2 +inherit ecm gear.kde.org + +DESCRIPTION="KIO thumbnail generator for Mobipocket files" +HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=kde-apps/kdegraphics-mobipocket-${PVCUT}:6 + >=kde-frameworks/kio-${KFMIN}:6 +" +RDEPEND="${DEPEND} + !<kde-apps/thumbnailers-24.05.2-r1:6 +" + +src_prepare() { + ecm_src_prepare + ecm_punt_kf_module Archive +} + +src_configure() { + local mycmakeargs=( + -DBUILD_ps=OFF + -DBUILD_blend=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON + ) + + ecm_src_configure +} diff --git a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.0.ebuild b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.2.ebuild index 5333f1b82349..5333f1b82349 100644 --- a/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.0.ebuild +++ b/media-gfx/kio-mobi-thumbnailer/kio-mobi-thumbnailer-24.08.2.ebuild diff --git a/media-gfx/kio-ps-thumbnailer/Manifest b/media-gfx/kio-ps-thumbnailer/Manifest index da2ca565e04d..741c073249ac 100644 --- a/media-gfx/kio-ps-thumbnailer/Manifest +++ b/media-gfx/kio-ps-thumbnailer/Manifest @@ -1,7 +1,9 @@ DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503 -DIST kdegraphics-thumbnailers-24.08.0.tar.xz 49000 BLAKE2B 090fe8542e29e1dc4c9ec32366442a01f207557f95b8e227792c41001693cbbeb514bbced5d0aa549986c64e37c4abe8559c092281ce6d463faec47b831c9f47 SHA512 cf1310df9577cdc0a1aaa032e20c9b561253b01a05bfe363b4138012c115d1d9faf25f7340b7b702ae1c66007eb683b8e7f899c68e71ede31887c702d84fdee9 +DIST kdegraphics-thumbnailers-24.08.1.tar.xz 49016 BLAKE2B 1c29734d1371f970271e9bf0dd0750d80f5c19b78c7cdb90bc0665ee748cf4aa0414047796d96b21c207b3f6071e0e3a5fb83126d0f4f919793070f335180457 SHA512 d1b15005e080581ce31d96271bf8827a969ef95b3703ec80858b2d26fc5dd615d408471065647e0d7b7fef39b9e9af18fcf1af56594be13df5f3119fa81c2134 +DIST kdegraphics-thumbnailers-24.08.2.tar.xz 49096 BLAKE2B 3c6eddf3abe61ca55ffe04dda9e720be324078bf453b2c768ed001490e19b5c8df5d4904c14d4f82a96d9fc669cae5956f673a6aa81591044fa8f40695e594eb SHA512 0d9c536865702e0e1962cf7405373a2166656f9b63fdd03128000b2aac01fceceb1b9ddea041fbc6c66d79a744b76575929896fe1614b060941eb56ae69fa0f1 EBUILD kio-ps-thumbnailer-23.08.5.ebuild 891 BLAKE2B 3c02646c14ee63032e2324bba9466680881a3ae03f41b8b9b0f1341227a800e3fc8313b2168526984afe6f9dbb1925cc7e4290bbf4bff3f0f6e95e4bcc8ee3c0 SHA512 000aab394868e1a260f6c7065810f727eb6da1bea3a76a56230c1194dc9dfe340982abe56e54a957290754dcaf76032e2c7dac33548cc6893cb972acc8cbe3f3 -EBUILD kio-ps-thumbnailer-24.05.2.ebuild 891 BLAKE2B 18a07a5b8a6fa9f14e807c44714d741ebde774d9f7d5bb5d7b5387c266ac22b846c4c09008bfe04c45495b3238f927f9e197776cfe374015dd084b5b97b71b51 SHA512 cdeb6e581c911d886a557f4bc28fb9a42117f041482ae5ca5664b615ca17e95258abad45f05d7d1c50f46e4c17442818d1d7d222f68d839b411cc9499e339b7a -EBUILD kio-ps-thumbnailer-24.08.0.ebuild 891 BLAKE2B 4c5ac8b57474148cf88b291a6242aa71c84a309340b5e249ec0eab583424357e0e0a46d970aa08809a3759e7a26be65fa985f99469a9f9f5651b7a805861ca2b SHA512 7aab6771f812694bb9414c8fb19dfef890f00cac29419b852ae9c70ef0f3dd74d6146f16221762aa8dc4ef191e0262a70b8a5623acad125fc9246d9beaf23403 +EBUILD kio-ps-thumbnailer-24.05.2.ebuild 889 BLAKE2B 0d9aaa5c53de1d25f08d8d43ae277269970926e943debc314a4fb724ddad9719497c73ff36bc66ec932da03adbac975b32fddc65f9071a3ed1483db1603d8a65 SHA512 a56a11b3cceff9d2e8fa2774ff31a6c773d875ceed883e4989bd549a33a6c02e7878f70536c0829bfb4ef504832c074044e35f14450db6c644adc15c62180e1e +EBUILD kio-ps-thumbnailer-24.08.1.ebuild 889 BLAKE2B 05b642a21a5aad1aa3b2a9937abaeef4047ca0b616615348eafb3c32f8f4fec90f25edd24fe2769c3a67c9f4a776ddb3a920b0d089de3538518f69f6ec19d3aa SHA512 dc3c3701df8ac4dfd6d2881a8ef5a24cb90d369335aba9308e544c5e2a9dcfc965b98c8078392a79837409f1bc870d279db80758515b6a349153a84d67aae177 +EBUILD kio-ps-thumbnailer-24.08.2.ebuild 891 BLAKE2B 4c5ac8b57474148cf88b291a6242aa71c84a309340b5e249ec0eab583424357e0e0a46d970aa08809a3759e7a26be65fa985f99469a9f9f5651b7a805861ca2b SHA512 7aab6771f812694bb9414c8fb19dfef890f00cac29419b852ae9c70ef0f3dd74d6146f16221762aa8dc4ef191e0262a70b8a5623acad125fc9246d9beaf23403 MISC metadata.xml 395 BLAKE2B e3794bfe43e720ba54df37c3174ab9754e3c09ff986b80ce66511bf6fb739344eb49d4cf1e6daae63eb13d11deb82407945f48e4dd186905477155a624dd0787 SHA512 50a4cbb59e7411ccbdf6a135877b3103bee5dd58511b9030556df9a076c806032302e02ee067d917ba6b1d7e6a8233d93b3335ac21a14c59c00240150013d6b5 diff --git a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.05.2.ebuild b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.05.2.ebuild index 30266f3432c9..3042e12f1b3b 100644 --- a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.05.2.ebuild +++ b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.05.2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" LICENSE="GPL-2+" SLOT="6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] diff --git a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.1.ebuild b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.1.ebuild new file mode 100644 index 000000000000..d1bfa0020957 --- /dev/null +++ b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_NAME="kdegraphics-thumbnailers" +KFMIN=6.5.0 +QTMIN=6.7.2 +inherit ecm gear.kde.org + +DESCRIPTION="KIO thumbnail generator for DVI, EPS, PDF and PS files" +HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=kde-frameworks/kio-${KFMIN}:6 +" +RDEPEND="${DEPEND} + !<kde-apps/thumbnailers-24.05.2-r1:6 + app-text/dvipsk + app-text/ghostscript-gpl +" + +src_prepare() { + ecm_src_prepare + ecm_punt_kf_module Archive +} + +src_configure() { + local mycmakeargs=( + -DBUILD_blend=OFF + -DDISABLE_MOBIPOCKET=ON + -DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KExiv2Qt6=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KDcrawQt6=ON + ) + + ecm_src_configure +} diff --git a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.0.ebuild b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.2.ebuild index e0ab87727184..e0ab87727184 100644 --- a/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.0.ebuild +++ b/media-gfx/kio-ps-thumbnailer/kio-ps-thumbnailer-24.08.2.ebuild diff --git a/media-gfx/kio-raw-thumbnailer/Manifest b/media-gfx/kio-raw-thumbnailer/Manifest index 8982e4b6db82..f132f4e536e2 100644 --- a/media-gfx/kio-raw-thumbnailer/Manifest +++ b/media-gfx/kio-raw-thumbnailer/Manifest @@ -1,7 +1,9 @@ DIST kdegraphics-thumbnailers-23.08.5.tar.xz 49436 BLAKE2B 943ad7bd93ca5e4d80854869d4d97f7121d259a82062afb7781d1845e94cbc6ea1732aff3d3476eb6db5ffe54f8f97b352ef8977ebdccc2b173594dd3cbccd6f SHA512 77c328e9532fbd12548d4d219d6da2ad369ee14825d3cf5d142ec11afb842640e1fd01e7e1f911147c93e7e93893b9ae10be66b3d568866ed8985b5e5b38663f DIST kdegraphics-thumbnailers-24.05.2.tar.xz 48756 BLAKE2B f5c2932c89fe38933c764171c31edfc0c11b7d6a34170e283a5f7ebc221866a2005897e580f1076b4a8bd9438d2fc39ff4b5da99abe90ce41c7465f35b7f6479 SHA512 eafc1eaf48fe7fef2556b1ba39beec0032b3fbc3ad01856517c86e6d56a2d24c488db9ca6cd9669a5b70c16ce44b6006c0a9e48216af08d03fbd805973158503 -DIST kdegraphics-thumbnailers-24.08.0.tar.xz 49000 BLAKE2B 090fe8542e29e1dc4c9ec32366442a01f207557f95b8e227792c41001693cbbeb514bbced5d0aa549986c64e37c4abe8559c092281ce6d463faec47b831c9f47 SHA512 cf1310df9577cdc0a1aaa032e20c9b561253b01a05bfe363b4138012c115d1d9faf25f7340b7b702ae1c66007eb683b8e7f899c68e71ede31887c702d84fdee9 +DIST kdegraphics-thumbnailers-24.08.1.tar.xz 49016 BLAKE2B 1c29734d1371f970271e9bf0dd0750d80f5c19b78c7cdb90bc0665ee748cf4aa0414047796d96b21c207b3f6071e0e3a5fb83126d0f4f919793070f335180457 SHA512 d1b15005e080581ce31d96271bf8827a969ef95b3703ec80858b2d26fc5dd615d408471065647e0d7b7fef39b9e9af18fcf1af56594be13df5f3119fa81c2134 +DIST kdegraphics-thumbnailers-24.08.2.tar.xz 49096 BLAKE2B 3c6eddf3abe61ca55ffe04dda9e720be324078bf453b2c768ed001490e19b5c8df5d4904c14d4f82a96d9fc669cae5956f673a6aa81591044fa8f40695e594eb SHA512 0d9c536865702e0e1962cf7405373a2166656f9b63fdd03128000b2aac01fceceb1b9ddea041fbc6c66d79a744b76575929896fe1614b060941eb56ae69fa0f1 EBUILD kio-raw-thumbnailer-23.08.5.ebuild 847 BLAKE2B ad607b3ce62e690781508dd78bdbcaaaf7bba07613088d1fc45dc49d2b6ad425cc84647a69ae899ca5d9d479acca0165fdf701a4dce00c8033a747f5bc101476 SHA512 933b3ac994eccf59b1951b54443df89de5b61386ff71a101c4aff16ec022f86df45d542db95f2abda5f4d35327a2ac88afd9996598d3f83b3dd6190688ac029e -EBUILD kio-raw-thumbnailer-24.05.2.ebuild 847 BLAKE2B 1e3ad05aa5684aec7ae34c267bc88f6ff8d14d018d3f2c64e5a612290130fcd7e916e2f8e38b77dc9b89ef3b8efb142cc931239ad7b156de8765cdf45536f3ce SHA512 2f097c49bae76d177bc485fc6befccd23736e7d01c153fb5188a5b77d8e3540f64a9aee8b8eab05b98e8ea72618487145e1f50184356198f869e60c867a90e38 -EBUILD kio-raw-thumbnailer-24.08.0.ebuild 847 BLAKE2B f17933d56e401580dd8073ad355cf4e2abf315d3d595272769c69fcab4566ff5d4a4902098660ed74adb4b911f624c9be56d3ca32b626d6fdb9b4015bc245bfe SHA512 79315aecb999965da39cd092759bfa659f06985130e2dd100ac6a4afb5e2bb2cf4dad6f2054783386b732d22e0c6176cca6c6b5aa84a711c8a9c01a2cc29db41 +EBUILD kio-raw-thumbnailer-24.05.2.ebuild 845 BLAKE2B 8d7700de811ba4594389ebcbc90135ec50e4bada109da59d6e7ac398c2bca27d3841096500cec1ddbfc72d3403691d87537a71b75f735f56289019ca4ea0b579 SHA512 f923c11d089679f66b1be9975fd4fb3e747aeb89f65e42f8795a2fc79c67c6c00a7e30f83a21ebd810457ecddeda5d26ab6748a749c5156a38464359ab123298 +EBUILD kio-raw-thumbnailer-24.08.1.ebuild 845 BLAKE2B 760ce39feddec65a2080e2d4ca118082de57acc853c60671032045d7415436e7e36e90f8ad931ef36d70f6ea6a8e5f68b61888e08ab3255fb116886773ad5c0e SHA512 87d7584b7f949f93351ac11ae4249cf9d87a4e1a343008c699d992124a22bbcd66453df7d2e2d0d63c9617a7912b8de0084a61cd52f442b62be2906696b64f11 +EBUILD kio-raw-thumbnailer-24.08.2.ebuild 847 BLAKE2B f17933d56e401580dd8073ad355cf4e2abf315d3d595272769c69fcab4566ff5d4a4902098660ed74adb4b911f624c9be56d3ca32b626d6fdb9b4015bc245bfe SHA512 79315aecb999965da39cd092759bfa659f06985130e2dd100ac6a4afb5e2bb2cf4dad6f2054783386b732d22e0c6176cca6c6b5aa84a711c8a9c01a2cc29db41 MISC metadata.xml 395 BLAKE2B e3794bfe43e720ba54df37c3174ab9754e3c09ff986b80ce66511bf6fb739344eb49d4cf1e6daae63eb13d11deb82407945f48e4dd186905477155a624dd0787 SHA512 50a4cbb59e7411ccbdf6a135877b3103bee5dd58511b9030556df9a076c806032302e02ee067d917ba6b1d7e6a8233d93b3335ac21a14c59c00240150013d6b5 diff --git a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.05.2.ebuild b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.05.2.ebuild index b6b93b511ae8..335ba17313cc 100644 --- a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.05.2.ebuild +++ b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.05.2.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" LICENSE="GPL-2+" SLOT="6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] diff --git a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.1.ebuild b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.1.ebuild new file mode 100644 index 000000000000..06bf909cf2b9 --- /dev/null +++ b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_NAME="kdegraphics-thumbnailers" +PVCUT=$(ver_cut 1-3) +KFMIN=6.5.0 +QTMIN=6.7.2 +inherit ecm gear.kde.org + +DESCRIPTION="KIO thumbnail generator for RAW files" +HOMEPAGE="https://apps.kde.org/kdegraphics_thumbnailers/" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=kde-apps/libkdcraw-${PVCUT}:6 + >=kde-apps/libkexiv2-${PVCUT}:6 + >=kde-frameworks/kio-${KFMIN}:6 +" +RDEPEND="${DEPEND} + !<kde-apps/thumbnailers-24.05.2-r1:6 +" + +src_prepare() { + ecm_src_prepare + ecm_punt_kf_module Archive +} + +src_configure() { + local mycmakeargs=( + -DBUILD_blend=OFF + -DBUILD_ps=OFF + -DDISABLE_MOBIPOCKET=ON + -DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket6=ON + ) + + ecm_src_configure +} diff --git a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.0.ebuild b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.2.ebuild index 369f5f44090d..369f5f44090d 100644 --- a/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.0.ebuild +++ b/media-gfx/kio-raw-thumbnailer/kio-raw-thumbnailer-24.08.2.ebuild diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest index 7a0e60154f5c..498382dd8ae5 100644 --- a/media-gfx/kphotoalbum/Manifest +++ b/media-gfx/kphotoalbum/Manifest @@ -1,3 +1,5 @@ DIST kphotoalbum-5.12.0.tar.xz 11907204 BLAKE2B c4a9193d74c902788a5f68794948ca544f92eb1d2ef7a8c856b96832c7f1b8c5ba8b828744407e74a7101c3e954e83758444d31138c35c3a9045fae94f227e39 SHA512 f4d31d1c00ae2d8ec5a0475a4b3332e32f1ed980034419e6d07388544b65a6bd445c04c0640fba4fd5084c83840b6211ee64d556b6a82e4b182b5f07fbab3338 +DIST kphotoalbum-5.13.0.tar.xz 11477268 BLAKE2B 7127b544822aadb73fc94cc660065bab5ac682d2ce60c92d8e2d436de0fedfc06868c5117645141a9c1a0147abec5440bb91b66d923a3af6c23bd8436a77756a SHA512 0e26d0ee3ac94803427c09375325625122fbda2b1ec0974e9b6d5c5fea33f05c95707bc7e42cfc9ed2403003355c3ba55a8b0ada8c32e85d923c4c499aa28b13 EBUILD kphotoalbum-5.12.0.ebuild 1884 BLAKE2B 59b7c79276e293966fd901f108b28735f734f9ac5c95493b0beaf7ca4fe569ef1a55d2332b25ce6630dea694652c85f569b563739969c87af5ba49308782fb62 SHA512 6183e7bd6871df496ceda647c48a57592c7d71392e7aa12ade71d6b04eb9d7e5806709890679cfa9ff1b558b6c2309f3a7aa48438db8f3b906ef45dc0de46455 +EBUILD kphotoalbum-5.13.0.ebuild 1887 BLAKE2B 676793c7d3af0fe19924c8487eb6d04afe0efa287620f2f5838d6742e0dd8483f1e9d25796c80e4c237de23883de4d397fc8189e8c9b666efde511de95937ced SHA512 2dbd46f864674a13347e8317a0cad09b48a09b4d88d2bd6b10cda67dce80593f8bb716fa9ae53f4b2fbc83619149ccdb67cbd3becbaa5696bec4a22ddcc5e0b8 MISC metadata.xml 733 BLAKE2B 8925ee0f3c5e6e4d8592c3403781228f00cf39f39b0363920c86091fdb566e43889b522121112cf3f0f857cdb94f2da86cf6dd0029276e990ac197870a0ab718 SHA512 824eed39872862a0502dadf33cfee45ecc269bd0750286157abc08119b49c0fa3abf6ec66eb170a37251e141dd2842563219084a41245dc9b8cfe61fa8ad8a08 diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.13.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.13.0.ebuild new file mode 100644 index 000000000000..17da1cafb23e --- /dev/null +++ b/media-gfx/kphotoalbum/kphotoalbum-5.13.0.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=5.115.0 +QTMIN=5.15.12 +inherit ecm kde.org + +DESCRIPTION="Tool for indexing, searching, and viewing images" +HOMEPAGE="https://www.kphotoalbum.org/" + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0" +SLOT="5" +IUSE="map phonon +raw share +vlc" + +REQUIRED_USE="|| ( phonon vlc )" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5[jpeg] + >=dev-qt/qtsql-${QTMIN}:5[sqlite] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + media-gfx/exiv2:= + media-libs/libjpeg-turbo:= + map? ( kde-apps/marble:5 ) + phonon? ( >=media-libs/phonon-4.12.0[qt5(-)] ) + raw? ( kde-apps/libkdcraw:5 ) + share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 ) + vlc? ( media-video/vlc:= ) +" +RDEPEND="${DEPEND} + media-video/ffmpeg +" + +DOCS=( CHANGELOG.{md,old} README.md ) + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_QtAV=ON # bug 758641, last-rited + $(cmake_use_find_package map Marble) + $(cmake_use_find_package phonon Phonon4Qt5) + $(cmake_use_find_package raw KF5KDcraw) + $(cmake_use_find_package share KF5Purpose) + $(cmake_use_find_package vlc LIBVLC) + ) + + ecm_src_configure +} diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 904e49a2a187..697fca9c36db 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -9,6 +9,8 @@ AUX krita-5.2.3-znver4-xsimd.patch 1650 BLAKE2B a534c96c1fdbaf3aeb59499c88079d70 DIST krita-5.1.5-exiv2-0.28.patch.xz 4664 BLAKE2B e364325be3d8e40e293a7d268136be3737ce5d2b9b5607f140b30ba3e687dc8d86545f4463348587711150f1652b521f87efc859a1bf2bc3b5ed704cf3236781 SHA512 130ba9cce7d6c0138f7ef6dab1445816c2e29752aa16643c32a7d9c00d7a156ac88f01afdb782ab03fc1e0822660a070f74c02e7cde4dfbcec30baaf3c3dba7f DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716 SHA512 b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1 DIST krita-5.2.3.tar.xz 186685456 BLAKE2B 42943e7ebffdb46b9da085b2069701895e37ad9c457273b9217a095f1dfdf15c715cde0b88d440abb2d73dee656730da38844f11f27022885f87bb9cc9adab26 SHA512 69a0477e3119765dd53e0502fe5a64fcdc921dfcba3ddc5dec5c1bc4342a77b172b38276f134cc56f79741e6c47b51ef51786aadf0d178ce3955e24a9fd27b74 +DIST krita-5.2.6.tar.xz 186560016 BLAKE2B 788385983b371626214898391b08b1276a74b2ee3c9f01c1b1ae19d8791bfcf1ea1f59f6304643aeb6b16a2559fd2e45464596c721eb5d53546672d0efe17903 SHA512 8502ebef11ae066b298e999aba06df7858605cca14b889cec167b7ee3953b8ed86459b44ed90508d59bd7a9968cc9957309cefaa140a8d20293344f4dcb7fea7 EBUILD krita-5.1.5.ebuild 3781 BLAKE2B ca13633df6861d9159cae079b667123280d3b4ed73e707e648b710782219999f67e8f7f806471f8eddb8c95c2e3f0a797434157a4fcc5db3cfb2a5430698ba05 SHA512 b12e60d70eb03c76c6a5dbb3df451d6666f37d07060fe90601b8c569d130ac1bb7d71ef95a6d87faa58a627b5a3823dd468eee8d0be7b370960e81957aec3316 -EBUILD krita-5.2.3.ebuild 3784 BLAKE2B d4cb1c83118cc8e363baa95fbeabffd28c761362c780b20b9936c262ff150069cd0e6fbb953536d27a553ae8a5c35f3edcbb7f9e5ed116d9efa0e7596456666e SHA512 4cbad65b9bbc625f4ce981442b52538e09928e708dcf77c5f9baceb82a827bb844433bf4a03a1dc9a5d7e90925a3a972692ce0a0a648d89004ee5cebd2e6e971 +EBUILD krita-5.2.3.ebuild 3789 BLAKE2B 6b55cc22a1dfd1766561b37c9b812907e36354021099e1613bc5a0182f19d4653c3db574311fd65cd7d7fbab689d3a80f02b638ee188383b7fb56d381c32c78d SHA512 5e03c9129ddde0c1c595beb8af2772f1056c52f9a55c3e66257b2d94f5c88fa00e8e62f85651426a96a7adce4c3e8931c3a81b6dceda66e3c3c18fd607810af9 +EBUILD krita-5.2.6.ebuild 3738 BLAKE2B e09b053369e25ca24d7814917e5b88b37b56796559435c8a9750bfbc4da6a91745f9e9fe22385679456986f4c13929abfab4c6436c816e5ba359e282ccf1a44e SHA512 404b398e3d6436163d73e39538150aba4c201b9271a92b01ee887d03f865768d6616d67aadfe209acbf492222d8d1b45f378945104d3da89dec9cd8347cf800d MISC metadata.xml 832 BLAKE2B 53e632c3407b42c5d0f165bdcf67dfdd3a30bf1ec3c19ea79b90323ccbe5415e7cd34fbc79ebbb0e513359f28f381e3dac5d2534daf9ae7696f83ea77acb8130 SHA512 6cb02292d63602c80451759f6b935f65c9dfc2f01b32ac540d8cd4422ab2a70e04261fabc67b570c60e116f03e34d0165c8db6dcf9595db6cfa10849d8066336 diff --git a/media-gfx/krita/krita-5.2.3.ebuild b/media-gfx/krita/krita-5.2.3.ebuild index 6026fabe1417..6b6678994687 100644 --- a/media-gfx/krita/krita-5.2.3.ebuild +++ b/media-gfx/krita/krita-5.2.3.ebuild @@ -11,7 +11,7 @@ inherit ecm kde.org python-single-r1 if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~riscv" + KEYWORDS="amd64 ~arm64 ~riscv ~x86" fi DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" diff --git a/media-gfx/krita/krita-5.2.6.ebuild b/media-gfx/krita/krita-5.2.6.ebuild new file mode 100644 index 000000000000..0a1c86338154 --- /dev/null +++ b/media-gfx/krita/krita-5.2.6.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +PYTHON_COMPAT=( python3_{10..12} ) +KFMIN=5.115.0 +QTMIN=5.15.12 +inherit ecm kde.org python-single-r1 + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +fi + +DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" +HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/" + +LICENSE="GPL-3" +SLOT="5" +IUSE="color-management fftw gif +gsl heif jpeg2k jpegxl +mypaint-brush-engine openexr pdf media +raw +xsimd webp" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# bug 630508 +RESTRICT="test" + +RDEPEND="${PYTHON_DEPS} + dev-libs/boost:= + dev-libs/libunibreak:= + dev-libs/quazip:0=[qt5(+)] + $(python_gen_cond_dep ' + dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}] + dev-python/sip:=[${PYTHON_USEDEP}] + ') + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only] + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + media-gfx/exiv2:= + media-libs/lcms + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/tiff:= + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + x11-libs/libXi + color-management? ( >=media-libs/opencolorio-2.0.0 ) + fftw? ( sci-libs/fftw:3.0= ) + gif? ( media-libs/giflib ) + gsl? ( sci-libs/gsl:= ) + jpeg2k? ( media-libs/openjpeg:= ) + jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825:= ) + heif? ( >=media-libs/libheif-1.11:=[x265] ) + media? ( media-libs/mlt:= ) + mypaint-brush-engine? ( media-libs/libmypaint:= ) + openexr? ( media-libs/openexr:= ) + pdf? ( app-text/poppler[qt5] ) + raw? ( kde-apps/libkdcraw:5 ) + webp? ( >=media-libs/libwebp-1.2.0:= ) + xsimd? ( >=dev-cpp/xsimd-13.0.0 ) + +" +DEPEND="${RDEPEND} + dev-libs/immer + dev-libs/lager + dev-libs/zug +" +BDEPEND=" + dev-cpp/eigen:3 + dev-lang/perl + sys-devel/gettext +" + +PATCHES=( + # downstream + "${FILESDIR}"/${PN}-5.2.3-tests-optional.patch + "${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518 + # git master + "${FILESDIR}"/${PN}-5.1.5-sip-6.8.patch # bug 919139 +) + +pkg_setup() { + python-single-r1_pkg_setup + ecm_pkg_setup +} + +src_configure() { + # Prevent sandbox violation from FindPyQt5.py module + # See Gentoo-bug 655918 + addpredict /dev/dri + + local mycmakeargs=( + -DENABLE_UPDATERS=OFF + -DKRITA_ENABLE_PCH=OFF # big mess. + -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged + $(cmake_use_find_package color-management OpenColorIO) + $(cmake_use_find_package fftw FFTW3) + $(cmake_use_find_package gif GIF) + $(cmake_use_find_package gsl GSL) + $(cmake_use_find_package heif HEIF) + $(cmake_use_find_package jpeg2k OpenJPEG) + $(cmake_use_find_package jpegxl JPEGXL) + $(cmake_use_find_package media Mlt7) + $(cmake_use_find_package mypaint-brush-engine LibMyPaint) + $(cmake_use_find_package openexr OpenEXR) + $(cmake_use_find_package pdf Poppler) + $(cmake_use_find_package raw KF5KDcraw) + $(cmake_use_find_package webp WebP) + $(cmake_use_find_package xsimd xsimd) + ) + + ecm_src_configure +} diff --git a/media-gfx/libbgcode/Manifest b/media-gfx/libbgcode/Manifest index a41d87aed3a9..3ee929f68df2 100644 --- a/media-gfx/libbgcode/Manifest +++ b/media-gfx/libbgcode/Manifest @@ -1,5 +1,3 @@ -DIST libbgcode-0.0.20240704.tar.gz 456516 BLAKE2B 26f0a6f01a937da0fc4e4a4db715759967eb235f004daa9140841d7b0040a04dc86627c07265f5eb0cb7b34a9c6b43ec97ee1c59b53319ab95a9f3cb965fe906 SHA512 ed45cad28b15f5ac4b2cc340159f591c2cfb2560e8fa96f67bb122a2f7337a2fd67e632550fae8c07b36aad523ebe91334776f132291c4f84ff63d0f4a3b583e -DIST libbgcode-0.0.20240730.tar.gz 456671 BLAKE2B a15e903e42090eff3945f446f7d805ceabad533a2edcc9e4c82d99bac7aa42e9f10470f5ee41ed449799d9bc318c9097439a6534607a00d0bfeb2e2dea252b79 SHA512 b448d9ace946d85a4decc4a2cc05e1a41c64ba49968db1f818ba5974120f458159d5b639d5501a98daf4544a483366cd0e299c052f21577bb5ad763f7220d7e3 -EBUILD libbgcode-0.0.20240704.ebuild 769 BLAKE2B 3d8d58b04e01726ad7406ace6e68f725f82445921bc2b9fddb103539435f11a4a5a38d8125d26539d751d206178836373e88ed7d65419eba9a479e5dfce73e62 SHA512 4aaea92c01d82dd6836165f3d90ca566c3ee6e60df2ba8c817842507ad09c6526c85c692c9566f347a194281702855d52656a27e76bbc81754ff0ab5f222c244 -EBUILD libbgcode-0.0.20240730.ebuild 770 BLAKE2B e6b34eff1d7322fa934aad0f519af597c4254d8e0003e0348e1b61a077204dea5c3cdab207402981803d3614e3629a6b71fcef98153d04c276cd7f6b09c99712 SHA512 9b005e87b3fc77ee8ad4a129d0ee9fa4d82d627063e5f50ad8609abfa160d11039ce885fc2641291c55a06291b75fe527dfbec2473d5df9169e7394710904708 +DIST libbgcode-0.0.20240903.tar.gz 456751 BLAKE2B 93cd8eb83083581ba1ba735c6820dc0ead18d13ca0613387559d610f39c8011881bcc92ffec65fbcb40113b2b877050c15c7816d6db063698ce7ba5df7b35eda SHA512 86e9d85f0e52ebde853979e79639dc4424e26686fe55c45d78ca683cf32d8ec059976d43ffda9339a41892d30ebb267f8c360851889ad0a48ced874c27546f04 +EBUILD libbgcode-0.0.20240903.ebuild 769 BLAKE2B d7d12286daa36967556870cc79ea85fe390ed21fdb02a47232bb4da750796d271deb3f6c14bd94ae260c6e9cf8a392f06e067a209821151da23721fa51a22045 SHA512 28cd11cdc56b70aa4b5ee7d39672269ee81c00f828f265a295228684c6185e4fa874dd3c30a8af75e715c5c4824eab87612494a98c58bdfbc572648f1d08603a MISC metadata.xml 517 BLAKE2B f13be19479e8ade30b867081f8014821be2c5650b407890268e6cab65330bd4b8e3ab37e6cba531f029ebb0499d0cb7269ccb17b309b15105f6bb6aa94b5c42e SHA512 0d09893294fc40e9b52bbdf7f8f31e075c1e8839fd90c2b9656b70d30ab52f088527ab2d1ffec797ecb1e309ea7d40bb48d571eafd19eb3a2592aef4e7c918c0 diff --git a/media-gfx/libbgcode/libbgcode-0.0.20240730.ebuild b/media-gfx/libbgcode/libbgcode-0.0.20240730.ebuild deleted file mode 100644 index bf5c06541e91..000000000000 --- a/media-gfx/libbgcode/libbgcode-0.0.20240730.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -LIBBGCODE_COMMIT=5347c3399ec933f590d1f96903a406647f287d8f - -DESCRIPTION="Prusa Block & Binary G-code reader / writer / converter" -HOMEPAGE="https://github.com/prusa3d/libbgcode" -SRC_URI="https://github.com/prusa3d/libbgcode/archive/${LIBBGCODE_COMMIT}.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/${PN}-${LIBBGCODE_COMMIT}" -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/heatshrink-0.4.1 - >=sys-libs/zlib-1.0 -" -DEPEND="${RDEPEND} - dev-libs/boost - test? ( =dev-cpp/catch-2*:0 ) -" - -src_configure() { - local mycmakeargs=( - -DLibBGCode_BUILD_TESTS=$(usex test) - ) - cmake_src_configure -} diff --git a/media-gfx/libbgcode/libbgcode-0.0.20240704.ebuild b/media-gfx/libbgcode/libbgcode-0.0.20240903.ebuild index ec7244e9227a..783c85114ec0 100644 --- a/media-gfx/libbgcode/libbgcode-0.0.20240704.ebuild +++ b/media-gfx/libbgcode/libbgcode-0.0.20240903.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit cmake -LIBBGCODE_COMMIT=dcb8f7b6d91f1d490022083be09a76dc2bc9c51f +LIBBGCODE_COMMIT=3db61e45713932b4a9cdd469aa567d65e0095d00 DESCRIPTION="Prusa Block & Binary G-code reader / writer / converter" HOMEPAGE="https://github.com/prusa3d/libbgcode" diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest index 061002b635a7..cd0172817da8 100644 --- a/media-gfx/libimagequant/Manifest +++ b/media-gfx/libimagequant/Manifest @@ -38,8 +38,8 @@ DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542d DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 DIST zerocopy-0.7.20.crate 121557 BLAKE2B 24e63690b03c5becade47aa7ed16ef7a3d482c4cc8d0dfcf470f01f7592e3a704e4c52f0ab361b6fca4af18f977e33ff2bb4feb64d13daa1fcb62af9f9731be5 SHA512 fc3f883e4cfa38d01443841242a64575e69fb2ce0cfcdd71a28dd4ccb95e383ea1839a199fb13a58f9faf7608720a38cb0537612d7d832c3582946ee638886a0 DIST zerocopy-derive-0.7.20.crate 528379 BLAKE2B 247ab986cb720903df383429a6785c7dec230f6888246a9a7539a1bc8061601b27cea8baf4db2fab491fb32842901466ac32cc80504b3eaf35c25cd1a27ec9e8 SHA512 3c76100c3c9c1a5aae39750448f8ed37069be8e65cc74d67cc983c7e69988581f98248183955294e7c8d044c7a968b6e6534b8f84d9969693cbe4c5f679d5818 -EBUILD libimagequant-2.17.0.ebuild 1385 BLAKE2B f286c1e73acec4ec45c45da09fa4a45b70ff76f5090e490180a757c933acc998ef92064aa01cea1e8630e5cf2e216c2ec9e7577888912eaf4188fe78caff8e4e SHA512 beb4f2736ea3faa92c4f8f36eb752e31391f27e794ea1e0b92b3cefe7858bd60600df5d5d644f0bb6bbcee150c3ddaca703fb38aad65379fe70bad555f0aaf30 -EBUILD libimagequant-2.18.0.ebuild 1385 BLAKE2B cf827fc28482b2da325dd14c7b3246caa669bc362afa2f034bc8a437df692002ac8f5bb9a302167bee66144300ebe2fc7172f040bae90a3172a2cb4e553027ac SHA512 52222bbb7c4ff91d6675188544786b2c7693843ee553a0ef3566b135f0f48a376da61b8dd92f8b48edaaf3a9cbff7144a12d1fa9d013b0c87bc3c035de31ac40 +EBUILD libimagequant-2.17.0.ebuild 1379 BLAKE2B 6ca72ee6ec84edd8e950ed5b512561ea3eda0f527686866313c9fd8e60fda898857b69f1bc307ba53256e403c4e94f63b6686286ae30c52285c6e9bacee89d01 SHA512 991ccda370e134a476dba916b36817e11a87a14857985d2973222b872fc6e45928aff7e5fb8dbc90b41f8e5a64942d4eb2d59cd8f3466c4aa9f58f2637b1367b +EBUILD libimagequant-2.18.0.ebuild 1379 BLAKE2B 3e3d07bb4e879ee47f7aa92aab771200779a67b9f49bac88004f50038517418d832a4bf5ed7fbc1147207d74a5bdfaa6da0dd04aa84b46abf9118ee72b106d81 SHA512 24ca1bf46a5168a7a2bc45c4cc37fd3580576211e366c6bab3be6eb885e31d3c524dac4f10ac54d099505b8065de8088e3b49cf23227856470616d5437df111d EBUILD libimagequant-4.2.2.ebuild 1728 BLAKE2B b7178b42b78cbee9ac584671191165fba6c7fc36ab23ff675b0f7ef86fd53c10ee63fece727eaec33a013b06bed6b0ee77da170b9648e637faf0308c2157ed16 SHA512 2e4ce84bced1c3e731d7a369421d286a16f6c9f20efcc58e15c285a701ac3dcf835b0a1eb25739a5c843044302ebcc445054a8349d7a202294c6aca99fe6b393 -EBUILD libimagequant-4.3.0.ebuild 1203 BLAKE2B 11f74e18f0f25b86d3d98eebd262a4343ed29fef47147e8dbc8cccee71db498465a0253708c57c3d42ed98f265fa3a0b64b22b1b57fbb8a295563526ab36a703 SHA512 9d02d36954ae760873ad5a0c336848cfbf1c0a96dbb9db96deccbaf0312900d37b5b7774c962a0b65b4216ed287cd16f27ea5a474188714bc3d4177cd4072bf2 +EBUILD libimagequant-4.3.0.ebuild 1199 BLAKE2B 902a98544f4a03d9409771e42e9458113720c5d87be1ed7b89864b5745606e3967e0dba40d1d6179ff376c1282ecd8a93d911e3c3eded6d930edd06d190b95b9 SHA512 aa804f297b315ef054ad000600e5bfed8686868a961998087fcc23a6691805c744453e82ec1277f830b1b875fc0acbb88ff119e6b719db8d1188a2b67cf88734 MISC metadata.xml 431 BLAKE2B 19ce5c802fc25f17f74073dba0473b11ea6a5820ec0726d405701c1e6b8f0a64d7019f4fe56ff0e6e43aba6cb52c34a5ac821d4bfcb8d9d6a10d0945bafc8a90 SHA512 4e22cda189c98a07cab44be95311def7b6955025d320869b55006e0e09f98c7370de40f552b556c466013b0c68b04013f36559f4970ebfd79655faf446c1e166 diff --git a/media-gfx/libimagequant/libimagequant-2.17.0.ebuild b/media-gfx/libimagequant/libimagequant-2.17.0.ebuild index 6d059018082b..58d2884303ca 100644 --- a/media-gfx/libimagequant/libimagequant-2.17.0.ebuild +++ b/media-gfx/libimagequant/libimagequant-2.17.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0/0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_x86_sse2 openmp" PATCHES=( diff --git a/media-gfx/libimagequant/libimagequant-2.18.0.ebuild b/media-gfx/libimagequant/libimagequant-2.18.0.ebuild index ab7503e70f89..b029927b09fa 100644 --- a/media-gfx/libimagequant/libimagequant-2.18.0.ebuild +++ b/media-gfx/libimagequant/libimagequant-2.18.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0/0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_x86_sse2 openmp" PATCHES=( diff --git a/media-gfx/libimagequant/libimagequant-4.3.0.ebuild b/media-gfx/libimagequant/libimagequant-4.3.0.ebuild index 3834a58ebed1..55609484950f 100644 --- a/media-gfx/libimagequant/libimagequant-4.3.0.ebuild +++ b/media-gfx/libimagequant/libimagequant-4.3.0.ebuild @@ -19,7 +19,7 @@ LICENSE="GPL-3+" # Dependent crate licenses LICENSE+=" MIT Unicode-DFS-2016 ZLIB" SLOT="0/0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~s390 ~sparc" +KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~s390 sparc" BDEPEND=" >=dev-util/cargo-c-0.9.14 diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest index 894736d7e964..88a947365675 100644 --- a/media-gfx/librecad/Manifest +++ b/media-gfx/librecad/Manifest @@ -8,7 +8,7 @@ DIST librecad-2.2.0.2.tar.gz 13645528 BLAKE2B 43a9ada4d6fe8c0cb96dc1003a9e7aa3b4 DIST librecad-2.2.0.tar.gz 13837301 BLAKE2B ede9181b6805455d10773b70a8262ffb5a1c48f353dbfd1b80f705ba3194be700e9a486cdf528c4e8015b327a75a29c81b832186024d48229a6cc5fd9ca2dc12 SHA512 df33eac311b5232d6fc0480be1b1c9d257a33ba22f9b7897af4c1761978c87c07a962ae3ea37e8728661a788152157fc621aae65d60d44ae37b2028919cc96a2 DIST librecad-gentoo-CVE-patches-2.1.3.tar.gz 11687 BLAKE2B 4676fa60033e6d0ace35bbebfae569366a50ec46c2dc5b90bace9564e1f6c2020f733f63981788b6f5288fb0c57760215e7b35f294656c21787ebdefa8447fa0 SHA512 b485b41ab1d6eb61750c11a9b327fc70d28cd0cf689b3cd815b4982d3d800737f402522d9c3d416f1e43422166e7de4f97055de238cc2fe80cc45f11fa3377e6 EBUILD librecad-2.1.3-r7.ebuild 2879 BLAKE2B 4b9da167e4db48da0c8a41bf43c3d5fcadabea9f57a82270fec85b18da2dd6823d60be0eea3bd4bad7f4324599c47fd4b020276f3a4a28f7be5a2d13004a5f8a SHA512 3ed191982b167c0cabdd28e5ab7702784e0da508f358a066507bde711cb5917c885de435985ea0636e96d1f94586f76c007607a7ec1e1f90cb14646724988546 -EBUILD librecad-2.2.0.2.ebuild 2357 BLAKE2B 303cdeee8cdd626046c61fb78b5f16eb5dab1cd056f9a5fe8dce8ea4759034f1e525b936d487da823653946908da0c3d3bc4651f121521529f8eb109d16bfba4 SHA512 41902aee53ee09c807a523ffef651a0a066c016fe286a3ca98b92a587fff91775b892f26fd413bb6f6b8509772fe3d356b9e420551415b4d24439e12128db520 +EBUILD librecad-2.2.0.2.ebuild 2355 BLAKE2B 16afc5c397a9d304a21542c1e642097c591997db0bd44816ac6a20c62ab9c9e59db6496d9c985d68279e1507ca8f53fe787a27d5b166c09de2881c6fe49529b9 SHA512 22bdefe9263b512008c74df3e272173a5b9dadaf782da131ffbdcf04984ab671e1250d1c1f274f2e8a7d11624a8d9a17a60a701b9a1b08a2b5de9cbee8ac839f EBUILD librecad-2.2.0.ebuild 2413 BLAKE2B 96ede5e05dda79f883dd89b2cd759e56400b2474b3609e135e0faa34904121694e396f34cd121a9b4df84afe57d818a1bb7ca253f6a894d96aff41a093dd89b2 SHA512 84d0f89d8f9f35ddb21a18537bcbc02cad1f665009e5f0c251fd78bc73baeb1f0273244e4e7b353bd97f4484a21542953e45042d8c53ab210677e6a49396990b -EBUILD librecad-9999.ebuild 2357 BLAKE2B f1b84cd8486d81b2a11216448be1e7c36d8d4347bfe09297a472b31278fa9e7aeeb4d9f325ed234ac05a0ae6065280efd159b7847195bd868d0991f6101f6c04 SHA512 ca46b07e00004e93ff1fcc2be9ea55049fa92154ce26eca11d033476d66b401653106dfe0fd835e07421d67d651a9af27a9cc505a440f85b43d3ba0c76d17d40 +EBUILD librecad-9999.ebuild 2342 BLAKE2B 435e4e8c7d5d7e3c1fd3338b98bda4617cc1b246a0670bcda542d0e061593d4da6a176bdddc7508cf543121a42a7ae72c04948c52176a731da67f756b153c38b SHA512 6b3c27abf552b61ce21b30605ef31015a557424679940281a1516ec3f9f5ca296289896fbcc08f15764e8a9a6ef653ceb2e4672538d01b48f708b030af2f0c0e MISC metadata.xml 333 BLAKE2B 2790ea3fb043f1d8393fd715b4669edab3229e1de59e27cc70f3fd3cc13f83964ad1dc6a5534af981111b4ba1a2c7d29501015459e300905574fbc59fce88ee2 SHA512 bf932b64f53780d10e7e64845f4d50f1726f9d57e4625cb94ed2dcc761a0d7f409731b9e9cd1475880b283b43d7b0b979493b984cb243f09954a38f39baac5b9 diff --git a/media-gfx/librecad/librecad-2.2.0.2.ebuild b/media-gfx/librecad/librecad-2.2.0.2.ebuild index 6da50e9fe6f7..ff44cb2fa0b0 100644 --- a/media-gfx/librecad/librecad-2.2.0.2.ebuild +++ b/media-gfx/librecad/librecad-2.2.0.2.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then else SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/LibreCAD-${PV}" - KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild index dd55eaef5195..a647eb2a96ff 100644 --- a/media-gfx/librecad/librecad-9999.ebuild +++ b/media-gfx/librecad/librecad-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PLOCALES="ar ca cs da de el en en_au es es_ar es_bo es_cl es_co es_cr es_do es_ec es_gt es_hn es_mx es_ni es_pa es_pe es_pr es_py es_sv es_us es_uy es_ve et eu fi fr gl hi hu id_ID it ja ko lv mk nl no pa pl pt_br pt_pt ro_ro ru sk sl sq_al sv ta tr uk zh_cn zh_tw" +PLOCALES="ar ca cs da de el en en_au es es_ar es_bo es_cl es_co es_cr es_do es_ec es_gt es_hn es_mx es_ni es_pa es_pe es_pr es_py es_sv es_us es_uy es_ve et eu fi fr gl he hi hu id_ID it ja ka ko lv mk nl no pa pl pt_br pt_pt ro_ro ru sk sl sq_al sr sv ta th tr uk zh_cn zh_tw" inherit desktop edo plocale qmake-utils @@ -25,19 +25,16 @@ IUSE="debug doc tools" RDEPEND=" dev-cpp/muParser dev-libs/boost:= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 + dev-qt/qtbase:6[gui,widgets] + dev-qt/qtsvg:6 media-libs/freetype:2 " DEPEND="${RDEPEND} - dev-qt/qthelp:5 - dev-qt/qtxml:5 + dev-qt/qtbase:6[xml] + dev-qt/qttools:6[assistant] " BDEPEND=" - dev-qt/linguist-tools:5 + dev-qt/qttools:6[linguist] " src_prepare() { @@ -52,14 +49,14 @@ src_prepare() { } src_configure() { - eqmake5 -r + eqmake6 -r } src_compile() { default build_locale() { - local lrelease="$(qt5_get_bindir)/lrelease" + local lrelease="$(qt6_get_bindir)/lrelease" edo "${lrelease}" "librecad/ts/librecad_${1}.ts" \ -qm "unix/resources/qm/librecad_${1}.qm" edo "${lrelease}" "plugins/ts/plugins_${1}.ts" \ diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest index 0154fd54ee51..2c54583c4df7 100644 --- a/media-gfx/lximage-qt/Manifest +++ b/media-gfx/lximage-qt/Manifest @@ -1,5 +1,5 @@ DIST lximage-qt-1.4.0.tar.xz 841028 BLAKE2B d5f76bfe9763807e8e836de43ff433a1553cea0858b61e76411017ee239fbec6dfd9d3776322b60da6ad8b6b9b1b30c6a02a8c494b62eef440f4d8c5ab9e7143 SHA512 c0dea9418890745de685c7df228ceb849fa21781764c2089481bea89526842e5e8f0972e032ba9c52b07c32202ed284d977f47ace598c44880dff661d76cd125 DIST lximage-qt-2.0.1.tar.xz 848348 BLAKE2B d2484baffaae220436ae157dccda86e126b416101f047133f494cb44d9c3bba007ce797c1aa88d21ba4b242abdf8cacf73706831570943e4d7a36eb02591fc7b SHA512 594e86a4bedf3f9689107d79d852ba1ef4db83f06572b8c077ed5850dc10cc05a33fe79a0c05632f7e7541a6f895919b72c264635306f7a468eac6ecde531ba4 EBUILD lximage-qt-1.4.0.ebuild 1087 BLAKE2B 95edea7c02f664c8d60b1ea00749da95899459b9dca4ca94f8137ef9e91a0579888212c90f3a057f0aff81435261b8c872a1b38e5d764017c024715d0bd9648d SHA512 ff4e17eed33bf1be3188b38e0d26a107b55fd547a609a8465d79fc5ba91eee6e4c0587102b8448f5da04819a97705e43f15bc9bbd8335206845dc45a3f769ef1 -EBUILD lximage-qt-2.0.1.ebuild 928 BLAKE2B 22ca1180c15e25249c114f3ba5805ed51b01ee169893e8b558b04c594f6af50ecd22661a8f170b165d67efb8e02a994b6cf04dd06bfdacf78e3fcca2802fcf91 SHA512 76528689f8885efcef4321f311f0302d0a3b1d75764dd2315e363100a79291421181113c6d6942cf8044a057e3b896169fd4547724caa869032fa35dc0368009 +EBUILD lximage-qt-2.0.1.ebuild 938 BLAKE2B 2df26215a5ee92fb8706077e1db64fe9d1b49da6df78a6f925a251b65c6fccabe52818394780da86401717a0a2a72bfdb14b12a726bb343a1afd83896a3740fa SHA512 939382b058e11ad208e1377d5ba2370520a2d31f32d16f01dc5ffb41b7e9550571036ef7d80df59d19f3bca8e6d13b849e54cd1c076d11dd33dbdac8b2e3c07e MISC metadata.xml 317 BLAKE2B f63e3e91e5dc9fcc6113bf1ae9c9bb5680d2b7cf40359eaa058dcbc247f3b2f43f540ffa6525935220d52c3e8b94ee3629ce237c788c8e4f0946dddbf610680e SHA512 74c882b00f38c28d8546d31c59636252b2627053143a1bea3551c4bc507a63361c88bc555ea15760395f995c6d20dd6fe6adf65f11d42cc90ffd8378aae03f1f diff --git a/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild b/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild index d369079f6c01..920333b3a4d0 100644 --- a/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild +++ b/media-gfx/lximage-qt/lximage-qt-2.0.1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~riscv" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2 GPL-2+" diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest index ce933ca66467..af442ef23165 100644 --- a/media-gfx/mandelbulber/Manifest +++ b/media-gfx/mandelbulber/Manifest @@ -1,5 +1,3 @@ -DIST mandelbulber2-2.28.tar.gz 122800825 BLAKE2B a1bc8b3b743687003aeccaea7763b8100736b03dcd5044e43193f07bb519a7e78075c63cd0466373e8240a317fc2bbb6481bc07b51b137241cbb477e679093c3 SHA512 9bb2ecdcc2a2976efb6af930d49f067462713c6fd48f54631477102f3153479df6336b43b160c98c4e01f00d48188b314ccc86a84055a05cac5eb009db4e52e2 DIST mandelbulber2-2.31.tar.gz 133379945 BLAKE2B c7b4cfa151f3bf0161b5871d0b22cd05567edc5a7145d64f38c4059b1f4b6f19f1ac3285d7a60cfb2979cd98f10041b7c7dd9100dab9ec93258e567034a03d63 SHA512 cf70c73f80c89731da6711af6ad6e1be33d43d7b014e16a6516eabf22d39b49469ee3e7b4ecc5e5adad3a1b26c8c1892c1a82d5891fe2b71fe524cdd1c3460c7 -EBUILD mandelbulber-2.28-r1.ebuild 1839 BLAKE2B 5798e1c9fe1aa064c43b2100113c880cea5825e420e18148e55649855c3a452377f6cd25b9ae0cf67d36f6595802e24e92ef475deb12e22f55a364299a0e08a5 SHA512 9eedabd79d50453d5e434caa343f04cca54aca03974cc4034afe6f2492a5905f3a60b363b3cbb0192069ca5ca9afb070a08de6343159758af5ea8fdee1ea81d5 EBUILD mandelbulber-2.31.ebuild 1868 BLAKE2B 941e1c9659c9790cbba07264d52c887a90e1ec9ee3f5bf02ed52d1398a0b9e9508ea8a3daf6aa65a9ca59a805eb18b814ca285118a609624086a5229141a5151 SHA512 c0d651bacb929937bab45e7700f8d697d97e8f4bc8370ab0bb800a8360d3bced36cc040cf582312efab36284cbcca4ac16659b8ebab47e6da581857a2ceda713 MISC metadata.xml 672 BLAKE2B 8b7d423df1cd3f405b43bbeea9f6de9438951cf55b2020016b3174376e5498f2bc903295afde6626bf342b77050210eec78db8672cf2555f344f12248f1e58be SHA512 4005cd3324e642b6ea382e992949c1a3f459cef6f6094eb896e58fbc5651cd1d88c6575ef76896673bd0589e46285d3df9858a110f9b4b4c867c797a329dee77 diff --git a/media-gfx/mandelbulber/mandelbulber-2.28-r1.ebuild b/media-gfx/mandelbulber/mandelbulber-2.28-r1.ebuild deleted file mode 100644 index 35bcd7fe3da4..000000000000 --- a/media-gfx/mandelbulber/mandelbulber-2.28-r1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P="${PN}2-${PV}" -inherit desktop qmake-utils toolchain-funcs xdg - -DESCRIPTION="Tool to render 3D fractals" -HOMEPAGE="https://www.mandelbulber.com" -SRC_URI="https://github.com/buddhi1980/${PN}2/releases/download/${PV}/${MY_P}.tar.gz https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}"/${MY_P} - -LICENSE="CC-BY-4.0 GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="joystick opencl openexr sndfile tiff" - -RDEPEND=" - dev-libs/lzo - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - media-libs/libpng:= - sci-libs/gsl:= - joystick? ( dev-qt/qtgamepad:5 ) - opencl? ( - dev-cpp/clhpp - virtual/opencl - ) - openexr? ( - dev-libs/imath:= - media-libs/openexr:= - ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:= ) -" -DEPEND="${RDEPEND} - dev-qt/designer:5 -" -BDEPEND="virtual/pkgconfig" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp -} - -src_prepare() { - default - - use joystick || sed -i -e "s/qtHaveModule(gamepad)/false/" makefiles/common.pri || die - use openexr || sed -i -e "s/packagesExist(OpenEXR)/false/" makefiles/common.pri || die - use sndfile || sed -i -e "s/packagesExist(sndfile)/false/" makefiles/common.pri || die - use tiff || sed -i -e "s/packagesExist(libtiff-4)/false/" makefiles/common.pri || die -} - -src_configure() { - if use opencl; then - eqmake5 makefiles/${PN}-opencl.pro - else - eqmake5 makefiles/${PN}.pro - fi -} - -src_install() { - dobin ${PN}2 - - dodoc README NEWS usr/share/doc/${PN}2/Mandelbulber_Manual.pdf - - insinto /usr/share/${PN}2 - doins -r usr/share/${PN}2/* - - domenu ${PN}2.desktop - - newicon -s 256 qt/icons/${PN}.png ${PN}2.png -} diff --git a/media-gfx/mkbold-mkitalic/Manifest b/media-gfx/mkbold-mkitalic/Manifest index b83b289971a2..d60d03348bc7 100644 --- a/media-gfx/mkbold-mkitalic/Manifest +++ b/media-gfx/mkbold-mkitalic/Manifest @@ -1,3 +1,3 @@ DIST mkbold-mkitalic-0.11.tar.bz2 21922 BLAKE2B 90473ee9ce751f491a36b18b4adcfc15a64535ca11b7394a2d46b48a144394ae549133635f898b8b16d87eb3271439fc425cee3cb05e4559818ab00a7d054e3d SHA512 fe40693bc5d73aaf45daf1bbd22f8107fb61604cd4ff0ec09e8bd63029be811a2b1bb46a3ce214954841c5d074e9ec23c150006d9a2c8ffe633e93801c2d7345 -EBUILD mkbold-mkitalic-0.11.ebuild 761 BLAKE2B 8a9f9ccba3506f35a2dcdd7d4510035f19c03dd7b5ecbffb0d7504d959995b9c6c45f637d19de370a40a83a9db022d97f9495f297571fbad4cf906935c64cf33 SHA512 34cb049179b645960017a4c23f4627fd74c1f1f38916baccc0f274f9378dfbea3ece26dc744babfff2a237b4b2075b28bdf58301c9369eb2c134bfcee2180247 +EBUILD mkbold-mkitalic-0.11.ebuild 755 BLAKE2B 3d7d80412cd09532f2d3b6a4783a2ce35639d86ce83bc1778ef0f3496cd55c326f25bcdd04f051943551dcb574711c489a39aac2de37fdc9f1b0f01e9dc5962d SHA512 d5b3feb28b7b0fcdc63e8674db212d02bfd738e4ed8df3b9d855161bb0932c72ea4121cc4a571dbc103d5a0be2812742ce8fd922e145ab73cbe59a5ba3e91a9c MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549 diff --git a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild index 5aa8c4ee1a47..79c05eab2b46 100644 --- a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild +++ b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://hp.vector.co.jp/authors/VA013651/lib/${P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm ~ia64 ~loong ppc ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~loong ppc ~riscv ~s390 sparc x86" DEPEND="" RDEPEND="" diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest index 8dd24e10a201..b933e8a94970 100644 --- a/media-gfx/mypaint-brushes/Manifest +++ b/media-gfx/mypaint-brushes/Manifest @@ -1,3 +1,3 @@ DIST mypaint-brushes-2.0.2.tar.xz 1522216 BLAKE2B ba274d9abcac51bba3b8e7d4489893eef62e2b35ee8d0607d476d022150d92944693cae6d1ddb9f4f9b01f229f050f4ccf7416a0ef0fe27e9e0f5e84a4e2c56f SHA512 bae870e930381b818165e5e39d38b25782d5744c9a507a71dab37ae7ca2d4502896057f919a16eb9305d803a01db3a948a735d5c5b850893997a9afd6403144b -EBUILD mypaint-brushes-2.0.2-r1.ebuild 507 BLAKE2B 5d4fa4645221b2adeea62343cb90d4480197b60ef0599b843285f6ecfd8b30ad9d36df9909ae5d865aaa8c8db74517eabbf1801daabcdad7c3dbeccc74a3d4d1 SHA512 a0d672a106eda28524aef40e4a4278d0ab8c201415091d07c1bfe5c3738c678112dbec3e3c8d711995a543d4f7e6a7f74ce841c272e807d37be14120603f98bf +EBUILD mypaint-brushes-2.0.2-r1.ebuild 501 BLAKE2B 9e6afb113994418cff1456bb906fba4bc9740a9217151f2c2771d39f8128f6a651d44bb82cfda1f8e90ce6155e6fb7bb311cc91b7edfd8529a2a9e29daa2370d SHA512 a60f90b95c01f142d466675428f341590c0b2cd8ba04ecd785053fc78e47d3503d2e544357d925ab9164f3b8dba2bc5610595ef1a6c1fb3b045ecae61588ca2e MISC metadata.xml 352 BLAKE2B 2ab3826fec46744aceb8210d0892c4d928cb818db4bd2704c156ca74c4c85bc8778e8212ae07010a0f87876b9448bae139f988465b9b5f2e50f62061c860d31d SHA512 bf153d124d449c2b4e870b2aad73ab45708f622c09d37a42975dfa5e1c42005009bf6c0d361bc03cab7fee76ba0a811877a7518cc6b84cfe1fc941e9a41c2921 diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild index 0b8ac9f4982c..5463c117e59b 100644 --- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild +++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mypaint/mypaint-brushes/releases/download/v${PV}/${P LICENSE="CC0-1.0" SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" src_prepare() { default diff --git a/media-gfx/netgen/Manifest b/media-gfx/netgen/Manifest index b7f5bbb3f667..118589c4a8c2 100644 --- a/media-gfx/netgen/Manifest +++ b/media-gfx/netgen/Manifest @@ -8,4 +8,4 @@ AUX netgen-6.2.2301-find-libjpeg-turbo-library.patch 1280 BLAKE2B 47cbb27914badd AUX netgen-6.2.2301-fix-nullptr-deref-in-archive.patch 1012 BLAKE2B 2de4195438ce6dec88d1bc0d05f841bb959690b271cb1a40464ae81cc056e4520246c49533a2dc90ee88a29f450b9bf89a285342f9e8a08f0b9a44cee1933ec2 SHA512 3f28bce676c3db1d0dd05ff21716745dfc01b8d9f5cc6c278baed76f10514d283e78012f04fca956f71337f4a34287f949b06881a12cb84ae812a61bd1ff79ea DIST netgen-6.2.2302.tar.gz 3398683 BLAKE2B 7cf4626ee8163898864af0346cf2c4fa73dcca3ac2068d67f80b05ee926024b36552b33013c2ef8f74026ab942ae08c0628af0ce0c0dac2d004ba26e18bf4619 SHA512 da6e8e43d73af6b7bfae2e3c771d46e34601ff481c251924673f7330bae032a743fb9d5ff2792855e91ed5addb4d22fd4bf9cd7a9dcfb53f476e22a30f1eedb3 EBUILD netgen-6.2.2302.ebuild 4089 BLAKE2B 1d663d3a6d22a2b2c6196719b26a61d300735a917bb7493a76779dcd183526650f3ed2739405439988642b2c41af9eadee169e1104c7cbb0efe0747a57895d4c SHA512 3a8f4dd92088288330d4f63390d04bc867724766d12798ee35e7caa7e8691d74619c5cabead75cf24ae07c8cfc0f26bc4ad30e2683420f7f36ba4833e9b4a68f -MISC metadata.xml 648 BLAKE2B 8011d98cf84e88a045f2ace8e31e48b06f9c7555d73f1220a1a877f36c579ea4829568837b31077e84ecf2eff932d3290032479b3eabf824c0c7e4f95a42c485 SHA512 f78534e481c213ecd3091ca2b09bfd62a654c1c5a1b6129db108a94e974b9d44090ccb3d89e8750a96b29ef182978bca65939b7c1a4b117e563c7c8503ebdb4b +MISC metadata.xml 649 BLAKE2B 01bb3d452a1f0002e2e5b8589c2ff83668b2135705599a3223fe37bc89287423f2bef8af15bd949e08c40e7e7ef304362fa8900b048f85b3ad95bcbbc1a7caed SHA512 072b3dc1049e26655316756255a96d34d2e2964296088d0768a8a6953703840d936aace4625b2a46bb36cc147c2814dfe537e01662294c3d5b02f397e5255d0b diff --git a/media-gfx/netgen/metadata.xml b/media-gfx/netgen/metadata.xml index 201e5f704aba..0cb4ec70802b 100644 --- a/media-gfx/netgen/metadata.xml +++ b/media-gfx/netgen/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project" proxied="proxy"> <email>sci-mathematics@gentoo.org</email> diff --git a/media-gfx/openmesh/Manifest b/media-gfx/openmesh/Manifest index a62933a7517a..fcd86be89a4c 100644 --- a/media-gfx/openmesh/Manifest +++ b/media-gfx/openmesh/Manifest @@ -1,3 +1,3 @@ DIST OpenMesh-7.1.tar.bz2 22855582 BLAKE2B 778b3a40c2e476cdb2f50b5b4a90f8b6ae7852f166087426ff1db25c829cb4172cd7ed14db1a22229f7b4447e7ebeb0d6116647d929b7dab43d565192a8ac48e SHA512 bca0f937e08fe512efb436f5b96b83a1ff7945640e18fb1bb083956f04609560e29b1c1f7e058840791df77df6859fdd20ff6f49d80b908e8c1c5542b8615e6d -EBUILD openmesh-7.1-r1.ebuild 1457 BLAKE2B c066180e93acccefecc3dba5599d06fe20e1ff4f623a80a0e442b7be3cbbd8e2e92237c358532cb5fcbcd5c71f1af9f43b8f768ef81f5eb3e2a8a0965b4ac8a0 SHA512 8489f8a1b395b4f4f036f9cefde9370d29e041daff0906a91c106574d1ba7692738859841c1a79ae917dd8982309a3394275de07541563446273b8767642bddc +EBUILD openmesh-7.1-r1.ebuild 1451 BLAKE2B 95c4b5aec4504cc64718821f565f0ec1a5259e8eeadee9632eca28a17980ff0e10f6c4b35cfbdf704b97dc134a0145bf2344fc965bff6e5c1dc85764a7a40bc1 SHA512 a730b04f593cbed7f61ea2f15fccbe5ad4f5a0e1f27aa5235c8c442d26e87a39dfbd2ee74c383b1660bd4a070963c7be9834668418f94b554317fcb2008453b2 MISC metadata.xml 649 BLAKE2B 885190b0bcbd5eea997faf14865a5873839ce727d3a98dc36f712063f487271d2882c2d5ea08af9d019edd8e780640f2684905ac01de00163e06e832c9afdf60 SHA512 f1c2f1b486f851d8ebc796c8738d1842e12edfc5968fbeea7c150ce8bbf6be107c64a7de051326d485222210a2972868d71d9cd619aa8a3fa5eca8bdd02da68e diff --git a/media-gfx/openmesh/openmesh-7.1-r1.ebuild b/media-gfx/openmesh/openmesh-7.1-r1.ebuild index 4f02e9b682d2..41c0b43f5636 100644 --- a/media-gfx/openmesh/openmesh-7.1-r1.ebuild +++ b/media-gfx/openmesh/openmesh-7.1-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://openmesh.org/media/Releases/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.t LICENSE="BSD" SLOT="4" -KEYWORDS="~amd64 ~ia64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="qt5 static-libs test" RESTRICT="!test? ( test )" diff --git a/media-gfx/oxipng/Manifest b/media-gfx/oxipng/Manifest index 371aabd26194..98ed2d502faf 100644 --- a/media-gfx/oxipng/Manifest +++ b/media-gfx/oxipng/Manifest @@ -201,5 +201,5 @@ DIST zopfli-0.7.1.crate 44416 BLAKE2B 14c6e7982f34de921bc3ce0048281e76f1de9715c0 DIST zopfli-0.8.0.crate 54234 BLAKE2B a5e0434a4b20840f2bd59d72121849ea23c2f21d0e87bcd6e918c8521f2989c71aedcd98853533a85bde576bbc064e56497be864065e373bba3cfe8b9b9cf94e SHA512 3b788f0ca94a106ce690764d081bf277eddb364b07287c33be3855fdc63bd583b5e8aac95b709833b4ec4a8f153e7e1ea822b09da23d5db777137bc1dd49e17c EBUILD oxipng-8.0.0.ebuild 2248 BLAKE2B cd63860e6989f30c4a3aa60fc1a482e13737ac37acd71d19e33e3778036dc3d1326c51141c9103efb8a28f639192825a7c9814ff9ccc7f6f315ffc0a5031e3e8 SHA512 fb92eb7d550f430fc944fffcaaea00e04a03a57a3813a7972ac834c4afa6cddaec14d0ba9adbfcff89bb38efd52e4539d7fb185b349330db55d9543c48cf8904 EBUILD oxipng-9.0.0.ebuild 2279 BLAKE2B ca45c8e5f686ac77bd453a415f696d4224f2e3548cba679e00b57448cc6a030e5f35111614079344932593d51cb33652a31b0d96a65aaf6c061c565cac6443f4 SHA512 cff8457f7b6606a7baa2e49eb43c4d81d155b0b9e21f70f700a37a85d41b64a15884b29622dd0478440ef8f7b68e86af3db8240aef765572dc20a3e9b57a4b4c -EBUILD oxipng-9.1.2.ebuild 2636 BLAKE2B 7a856e58675b6f5efcc83cc7fcdd29b82bfa3f52fc5f7d2bfec98c3db3ce729075c93490a19d99f8f4999ea354b3ef4d178ebeaa85791f76ad8f58f4f49861c5 SHA512 1cb9db23efb8529fa829448d78317c9a9713c88c24acbe38a635c5388a3cd32366d9a5288a4d6a6e1712f3caa172e905638fda611fea0c0da9e846d3e23d5b16 -MISC metadata.xml 622 BLAKE2B e1d908e3eddcbeae97cbe17f3d599980afa55073f4aec05421d77ac43c6fe73231d3a5371cabb341bbe325918315a16f356612d67ceaec93cbccead92d5b545e SHA512 db5befcc73330783a467043ddf7af90341b13838348108e49826ead55c009d3597652c01b4e378955326ff1db2c244b65418c25af3c10436a3b4fbcc566ef0bc +EBUILD oxipng-9.1.2.ebuild 2635 BLAKE2B 463b4c63aed640002601468cbbd899d7a148497331c1c86be7180841c2893f8833a285b541eeb5f49193bf74d4686c7f406c715744bb8eabc0833f09a5faca92 SHA512 b458566face09784166827ba28af41205189bff0684959b188e3f4118f800aae59d2ec9e86f408924b335f00d906a2559c338718dea60299b66fb867abe927b1 +MISC metadata.xml 623 BLAKE2B e494053d292bf36c65237f5cb7c8b488ac60ead764ae88d90e9ff80aefe46f11c4d2c4bfea88258d0fb70eea136f552f5b77cdb16e3de0438e1843c79f5c5c56 SHA512 3a886300372c8cd3d837cd206e4451ba156afad49400b3594e3dff7ce430c2f8612a72d986485cb848b6f9ecf852f739a184f0d8f3015defc716beccee162654 diff --git a/media-gfx/oxipng/metadata.xml b/media-gfx/oxipng/metadata.xml index 03cc5284d087..7057283aee94 100644 --- a/media-gfx/oxipng/metadata.xml +++ b/media-gfx/oxipng/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>unlord@xiph.org</email> diff --git a/media-gfx/oxipng/oxipng-9.1.2.ebuild b/media-gfx/oxipng/oxipng-9.1.2.ebuild index 05985f225a51..8504fd85f18f 100644 --- a/media-gfx/oxipng/oxipng-9.1.2.ebuild +++ b/media-gfx/oxipng/oxipng-9.1.2.ebuild @@ -104,7 +104,7 @@ LICENSE=" MIT " SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~riscv ~x86" BDEPEND=">=virtual/rust-1.74.0" diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest index 1b8f7dba26d8..3c86f43a176c 100644 --- a/media-gfx/plantuml/Manifest +++ b/media-gfx/plantuml/Manifest @@ -1,3 +1,3 @@ -DIST plantuml-1.2024.5.tar.gz 12119170 BLAKE2B 97fd8f48aa04d9d8b089547871abd954b8b1c189d32b844f1de4ac33678dabe2968a3307fb573f571adf541dbbbfd5eb5c21839b14f3cb9ed2e86ac7b447bb87 SHA512 20b9502a3d6ac9ceccb667943f8ea70990102f778175001852b1fcd2b9b7fa570f5b7a7fb237b6831c0411667c3e986f2b0ea09ce2602b5c1ca98694b37c20a5 -EBUILD plantuml-1.2024.5-r1.ebuild 1379 BLAKE2B d9828453b19199934914faa621789747aea212803c63c48500bc283907359c6c04671ff62c00c0ef17e7accd9e2c948bb354c54d796bb77439a5339bef31c0fe SHA512 6ae5acbbb52f987d5d270c90a8940cad08430f7fd02d61d38cf9850ddd3807f664f78a265a8d2ea2bda054fb728ce603e164a4ecf17eaaae53b39b1b649a04b7 +DIST plantuml-1.2024.7.tar.gz 12645142 BLAKE2B 5716e3085c8e326cb504637779fa4a50ab73fb557345858b6985e8f67412ee24d5447bb41b9037c54a565e6dd45db3dbd76245378add7d168e5bc0e05dfca83c SHA512 4f201b0341efa02deb260b44837fff2e1225715ded1fd196f7cd79d0d75baa0a5a146880d9c46470d9652df593b4c4419554d9bbc4a94d380b689359130d70dd +EBUILD plantuml-1.2024.7.ebuild 1374 BLAKE2B 0f09d29f7740d522aa6ca68781b3acf862c62365dfca7b3223f45de2bd9c57c98d1da3756b9e1d58f1ca7c8dd49e5fd4072ce346f69015cdb9658cbc9294cb33 SHA512 51d1069d2617cf7393d1db274f8891c0c25b8d71107e31bd50ca09c32bed895b0c5df71f61a01de8f6333d7b3c3919f7212a3b5f55e476a6f52ba74717e5d5a0 MISC metadata.xml 975 BLAKE2B 3a847073b2f3b5f14adb59f8dec5183533eef81f8b10e5633b356743cb45c3927dfc2f8427f26f1e2b3eef01976b0a8e5884b5f9492310e87884c26759dbfed8 SHA512 2cd56c421b1566a679afb739ca82377d5c8b47519fd2cc44307424f5cd88fa0f8b2144842943a7da6abef7ad79254101818292819fdef97631746815a892e7a5 diff --git a/media-gfx/plantuml/plantuml-1.2024.5-r1.ebuild b/media-gfx/plantuml/plantuml-1.2024.7.ebuild index 5fd769605c36..4493b5a25ef3 100644 --- a/media-gfx/plantuml/plantuml-1.2024.5-r1.ebuild +++ b/media-gfx/plantuml/plantuml-1.2024.7.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${P}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64" IUSE="ant-task" DEPEND=">=virtual/jdk-1.8:* diff --git a/media-gfx/pngcheck/Manifest b/media-gfx/pngcheck/Manifest index 963b1d96ae96..1a94b842cc3f 100644 --- a/media-gfx/pngcheck/Manifest +++ b/media-gfx/pngcheck/Manifest @@ -1,5 +1,3 @@ -DIST pngcheck-3.0.2.tar.gz 63202 BLAKE2B 4cc6040e087aa2f5829e79ea1a5feb45af8bb15fa72325f9cb4822169c7d278306d6d89b936fd4c3c3819a09380e07f1f64ce0c276e776c3146c1533b1ee1363 SHA512 81bba699141c0f506ee589785eccc4b1ea882df5d211bcd91885bbcc4230bf14d23fc1298ffc10a110d6a8459522f6a01bfba1f81739f6085e4d3de964bda3d5 DIST pngcheck-3.0.3.tar.gz 63766 BLAKE2B 962f90e6a05170a14fba45372d65f8cc94d1b4f6119c30d252a67644b69eb8a925c20b0d020b917673754f491305f73ac7e294df9b2a908a93011cec420c3629 SHA512 cdb2620cb508f9df748bd3e9cb657d2c503a1f62171f497f1ff1e0f220287364829f03164869567c83b5797d8bc478495ad6c35860196812ef8262fce4cbff26 -EBUILD pngcheck-3.0.2.ebuild 703 BLAKE2B 950431772e8c99335eb9cb875dc5f864ac143d44265b52c6b13335cf298aad8f64de2e14aa28aba78121d91b1b3ec5ffe17e01ff6ac10807e3fea936c532c7ec SHA512 a5a2391005d6fc1fa61016aa551f853c5b55cc84006c157380cc0d1bf27b534d308706fd08a8d3eee15f7f5fc39a8ce590b8ba4de5c53bd64a2118bd3b0a8b2e EBUILD pngcheck-3.0.3.ebuild 696 BLAKE2B ca6243ef70a236644110b9e4dcce87a793613430465617513c2373ee5d71306ad5e6985e8d5167a3f07d6eff317ec7109d2ae5ac55ec7c3d78a652d9a30cb275 SHA512 8e69784097d1b9df1efcc91175df7836e22624f179cc06c29f7db977ca0860d4c737c38c4609b14375ef797f6f05ddad510ae2caf63286ff738c3ff382fc4733 MISC metadata.xml 245 BLAKE2B 30ec91c1f9ea95e1a599102f696a4fe4b20d1f4f75cf7e7be32c5b53716ab4944b46f2e03bfb03bc1c45779f12768a6f6c14fe34c074678a02c705aaaceda709 SHA512 ed5a8995a5bbcbc8f921f25f096f6211ba40548527e4acc752fd93a847a133857ee14a91bf9ab3c3f9aee14213a06a72c1c23e9428a1b37815b09324d0344ee8 diff --git a/media-gfx/pngcheck/pngcheck-3.0.2.ebuild b/media-gfx/pngcheck/pngcheck-3.0.2.ebuild deleted file mode 100644 index ca87c90889f4..000000000000 --- a/media-gfx/pngcheck/pngcheck-3.0.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Verifies the integrity of PNG, JNG and MNG files with internal checksums" -HOMEPAGE="http://www.libpng.org/pub/png/apps/pngcheck.html" -SRC_URI="https://downloads.sourceforge.net/png-mng/${P}.tar.gz" - -LICENSE="HPND GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND}" - -src_compile() { - emake -f Makefile.unx \ - CC="$(tc-getCC)" \ - LD="$(tc-getLD)" \ - CFLAGS="${CFLAGS} ${LDFLAGS} -DUSE_ZLIB" \ - ZLIB="-lz" -} - -src_install() { - dobin png{check,split,-fix-IDAT-windowsize} - doman pngcheck.1 gpl/pngsplit.1 - - einstalldocs -} diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest index d4fe34af71e5..2601b0b0f798 100644 --- a/media-gfx/pngcrush/Manifest +++ b/media-gfx/pngcrush/Manifest @@ -1,4 +1,4 @@ AUX pngcrush-1.8.13-adler32_check.patch 486 BLAKE2B 73bd6fc0a81ca1dddcf3aba4f8d4223aa501fa0cef59c2b1b5dde702705c12f1280884db533578ddbfb0909a5cf9288bbe6b84d49d18e5e1ae65baf44a27221d SHA512 65f5e269e076b740bfa112d232d1f220776975d5f8fe10e7d6ed924f17a5b864a738f2747992dc87f8f20d910616b2ee5afc755ba0a2b2ef82398cd306721835 DIST pngcrush-1.8.13-nolib.tar.xz 66104 BLAKE2B dad0bce2e8f2a135d085343da98ebecfb78a6b05019d43be1b0b1f940ce23ffa980bcb08e8948b6b8cc3efc04bc6ae92a0b9cf8ea8183e27eebfae4c6c48e31e SHA512 c073d573e9b13b72fa39b178271ce65d1a19fef35943ef0a9e6121a5c66d9db212aaad38ab777c5b44e20a107eb677003acbdb4a354bcb2dc40f535a97d9df0e -EBUILD pngcrush-1.8.13.ebuild 855 BLAKE2B a826f6b6e5a2365f3751d835a39852a20ef192773d65f3ff15e1ec06b043c09d68deda6ab518a856a29f87ba45574610b6d276958d6a2eb7dccbd25c37adb06e SHA512 7ea8a87d62c8384afb34029d16425642e5dd28266214e10772355ef68f2caa3dcd25687f64df0bbc83fd5113fe0cd269f1f507e3116f853ecedf36b83cb65250 +EBUILD pngcrush-1.8.13.ebuild 849 BLAKE2B 8449d6f118b06883191b5fccf93f87fe57e1a93e27fb15d437a2af96875465b125d26710af259af9c14416012caf24f8872cb2baaf466d65340abc85501065ea SHA512 c0738a574e5bf9d0055dd24c0d6e878c737759ba379814835ffc1c8360e0e02a96a8c6757095d9eff8fe452834a35b989a6c86fda21302088e9d3d161a5b4f1c MISC metadata.xml 488 BLAKE2B 94fc372620c5ac603b963cc47b594486ee1bfb929cbf9b7858adc73c168477d2267261e8becddb00ee44ebf606286d4e14e9430005bb34248286a44410cb7755 SHA512 3e42cc11c4e57853156aa2e5ad991d2dd158c733e6d8bba738f94707fca97d00b465b1b36e648d25a64816574ebb35b736a77ee12d34c87bbf0a20091f38f9ec diff --git a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild index 27787e17634f..71051bbc3824 100644 --- a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild +++ b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/pmt/${P}-nolib.tar.xz" LICENSE="pngcrush" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND="media-libs/libpng:0= sys-libs/zlib:=" diff --git a/media-gfx/pngtools/Manifest b/media-gfx/pngtools/Manifest index 48c6e09238e1..f6c64971b882 100644 --- a/media-gfx/pngtools/Manifest +++ b/media-gfx/pngtools/Manifest @@ -3,7 +3,5 @@ AUX pngtools-0.4-libpng14.patch 1265 BLAKE2B a959b83fe85a10348d815ccccaa17d2e46c AUX pngtools-0.4-libpng15-fixes.patch 6722 BLAKE2B 083318ef199f4c07ed1f44ddf95623fd198e10a2b939f86c1bf7a9995fac98080d0dbbe79e2e88817e8f07c5bd2f79ad80d7ee2d41cb0d03ca7aa46b8707ba64 SHA512 aafc4c746efc0ef00e9d9e59acf0dee58b56ce80a9f04ddfa9879f46f342170f4641f23081323299a143d4837367645240f823ba9900592fcfdec71961f3f330 AUX pngtools-0.4_p20220314-docbook-dtd.patch 2482 BLAKE2B b6f48ff4fa4d3f20f3d720d7e03b37b2a9b4af5c0daabf73ef2f91a874106bb7b465f024c24c79516fd8a6c10a0569cab59ccde0afd1a21cf1c337e23801ffae SHA512 ee28229423354cd99bae0e964ddb6554e5c7eb61e3d2ccd0151ae68aa138ac1f6781746cb134a6a9e9af6c62bc58804b212f35a03757c5fed51e98a172c90a02 DIST pngtools-0.4_p20220314.tar.gz 651338 BLAKE2B 9df108da4a52c6292c52a08ddc59163d386bc5de4aaaac96a166ba1e5dc38029b4261e80b8a186997d199ecd11b43fe9e46a41b6b25c65595b7baa4eab43376e SHA512 d1812051d4d1e6306805c96f686798e5af0a304ec045dbf02d77ab3f6432bc0f4e0c96c800bbb159d6ca9e83e8ef479c6d4ba742072fa897ec55808061001676 -DIST pngtools_0_4.tgz 1312178 BLAKE2B bff4be34b9a14a459cef2fb5cd1b70bb645c1fca8843bffc2a517b7f56e7a40e104b25b887f8bda227da2e12613c6c568b081b38bf70881b291bb5562eaeb6db SHA512 588b954c7c43ba48442ed4b22ad94fcfb456c7fc84a682e9126ca9d1c9b63dbb8f2d64e6e156664f327efbe11bb2ab1ac29d63ebb8a05329ac14200fb29f95a1 -EBUILD pngtools-0.4-r2.ebuild 703 BLAKE2B 2ce8afd2ce3d957fdd4bf77b3e1cc821523aadde6b2f4995928ece1cae9c633f4c3de60454589929536cc0299b257485de175e7fd73877e2f272f0a161a99086 SHA512 6c618d4ec7c027b1a621d879aa10ff27bab962ffbbe6de42031380fc1343b6a63f6f85a15385232765c9d46d5dc83ce616adcc1aebea8930259529fdb86b5788 EBUILD pngtools-0.4_p20220314.ebuild 973 BLAKE2B e5297259cfcd47706fddd44cfbac026f61c090b7da99f35b112c66748707fcf568e158ca783158b8b8f6c96a6bd47c16290632730696df6940558b9cb6bf1e97 SHA512 b9d18223dedf08252930a872bd4e88fa9126076f36d9a483158b06c225499f92f5a872893480f5c3ca6e33d7c6a6f7f3b72619a4c3833553905786451536fb14 MISC metadata.xml 303 BLAKE2B f87e0bb36559ffa7e785a019927f1f11d4d5de135c5b82331ee1a4acf21ceb94f8fd41486235be173e5e966b270b270772153ea74ec5a71036cec2f56b91ee8d SHA512 5ece8e5c353817fa3e6825116f62f610285cbb7ad4cc3b6b06d6d4136fd6969dc0662b92363bd2441d544038e438be721b00af4780420cb64547c01729db2b07 diff --git a/media-gfx/pngtools/pngtools-0.4-r2.ebuild b/media-gfx/pngtools/pngtools-0.4-r2.ebuild deleted file mode 100644 index 18ba166788ad..000000000000 --- a/media-gfx/pngtools/pngtools-0.4-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="A series of tools for the PNG image format" -HOMEPAGE="http://www.stillhq.com/pngtools/" -SRC_URI="http://www.stillhq.com/pngtools/source/pngtools_${PV/./_}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -RDEPEND="media-libs/libpng:=" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.3-implicit-declarations.patch - "${FILESDIR}"/${P}-libpng14.patch - "${FILESDIR}"/${P}-libpng15-fixes.patch -) - -src_prepare() { - default - mv configure.{in,ac} || die - eautoreconf -} - -src_install() { - default - dodoc ABOUT chunks.txt - - docinto examples - dodoc *.png -} diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest index da904b3c98ae..3179d1a1e8e5 100644 --- a/media-gfx/potrace/Manifest +++ b/media-gfx/potrace/Manifest @@ -1,5 +1,5 @@ AUX potrace-1.16-lto.patch 919 BLAKE2B e109311b319197deb0a5b6dc133c9a42f001823cfa3b387beae96289de107f54e34b2b6448bd144cba930bfe00569d4a66e9009ec5521a19c62cb5356664ef9d SHA512 3987506225bbb31badb36aa8b7cff399103e762583eb066709f5083dacfb1a48190115ba12aaec91775c4a3ab401e33ee7bf1285b4ce2d8ffb462f57910988a4 DIST potrace-1.16.tar.gz 657314 BLAKE2B ee6b04f355d593dd1ebcc4833b244e25eaaa69c91f90987d530a4e5a454668dff6ecfb7a5d8270ebbd9e7c177fd447d1b3fe2a343fc4b9413dd3f507c0c6e417 SHA512 10d85ed3fada80951223c65e923b5e6ee3e76e071575971d5b09b996b477ec5ff2403e0337c44963c6b441cc3ba6c4f7009541124a25c16b7721fdebd1f774b9 -EBUILD potrace-1.16-r1.ebuild 960 BLAKE2B 7ebaaf4ba4f9ca56bc95f6aef36686eac65d996070178f71375d0e80ea817477c1d1075bb8e8299c286913bf925fe8e042224bb89ebd959f4d6d39ece6bb5514 SHA512 7cda6cc87e80c2e739a45ca0eb15fd569700fd7a7f8bf21a89702a309efa682d49068cade04ba8c15e7656aa3c4d0e26e7357225ea95ec71006f6821d501f7ec -EBUILD potrace-1.16.ebuild 867 BLAKE2B 1698f083578aa2c2a3556241268694f847d0edbf828efacc8871fe429fbbb017285e2d843b47c4e681dc3768f3bdb34e86ea9683a2196d75d5dfcc92cfcb08fa SHA512 2e2b14f7777f40589c178e1240f93cfac6f93868197eb97244ffcf2854fbc1b505175e378facedec3b2d9f55a149a29ac37a422fb48c47e30565c99fb4a98cca +EBUILD potrace-1.16-r1.ebuild 947 BLAKE2B 6f612da9b133e4e7c37d51472243be9e18d18fb3b1852f2118f054625d22c16091a8f9b6b0a58c547e4f9d7c7507c703ba6dfaf6368d35f7540505dbabc0891f SHA512 e70f356748e8cffc7e41e7b82d83bd85b85d4410b54c7dfe1ef4e4e5a41a846bc02b590e2aba8a2890c559beab89f2c12b7522e4fcee0174cdf56245fae955cb +EBUILD potrace-1.16.ebuild 861 BLAKE2B 3f601f3c5fa60237df087a1598a33cec3e862993d930edacb77fe08e8eb72696f3912e8912968d65db9f357271e129963bc5d69fa47ab5eb2a9b43509bacb0d2 SHA512 7f20420344f6b96baad210cb28a7325ab8e6a472c21f509562c445320f81144dbcc465ff94ceb8e0b1f328077048d119384d0728e3b904d6e9e84611b4c4fefb MISC metadata.xml 410 BLAKE2B 600ab550a0c7fed79d5b6dff4cb1857e410f7e350ca6717cbccc826486dcba7040a9b84b04695af64b7cff426598a58c2935cacdf958b36c78224c23d0ac6ae1 SHA512 fcb52aa25ca9d56d93412db81d6826b71c35102d1643c3576e4938111292106cabfde73143b552c2799e6f337f94e84d3318d1240bfabcdbfbd4dd48e37eb476 diff --git a/media-gfx/potrace/potrace-1.16-r1.ebuild b/media-gfx/potrace/potrace-1.16-r1.ebuild index ac9fe7c8ddb2..bbfcdc01a25c 100644 --- a/media-gfx/potrace/potrace-1.16-r1.ebuild +++ b/media-gfx/potrace/potrace-1.16-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://potrace.sourceforge.net/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="metric" RDEPEND="sys-libs/zlib:=" diff --git a/media-gfx/potrace/potrace-1.16.ebuild b/media-gfx/potrace/potrace-1.16.ebuild index 662e9bb2b546..796436aa52f3 100644 --- a/media-gfx/potrace/potrace-1.16.ebuild +++ b/media-gfx/potrace/potrace-1.16.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://potrace.sourceforge.net/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="metric" RDEPEND="sys-libs/zlib:=" diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest index 2e085d4433f4..6e731c5f6ee3 100644 --- a/media-gfx/povray/Manifest +++ b/media-gfx/povray/Manifest @@ -5,5 +5,5 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04 -EBUILD povray-3.7.0.0-r6.ebuild 4889 BLAKE2B 7f4d154e0ff8a45ddf6e1d0a69290a1fddadc5bf3c940fa466564df93b7e45af8099d354e3225f08222c7e1f9d904f285d637f2418af9a7714f8a3da4f2bcabc SHA512 4279092dae83534c452f3132a7438ae05e57e1dd1fc30d4064fc290a8ce07356cf3b2c9e1ab0c9570a88633ac7db5499373c71f2a00ca796c3ee08b54e74def7 +EBUILD povray-3.7.0.0-r6.ebuild 4883 BLAKE2B 55f67cb40b62f82d049a7caf4640e77f7e6ec1f5852c53f8fc2fa5443ec490dbf54b75e65776de7626ad8992a362f8ad741dc06107eaab00c5d6d116374d3d7c SHA512 59ec48c2d178c6983d2d99590b07fb1ffa13b1e41e145ecef6e8c092e4f63d3263779954d574e3623a05147f15c16bbf3baba0a46e3338434260957695f0df21 MISC metadata.xml 410 BLAKE2B e2d166cc7ed5872c7e0bdcf69c7856bd8218b059e9b0444a68930216c423ef7c8922ad963cfc3dc56f0d997c1a6372a04058815eb2b36487d07dbc6752908e2d SHA512 c159e2c730bba95d7c65525d62af05bd5b9d873a519e734010a8e5bc597590147accfe02e23946f0349c0be31a10b3e578d035bc3ff8d11a11274c1957a834be diff --git a/media-gfx/povray/povray-3.7.0.0-r6.ebuild b/media-gfx/povray/povray-3.7.0.0-r6.ebuild index 2f37892249f4..cf23b11ffd6b 100644 --- a/media-gfx/povray/povray-3.7.0.0-r6.ebuild +++ b/media-gfx/povray/povray-3.7.0.0-r6.ebuild @@ -24,7 +24,7 @@ S=${WORKDIR}/${PN}-${MY_PV} # to actually be in the sources, so we don't distribute it either. LICENSE="AGPL-3+ CC-BY-SA-3.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="debug +io-restrictions tiff X" DEPEND=" diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index 3216fac004b7..411ec04caecf 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -1,8 +1,16 @@ AUX prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch 448 BLAKE2B 1d4a96762ed6da41e5f4322d6ac6019fb3894321da206ea354d1d9b57e1892155a109c329590bad4393cffd748f9e27542a7cc468803329c8f493789a2b497b1 SHA512 71a3eb2bbe3766be555e94f32219edfb908bdd5f86c74971c1c9b2586306d70724c45b06edbd4ade232017259fe4a99e504447cbbbdd5d5c91f4df03f4d52140 AUX prusaslicer-2.7.2-opencascade-7.8.0.patch 323 BLAKE2B ee422c91800bf164098396dab448630174b2dd5444d55ff176f10b73e660a446006a0dadfcd2d3cde715b8b58023fe10dd41f6bddb6165fb405382b256eebc52 SHA512 408897cc09ad58e9828b5645553f948a0e0e1b6b07c0bca7bb3ab37789bd988a7076c6d2c79d16ee198f16fdacc59d408ea759e969c83787b2f4bc1161dd94b0 +AUX prusaslicer-2.8.0-cgal-6.0.patch 11085 BLAKE2B 459d6862ab6dceab56beaba58b15d91b398a16b7a8e2a25f0ed2e3f9a699f52d1408027501f4e29903ae50ef52a07555a63de370022de9bd4444e107c6c0df1f SHA512 b2339ab275600126a72a9eb60b805d72dc5101e140cfb31e713413ea2d3d96a5533ac058672d9c10df347ddd001597ec0af375b3eb429ad0f83e18386870497f AUX prusaslicer-2.8.0-fixed-linking.patch 751 BLAKE2B d0a5593a2559514f68df6798fb9c4e5c0b9c4021ece74281311c2a19b8233914fcb16227b7aafa5ee222d41ac82c4d5c9c363c32029d13c44c7fe2cb02e60291 SHA512 5f2fdc0da5d979b8520d302549f42103f7e9b0588165430aff734d7d50d56e98c8c208394d9bfaf82f042c9ecac7a3ae72713bfe18341f0ba184cf313cec9206 AUX prusaslicer-2.8.0-missing-includes.patch 575 BLAKE2B aef794b75d180176f6ba4b1ec05e4ddfe740ced6000225ce51e3a15bd1143209a340af28dc91660d3f07696f19ad525ef86f5e84f3ff4c96ad77c90940059352 SHA512 65c2c8a2046bf39a9d0f5c073998ec93906efbeb8b2d3b7d835f1a65b2edc00c473fb2bed7396e35e45d00b9420f3942f2e16af2e2c6a1405e90341e41b16cf2 +AUX prusaslicer-2.8.0-wxwidgets-3.2.4.patch 1332 BLAKE2B a5e343f64e5f3c2150d170453579b87c3912b5bcb0a7cbd7d1076d2d1f1b10f4e586ed5237ef9faebdbfea23c0e8941a1d0c5f9c71fef2e0269c0120206f2155 SHA512 0fe1af19f8f55bbb11ca8b6685b73858f23b87e3785cb4babe4a8b5ae09694681df4d5f354af896ca1833be2d934da0cf8193285a25e8f28d588b52147ce96a2 +AUX prusaslicer-2.8.1-cgal-6.0.patch 11183 BLAKE2B 3d0b7729fd0a64eb335b1bb8fd4af547c71ddbaec1e589dc4aba2f608073b394c44012d18b127cc17a3b2d5ef8eaad31b21c00623326cc818ec953103ea6dd1c SHA512 a8a3e7c9e7d39519ae93f78b1c6b220f419ef0141a11e9d68c8a3f599a57e164221a572b6989a5b5285b61419cc207ed091834b4de1a442db5806402524e9885 +AUX prusaslicer-2.8.1-fixed-linking.patch 1220 BLAKE2B ef23b03e3fef11d7d1080a140af1085be748b5c0009084acd77f3596c8dffddbad0c612b6a0a2c0da12b130f325cf2798c3e7f41d99b75fd22c093b3e0747912 SHA512 9bdbbb76163549612157976e3770aae7c3b4644b4f9c29c17ca1420a9f7269e30db6556c5c0b06cb7475d6202346b69d21908e0847a7953fa6687ae58d8b0c8b +AUX prusaslicer-2.8.1-fstream.patch 1682 BLAKE2B 2acebf6900b82e9b9fb94988d0d8c2ce57d470c6db3e282d6232ed3ffc312611317cede5292274dfdaa3d8aa599b074164a2b5d443d5653b35e3db5dca43f8e0 SHA512 385fc73a68a36466becf325cbf8621aa7428f0bfd18b396066382a8f2a91422d3320b7a257f8b251c04be36c13f52af4569e3d154758cf844238657672e22b22 +AUX prusaslicer-2.8.1-opencascade-7.8.0.patch 401 BLAKE2B e2d3a859e418be897d093fb499248d0dda8ab5e3be783cd653591923feb0c4808c7451f4f8e8f0907daa12bd8bd82350a12794c5c8f3136cc73b5ba28e8ba37e SHA512 feecf49443aac23a78c88127e08133f6a6989da93cc187c923aec347286e7cdc8425fc8e4e449f47547a4310a3572bb6391eeb8e7fb16b510db52d4f7f48fc49 DIST prusaslicer-2.8.0.tar.gz 69806919 BLAKE2B b87c63ae411814dbffc8ae96c243bf06018d600db732ef32f7c766ce6bdf156b0aca6da90868482f39b9c6421c6a386bccc9f69e23218dadc07f1bcdb21b9793 SHA512 d98b43e9e1a6da9cbab46b2564da02fc0f8521d84a4df915d0ffd0878ee1a25afebe7078e38b124ec8565782379c51a7f9564462652ef1a7d9819d29297c1937 -EBUILD prusaslicer-2.8.0.ebuild 2357 BLAKE2B 8802ef58761fa6d220836b97d70b0205614cc1f13383f1a33b07ccc3f36c219c21b235e04a6c2a402494bedc25e5a5afaaaeb10da96a67958e9b260865caa244 SHA512 d1eb4f621f967675bf1b86855db2246010098820d8ba2a0474c6a388122cbff7cdda5ed10854b118f7ad069ff10564989cd0e4364ee679a6be0474b9d9f5e09f -EBUILD prusaslicer-9999.ebuild 2358 BLAKE2B 45a962647acce9d291eb1e9f45d4944dbd639b3533ff984919449218904c80d950d87df0070e7c597c2464a5603f044a0bfe4d556d02f6fef6fb68b798bd6e13 SHA512 88a8cb03f6a11239ba038579300793fe1323d023fe81195ebf810b524aad5eec17b408ab6c1c05312a6c37ada80bd4eff03c72677323361a5fd89d1bad994d66 +DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453 SHA512 0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8daddddb19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912 +EBUILD prusaslicer-2.8.0-r1.ebuild 2448 BLAKE2B 500db712e5ea5911c11a50c757ac52cf1ac03675e97b365fd6089fe5ca483becd6ad1c8648ddd50ea1e2c29b6e47f06d7d907968a338f0b090128f5803bf6128 SHA512 95dd1d9d6e5cb6a97af18f1dd9b2bcbd2b23cbd69f402fe1893c2834c4388fb8655b0f711f5fada72b884feb8a85f616b8db151bc2340e3b8ee2818cb6e57520 +EBUILD prusaslicer-2.8.1.ebuild 2710 BLAKE2B 3de57e6ef22c17c4f509c5556250ebeecd30f17e02db91bcf56cb2d26e4b2aeaaa4b3511c840551951eaef792143dd2c4f99b0ee61f0133d48b585269cb65c1b SHA512 f6fed2bc17acdf7c1ad6bd0d9f2da5ebe86e4d9cdc91eb0ae5f7bf02f3b6c2652fc8d3bc763b4f37057501e25901023fa5b3be5cb1527cb26ea9f3f825db7fc4 +EBUILD prusaslicer-9999.ebuild 2710 BLAKE2B 3de57e6ef22c17c4f509c5556250ebeecd30f17e02db91bcf56cb2d26e4b2aeaaa4b3511c840551951eaef792143dd2c4f99b0ee61f0133d48b585269cb65c1b SHA512 f6fed2bc17acdf7c1ad6bd0d9f2da5ebe86e4d9cdc91eb0ae5f7bf02f3b6c2652fc8d3bc763b4f37057501e25901023fa5b3be5cb1527cb26ea9f3f825db7fc4 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512 diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch new file mode 100644 index 000000000000..52013146b1c3 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch @@ -0,0 +1,189 @@ +From a9283c62cec2b802aa2133c92b7ff5bf320c0bb6 Mon Sep 17 00:00:00 2001 +From: Laurent Rineau <laurent.rineau@cgal.org> +Date: Sat, 13 Jul 2024 01:19:21 +0200 +Subject: [PATCH] compatibility with CGAL-6.0 (and 5.6.x) + +--- a/src/libslic3r/CutSurface.cpp ++++ b/src/libslic3r/CutSurface.cpp +@@ -4,6 +4,14 @@ + ///|/ + #include "CutSurface.hpp" + ++template <typename T> ++auto access_pmap(std::optional<T> opt) -> T { ++ return opt.value(); ++} ++ ++template <typename Pair> ++auto access_pmap(Pair pair) { return pair.first; } ++ + /// models_input.obj - Check transormation of model to each others + /// projection_center.obj - circle representing center of projection with correct distance + /// {M} .. model index +@@ -33,6 +41,7 @@ using namespace Slic3r; + #include <CGAL/Exact_integer.h> + #include <CGAL/Surface_mesh.h> + #include <CGAL/Cartesian_converter.h> ++#include <CGAL/AABB_traits.h> + #include <tbb/parallel_for.h> + + // libslic3r +@@ -997,8 +1006,8 @@ priv::CutMesh priv::to_cgal(const ExPolygons &shapes, + if (shapes.empty()) return {}; + + CutMesh result; +- EdgeShapeMap edge_shape_map = result.add_property_map<EI, IntersectingElement>(edge_shape_map_name).first; +- FaceShapeMap face_shape_map = result.add_property_map<FI, IntersectingElement>(face_shape_map_name).first; ++ EdgeShapeMap edge_shape_map = access_pmap((result.add_property_map<EI, IntersectingElement>(edge_shape_map_name))); ++ FaceShapeMap face_shape_map = access_pmap((result.add_property_map<FI, IntersectingElement>(face_shape_map_name))); + + std::vector<VI> indices; + auto insert_contour = [&projection, &indices, &result, +@@ -1408,17 +1417,17 @@ priv::CutAOIs priv::cut_from_model(CutMesh &cgal_model, + const ExPolygonsIndices &s2i) + { + // pointer to edge or face shape_map +- VertexShapeMap vert_shape_map = cgal_model.add_property_map<VI, const IntersectingElement*>(vert_shape_map_name, nullptr).first; ++ VertexShapeMap vert_shape_map = access_pmap((cgal_model.add_property_map<VI, const IntersectingElement*>(vert_shape_map_name, nullptr))); + + // detect anomalities in visitor. + bool is_valid = true; + // NOTE: map are created when convert shapes to cgal model +- const EdgeShapeMap& edge_shape_map = cgal_shape.property_map<EI, IntersectingElement>(edge_shape_map_name).first; +- const FaceShapeMap& face_shape_map = cgal_shape.property_map<FI, IntersectingElement>(face_shape_map_name).first; ++ const EdgeShapeMap& edge_shape_map = access_pmap((cgal_shape.property_map<EI, IntersectingElement>(edge_shape_map_name))); ++ const FaceShapeMap& face_shape_map = access_pmap((cgal_shape.property_map<FI, IntersectingElement>(face_shape_map_name))); + Visitor visitor{cgal_model, cgal_shape, edge_shape_map, face_shape_map, vert_shape_map, &is_valid}; + + // a property map containing the constrained-or-not status of each edge +- EdgeBoolMap ecm = cgal_model.add_property_map<EI, bool>(is_constrained_edge_name, false).first; ++ EdgeBoolMap ecm = access_pmap((cgal_model.add_property_map<EI, bool>(is_constrained_edge_name, false))); + const auto &p = CGAL::parameters::visitor(visitor) + .edge_is_constrained_map(ecm) + .throw_on_self_intersection(false); +@@ -1427,7 +1436,7 @@ priv::CutAOIs priv::cut_from_model(CutMesh &cgal_model, + + if (!is_valid) return {}; + +- FaceTypeMap face_type_map = cgal_model.add_property_map<FI, FaceType>(face_type_map_name, FaceType::not_constrained).first; ++ FaceTypeMap face_type_map = access_pmap((cgal_model.add_property_map<FI, FaceType>(face_type_map_name, FaceType::not_constrained))); + + // Select inside and outside face in model + set_face_type(face_type_map, cgal_model, vert_shape_map, ecm, cgal_shape, s2i); +@@ -1563,8 +1572,8 @@ void priv::collect_surface_data(std::queue<FI> &process, + + void priv::create_reduce_map(ReductionMap &reduction_map, const CutMesh &mesh) + { +- const VertexShapeMap &vert_shape_map = mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name).first; +- const EdgeBoolMap &ecm = mesh.property_map<EI, bool>(is_constrained_edge_name).first; ++ const VertexShapeMap &vert_shape_map = access_pmap((mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name))); ++ const EdgeBoolMap &ecm = access_pmap((mesh.property_map<EI, bool>(is_constrained_edge_name))); + + // check if vertex was made by edge_2 which is diagonal of quad + auto is_reducible_vertex = [&vert_shape_map](VI reduction_from) -> bool { +@@ -1749,10 +1758,10 @@ priv::VDistances priv::calc_distances(const SurfacePatches &patches, + for (const SurfacePatch &patch : patches) { + // map is created during intersection by corefine visitor + const VertexShapeMap &vert_shape_map = +- models[patch.model_id].property_map<VI, const IntersectingElement *>(vert_shape_map_name).first; ++ access_pmap((models[patch.model_id].property_map<VI, const IntersectingElement *>(vert_shape_map_name))); + uint32_t patch_index = &patch - &patches.front(); + // map is created during patch creation / dividing +- const CvtVI2VI& cvt = patch.mesh.property_map<VI, VI>(patch_source_name).first; ++ const CvtVI2VI& cvt = access_pmap((patch.mesh.property_map<VI, VI>(patch_source_name))); + // for each point on outline + for (const Loop &loop : patch.loops) + for (const VI &vi_patch : loop) { +@@ -2640,7 +2649,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis, + /* const */ CutMesh &mesh, + const ReductionMap *rmap) + { +- auto is_counted = mesh.add_property_map<VI, bool>("v:is_counted").first; ++ auto is_counted = access_pmap((mesh.add_property_map<VI, bool>("v:is_counted"))); + uint32_t count_vertices = 0; + if (rmap == nullptr) { + for (FI fi : fis) +@@ -2670,7 +2679,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis, + cm.reserve(count_vertices, count_edges, count_faces); + + // vertex conversion function from mesh VI to result VI +- CvtVI2VI mesh2result = mesh.add_property_map<VI,VI>("v:mesh2result").first; ++ CvtVI2VI mesh2result = access_pmap((mesh.add_property_map<VI,VI>("v:mesh2result"))); + + if (rmap == nullptr) { + for (FI fi : fis) { +@@ -2722,7 +2731,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis, + assert(count_edges >= cm.edges().size()); + + // convert VI from this patch to source VI, when exist +- CvtVI2VI cvt = cm.add_property_map<VI, VI>(patch_source_name).first; ++ CvtVI2VI cvt = access_pmap((cm.add_property_map<VI, VI>(patch_source_name))); + // vi_s .. VertexIndex into mesh (source) + // vi_d .. new VertexIndex in cm (destination) + for (VI vi_s : mesh.vertices()) { +@@ -2913,7 +2922,7 @@ bool priv::is_patch_inside_of_model(const SurfacePatch &patch, + uint32_t priv::get_shape_point_index(const CutAOI &cut, const CutMesh &model) + { + // map is created during intersection by corefine visitor +- const VertexShapeMap &vert_shape_map = model.property_map<VI, const IntersectingElement *>(vert_shape_map_name).first; ++ const VertexShapeMap &vert_shape_map = access_pmap((model.property_map<VI, const IntersectingElement *>(vert_shape_map_name))); + // for each half edge of outline + for (HI hi : cut.second) { + VI vi = model.source(hi); +@@ -2938,7 +2947,7 @@ priv::SurfacePatch priv::separate_patch(const std::vector<FI>& fis, + patch_new.model_id = patch.model_id; + patch_new.shape_id = patch.shape_id; + // fix cvt +- CvtVI2VI cvt = patch_new.mesh.property_map<VI, VI>(patch_source_name).first; ++ CvtVI2VI cvt = access_pmap((patch_new.mesh.property_map<VI, VI>(patch_source_name))); + for (VI &vi : cvt) { + if (!vi.is_valid()) continue; + vi = cvt_from[vi]; +@@ -2956,9 +2965,9 @@ void priv::divide_patch(size_t i, SurfacePatchesEx &patches) + CutMesh& cm = patch.mesh; + assert(!cm.faces().empty()); + std::string patch_number_name = "f:patch_number"; +- CutMesh::Property_map<FI,bool> is_processed = cm.add_property_map<FI, bool>(patch_number_name, false).first; ++ CutMesh::Property_map<FI,bool> is_processed = access_pmap((cm.add_property_map<FI, bool>(patch_number_name, false))); + +- const CvtVI2VI& cvt_from = patch.mesh.property_map<VI, VI>(patch_source_name).first; ++ const CvtVI2VI& cvt_from = access_pmap((patch.mesh.property_map<VI, VI>(patch_source_name))); + + std::vector<FI> fis; + fis.reserve(cm.faces().size()); +@@ -3059,7 +3068,7 @@ priv::SurfacePatches priv::diff_models(VCutAOIs &cuts, + CutAOIs &model_cuts = cuts[model_index]; + CutMesh &cut_model_ = cut_models[model_index]; + const CutMesh &cut_model = cut_model_; +- ReductionMap vertex_reduction_map = cut_model_.add_property_map<VI, VI>(vertex_reduction_map_name).first; ++ ReductionMap vertex_reduction_map = access_pmap((cut_model_.add_property_map<VI, VI>(vertex_reduction_map_name))); + create_reduce_map(vertex_reduction_map, cut_model); + + for (size_t cut_index = 0; cut_index < model_cuts.size(); ++cut_index, ++index) { +@@ -3145,7 +3154,7 @@ bool priv::is_over_whole_expoly(const CutAOI &cutAOI, + const CutMesh &mesh) + { + // NonInterupted contour is without other point and contain all from shape +- const VertexShapeMap &vert_shape_map = mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name).first; ++ const VertexShapeMap &vert_shape_map = access_pmap((mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name))); + for (HI hi : cutAOI.second) { + const IntersectingElement *ie_s = vert_shape_map[mesh.source(hi)]; + const IntersectingElement *ie_t = vert_shape_map[mesh.target(hi)]; +@@ -3682,7 +3691,7 @@ void priv::store(const CutMesh &mesh, const FaceTypeMap &face_type_map, const st + } + + CutMesh &mesh_ = const_cast<CutMesh &>(mesh); +- auto face_colors = mesh_.add_property_map<priv::FI, CGAL::Color>("f:color").first; ++ auto face_colors = access_pmap((mesh_.add_property_map<priv::FI, CGAL::Color>("f:color"))); + for (FI fi : mesh.faces()) { + auto &color = face_colors[fi]; + switch (face_type_map[fi]) { +@@ -3708,7 +3717,7 @@ void priv::store(const CutMesh &mesh, const ReductionMap &reduction_map, const s + std::string off_file = dir + "model" + std::to_string(reduction_order++) + ".off"; + + CutMesh &mesh_ = const_cast<CutMesh &>(mesh); +- auto vertex_colors = mesh_.add_property_map<priv::VI, CGAL::Color>("v:color").first; ++ auto vertex_colors = access_pmap((mesh_.add_property_map<priv::VI, CGAL::Color>("v:color"))); + // initialize to gray color + for (VI vi: mesh.vertices()) + vertex_colors[vi] = CGAL::Color{127, 127, 127}; diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch new file mode 100644 index 000000000000..d7c700662b72 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch @@ -0,0 +1,28 @@ +From f67a877d583eba5472003f0ea4df3f7420d70734 Mon Sep 17 00:00:00 2001 +From: Gregor Riepl <onitake@gmail.com> +Date: Mon, 27 Nov 2023 13:01:55 +0100 +Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString + overloads + +--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp ++++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp +@@ -606,7 +606,7 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr + // Always fill in the "printhost_port" combo box from the config and select it. + { + Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port")); +- choice->set_values({ m_config->opt_string("printhost_port") }); ++ choice->set_values(std::vector<std::string>({ m_config->opt_string("printhost_port") })); + choice->set_selection(); + } + +--- a/src/slic3r/GUI/Plater.cpp ++++ b/src/slic3r/GUI/Plater.cpp +@@ -4048,7 +4048,7 @@ void Plater::load_project(const wxString& filename) + + p->reset(); + +- if (! load_files({ into_path(filename) }).empty()) { ++ if (! load_files(std::vector<boost::filesystem::path>({ into_path(filename) })).empty()) { + // At least one file was loaded. + p->set_project_filename(filename); + // Save the names of active presets and project specific config into ProjectDirtyStateManager. diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal-6.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal-6.0.patch new file mode 100644 index 000000000000..3aac479197bb --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal-6.0.patch @@ -0,0 +1,191 @@ +From a9283c62cec2b802aa2133c92b7ff5bf320c0bb6 Mon Sep 17 00:00:00 2001 +From: Laurent Rineau <laurent.rineau@cgal.org> +Date: Sat, 13 Jul 2024 01:19:21 +0200 +Subject: [PATCH] compatibility with CGAL-6.0 (and 5.6.x) + +updated for 2.8.1 + +--- a/src/libslic3r/CutSurface.cpp ++++ b/src/libslic3r/CutSurface.cpp +@@ -4,6 +4,14 @@ + ///|/ + #include "CutSurface.hpp" + ++template <typename T> ++auto access_pmap(std::optional<T> opt) -> T { ++ return opt.value(); ++} ++ ++template <typename Pair> ++auto access_pmap(Pair pair) { return pair.first; } ++ + /// models_input.obj - Check transormation of model to each others + /// projection_center.obj - circle representing center of projection with correct distance + /// {M} .. model index +@@ -31,6 +39,7 @@ using namespace Slic3r; + #include <CGAL/Exact_integer.h> + #include <CGAL/Surface_mesh.h> + #include <CGAL/Cartesian_converter.h> ++#include <CGAL/AABB_traits.h> + #include <oneapi/tbb/blocked_range.h> + #include <oneapi/tbb/parallel_for.h> + #include <boost/property_map/property_map.hpp> +@@ -1021,8 +1030,8 @@ priv::CutMesh priv::to_cgal(const ExPolygons &shapes, + if (shapes.empty()) return {}; + + CutMesh result; +- EdgeShapeMap edge_shape_map = result.add_property_map<EI, IntersectingElement>(edge_shape_map_name).first; +- FaceShapeMap face_shape_map = result.add_property_map<FI, IntersectingElement>(face_shape_map_name).first; ++ EdgeShapeMap edge_shape_map = access_pmap((result.add_property_map<EI, IntersectingElement>(edge_shape_map_name))); ++ FaceShapeMap face_shape_map = access_pmap((result.add_property_map<FI, IntersectingElement>(face_shape_map_name))); + + std::vector<VI> indices; + auto insert_contour = [&projection, &indices, &result, +@@ -1432,17 +1441,17 @@ priv::CutAOIs priv::cut_from_model(CutMesh &cgal_model, + const ExPolygonsIndices &s2i) + { + // pointer to edge or face shape_map +- VertexShapeMap vert_shape_map = cgal_model.add_property_map<VI, const IntersectingElement*>(vert_shape_map_name, nullptr).first; ++ VertexShapeMap vert_shape_map = access_pmap((cgal_model.add_property_map<VI, const IntersectingElement*>(vert_shape_map_name, nullptr))); + + // detect anomalities in visitor. + bool is_valid = true; + // NOTE: map are created when convert shapes to cgal model +- const EdgeShapeMap& edge_shape_map = cgal_shape.property_map<EI, IntersectingElement>(edge_shape_map_name).first; +- const FaceShapeMap& face_shape_map = cgal_shape.property_map<FI, IntersectingElement>(face_shape_map_name).first; ++ const EdgeShapeMap& edge_shape_map = access_pmap((cgal_shape.property_map<EI, IntersectingElement>(edge_shape_map_name))); ++ const FaceShapeMap& face_shape_map = access_pmap((cgal_shape.property_map<FI, IntersectingElement>(face_shape_map_name))); + Visitor visitor{cgal_model, cgal_shape, edge_shape_map, face_shape_map, vert_shape_map, &is_valid}; + + // a property map containing the constrained-or-not status of each edge +- EdgeBoolMap ecm = cgal_model.add_property_map<EI, bool>(is_constrained_edge_name, false).first; ++ EdgeBoolMap ecm = access_pmap((cgal_model.add_property_map<EI, bool>(is_constrained_edge_name, false))); + const auto &p = CGAL::parameters::visitor(visitor) + .edge_is_constrained_map(ecm) + .throw_on_self_intersection(false); +@@ -1451,7 +1460,7 @@ priv::CutAOIs priv::cut_from_model(CutMesh &cgal_model, + + if (!is_valid) return {}; + +- FaceTypeMap face_type_map = cgal_model.add_property_map<FI, FaceType>(face_type_map_name, FaceType::not_constrained).first; ++ FaceTypeMap face_type_map = access_pmap((cgal_model.add_property_map<FI, FaceType>(face_type_map_name, FaceType::not_constrained))); + + // Select inside and outside face in model + set_face_type(face_type_map, cgal_model, vert_shape_map, ecm, cgal_shape, s2i); +@@ -1587,8 +1596,8 @@ void priv::collect_surface_data(std::queue<FI> &process, + + void priv::create_reduce_map(ReductionMap &reduction_map, const CutMesh &mesh) + { +- const VertexShapeMap &vert_shape_map = mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name).first; +- const EdgeBoolMap &ecm = mesh.property_map<EI, bool>(is_constrained_edge_name).first; ++ const VertexShapeMap &vert_shape_map = access_pmap((mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name))); ++ const EdgeBoolMap &ecm = access_pmap((mesh.property_map<EI, bool>(is_constrained_edge_name))); + + // check if vertex was made by edge_2 which is diagonal of quad + auto is_reducible_vertex = [&vert_shape_map](VI reduction_from) -> bool { +@@ -1773,10 +1782,10 @@ priv::VDistances priv::calc_distances(const SurfacePatches &patches, + for (const SurfacePatch &patch : patches) { + // map is created during intersection by corefine visitor + const VertexShapeMap &vert_shape_map = +- models[patch.model_id].property_map<VI, const IntersectingElement *>(vert_shape_map_name).first; ++ access_pmap((models[patch.model_id].property_map<VI, const IntersectingElement *>(vert_shape_map_name))); + uint32_t patch_index = &patch - &patches.front(); + // map is created during patch creation / dividing +- const CvtVI2VI& cvt = patch.mesh.property_map<VI, VI>(patch_source_name).first; ++ const CvtVI2VI& cvt = access_pmap((patch.mesh.property_map<VI, VI>(patch_source_name))); + // for each point on outline + for (const Loop &loop : patch.loops) + for (const VI &vi_patch : loop) { +@@ -2666,7 +2675,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis, + /* const */ CutMesh &mesh, + const ReductionMap *rmap) + { +- auto is_counted = mesh.add_property_map<VI, bool>("v:is_counted").first; ++ auto is_counted = access_pmap((mesh.add_property_map<VI, bool>("v:is_counted"))); + uint32_t count_vertices = 0; + if (rmap == nullptr) { + for (FI fi : fis) +@@ -2696,7 +2705,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis, + cm.reserve(count_vertices, count_edges, count_faces); + + // vertex conversion function from mesh VI to result VI +- CvtVI2VI mesh2result = mesh.add_property_map<VI,VI>("v:mesh2result").first; ++ CvtVI2VI mesh2result = access_pmap((mesh.add_property_map<VI,VI>("v:mesh2result"))); + + if (rmap == nullptr) { + for (FI fi : fis) { +@@ -2748,7 +2757,7 @@ priv::SurfacePatch priv::create_surface_patch(const std::vector<FI> &fis, + assert(count_edges >= cm.edges().size()); + + // convert VI from this patch to source VI, when exist +- CvtVI2VI cvt = cm.add_property_map<VI, VI>(patch_source_name).first; ++ CvtVI2VI cvt = access_pmap((cm.add_property_map<VI, VI>(patch_source_name))); + // vi_s .. VertexIndex into mesh (source) + // vi_d .. new VertexIndex in cm (destination) + for (VI vi_s : mesh.vertices()) { +@@ -2939,7 +2948,7 @@ bool priv::is_patch_inside_of_model(const SurfacePatch &patch, + uint32_t priv::get_shape_point_index(const CutAOI &cut, const CutMesh &model) + { + // map is created during intersection by corefine visitor +- const VertexShapeMap &vert_shape_map = model.property_map<VI, const IntersectingElement *>(vert_shape_map_name).first; ++ const VertexShapeMap &vert_shape_map = access_pmap((model.property_map<VI, const IntersectingElement *>(vert_shape_map_name))); + // for each half edge of outline + for (HI hi : cut.second) { + VI vi = model.source(hi); +@@ -2964,7 +2973,7 @@ priv::SurfacePatch priv::separate_patch(const std::vector<FI>& fis, + patch_new.model_id = patch.model_id; + patch_new.shape_id = patch.shape_id; + // fix cvt +- CvtVI2VI cvt = patch_new.mesh.property_map<VI, VI>(patch_source_name).first; ++ CvtVI2VI cvt = access_pmap((patch_new.mesh.property_map<VI, VI>(patch_source_name))); + for (VI &vi : cvt) { + if (!vi.is_valid()) continue; + vi = cvt_from[vi]; +@@ -2982,9 +2991,9 @@ void priv::divide_patch(size_t i, SurfacePatchesEx &patches) + CutMesh& cm = patch.mesh; + assert(!cm.faces().empty()); + std::string patch_number_name = "f:patch_number"; +- CutMesh::Property_map<FI,bool> is_processed = cm.add_property_map<FI, bool>(patch_number_name, false).first; ++ CutMesh::Property_map<FI,bool> is_processed = access_pmap((cm.add_property_map<FI, bool>(patch_number_name, false))); + +- const CvtVI2VI& cvt_from = patch.mesh.property_map<VI, VI>(patch_source_name).first; ++ const CvtVI2VI& cvt_from = access_pmap((patch.mesh.property_map<VI, VI>(patch_source_name))); + + std::vector<FI> fis; + fis.reserve(cm.faces().size()); +@@ -3085,7 +3094,7 @@ priv::SurfacePatches priv::diff_models(VCutAOIs &cuts, + CutAOIs &model_cuts = cuts[model_index]; + CutMesh &cut_model_ = cut_models[model_index]; + const CutMesh &cut_model = cut_model_; +- ReductionMap vertex_reduction_map = cut_model_.add_property_map<VI, VI>(vertex_reduction_map_name).first; ++ ReductionMap vertex_reduction_map = access_pmap((cut_model_.add_property_map<VI, VI>(vertex_reduction_map_name))); + create_reduce_map(vertex_reduction_map, cut_model); + + for (size_t cut_index = 0; cut_index < model_cuts.size(); ++cut_index, ++index) { +@@ -3171,7 +3180,7 @@ bool priv::is_over_whole_expoly(const CutAOI &cutAOI, + const CutMesh &mesh) + { + // NonInterupted contour is without other point and contain all from shape +- const VertexShapeMap &vert_shape_map = mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name).first; ++ const VertexShapeMap &vert_shape_map = access_pmap((mesh.property_map<VI, const IntersectingElement*>(vert_shape_map_name))); + for (HI hi : cutAOI.second) { + const IntersectingElement *ie_s = vert_shape_map[mesh.source(hi)]; + const IntersectingElement *ie_t = vert_shape_map[mesh.target(hi)]; +@@ -3708,7 +3717,7 @@ void priv::store(const CutMesh &mesh, const FaceTypeMap &face_type_map, const st + } + + CutMesh &mesh_ = const_cast<CutMesh &>(mesh); +- auto face_colors = mesh_.add_property_map<priv::FI, CGAL::Color>("f:color").first; ++ auto face_colors = access_pmap((mesh_.add_property_map<priv::FI, CGAL::Color>("f:color"))); + for (FI fi : mesh.faces()) { + auto &color = face_colors[fi]; + switch (face_type_map[fi]) { +@@ -3734,7 +3743,7 @@ void priv::store(const CutMesh &mesh, const ReductionMap &reduction_map, const s + std::string off_file = dir + "model" + std::to_string(reduction_order++) + ".off"; + + CutMesh &mesh_ = const_cast<CutMesh &>(mesh); +- auto vertex_colors = mesh_.add_property_map<priv::VI, CGAL::Color>("v:color").first; ++ auto vertex_colors = access_pmap((mesh_.add_property_map<priv::VI, CGAL::Color>("v:color"))); + // initialize to gray color + for (VI vi: mesh.vertices()) + vertex_colors[vi] = CGAL::Color{127, 127, 127}; diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch new file mode 100644 index 000000000000..b7fc95554591 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch @@ -0,0 +1,45 @@ +--- a/bundled_deps/admesh/CMakeLists.txt ++++ b/bundled_deps/admesh/CMakeLists.txt +@@ -13,4 +13,3 @@ add_library(admesh STATIC + + target_include_directories(admesh PUBLIC .) + target_link_libraries(admesh PRIVATE boost_headeronly localesutils) +-target_link_libraries(admesh PUBLIC Eigen3::Eigen) +--- a/src/clipper/CMakeLists.txt ++++ b/src/clipper/CMakeLists.txt +@@ -10,5 +10,4 @@ add_library(clipper STATIC + ) + + target_link_libraries(clipper PRIVATE TBB::tbb TBB::tbbmalloc int128) +-target_link_libraries(clipper PUBLIC Eigen3::Eigen) + target_include_directories(clipper PUBLIC .) +--- a/src/libslic3r/CMakeLists.txt ++++ b/src/libslic3r/CMakeLists.txt +@@ -629,7 +629,6 @@ target_link_libraries(libslic3r PRIVATE + int128 + ) + target_link_libraries(libslic3r PUBLIC +- Eigen3::Eigen + semver + admesh + localesutils +--- a/src/slic3r/CMakeLists.txt ++++ b/src/slic3r/CMakeLists.txt +@@ -383,6 +383,7 @@ set(SLIC3R_GUI_SOURCES + ) + + find_package(NanoSVG REQUIRED) ++find_package(OpenSSL REQUIRED) + + if (APPLE) + list(APPEND SLIC3R_GUI_SOURCES +@@ -438,6 +439,9 @@ target_link_libraries( + NanoSVG::nanosvgrast + stb_dxt + fastfloat ++ OpenSSL::SSL ++ OpenSSL::Crypto ++ Boost::log + ) + + if (MSVC) diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch new file mode 100644 index 000000000000..f550c53d3f42 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch @@ -0,0 +1,42 @@ +--- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp ++++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp +@@ -1595,7 +1595,7 @@ void GLGizmoSVG::draw_filename(){ + if (dlg.ShowModal() == wxID_OK ){ + last_used_directory = dlg.GetDirectory(); + std::string out_path_str(into_u8(dlg.GetPath())); +- boost::nowide::ofstream stream(out_path_str); ++ std::ofstream stream(out_path_str); + if (stream.is_open()){ + stream << *svg.file_data; + +--- a/src/slic3r/GUI/PresetArchiveDatabase.cpp ++++ b/src/slic3r/GUI/PresetArchiveDatabase.cpp +@@ -515,7 +515,7 @@ void PresetArchiveDatabase::load_app_manifest_json() + if (!fs::exists(path, ec) || ec) { + copy_initial_manifest(); + } +- boost::nowide::ifstream file(path.string()); ++ std::ifstream file(path.string()); + std::string data; + if (file.is_open()) { + std::string line; +@@ -682,7 +682,7 @@ void PresetArchiveDatabase::save_app_manifest_json() const + data += "]"; + + std::string path = get_stored_manifest_path().string(); +- boost::nowide::ofstream file(path); ++ std::ofstream file(path); + if (file.is_open()) { + file << data; + file.close(); +--- a/src/slic3r/Utils/Http.cpp ++++ b/src/slic3r/Utils/Http.cpp +@@ -302,7 +302,7 @@ void Http::priv::form_add_file(const char *name, const fs::path &path, const cha + //FIXME may throw! Is the caller aware of it? + void Http::priv::set_post_body(const fs::path &path) + { +- boost::nowide::ifstream file(path.string()); ++ std::ifstream file(path.string()); + std::string file_content { std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>() }; + postfields = std::move(file_content); + } diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-opencascade-7.8.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-opencascade-7.8.0.patch new file mode 100644 index 000000000000..1e37ce9baa19 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-opencascade-7.8.0.patch @@ -0,0 +1,20 @@ +--- a/src/occt_wrapper/CMakeLists.txt ++++ b/src/occt_wrapper/CMakeLists.txt +@@ -19,14 +19,11 @@ include(GenerateExportHeader) + + generate_export_header(OCCTWrapper) + +-find_package(OpenCASCADE 7.6.1 REQUIRED) ++find_package(OpenCASCADE REQUIRED) + + set(OCCT_LIBS +- TKXDESTEP +- TKSTEP +- TKSTEP209 +- TKSTEPAttr +- TKSTEPBase ++ TKDESTEP ++ TKDESTL + TKXCAF + TKXSBase + TKVCAF diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild b/media-gfx/prusaslicer/prusaslicer-2.8.0-r1.ebuild index ed23b287f530..92c404bba643 100644 --- a/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-2.8.0-r1.ebuild @@ -63,6 +63,8 @@ PATCHES=( "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch" "${FILESDIR}/${PN}-2.8.0-missing-includes.patch" "${FILESDIR}/${PN}-2.8.0-fixed-linking.patch" + "${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch" + "${FILESDIR}/${PN}-2.8.0-cgal-6.0.patch" ) src_prepare() { diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild new file mode 100644 index 000000000000..fbf13e9d7d66 --- /dev/null +++ b/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" +MY_PN="PrusaSlicer" +MY_PV="$(ver_rs 3 -)" + +inherit cmake wxwidgets xdg + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git" +else + SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" + S="${WORKDIR}/${MY_PN}-version_${MY_PV}" +fi + +DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +HOMEPAGE="https://www.prusa3d.com/prusaslicer/" + +LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" +SLOT="0" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-cpp/eigen:3 + dev-cpp/tbb:= + dev-libs/boost:=[nls] + dev-libs/cereal + dev-libs/expat + dev-libs/glib:2 + dev-libs/gmp:= + dev-libs/mpfr:= + media-gfx/openvdb:= + media-gfx/libbgcode + 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:= + sci-mathematics/cgal:= + sys-apps/dbus + sys-libs/zlib:= + virtual/opengl + x11-libs/gtk+:3 + >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl,webkit] + media-libs/nanosvg:= +" +DEPEND="${RDEPEND} + media-libs/qhull[static-libs] + test? ( =dev-cpp/catch-2* ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch" + "${FILESDIR}/${PN}-2.8.0-missing-includes.patch" + "${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch" + "${FILESDIR}/${PN}-2.8.1-fixed-linking.patch" + "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch" + "${FILESDIR}/${PN}-2.8.1-fstream.patch" +) + +src_prepare() { + if has_version ">=sci-libs/opencascade-7.8.0"; then + eapply "${FILESDIR}/prusaslicer-2.8.1-opencascade-7.8.0.patch" + fi + + 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.[0-9] REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \ + src/occt_wrapper/CMakeLists.txt || die + + find . -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) -exec \ + sed -i 's|#include <Eigen/|#include <eigen3/Eigen/|g; s|#include <unsupported/Eigen/|#include <eigen3/unsupported/Eigen/|g' {} + || die + + cmake_src_prepare +} + +src_configure() { + CMAKE_BUILD_TYPE="Release" + + setup-wxwidgets + + local mycmakeargs=( + -DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB" + + -DSLIC3R_BUILD_TESTS=$(usex test) + -DSLIC3R_FHS=ON + -DSLIC3R_GTK=3 + -DSLIC3R_GUI=ON + -DSLIC3R_PCH=OFF + -DSLIC3R_STATIC=OFF + -DSLIC3R_WX_STABLE=ON + -Wno-dev + ) + + cmake_src_configure +} + +src_test() { + CMAKE_SKIP_TESTS=( + "^libslic3r_tests$" + ) + cmake_src_test +} diff --git a/media-gfx/prusaslicer/prusaslicer-9999.ebuild b/media-gfx/prusaslicer/prusaslicer-9999.ebuild index 2bb72a7c183f..fbf13e9d7d66 100644 --- a/media-gfx/prusaslicer/prusaslicer-9999.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-9999.ebuild @@ -62,18 +62,25 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch" "${FILESDIR}/${PN}-2.8.0-missing-includes.patch" - "${FILESDIR}/${PN}-2.8.0-fixed-linking.patch" + "${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch" + "${FILESDIR}/${PN}-2.8.1-fixed-linking.patch" + "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch" + "${FILESDIR}/${PN}-2.8.1-fstream.patch" ) src_prepare() { if has_version ">=sci-libs/opencascade-7.8.0"; then - eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch" + eapply "${FILESDIR}/prusaslicer-2.8.1-opencascade-7.8.0.patch" fi 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' \ + sed -i -e 's/find_package(OpenCASCADE 7.6.[0-9] REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \ src/occt_wrapper/CMakeLists.txt || die + + find . -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) -exec \ + sed -i 's|#include <Eigen/|#include <eigen3/Eigen/|g; s|#include <unsupported/Eigen/|#include <eigen3/unsupported/Eigen/|g' {} + || die + cmake_src_prepare } diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest index 2fa2933a3a4a..ff544bf7bc3c 100644 --- a/media-gfx/pstoedit/Manifest +++ b/media-gfx/pstoedit/Manifest @@ -1,5 +1,5 @@ AUX pstoedit-3.75-gcc12.patch 282 BLAKE2B b25ffea80561cc5b3a35c2f48333996195bba681c8c14464f798344b6d09f72c86cbc4546fa185e699e8da729b394027b66162fc50e96dbb7e2ef8061ae300b2 SHA512 b4c1256a8b53746d611bd41d02184fd3d532aa16fda1661dd4bfa4badae94164c66bd47041e87072678bbbf7dfdc8eb0a928fbfb4f8cb6c947e28916871b17b0 AUX pstoedit-3.75-libdl.patch 432 BLAKE2B 19d6b192c7fa1497f40baff8c039139248be34bbd7f1858e4731da4e631a46dfa8a7e5a9041a5e991a44fb049b0399fad763c65b9a27437d7bcd1d61631fd760 SHA512 010263020e07b57fdde3fa6478cf5865877d71d015a446d8111326d69ce7138467e384bb5f48baa149932a0c4a42d9a60552ff8616125cbc1dabf613cd78df79 DIST pstoedit-3.75.tar.gz 1290057 BLAKE2B 607a265ea6f058e1ba432d55c4602452cd52a48302441ecee542a113d90b090ce888cc6fa5e3a8e3a2fdbf94dce9b1ab1f7f5ba58ab81f1f509eea9052a3cd82 SHA512 54b8cf7e78e52027d45e7550821476d9a9c4df4f63af83792b6a2909bc62236450ba6b619f95eede9f61a715f4937f1fbaf2ce4ae4b486daa0294c396a882a28 -EBUILD pstoedit-3.75.ebuild 1346 BLAKE2B ed842c462a32bb22bd1b1228a60ddc0e9fa4d56e365125212ceecab6e5ec3d3ead9b9c72a20613316ed8168ce0d016b52984f38fe4db203185d751d6080b5591 SHA512 3484097f04b8d584162cb23c33f133210ba1f7d6ef6c60910594758eb39b3f2dc137ff6765634492de90bc58cca212b4684b4dc8792ce653e156e00b141d249d +EBUILD pstoedit-3.75.ebuild 1340 BLAKE2B 7bd6eb40c0dc9c2907f18f4f0834321b657fe1fa2978c472d3d9c97f6328c6d33aee47a13f0d162f5217242616c3943a9f94ed69fbf0e4ae0c307b4874668411 SHA512 517bbe98e030fb84d194a27065e1f72524bff38e960473c24f731adf850e71c2cad2a4336dffef8d4fbc71ef6fa78c3ae5f27ee3216b4330902fad1d90139243 MISC metadata.xml 634 BLAKE2B ea6bd21397a45a3591572e803513b32361761a9872800027ab779c2a9f0e214db9e70dc9fed0acbf6dafe3769cd8525e21d2875e62f4b8711bfc03f38bc47214 SHA512 d8d509f442aee8fbb9036dab15fba870e18b8d6b0b120d3c82bb50e7d86379425f5b91161e4f37137f43710fd50ac2c8481b47b0dd5ab39654729a7280258465 diff --git a/media-gfx/pstoedit/pstoedit-3.75.ebuild b/media-gfx/pstoedit/pstoedit-3.75.ebuild index 6ec8c7b5d1aa..8e98594fc96d 100644 --- a/media-gfx/pstoedit/pstoedit-3.75.ebuild +++ b/media-gfx/pstoedit/pstoedit-3.75.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="emf imagemagick plotutils pptx" BDEPEND=" diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest index 639c6a12e40d..18cb4f6884e7 100644 --- a/media-gfx/qiv/Manifest +++ b/media-gfx/qiv/Manifest @@ -1,6 +1,3 @@ -AUX qiv-2.3.2-optional-tiff.patch 519 BLAKE2B 1c2f4d4d79f3d746927f4c5af05769992460c30cdd438096d4c4d0c39a9460bcb921ddd854786ec394fc9e229ad239c541cc97f5468cd6934c15a0557275270a SHA512 c492b902bbd7771648deaffc7eafb8fccf86d294c0e2597999f2fff02ed1e02f6fc158ea95fe25c2a9b27d15dffe724c85654c99e7769254abb40e9fdcb8f358 -DIST qiv-2.3.2.tgz 133614 BLAKE2B f06f36524db8cdde1baf3e118e8ceeeb654dd49a674b55d661255734c0bedaa765fcf8bb77b03d3c2bac8d75a9088b3290f1d802d670393b6795fee85dd4f778 SHA512 c4636591f79e8e4c13807433a4101a461e614439e497a5637b958bd9d0937b04515854483d4060d9b1004d6c6060b437d634fdbe491eb0747a660ba65240472d DIST qiv-2.3.3.tgz 139301 BLAKE2B 0167e074f859ef028e3b343a8e521573f953ba43b7bd78f58e8b337a558b0d48a3c857cccafa2d55384fb48afdc0735949d873de878eff18658f09b98700c61c SHA512 95b5f3759c03648dea1ea1eacaf3d38d808a6eff4d26edf711df0e20a741fc22a0c16bcd84b8740f1455f5d35db9c2b04392dff8b4e030ec3d3c05cd01886759 -EBUILD qiv-2.3.2-r3.ebuild 1209 BLAKE2B d9f0dd4e51d27e0a81df429581bb1114c49b6d9aaff92d90b0725e5407597bfc527f2c6be93ec526e1f3c8aa70ae70c7de203d658c5a01ace96efc033206bda0 SHA512 eb0eba33bf4630d68fa02b339365aae9631c7580b1c0714cde1b0d0b47235f95c1d3e912e111f0e70d648e1865ae79957f1dcf929e0c87531ed61b50d7de4768 EBUILD qiv-2.3.3.ebuild 1157 BLAKE2B ac9b1ee17a105047481605f73baa05cd61fc13111a16c25ab0591adab0add356dd45985eec094300b1e2f20b323f29e10d5bfda14b604013c47c3a970b87f9db SHA512 a95dac67ac2c98301570074dfef14c87bc9b9942fc0588e17d988436aa213a73b6b06f324722b48113d8a32c852850dae0f688a5e5f6e916b1693f124d4729f5 MISC metadata.xml 248 BLAKE2B 374595d5e26ff95209fa2ffc9ffd10db830ed966d8c14c91fbda1c444d4a96c55a938a2be083a93218ff0e2e59cb876b3311429266efc1c07e39ed913412b669 SHA512 fe38b08d3554e7aa56699814cd72f9b64481ca4e7c7e715e01cc3ed29ac7dddc17f0b8b56bac42ff2c0550c4ddd09537853a272ec7d0ce08506b46b73e1872c9 diff --git a/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch b/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch deleted file mode 100644 index e00ad10f93e2..000000000000 --- a/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch +++ /dev/null @@ -1,22 +0,0 @@ -Make tiff header usage conditional on LCMS support as intended. - ---- ciberandy-qiv-14b562fe2fc3/qiv.h -+++ ciberandy-qiv-14b562fe2fc3/qiv.h -@@ -12,6 +12,7 @@ - #ifdef SUPPORT_LCMS - #include <lcms2.h> - #include <jpeglib.h> -+#include <tiffio.h> - #endif - - /* ---- ciberandy-qiv-14b562fe2fc3/utils.c -+++ ciberandy-qiv-14b562fe2fc3/utils.c -@@ -17,7 +17,6 @@ - #include <dirent.h> - #include <fcntl.h> - #include <errno.h> --#include <tiffio.h> - #include <X11/extensions/dpms.h> - #ifdef HAVE_EXIF - #include <libexif/exif-loader.h> diff --git a/media-gfx/qiv/qiv-2.3.2-r3.ebuild b/media-gfx/qiv/qiv-2.3.2-r3.ebuild deleted file mode 100644 index 7329747aa9a0..000000000000 --- a/media-gfx/qiv/qiv-2.3.2-r3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop toolchain-funcs xdg - -DESCRIPTION="Quick Image Viewer" -HOMEPAGE="https://spiegl.de/qiv/ https://codeberg.org/ciberandy/qiv" -SRC_URI="https://spiegl.de/qiv/download/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~mips ~x86" -IUSE="exif lcms magic" - -RDEPEND=" - media-libs/imlib2[X] - >=x11-libs/gtk+-2.12:2 - exif? ( media-libs/libexif ) - lcms? ( - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/tiff:= - ) - magic? ( sys-apps/file )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${P}-optional-tiff.patch ) - -src_prepare() { - default - - sed -i \ - -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \ - Makefile || die - - if ! use exif ; then - sed -i 's/^EXIF =/#\0/' Makefile || die - fi - - if ! use lcms ; then - sed -i 's/^LCMS =/#\0/' Makefile || die - fi - - if ! use magic ; then - sed -i 's/^MAGIC =/#\0/' Makefile || die - fi -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - -src_install() { - dobin qiv - doman qiv.1 - dodoc Changelog contrib/qiv-command.example README README.TODO - - domenu qiv.desktop - doicon qiv.png -} diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest index c01fada63600..1b9c0e631377 100644 --- a/media-gfx/qrencode/Manifest +++ b/media-gfx/qrencode/Manifest @@ -1,3 +1,3 @@ DIST qrencode-4.1.1.tar.bz2 461562 BLAKE2B ae3abb4a162518c0204d09c9df7434fb348e24c20e790a261841220b0a7165168137d5acbdbc53e40558724eac2e1e21786f11013f384b545d56a1c9caaff61d SHA512 981b3242c213e1b40ac88711912dd8c27ea11f3437d1a04b6b226499a6e991a8f0b3b10f818bcc104812192a1dac4ce05f16ecd847a50cb03d4859b84bad89b8 -EBUILD qrencode-4.1.1-r1.ebuild 1067 BLAKE2B fbdb2eb966edbad0ff1e73993cff9ec35dda18c83ba437a300616952cfc110f89d374fb5aeb02e55b811d3a7146cb63ed9da8c7fb24155f4c7b9cc675faefe26 SHA512 1aee33cd76f38a8e2438a59cf30caad557543d2eaff5feb64e430a466839db92b65aea89f248e511fff0206cee5c3969cdcad028632bbd181c1df5fcf8444746 -MISC metadata.xml 440 BLAKE2B 9f73217513f5128180c5e50f29f3e55399b728446d55332b9f80ac5dde854ca052b8f0e882fedc5a3c26f2a013f594023d708ce741fdd2660abc2233ac50c22c SHA512 46951797c3472c850d0572c644a11ba513ae8769f4c5e70f55f7af4c838d13320e16e83dc34d1cd7460f8ae295fe53eba0480d8601d0685a46ae6a19de056c67 +EBUILD qrencode-4.1.1-r1.ebuild 1061 BLAKE2B 687df58e46b684591eca57e2257dfe0f7b987312d280ed16b9cafed2046849a7cb373d173abfcfc4e99b333dbf5b3e2d1977ae15b0c9d63c152f54d0e61cac06 SHA512 f0df78920c3462519b31050dffb5cbea0afac45f352e5ad8909cec48ab5ad50176b5cab398b0198d4f312e39132b5bdee003b74cdcdbe97611a5b60ab95eb826 +MISC metadata.xml 501 BLAKE2B 5b72958901175d6d1be58a71788a588cb9ffda6eef60d187bf7dfb24172d238d15761e0f3e32e721982b98628387ac7a724255da460b87539c2732c1635e8c49 SHA512 c64f3e13755118e24afad0441be84845e5da076a1eba602c6e7026d8d781bcb11b85db0502f3665a1f6ca4338f82e1d047c6f6b7e269baefa835c653eb8a675f diff --git a/media-gfx/qrencode/metadata.xml b/media-gfx/qrencode/metadata.xml index 12c2b682079b..ddd5b9efbfc3 100644 --- a/media-gfx/qrencode/metadata.xml +++ b/media-gfx/qrencode/metadata.xml @@ -10,5 +10,6 @@ </use> <upstream> <remote-id type="cpe">cpe:/a:qrencode_project:qrencode</remote-id> + <remote-id type="github">fukuchi/libqrencode</remote-id> </upstream> </pkgmetadata> diff --git a/media-gfx/qrencode/qrencode-4.1.1-r1.ebuild b/media-gfx/qrencode/qrencode-4.1.1-r1.ebuild index 6bf83b4101c3..e1ca3a56fe38 100644 --- a/media-gfx/qrencode/qrencode-4.1.1-r1.ebuild +++ b/media-gfx/qrencode/qrencode-4.1.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2" LICENSE="LGPL-2" SLOT="0/4" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" IUSE="png test" RESTRICT="!test? ( test )" diff --git a/media-gfx/quat/Manifest b/media-gfx/quat/Manifest index 267d5fcf420a..b4b43d087fcc 100644 --- a/media-gfx/quat/Manifest +++ b/media-gfx/quat/Manifest @@ -1,5 +1,4 @@ AUX quat-1.20-fix-build-for-clang16.patch 2955 BLAKE2B f12610d484006de26bc42475af99269911e186bdc490b4c4d1e48d0ae152b97be162aa2ba178b10cef0ae1bb9e4199aaa79ab512ce8bad41a6bb414151d125f1 SHA512 53b2eb52f1c062da4b4f594ea0a62ca11c5b37bba3f7ac5028906412c03a2bdee831e9dbd42cf63798f5f5ff8a8aadac5a808c6596e5d6dff53358a6ca0cf206 DIST quat-1.20.tar.gz 474448 BLAKE2B 52a06460be261c622f0c30f8991762e91688da53ba2a9854cc5c94a6de7fa9c7d8028fc3f36608bf11f56c7bee8ca192a37c91ac993b3866ad7b630da3bee5ad SHA512 eb77d628ea0e329e8bda11124bfa57e4005f06ad4d54d8bdc31eaab09fc0cf7ebf1873e7dd47624781e8ee75c7644bfc75819ce5aeb5c150644f8b7a7c81e85b -EBUILD quat-1.20-r2.ebuild 785 BLAKE2B da0d6ab813115a0279ae46dcd0fb1e7d1edde4fdd3ea01c83d5abcd836ee0d4e73f60ecaa0a82f5b4a36d0ffadc0c405548c681499fc0c1fb44b562ad33b4d2e SHA512 32568d76deca41238afbdf13049582467e6b09dc31535c65dcaf49bb4a427c67560ae9c7573f40436c29e69e7f78fd8e5fdad75e2eb7c2b9b582fffe4630d44c EBUILD quat-1.20-r3.ebuild 972 BLAKE2B 3dba3013826bf82e854be298e994094f627cfd1ba504f610ea52b53b242f48d2d4232383949701d9423975078e189b2d9b36bd581deeb8bc3a76635d1430ca92 SHA512 dca80aa41fd6cacf7c3a16cb6d6134a65f7a3d29bf9bdc6cb3e7589e29239e4052aed0b04347c49a968277c85b3efd52d43a66f881471fa43de6a043a80f7f50 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/media-gfx/quat/quat-1.20-r2.ebuild b/media-gfx/quat/quat-1.20-r2.ebuild deleted file mode 100644 index 17e06e1566e8..000000000000 --- a/media-gfx/quat/quat-1.20-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A 3D quaternionic fractal generator" -HOMEPAGE="http://www.physcip.uni-stuttgart.de/phy11733/quat_e.html" -SRC_URI="http://www.physcip.uni-stuttgart.de/phy11733/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="X debug" - -DEPEND=" - >=sys-libs/zlib-1.1.4 - X? ( - =x11-libs/fltk-1* - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - ) -" -RDEPEND="${DEPEND}" - -src_configure() { - export FLUID="/usr/bin/fluid" # needed because configure tries an invalid option - econf \ - $(use_enable X gui) \ - $(use_enable debug) \ - $(use_enable debug prof) -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog NEWS README -} diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest index a93b0b9d033a..383f46c2f926 100644 --- a/media-gfx/rawtherapee/Manifest +++ b/media-gfx/rawtherapee/Manifest @@ -1,4 +1,4 @@ -AUX rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch 1956 BLAKE2B bd8153f64bba374142d1b516a21c15752fc4baf0e293f91904e63d264e5b571e98de1c88f9af8385b9f56a85c35974bf173c075be6068918bbcfc1fba3cb5b56 SHA512 ba8ae49b70efaeeec67cebbe0df82ee6027f240a59b3cdf6be5a03550b702492612a5fe9731153b9d095ab76d1fcc55425dfcb4216bf8f5d9b6360b6b809d16b -DIST rawtherapee-5.10.tar.xz 16943724 BLAKE2B 2d1250a03f2902ffcff666514f9785036c808e9883957f674bfdb9545b2feac8f2313ab819e0cb64f39196bd3db36e8084b52bda6194de9197215824e695809c SHA512 79d6d54f90fec6006d3dff53aca00ccd385c398ebede2f06a223905d69e1045c6ab772bd5aca4bde01d9086c3c03183be22c0df521166b1af63b60bd7d0e1cfc -EBUILD rawtherapee-5.10-r1.ebuild 1956 BLAKE2B e9748bdbd86a8224b6a74211e3ba4286303e14737951f3bc1d28f541c4eacff5f9c3d951d9b13da9b8986e0fc93d7b143e82b77c81b0e3093d14b2a37e6eb440 SHA512 ee979e48524058a437e26420bb317a9b4208bc552aae88a2bfd9e504496965f31fad392fa5afcaa92012c4fc38a2376d24d2a96dd1869d5e931caabec479fbc9 -MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c +DIST rawtherapee-5.11.tar.xz 18005652 BLAKE2B d4b4cb45042faf7eadb1c5bfbd7d1db2a452397d10eb12349d1d0a2ae4b9254beb3ee943cf3ddf40380f31abc653ec2c85fb0d4c8e2b1121402bbd41e74afaf0 SHA512 a37af6d99569a6b427379b76b980be8dca5007bf4ec8fc65663e9e8d13850dd2f547e1633f69ee495df105ca6f0f9ab4daf12beec29c9fff63e2e7e5083813b2 +EBUILD rawtherapee-5.11-r1.ebuild 2015 BLAKE2B 1560df366622c8aca27fa89f7090c86e7fa60a3299727b90b269a1d9ed96a6bfa51fe15d3c2e6c82aa4bd2cf71d210e3ee287994434566efd84e488c33cc8468 SHA512 cc52e7df5df516f488b3bf0869eb3674fe970f8d78fc0178f01b5de4b9aaaa52c974708f39a2322254084e5852a584a08ddec4b0fcf975f0e643c2b6a7ee5ded +EBUILD rawtherapee-5.11.ebuild 1898 BLAKE2B 15c4f40e7016b6d249c4129b41e8cfa472dfbb1063ae7fe30c393edf7d67c201fca1a71bbed303c1cba833d1cb7ef167c841b69bdc8d839adbd31c76f75b3647 SHA512 40f872d001a8f5179c5de769a53145bc555a4ad6b5b5884bf056e190fc12741aab1a7b0ad465780bd28046d71100e5ace4b973cdd041ffb5afe3bf55932cd374 +MISC metadata.xml 398 BLAKE2B 4a0ef68f8e8c4e04158552d21df211610a6ccd9195da6365c77f78297ee4957f61d91b5b6eb6af2912d28a70462bdeb012176dc1448cfdf7221eca7225c707ec SHA512 d562b2782f388590aac143ff10c74eb24b4df447d61051875d3a6d9200f013c290ca5c7fe7c2d130484b5ba01b9c725f453b690dbbe04cd0a0f398a9a99352ed diff --git a/media-gfx/rawtherapee/files/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch b/media-gfx/rawtherapee/files/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch deleted file mode 100644 index f65309fc64e6..000000000000 --- a/media-gfx/rawtherapee/files/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch +++ /dev/null @@ -1,63 +0,0 @@ -From efdc5bce3b9794847093baeb040937ab55eba86e Mon Sep 17 00:00:00 2001 -From: Richard E Barber <kd6kxr@gmail.com> -Date: Sun, 19 May 2024 04:27:10 -0700 -Subject: [PATCH] Fix linking with jpeg-turbo - -patch via Termux PR -https://github.com/termux-user-repository/tur/pull/1027 ---- - rtengine/jdatasrc.cc | 28 ++-------------------------- - 1 file changed, 2 insertions(+), 26 deletions(-) - -diff --git a/rtengine/jdatasrc.cc b/rtengine/jdatasrc.cc -index fa13b9dd13..a0d12657f2 100644 ---- a/rtengine/jdatasrc.cc -+++ b/rtengine/jdatasrc.cc -@@ -247,20 +247,6 @@ my_error_exit (j_common_ptr cinfo) - #endif - } - -- --#ifdef _WIN32 --#define JVERSION "6b 27-Mar-1998" --#define JCOPYRIGHT_SHORT "(C) 1998, Thomas G. Lane" --#define JMESSAGE(code,string) string , -- --const char * const jpeg_std_message_table[] = { --#include "jerror.h" -- NULL --}; --#else --extern const char * const jpeg_std_message_table[]; --#endif -- - /* - * Actual output of an error or trace message. - * Applications may override this method to send JPEG messages somewhere -@@ -409,24 +395,14 @@ reset_error_mgr (j_common_ptr cinfo) - GLOBAL(struct jpeg_error_mgr *) - my_jpeg_std_error (struct jpeg_error_mgr * err) - { -+ err = jpeg_std_error(err); - -+ /* override these functions */ - err->error_exit = my_error_exit; - err->emit_message = emit_message; - err->output_message = output_message; - err->format_message = format_message; - err->reset_error_mgr = reset_error_mgr; - -- err->trace_level = 0; /* default = no tracing */ -- err->num_warnings = 0; /* no warnings emitted yet */ -- err->msg_code = 0; /* may be useful as a flag for "no error" */ -- -- /* Initialize message table pointers */ -- err->jpeg_message_table = jpeg_std_message_table; -- err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1; -- -- err->addon_message_table = nullptr; -- err->first_addon_message = 0; /* for safety */ -- err->last_addon_message = 0; -- - return err; - } diff --git a/media-gfx/rawtherapee/metadata.xml b/media-gfx/rawtherapee/metadata.xml index aa20bff17b1d..aa96f3399ed7 100644 --- a/media-gfx/rawtherapee/metadata.xml +++ b/media-gfx/rawtherapee/metadata.xml @@ -5,4 +5,8 @@ <email>bkohler@gentoo.org</email> <name>Ben Kohler</name> </maintainer> + <upstream> + <bugs-to>https://github.com/Beep6581/RawTherapee/issues</bugs-to> + <remote-id type="github">Beep6581/RawTherapee</remote-id> + </upstream> </pkgmetadata> diff --git a/media-gfx/rawtherapee/rawtherapee-5.11-r1.ebuild b/media-gfx/rawtherapee/rawtherapee-5.11-r1.ebuild new file mode 100644 index 000000000000..06cfefe8c2bb --- /dev/null +++ b/media-gfx/rawtherapee/rawtherapee-5.11-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P=${P/_rc/-rc} +inherit cmake flag-o-matic toolchain-funcs xdg-utils + +DESCRIPTION="A powerful cross-platform raw image processing program" +HOMEPAGE="https://www.rawtherapee.com/" +SRC_URI="https://github.com/Beep6581/RawTherapee/releases/download/${PV}/${P}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~riscv x86" +IUSE="jpegxl openmp tcmalloc" + +RDEPEND=" + dev-cpp/atkmm:0 + dev-cpp/cairomm:0 + dev-cpp/glibmm:2 + dev-cpp/gtkmm:3.0 + dev-cpp/pangomm:1.4 + dev-libs/expat + dev-libs/glib:2 + dev-libs/libsigc++:2 + gnome-base/librsvg:2 + media-gfx/exiv2:= + media-libs/lcms:2 + media-libs/lensfun + media-libs/libcanberra[gtk3] + media-libs/libiptcdata + media-libs/libjpeg-turbo:= + media-libs/libpng:0= + media-libs/libraw:= + media-libs/tiff:= + sci-libs/fftw:3.0= + sys-libs/zlib + x11-libs/gtk+:3 + jpegxl? ( media-libs/libjxl:= ) + tcmalloc? ( dev-util/google-perftools )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + # upstream tested that "fast-math" give wrong results, so filter it + # https://bugs.gentoo.org/show_bug.cgi?id=606896#c2 + filter-flags -ffast-math + # -Ofast enable "fast-math" both in gcc and clang + replace-flags -Ofast -O3 + # In case we add an ebuild for klt we can (i)use that one, + # see http://cecas.clemson.edu/~stb/klt/ + local mycmakeargs=( + -DOPTION_OMP=$(usex openmp) + -DDOCDIR=/usr/share/doc/${PF} + -DCREDITSDIR=/usr/share/${PN} + -DLICENCEDIR=/usr/share/${PN} + -DCACHE_NAME_SUFFIX="" + -DWITH_SYSTEM_KLT="off" + -DWITH_SYSTEM_LIBRAW="on" + -DENABLE_TCMALLOC=$(usex tcmalloc) + -DWITH_JXL=$(usex jpegxl) + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/media-gfx/rawtherapee/rawtherapee-5.10-r1.ebuild b/media-gfx/rawtherapee/rawtherapee-5.11.ebuild index bc3e9aa37d1b..ff0c9e242b65 100644 --- a/media-gfx/rawtherapee/rawtherapee-5.10-r1.ebuild +++ b/media-gfx/rawtherapee/rawtherapee-5.11.ebuild @@ -8,7 +8,7 @@ inherit cmake flag-o-matic toolchain-funcs xdg-utils DESCRIPTION="A powerful cross-platform raw image processing program" HOMEPAGE="https://www.rawtherapee.com/" -SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz" +SRC_URI="https://github.com/Beep6581/RawTherapee/releases/download/${PV}/${P}.tar.xz" S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" @@ -41,8 +41,6 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch ) - pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest index 20028b65e18a..c1480418fada 100644 --- a/media-gfx/ristretto/Manifest +++ b/media-gfx/ristretto/Manifest @@ -1,5 +1,5 @@ DIST ristretto-0.13.0.tar.bz2 624244 BLAKE2B ac0d6b391b17538e47a26f7643f083854f6654a7394f210fcc165d36a3d614b11354a81ab3a45a303e447c4221bf43ff92a913c64c425ef242810fdcdad584e1 SHA512 a8e25e0fdd2d31a904c616995438b47cf144557f589ed97a551fc5411cd7a3da9edab0c23c955e86c72ed0d10f1efccd61edf0aaf5a82cf601bf3333ea2b332b DIST ristretto-0.13.2.tar.bz2 852320 BLAKE2B 48451479e698672cd74dc85f32e8430e83026845ed09bee138e7da458bf0f0222e9aa756accec2a939f164ed59fbda4f18792a1238cd648d96dbe29b386ab9cd SHA512 ae4eb0159707a793cefe88b681f61e8c2ce41d57a64c7ad33853fc863bb1909b2a48ccf5543d3484f5710e7bf86ecbbd8520fb59eff11368f3a7a7028cd85914 -EBUILD ristretto-0.13.0.ebuild 937 BLAKE2B 03b74f6d3606a21e96b614deaf0a843477df7b24bd64ed2fdf4c17837c0323dcd911f1d79fbc34fc48cbfedf9b832cc7c2e17fccbfafbf79a7f6b1e1538d25d2 SHA512 c01de33522150cccf0625401987bac0e7672bd7d4b16bd6b54528595fdac578ac32ba129b07b406f78aa7f56adc0b7daebadbe4d691368e1a62434d67c90f18d -EBUILD ristretto-0.13.2.ebuild 970 BLAKE2B 692ec5dea73b7fe47d948bb772ab48765e170ea4bc664b19e63eec89c44d5662b2a3b0a570e3b7de1279fe4edfda330d15c76cd0689e678b9642d517af1e9d65 SHA512 166353c962515e8da82583c60d729939f8d2b93f71d1ee1525c377f229826ae8f692bcabe0bfcd67efaa20e9612973b19183ad827fc3255f5857e85f88c97b57 +EBUILD ristretto-0.13.0.ebuild 931 BLAKE2B 2d000273fd2f8e5db0ce20b0829a5b007169b566eda86f342ef3d8e24608a861ac0fc5787807088dab8ff61deced0de9d9e91dc30bb243a7af2b14921a10b867 SHA512 c84b38f6f243ec0079405ef46a2ee3e391be37aa8affe8baf3b63166c1ccbe466f319e1bb79a3566d57afce88f0029b111bccfbd8e7035d4da93aadf3db60923 +EBUILD ristretto-0.13.2.ebuild 964 BLAKE2B d4ab2cac6ef7630db1f283d1b80104d3bec5d03f745cd17806a94c48f6b4cd8403c3e659bb251d9998b2b00eba5cf07e9d34d89ad6bb59a7a12dbeb4a7beeb8a SHA512 df0e6833fcd108733d1f3332342116336004d10254b02e149dfa6674740bc6e8fde033a3fc3c22da8447de9e38f29a341145d647f3721faaa4b8e3a4db668385 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5 diff --git a/media-gfx/ristretto/ristretto-0.13.0.ebuild b/media-gfx/ristretto/ristretto-0.13.0.ebuild index f62b7644ca14..ba9b3440467e 100644 --- a/media-gfx/ristretto/ristretto-0.13.0.ebuild +++ b/media-gfx/ristretto/ristretto-0.13.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" DEPEND=" >=dev-libs/glib-2.56:2 diff --git a/media-gfx/ristretto/ristretto-0.13.2.ebuild b/media-gfx/ristretto/ristretto-0.13.2.ebuild index 8f3e6b1aaad5..19eafffb4eb5 100644 --- a/media-gfx/ristretto/ristretto-0.13.2.ebuild +++ b/media-gfx/ristretto/ristretto-0.13.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" DEPEND=" >=dev-libs/glib-2.56.0:2 diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest index cfaa30b939c3..67c941d2e4b6 100644 --- a/media-gfx/sam2p/Manifest +++ b/media-gfx/sam2p/Manifest @@ -1,5 +1,5 @@ AUX sam2p-0.49.4_p20190718-fix-configure-clang.patch 353 BLAKE2B dcb39280fc99bc1d21e9ec9627d976844ed6ec9d14dda61c471766687ae3816c5672dd2b980665252bb22da4a345322e69accec719c86fdd5bfcbbec6d7b8284 SHA512 c351987915fc1b2051f55b9a80478b0ad400aa140e986b3a1dd0d8ae6b55252036f1038236d25456b9fcd604e863169ea5dfa329f5a180eeaccfcf4a58622a0d AUX sam2p-build-fixes.patch 1803 BLAKE2B d9c805da6c46f5457cc6006941a1331f0e46ed8fcadf7c73b9a11debfaa7e2f040beeae42aa9cf316a2df71ffe9d136808a1e9ebeea5c146851057a8addb7bf6 SHA512 fa32011db37a74f746542df82f29e7869412cf8ad93d0b4c3c6e100dda06c254f204671199db0d1abd6134975325cb939f65f0a22457a84a78b6b277411ea2f5 DIST sam2p-0.49.4_p20190718.tar.gz 1816309 BLAKE2B 3d97e00c2bd6b6c292c051d4eb6b73549d1c82a5bd7be3d6b718d8e9d2e96b47657c184af43fa57c0ca4b2b8c26904fb42508d17f7dda715def7d2082affa8b6 SHA512 1c6074fabca6146e51fe0d5a10c912ec679cf122e10aab7bead9e35e3d007e79773aedb1f627572b1b88cacefe0e7edf72efd71d32c47731723b910667220c51 -EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1414 BLAKE2B 0b4e912edfae61de02e6c7371c965a22e6a9e1173ea2ddc597cf5366fb6db04028d752b301f542492f8bf67756fc61272448b23149f481df94158ff68d89f1dd SHA512 80b37c141f1fabb419ec045a5434a249bd6efd6a7c7a5343e508df0b240c53b82787aa8465fc40cc9e97d1e3a8db577b4479764a5b1dc3ee1f9e0240236b012b +EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1408 BLAKE2B a9062998463cf63a9857ed06f0bed8eac5790e916dfb8e11c65abaf7d69c83a7dc6f961d2b48b7bac6a44cedf500266a9f3e91a0b5f97ceff4363ff6014c8248 SHA512 fed24d109d4ee30fa6be683151e981ddcc8d109e1e981297de5f9bfbdd78a3f19c74e10a8d3f6bc10659f61e45c1f9c59a3746c0d0ff26ced68569ad22666c3f MISC metadata.xml 374 BLAKE2B d19b7ae3a43094549eb9f02ddbab8077ebdb9b18fd2a608e038de18e1ade6824857899b1f7a19bb835ea2bfa3ae4e2d10c1cd67b38fe0d6d5927150f5b8644dd SHA512 900c1194a51963456c5f22c9eecf95645eda39e189cf72c89b63767c73027ebc152b5e67007047ada223f5b67671490cf75f3caa2989ec645b48bf4c81fdfcba diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild index fd8877e311de..9475eece6dc7 100644 --- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild +++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" IUSE="examples gif" RESTRICT="test" diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index 6dee214e9049..feda55443bdc 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -11,5 +11,5 @@ AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965 AUX saned_at.service-r1 432 BLAKE2B e6dab788c0bf705087974642ed714b5f41b3e676b80b5197a753227934b977ce6d1175872163e831e916b6aa36d6c5dd86effa44801494cff6fc669e6c24acaf SHA512 2c8725f9981216129f94a7c4cd75efab37bb75c891fdf7dbd4297161d8d4cd3b1c5fa0eebcaabe1f038aab8500f8b5579d776935f180fb2553bd2cb77506c29d DIST sane-backends-1.2.1.tar.gz 7308040 BLAKE2B 8448a66e70548f159cfac63501e52417fb1d0599008ce7bf26bf2e7a25a946e688968f01ae64b72c3d5efce67cfbdc0e8e04d8ab3bc92dae0a7e01bc81bf0140 SHA512 3ffce67e409caa5d32684290a56a46a68fef6991a14858d89cbab5aeb364fbbfd6d7c85bcbc4932c9167073a3a6ba682b4730f11fb320f0c4de53a7e7d3edba1 -EBUILD sane-backends-1.2.1.ebuild 8843 BLAKE2B d4aafdb85f6c56429151bc7e281670197a000177383935aabdf54854e05fa1f90695d485b1623987eef152ec0cc347588e1f89f1c6fa1934c12dce3555b2ef77 SHA512 ec080b23ac102b6405f9ab0a71e4df931402ea71edde6823176d964ad66aea8a0373a7f9bc932719a9114fc0aba98f808cecb8f5a8508246a883311beba25e4e +EBUILD sane-backends-1.2.1.ebuild 8837 BLAKE2B 942f956dd6f7b23c3e43e1b40517120cabd9ba087a42ea90dbb47d9009022b02ee42e3a60c80897363027bf1df3c757d6e2b2f57ad7c37d088510b255ee32a61 SHA512 d5c62ec336711d97c730338546c3fea7123dd27a21ba27504698cd50fe56963a75620e9d22505d0ebbafdf12fd954cb5141f1e41099bff32928772c6c435682c MISC metadata.xml 333 BLAKE2B 7d543cb4daa6542f7facef3e1f57c09144baed3198010d7c39df40398ab82791f56271375bce36e829a1364350d05f81c332a2359e7038b047df31407543d331 SHA512 52ac311d50fcfe020b4ec891bcbc1df2834d5d1e3ade7ab6926c6f85a31712dd5886b834739f6155873e1e09967c8f565b913c807acd7ea47a4d3b94160fff37 diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild index cec6801c00ca..7f364f68bc1e 100644 --- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1f LICENSE="GPL-2 public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" # gphoto and v4l are handled by their usual USE flags. # The pint backend was disabled because I could not get it to compile. diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest index e26d636f9639..989722b6f348 100644 --- a/media-gfx/scour/Manifest +++ b/media-gfx/scour/Manifest @@ -1,3 +1,3 @@ DIST scour-0.38.2.gh.tar.gz 99910 BLAKE2B 4273287b201ecea64cb2be666bb7de4fbadc3483935515de92ec8dfb39f3b856584e35ac877958efd798bb5840baba4fc4d40a376d2c9f3b0c52a679d7ded6df SHA512 a2c418e25283af399be032322b3af0c336c2392ba361681d4b133b64ebc441ac5beeed2b920f42316cef376c971b230681e306687786a875162d33b659d3fdeb -EBUILD scour-0.38.2-r1.ebuild 717 BLAKE2B 8bf31a0c39f2a5868540bec1daa56c2a999ae5dc5b3f31c4a8df3edc3dae6d38e1e7a2a466a162a96bdce02496060c428eb750b51b10bb78293ae09031d24d75 SHA512 fb9ac6ba0593358d909b755d29b760978a875bb69cb3264873069c5da9bd822e469b064c8aa0e8acd9ea1c21248dd40f258b30910d33a107fbd177594c9962cc +EBUILD scour-0.38.2-r1.ebuild 711 BLAKE2B 4592c2998500d4e900b4e06ce7b6b80a277d77a6b0a17bca1e2f7b8efa1c11fd071ac741d0255c0c8ff7d769c130ae020d87f9c8234943a175ff642f5cabfd1f SHA512 c8a52b2abb47fa6332da67ef46574ebf746cf11eeb47a8e176cbe5b815075db88f4b144fd3114972523a750bc3cc0283cd7d31a167cfd1f769dbdb5312b94f28 MISC metadata.xml 327 BLAKE2B b501c3f768a9e5e1af3cbb060c6ccdf4703d1cd6baacdc255997a563cfd9b6777b64d97d3540a532490e4ccf98724d82cf1e3a0f0366b85c47cf8660c7a7057e SHA512 322aefdbb22f52edbc453223ccc9e828f373b9d28b2a02c87429c7a16d8ced41567898a73a4e9ff50667bd8424fdb6e4a9bab836290de0d82df7969db6eb0cce diff --git a/media-gfx/scour/scour-0.38.2-r1.ebuild b/media-gfx/scour/scour-0.38.2-r1.ebuild index 8809aac2f3c1..41100b2c9900 100644 --- a/media-gfx/scour/scour-0.38.2-r1.ebuild +++ b/media-gfx/scour/scour-0.38.2-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" RDEPEND=" dev-python/six[${PYTHON_USEDEP}] diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest index 34c7499ad4c4..8af1ecaed0f3 100644 --- a/media-gfx/shotwell/Manifest +++ b/media-gfx/shotwell/Manifest @@ -1,5 +1,7 @@ DIST shotwell-0.32.4.tar.xz 35335296 BLAKE2B 32be135643f165f32f315c332a4f0b34cd724285e7239eadbb250253b27ce97fb15d314f68a5392d88224a0b97f7f6ef8789c1f6c40051c26a25b9012e860b90 SHA512 516ab26d6620429175097886a1874d2eaf0513f6ef732bef5ee07ef8cd200028b34d98f4eb09b47a621f5313de42a5f415185d76853de478e0b5e0c4e89eea69 DIST shotwell-0.32.7.tar.xz 35339216 BLAKE2B db87ee9c161f57dad638b47c37fb2737c95645e987e2bab81697895d9a28f14ab22b4669f218ea0baadfc0e1115f45fb9b094f546299083d83d2486fa1c15f98 SHA512 3cb9c9f2981ead8410f42680f6b4976d3b2efcfe7ded4d5217d28ebb8e5c968062a004ad3353affa13e94d996208ebf26c01f4beaf03a2ef6a1bc43960488d14 +DIST shotwell-0.32.9.tar.xz 35341312 BLAKE2B 81229b088c18b73e7039d8c1e644d0280988d888af798a8f8560a83ef24138772561609cbf9d502b07dfc1bb7f0acafe1b829af7a6213bbca623dd67f0893229 SHA512 9fc4027271c0d31660aa0579a3369ad25d87454efa5fb95a17a85e962232e0e35f28ab9e2fa63aef5aa9b89d895c7a97d3edffdd862bbaa5af29d1325a19a2d0 EBUILD shotwell-0.32.4.ebuild 2199 BLAKE2B 50ac5f6cd764cb515945ceb700230845bb200be64a7e7bb94f88847ae351238b1b0352b64b0886e92140471636987add46d3aeb81363ff541a0502884b7a2547 SHA512 86cff4865ca7f7305b58799049e085ea7a03ff93f0738fe33c98680d863c15e48df2425e550717905908659ec6a8e9d604d97c51bc58414def714dd9726a3fc2 EBUILD shotwell-0.32.7.ebuild 2205 BLAKE2B b8fccde94ab5fc0b40d3cecf6bb889a505ce2f485864fbc9201a7242270369401b83f51228e9c91fe6750346813d2d16aaab1654a7c07705abae86580cc08c8e SHA512 ba4842cc36e539c84bfcd76c79dd7291cc573318fa579c83c797f55d43c28e954caa0be5840208fbf0dd3235d754a8001393f1f3dcf2434668163ee6b2742790 +EBUILD shotwell-0.32.9.ebuild 2210 BLAKE2B eac31a001b30ea632664b2c2ca4e772e44b772606bf482f9369e0debc7113a0d0ecfa4656338848aec6cb7be85884d849430f3fe96a5e492b7cac10128e029d2 SHA512 be63f94f8f3473812af5d47a5726737e850f2025ff7137f6539c36d5136717f9305debe0c926c1e2d5b36d761ed6d512fe442e671ceeeca7b6d309a7692f4ed1 MISC metadata.xml 794 BLAKE2B c1eb4a08828db11ba473fe21036201d3b57c2fa36a2bd39b18e7671cf5e4c42b2b9e82956456a0376a60bfc982d9af106577075d936dba3c0cb73947da46f427 SHA512 2c65cdf3c6d5a953b52ad81e0a85d1c1465f5c38c3475e5c1408baea0b14a053255e97c0efc560059c77c51dbe98b72a90c6164fe575e68cba3eb04d4774f490 diff --git a/media-gfx/shotwell/shotwell-0.32.9.ebuild b/media-gfx/shotwell/shotwell-0.32.9.ebuild new file mode 100644 index 000000000000..1cbc27d4c8ad --- /dev/null +++ b/media-gfx/shotwell/shotwell-0.32.9.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson optfeature vala xdg + +DESCRIPTION="Open source photo manager for GNOME" +HOMEPAGE="https://gitlab.gnome.org/GNOME/shotwell" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86" +IUSE="opencv udev" + +DEPEND=" + >=x11-libs/gtk+-3.22.0:3 + >=dev-libs/glib-2.40.0:2 + >=dev-libs/libgee-0.8.5:0.8= + >=net-libs/webkit-gtk-2.26:4.1 + net-libs/libsoup:3.0 + >=dev-libs/json-glib-0.7.6 + >=dev-libs/libxml2-2.6.32:2 + x11-libs/gdk-pixbuf:2 + >=dev-db/sqlite-3.5.9:3 + >=media-libs/gstreamer-1.20:1.0 + >=media-libs/gst-plugins-base-1.20:1.0 + >=media-libs/libgphoto2-2.5:= + udev? ( >=dev-libs/libgudev-145:= ) + >=media-libs/gexiv2-0.12.3 + >=media-libs/libraw-0.13.2:= + >=media-libs/libexif-0.6.16 + app-crypt/libsecret + >=dev-libs/libportal-0.5:=[gtk,vala] + media-libs/libwebp:= + + >=app-crypt/gcr-3:0=[gtk] + x11-libs/cairo + opencv? ( >=media-libs/opencv-4.0.0:= ) +" +RDEPEND="${DEPEND} + media-plugins/gst-plugins-gdkpixbuf:1.0 + media-plugins/gst-plugins-meta:1.0 +" +BDEPEND=" + $(vala_depend) + dev-libs/appstream-glib + dev-libs/glib + dev-util/gdbus-codegen + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + net-libs/libsoup:3.0[vala] + media-libs/gexiv2[vala] + app-crypt/gcr:0[vala] +" + +src_prepare() { + default + vala_setup + xdg_environment_reset +} + +src_configure() { + local emesonargs=( + -Dunity_support=false + # -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support + #trace + #measure + -Ddupe_detection=true + $(meson_use udev) + -Dinstall_apport_hook=false + $(meson_use opencv face_detection) + -Dfatal_warnings=false + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + optfeature "Enable support for the AVIF format" media-libs/libavif[gdk-pixbuf] + optfeature "Enable support for the HEIF format" media-libs/libheif[gdk-pixbuf] + optfeature "Enable support for the JPEG format" x11-libs/gdk-pixbuf[jpeg] + optfeature "Enable support for the TIFF format" x11-libs/gdk-pixbuf[tiff] +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/media-gfx/skanpage/Manifest b/media-gfx/skanpage/Manifest index cf05b4ffb474..84fc4b8d5344 100644 --- a/media-gfx/skanpage/Manifest +++ b/media-gfx/skanpage/Manifest @@ -1,7 +1,7 @@ -DIST skanpage-23.08.5.tar.xz 1317292 BLAKE2B 2ee8e7db4e08c9f6ecac93789b20fcb862f56da8d44d5540268dd71f5e1e79c93c7d67455c534f2b0a50f4f2f99bcfdc1989dfd6ecafb7bd3c5a7bc15ab8880d SHA512 d5ddd8a52ad42421d79a6817eb3430996a9d968b2f824ca3c5adaf9bef69c60f6270b72a9d87308834b79f3038b6347b242c8fa635fd8c28953533061e21d158 DIST skanpage-24.05.2.tar.xz 1332884 BLAKE2B 11d66fec7f13a658d652ca2c70d7f46e50d6c965903573ecfd9ffb4d259c7dd4fc9d2155297c9ffff928ae3c22d67b5642f8c4a31852b1b3f582675bcbb8459b SHA512 aa5dcde24a72332986ca68fbb457097ba08fae04c186654094dbff2ebd0f9b22688370f8a87eed54f0e16265a42adb297d189856a276d8cf56227b90dd7c6ab8 -DIST skanpage-24.08.0.tar.xz 1333828 BLAKE2B 2dae5beecf23940c128504c733bd2f5bb1f9aa6dcaa4bfd9882cfa0f68af246bb6b4a662fa242a46f138adf9ef151265de3008a69b0f354241e7970c945d4098 SHA512 a8a22ef563b5c3793ada8465acf42b2fd9c26fecb5afbc7d45540b4f12fb209d289cda4e768a46bf449122ea306028170df8ca41b2a9a68b602b10c1341c0b90 -EBUILD skanpage-23.08.5.ebuild 1383 BLAKE2B 2b2d5cf4582e9d1e4897b1aeb8c8c3b4fa91b753293eb8886c881bb150186a83df2946e8e278f102baf03005b7ae3c8edf9dd8cd7363545fbad33d3f80e04abc SHA512 c0fab6531ac492693bead97c2b231b2379490bb4de55bb05d4df4650599d15a9602521fe03f0afc1dd64b72ac2bdd362a492838bfb690e6adc57fe2a9321701b -EBUILD skanpage-24.05.2.ebuild 1240 BLAKE2B de3160f2919a1cca15501e081778afa8099102ae29725e1a987c2c8ee7afa30a15fb4bba40abe7597790d08e7c690e7b87ad001d2a7846c47deca77935942a07 SHA512 b82278254de3d8f0686fcc92fa07fee272300f2bf70fbc53fef6e04b55b5fcc1d905927ab1f706aedc789ee7560cbff2470a8b3b08ddbce3d44dbdfe4195fed2 -EBUILD skanpage-24.08.0.ebuild 1240 BLAKE2B 9f3818d5d7a5fe493fc9846f21a524f876805bb14b4b97286795cd5c7c487acc22dc7a0a51b1b913126c5208fc9420029a929a395ecd95c0c4c216a84133f336 SHA512 52e1a0269cd9b483e1a02015793065d06a1ad5e9259f5d15d8ff770de71e256f8a0dbc90426d72c337c1860c44f3008e90ff0641ee451131b64092d1389e24bd +DIST skanpage-24.08.1.tar.xz 1333944 BLAKE2B f811d82efdc3ed3ee3ef317dd78956bbcb054aea4908e28a49f0f258df59cfe8538425df07e73c86283a4027ae5c88e3b6a15e6fa6fd0a2a9ab4f3e108e46bb7 SHA512 bf97c4a3029b666fcfed40a4747350cc523bd969f938e9b031bb1700f19dd058c9a79131c581645656d50a55e7f42f4119393f37c02a49a6f67133a46cdb8a1d +DIST skanpage-24.08.2.tar.xz 1334028 BLAKE2B 9317f9e656981e1115ba360ee93bb0d29eb8d57c629c485c4eb7e3e32a655989f0addfe64bb8b3516683c8c7d05f8309f1f403a03ee47dac3ab0557167fbc98b SHA512 1e77056356ba0118e8d7cf11de78a538af9844faffcbb7f8e278aab93009737670eb70a8c9868d7cda1abee6961d4670ff596acd71ae2060c9e408208bdb3ad1 +EBUILD skanpage-24.05.2.ebuild 1238 BLAKE2B 8606f527b934653bacfe697ce5ac498c587a07a8fa3911c870a88112fb66d75be5f3ac88d21026142b95f6b974756848e4e2584cc1da36dc467c00fc8c02c3ee SHA512 a217155d141343a2a14a52eeae3a11acd96112e98bb19ab3451cf164388f149b6602da32cbc8ae5507a8e24bce478a19995315e066388d73f509661c969f0d44 +EBUILD skanpage-24.08.1.ebuild 1238 BLAKE2B 934b1cdb3a5be00ca0ef2ef826f9dde6c37cbdc1eebb0bd3848036ef63965aab05ea77b8c9450673b7358fd3145fde50c2e2936918a9a3d28126a29e42b7d433 SHA512 b2b4410e82e9f73b00be6e014adc0b4444bd6fb276ca1a985eb52f70787dff646724b4d56ec4e80dbc3d26be7292306aa32b7f0e5ab9420a8da2bcea4bd699d1 +EBUILD skanpage-24.08.2.ebuild 1240 BLAKE2B 9f3818d5d7a5fe493fc9846f21a524f876805bb14b4b97286795cd5c7c487acc22dc7a0a51b1b913126c5208fc9420029a929a395ecd95c0c4c216a84133f336 SHA512 52e1a0269cd9b483e1a02015793065d06a1ad5e9259f5d15d8ff770de71e256f8a0dbc90426d72c337c1860c44f3008e90ff0641ee451131b64092d1389e24bd MISC metadata.xml 374 BLAKE2B 3666d82bcae95e5b38d777c81491cc25488aff6b55e112f6eebbaf80ef603d40e8287fe33d649e647c2f97b9caca237f2b9785ee49ff9c2f5c81576a2cf33379 SHA512 fcc360165d6fa100c9d92c2528f4f2ba291a0bf6b05a7b252b5bb215514144e9b699915f98d7aecda6869bf50bfbb51b42b3186679e5db2c3901cb4d6151e6e8 diff --git a/media-gfx/skanpage/skanpage-23.08.5.ebuild b/media-gfx/skanpage/skanpage-23.08.5.ebuild deleted file mode 100644 index e03bdc71cba1..000000000000 --- a/media-gfx/skanpage/skanpage-23.08.5.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_CATEGORY="utilities" -PVCUT=$(ver_cut 1-3) -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="Multi-page scanning application supporting image and pdf files" -HOMEPAGE="https://apps.kde.org/skanpage/" - -LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0" -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="ocr" - -DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/libksane-${PVCUT}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/purpose-${KFMIN}:5 - media-libs/kquickimageeditor:5 - >=media-libs/ksanecore-${PVCUT}:5 - ocr? ( - app-text/tesseract:= - media-libs/leptonica:= - ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package ocr Tesseract) - $(cmake_use_find_package ocr Leptonica) - ) - ecm_src_configure -} diff --git a/media-gfx/skanpage/skanpage-24.05.2.ebuild b/media-gfx/skanpage/skanpage-24.05.2.ebuild index 89428258adfb..d19cdc047d27 100644 --- a/media-gfx/skanpage/skanpage-24.05.2.ebuild +++ b/media-gfx/skanpage/skanpage-24.05.2.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/skanpage/" LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0" SLOT="6" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="amd64 arm64" IUSE="ocr" DEPEND=" diff --git a/media-gfx/skanpage/skanpage-24.08.1.ebuild b/media-gfx/skanpage/skanpage-24.08.1.ebuild new file mode 100644 index 000000000000..5b62a242083a --- /dev/null +++ b/media-gfx/skanpage/skanpage-24.08.1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_CATEGORY="utilities" +PVCUT=$(ver_cut 1-3) +KFMIN=6.5.0 +QTMIN=6.7.2 +inherit ecm gear.kde.org + +DESCRIPTION="Multi-page scanning application supporting image and pdf files" +HOMEPAGE="https://apps.kde.org/skanpage/" + +LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0" +SLOT="6" +KEYWORDS="amd64 arm64" +IUSE="ocr" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[concurrent,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtwebengine-${QTMIN}:6[pdfium] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/purpose-${KFMIN}:6 + media-libs/kquickimageeditor:6 + >=media-libs/ksanecore-${PVCUT}:6 + ocr? ( + >=app-text/tesseract-5:= + media-libs/leptonica:= + ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package ocr Tesseract) + $(cmake_use_find_package ocr Leptonica) + ) + ecm_src_configure +} diff --git a/media-gfx/skanpage/skanpage-24.08.0.ebuild b/media-gfx/skanpage/skanpage-24.08.2.ebuild index 73a1e52e8c7c..73a1e52e8c7c 100644 --- a/media-gfx/skanpage/skanpage-24.08.0.ebuild +++ b/media-gfx/skanpage/skanpage-24.08.2.ebuild diff --git a/media-gfx/springgraph/Manifest b/media-gfx/springgraph/Manifest index 1833d7de48c2..9d9d68cb1317 100644 --- a/media-gfx/springgraph/Manifest +++ b/media-gfx/springgraph/Manifest @@ -1,4 +1,4 @@ DIST springgraph.pl.88 29818 BLAKE2B d203bce543b0d6d8bd8519a24c3592a852971fb18219b0b34dd207724ed1db2859befcd6f69d7b00e2c6492fdabd5a8edf75bee634682f0a56a5361c9e832651 SHA512 51d7a840778478498c23d61af7e0ef0bd795953110850d0a1ec403146ce843c6eb5efa5c0c55d84a9995aecadf7657bc253dbf5a72354207d38a6e269b2f1325 DIST springgraph_0.82-5.diff.gz 3110 BLAKE2B 8459ffffe80cba463e95677ed264030ff150375bf2a163c081e719274b0f92cba27e5d8e5bc80923e433f332ee58773a7cbd053fc9680676193e7b852b4803bb SHA512 dcfc214c116cc8040b7eedf9a4864e84bc7c0b1f036fafb6322d9433564762135d1e845bb75891a380907059f7ebba7ed72efafb733a83a517f14af327d32e9b -EBUILD springgraph-88.ebuild 779 BLAKE2B 1814bec470e2038af556776c8b8a57c9e813b683297e79d7de87e2856f476860e792fb44796615f7747a4fa0ed68faccfd682a7bc259738c592daa6922c652fc SHA512 8b9a238b766743d59002e059ef859a80a9270547c9f2b893b5615c2f151a4ea14c25758bd0112b0b17adcd7c52d8a939d671786a20686b0500f8470b4628d6fc +EBUILD springgraph-88.ebuild 773 BLAKE2B 1c2ecd132b183ff8079b41aa00e53facd5cfa1108f01b9adc3b1c1a467e647c54f94da7104c9c86c26ad01d3da062fb82ba04b281bf7bd9b674ec1611fb94dd0 SHA512 3b9e0dc599d1d1bf0c9af10086ccea9acabdc6bba2247917c9428f0fd9e8bfcae377eaa921394d87f115ad55ec5ecc1221836af8456c9353f7298764f0c6389c MISC metadata.xml 710 BLAKE2B fa3b8384f430ae86afa1ca8b33907b5214a530364e49620ee80effc6c9b174db71b3d5617c37246982e8d20ef96f3885a75dfae65b4f8ec7bab8889197460d5e SHA512 1a6b997e402c4b39377fa903f67256770f11ef07c1c8948b08576f0f8774d5b9684cfd9a4f99318f6a1309b4f6d9a39953587f6e222aa78fc10e9b9584a5ebb4 diff --git a/media-gfx/springgraph/springgraph-88.ebuild b/media-gfx/springgraph/springgraph-88.ebuild index eb82210357fa..0247f2081e93 100644 --- a/media-gfx/springgraph/springgraph-88.ebuild +++ b/media-gfx/springgraph/springgraph-88.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.chaosreigns.com/code/springgraph/dl/${PN}.pl.${PV} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="" RDEPEND="dev-perl/GD" diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest index 4684099b27a4..d12265639493 100644 --- a/media-gfx/superslicer/Manifest +++ b/media-gfx/superslicer/Manifest @@ -1,4 +1,5 @@ AUX superslicer-2.5.59.10-boost-1.85.patch 2693 BLAKE2B eb434eedc4b1188c1e8df875d8f57ba9f3c9a6ea88521f5707c47e16b23e7939b9382dc416d023293642a3e5af6317e51058adf691cd2201b92ea8f390b60ca8 SHA512 c94ef6475a3dd81bfbfe80f44b571094476b21725b496fe5b26d81d55aa987953f9c642c0275260f9f149d1a6b85addf5b750ff4a306d555c324304055a4375b +AUX superslicer-2.5.59.10-boost-headers.patch 1561 BLAKE2B 9e8fd0003bf95786dfffc5a7d9da4fba997ebe8cffe204dd7ebc6b2c4a887f80d909f76c6686b4c0ae73278e17df45db53725dffa6f44cfcff3f7a15029ec722 SHA512 2df7c4f05847b3b5422fff517dfbbfb17f58da4c03c6224d7c23e07ff1939bc75819d3cf03e237f221a1f83322f73779cea03ffd8b25dad2a274be7c32e48508 AUX superslicer-2.5.59.2-boost.patch 12899 BLAKE2B 53cfab69e12af506c276fcc34851c62deba2c4ef5682176977ed1b07a60c1967264f56752f0c286aeb059fa7924272fa5d837c8c2add768590dd9604444705fe SHA512 798a275a6b310e6fa16e630a841fc3198fc287fa1ac9de0fc70a41effadd30b10887fed969ab59e73993c9ca1830ac1a8e633bbeaf0560a9225d0c5f1b00eab3 AUX superslicer-2.5.59.2-cereal.patch 1807 BLAKE2B 0ab8eb8e7f283e09e19c55d95bd6fe874797cc3d67f153a7c3920e1ff02e3b974c64f0dfc510b0cf3dde2484eeb00f550eab636e304bb6ba3c76b066bf537caf SHA512 503d3e8483315affb77f9bf9299e529455b73484cb278eda413a7e17f27f687b24158210b2fbf50581a970821930511934c994fa70c2ef8b68702f7614528d38 AUX superslicer-2.5.59.2-dont-install-angelscript.patch 427 BLAKE2B 8f853d1c8c861bcb18e3272467c5a4ca745b67790d88be9943d4cf92f1f5dfdd3b4e022ba697c90997ead2c8ad77debf7ea96fc262a21caa2087cd7b62901bdb SHA512 c4a718ead714b9d2a22cff7e9a48846954f9606290ad533c0e491429b3455f43dee7a10a93a34f564e03e9e3b2eeef87d8276f6062d770f57afef27a7fbdb868 @@ -20,6 +21,7 @@ DIST superslicer-2.5.59.2-profiles.tar.gz 16253775 BLAKE2B 20c99b14ba8ee26ea2a21 DIST superslicer-2.5.59.2.tar.gz 45622782 BLAKE2B ff2fecf233d2710d706b64eb2191bfac39df3f631634de5f9eb1bca6ca712e94b0283beb7c6e9f3b293dc308b50240871ef8651a5355a4d7c5ea6092ac1a836b SHA512 af8878bd8e0c3e0dd5247ce01bdbd2b42b6766d81efbde11b71c6642787a12dfeaea91e653ac928066b9610cd911ea1f4dc77cf4823639030b3c104d955b8cbd DIST superslicer-2.5.59.8-profiles.tar.gz 17931886 BLAKE2B 953a777dd12971c355a5f48148d4c3831b9435cf08f1baecb32ff0ef6245678f81c53bf5078cc4d6d04642e9ee18e1023d5d1578ebdf1384c7c1ce44a1153c50 SHA512 2e4561de7c57308a91c8964c8a957bc10c5e4cedc47c5fc37633bbcf78e3576ed1eaa6d7126485e94eb0aa593940c73a460f3d5ad65f33001d32953caa2fb4e1 DIST superslicer-2.5.59.8.tar.gz 46021260 BLAKE2B 04abffd1a9cdf417d544539d5cde9b3559f2da7c1cb24cfa0e4a5d11359bca53cb25a90a3a14b26ee10e33e283ba4774d404265e6740b5457f82110be2a44af9 SHA512 57ef6c129c24378d6f4f78d34a60ed15668a8c5c266fa706937edebbd7b52d145657aae1e46a7b1d19dabaf403465bc5af50a94fa70205456bfc87a1458bac6e +EBUILD superslicer-2.5.59.10-r1.ebuild 2799 BLAKE2B 568bbab777f09dc266e9c6ecf9d40d908d1346c41520d58c5133e315bd1b282875645af2a73172a0cf9e376ae903e7d66597005a486b451a21a9e44a2adb254d SHA512 11e0a7f449fe51e3bae7108c3773e2acf31ae67827934e87126cf2355262ee5fec307d4ef842c640a381311c60449d83bba97b5ecad0752b2d9698d617d2b58b EBUILD superslicer-2.5.59.10.ebuild 2748 BLAKE2B b6865b9c9d61b0a5afd49b1632488cc9983c169af5b7ded19bcf3c146bd1870fbc940c699005e9777793d3c759ad517f7e103eded6f4b6350768929d298356ac SHA512 dd31e1a229973bc91fabf18a415a111859c230888477223a3d6df19c79fed1b06fbca9245e0eac549beffbcc6a27123f7e2b0e1831c1a23e737f0aedbc4d9f1e EBUILD superslicer-2.5.59.2-r2.ebuild 2490 BLAKE2B 5f1775a715b74a581daec55361e3c0b813d09e6e46fb47c27e680f0f739a822c9669fe7dc0e49b35365f78bde93ae5f112446580c058f56f17297d4e010f1f2b SHA512 febd71376f386a2c6b6cbd2f39b7f58e86f607475d33c9792bf099f195a1c6a0971b24b76dff8615e1bce2713c334ba702b78bff0e810dce5db85fbf5a464704 EBUILD superslicer-2.5.59.8.ebuild 2743 BLAKE2B 6a7842738221df57aa1ea8e0682c50252e044e74bf90d69dc894d3bc92586c7e9520bc429cac3d1e53907cef3a3f56311f0f454f41fed4c915463a412ad8878f SHA512 d5ef833bd7a87d177df2cf99ec6ad5b5eb31e61e4babc315020d602b8eac5aabfa0c5d70f22de86f186cf1c3efd935629166695533939c8d33861b9faf22463f diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch new file mode 100644 index 000000000000..b6689d9a298e --- /dev/null +++ b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch @@ -0,0 +1,45 @@ +https://bugs.gentoo.org/936146 +--- a/src/slic3r/GUI/GLTexture.cpp 2024-08-10 11:05:17.663411745 +0100 ++++ b/src/slic3r/GUI/GLTexture.cpp 2024-08-10 11:05:34.463543701 +0100 +@@ -10,6 +10,8 @@ + + #include <boost/filesystem.hpp> + #include <boost/algorithm/string/predicate.hpp> ++#include <boost/log/trivial.hpp> ++#include <boost/log/core.hpp> + + #include <vector> + #include <algorithm> +--- a/src/slic3r/GUI/RemovableDriveManager.cpp 2024-08-10 11:24:53.572234573 +0100 ++++ b/src/slic3r/GUI/RemovableDriveManager.cpp 2024-08-10 11:28:24.393792051 +0100 +@@ -22,7 +22,7 @@ + #include <pwd.h> + #include <boost/filesystem.hpp> + #include <boost/system/error_code.hpp> +-#include <boost/filesystem/convenience.hpp> ++//#include <boost/filesystem/convenience.hpp> + #include <boost/process.hpp> + #endif + +--- a/src/slic3r/GUI/ScriptExecutor.cpp 2024-08-10 11:28:32.423851365 +0100 ++++ b/src/slic3r/GUI/ScriptExecutor.cpp 2024-08-10 11:28:41.893921315 +0100 +@@ -10,7 +10,7 @@ + #include <boost/algorithm/string/erase.hpp> + #include <boost/algorithm/string/split.hpp> + #include <boost/filesystem.hpp> +-#include <boost/filesystem/string_file.hpp> ++//#include <boost/filesystem/string_file.hpp> + + #include <fstream> + #include <string> +--- a/src/slic3r/GUI/BitmapCache.cpp.old 2024-08-10 12:00:52.538869133 +0100 ++++ b/src/slic3r/GUI/BitmapCache.cpp 2024-08-10 12:01:15.519040423 +0100 +@@ -6,6 +6,8 @@ + #include "GUI_Utils.hpp" + + #include <boost/filesystem.hpp> ++#include <boost/log/trivial.hpp> ++#include <boost/log/core.hpp> + + #ifdef __WXGTK2__ + // Broken alpha workaround diff --git a/media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild b/media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild new file mode 100644 index 000000000000..a19e63212295 --- /dev/null +++ b/media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" +MY_PN="SuperSlicer" +SLICER_PROFILES_COMMIT="ca25c7ec55dcc6073da61e39692c321cdb6497dc" + +inherit cmake wxwidgets xdg flag-o-matic + +DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" +HOMEPAGE="https://github.com/supermerill/SuperSlicer/" +SRC_URI=" + https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/slic3r/slic3r-profiles/archive/${SLICER_PROFILES_COMMIT}.tar.gz -> ${P}-profiles.tar.gz +" + +LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="test" + +RESTRICT="test" + +# No dep on sci-libs/libigl, in-tree version cannot build +# static library currently. Using bundled one. +RDEPEND=" + dev-cpp/eigen:3 + dev-cpp/tbb:= + dev-libs/boost:=[nls] + dev-libs/cereal + dev-libs/expat + 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/libpng:0= + media-libs/qhull:= + sci-libs/nlopt + sci-libs/opencascade:= + >=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] +" +DEPEND="${RDEPEND} + media-libs/qhull[static-libs] +" + +PATCHES=( + "${FILESDIR}/${PN}-2.5.59.2-boost.patch" + "${FILESDIR}/${PN}-2.5.59.2-cereal.patch" + "${FILESDIR}/${PN}-2.5.59.2-dont-install-angelscript.patch" + "${FILESDIR}/${PN}-2.5.59.2-gcodeviewer-symlink-fix.patch" + "${FILESDIR}/${PN}-2.5.59.2-missing-includes-fix.patch" + "${FILESDIR}/${PN}-2.5.59.2-openexr3.patch" + "${FILESDIR}/${PN}-2.5.59.2-wxgtk3-wayland-fix.patch" + "${FILESDIR}/${PN}-2.5.59.2-relax-OpenCASCADE-dep.patch" + "${FILESDIR}/${PN}-2.5.59.2-link-occtwrapper-statically.patch" + "${FILESDIR}/${PN}-2.5.59.8-additional-imports-fixes.patch" + "${FILESDIR}/${PN}-2.5.59.8-fix-compilation-error-gnu17.patch" + "${FILESDIR}/${PN}-2.5.59.8-libnest2d-link-xcb.patch" + "${FILESDIR}/${PN}-2.5.59.8-boost-replace-load-string-file.patch" + "${FILESDIR}/${PN}-2.5.59.10-boost-1.85.patch" + "${FILESDIR}/${PN}-2.5.59.10-boost-headers.patch" +) + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_unpack() { + default + + mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die +} + +src_configure() { + CMAKE_BUILD_TYPE="Release" + + append-flags -fno-strict-aliasing + + setup-wxwidgets + + local mycmakeargs=( + -DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB" + + -DSLIC3R_BUILD_TESTS=$(usex test) + -DSLIC3R_FHS=ON + -DSLIC3R_GTK=3 + -DSLIC3R_GUI=ON + -DSLIC3R_PCH=OFF + -DSLIC3R_STATIC=OFF + -DSLIC3R_WX_STABLE=ON + -Wno-dev + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die +} diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest index 16ec81c3af40..36010d28390c 100644 --- a/media-gfx/sxiv/Manifest +++ b/media-gfx/sxiv/Manifest @@ -1,5 +1,4 @@ AUX sxiv-25-makefile.patch 251 BLAKE2B 05b96799c7e94c2a907158becfbd3d0844a3919f75e7c4e6e8f994ec2881f173919c34625d80357882b28157f72ea6d0bbd6331473c6b213857c3e8a5db92bad SHA512 8e7b30bb73b87981b2d2c4e9bff8f62b5e59d341410dee0d4ecb889a0f39cfb38539a8d6ef2a738517ab5034c035e6588a4d2b7220bd408a2dd040f6cb8d7088 DIST sxiv-26.tar.gz 48569 BLAKE2B a73707e2fd699b53e38ddc48710a73b945d4e102743567283d7351c92c513e4e57a32c409267593a2c5808caf811b7caeb555f8ba2762f1cc76a421aceff0e95 SHA512 c4bd56ea14e520ea9b116e275009f2089e5c434d6894281215b09d07572b2d3190c3c3eca015a2933328d704afb7d443a66e858b4e6904a3d4d45378b35d22cb EBUILD sxiv-26.ebuild 1269 BLAKE2B a0b0b8ce87c89880c1178851d35e4b91da60a881260c79e7459776c3caade214258bd03b4fb96d800b3babe8f489e4f0b93e29bae45bf59a5ab9fa32130cd355 SHA512 8545378db759030ec1d768eb1a46be81a64ec662e250386d92a58a1c08fe13fa2cb3300b1d076eb4d7bc6bd4670c0d42322cb011c731c09ec099a02824754688 -EBUILD sxiv-9999.ebuild 1266 BLAKE2B 763b6673b358d2fae495e4509042d670fb406f27acb4557e9c259a929d05c4f482e20a1b0c226e76a8caab2390acedf3b22db1ee2dc05f79d41313d251f61162 SHA512 e36dc294b6a29021881d64fa48fd0dd93fc6adfd1761c358af51371c32281228f3519fdc8cc775dc9e925e762183a39e8075b667d2e4845c325a2670c7f86a0e MISC metadata.xml 244 BLAKE2B d7b28da2563099a3ae3aeaf6611e870f638d650a8997223ceb22cd178af94887d38f3082b4c357b463b309641d08d4b64f9db86e167f57ec4f80a6655565d41b SHA512 390c1b4771442a67506cdc8dbd5ff7ca2673af0635539e4cf6f7c252d29dd91b7e667f07992b412fd70649397ee9bc11fa0f3382e04ba74d3a7102a3ef15d194 diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild deleted file mode 100644 index 79d85908dc89..000000000000 --- a/media-gfx/sxiv/sxiv-9999.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop xdg-utils savedconfig toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/xyb3rt/sxiv.git" - inherit git-r3 -else - SRC_URI="https://github.com/xyb3rt/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -fi - -DESCRIPTION="Simple (or small or suckless) X Image Viewer" -HOMEPAGE="https://github.com/xyb3rt/sxiv/" - -LICENSE="GPL-2+ public-domain" -SLOT="0" -IUSE="exif gif +jpeg +png webp" - -RDEPEND=" - exif? ( media-libs/libexif ) - gif? ( media-libs/giflib:0= ) - media-libs/imlib2[X,gif?,jpeg?,png?,webp?] - x11-libs/libX11 - x11-libs/libXft -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-25-makefile.patch ) - -src_prepare() { - restore_config config.h - default -} - -src_compile() { - emake V=1 CC="$(tc-getCC)" HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0) -} - -src_install() { - emake DESTDIR="${ED}" PREFIX=/usr install - emake -C icon DESTDIR="${ED}" PREFIX=/usr install - dodoc README.md - domenu sxiv.desktop - - save_config config.h -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/media-gfx/termtosvg/Manifest b/media-gfx/termtosvg/Manifest index 971faec00585..d35c5ee5a339 100644 --- a/media-gfx/termtosvg/Manifest +++ b/media-gfx/termtosvg/Manifest @@ -1,4 +1,3 @@ DIST termtosvg-1.1.0.tar.gz 385300 BLAKE2B 63750444014ab6451ef32d884f9ccc095b58171438f0b5326d5bcb77ebb87daf6f212cf0c07ef426859b9a50dbcc9e77325ab6901f2a6ff95f43cca26c948010 SHA512 4e5000d885b2ac4fc281d9f45c3be3d6b4c93ed604d2d929471843edc7e0ee78a8cc5ee28f92b51050d3f46d3302a2dcbbba3c9a2a3775eebe87d8171c1c6e8d -EBUILD termtosvg-1.1.0-r1.ebuild 594 BLAKE2B 1fc42a2c613fdc95478db56c0f1e215b4c34420e8242a9d72de4e8df4961e43cc90e1bd73f6149a42abde428ee459029c4d0f8a25a365d57831a3915e39a5a1d SHA512 0bc24fb3d85141d34dc172a157c7f3cbab9e479441069974bbf7818fa4f1b29807e5a7b1b0d3cbdf74fc648ce829b762fede083caedeefc096a5620e820844c9 -EBUILD termtosvg-1.1.0.ebuild 560 BLAKE2B c11b4b949a3d862395536031b8bc1bfc085886fa31e275ae4f10b328e3deb1ff10ee93161e1fa428c27a984435f6c9198f6ff6d34b902f6e13a096ecbabe6073 SHA512 383646d52ff6e361f5b4890cbd2df268bccc9cddbba158ddd82d09ab2686558890e6b9b6e58b9eeffaa1d7e44a15752b7b40b6df8215f6d4a30f72866dccf9d3 +EBUILD termtosvg-1.1.0-r1.ebuild 594 BLAKE2B 554e9268d144485aa1c49fcdb573c71f7c15b3ae09f7fbadf62724425980b179d6f621111270c8544c3b94da078aff25fba4c2c58e9619483c8177c4bb56940c SHA512 11e4de6d9469383914f047e004315d41ee6cada8d4dbcadd955a7f55529b4e7581bc34e5a5f65e0d144e9bd1d450cbd11c05355ae1e0da55b9f32170f0ff3b3b MISC metadata.xml 298 BLAKE2B 7491eadab526b2b39d7432db0d75e4a1abd577c93dc5619cce66a4c82cc9ec6d914af9e35761445ead493f46efed5a00da0b0c8b11e16a9864754e0dfcd2fcce SHA512 2cd1ba813187bd4418c53acf680ba1787546015c533897d241cad7fe479e78c090892b4666d86649096f0a265b5856c2799199cec5751647b2cbdf5534780f05 diff --git a/media-gfx/termtosvg/termtosvg-1.1.0-r1.ebuild b/media-gfx/termtosvg/termtosvg-1.1.0-r1.ebuild index c9922d7c383a..004809937815 100644 --- a/media-gfx/termtosvg/termtosvg-1.1.0-r1.ebuild +++ b/media-gfx/termtosvg/termtosvg-1.1.0-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 diff --git a/media-gfx/termtosvg/termtosvg-1.1.0.ebuild b/media-gfx/termtosvg/termtosvg-1.1.0.ebuild deleted file mode 100644 index e45cd5e8c87e..000000000000 --- a/media-gfx/termtosvg/termtosvg-1.1.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) -inherit distutils-r1 - -DESCRIPTION="Record terminal sessions as SVG animations" -HOMEPAGE="https://github.com/nbedos/termtosvg" -SRC_URI="https://github.com/nbedos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-python/lxml[${PYTHON_USEDEP}] - >=dev-python/pyte-0.8.0[${PYTHON_USEDEP}] - dev-python/wcwidth[${PYTHON_USEDEP}] -" - -distutils_enable_tests unittest diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest index c30b2e8b59f3..bdd902b4d9ff 100644 --- a/media-gfx/transfig/Manifest +++ b/media-gfx/transfig/Manifest @@ -4,5 +4,5 @@ AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980 DIST transfig-3.2.5e-gentoo-patchset-r1.tar.bz2 21160 BLAKE2B 093020827fc0636f7549c3b325e4f148aa52407d8e288038dd02012875737523e83e0717662d04e463a01e8cfacfabffaaa4362b5bb1276c4f2052f6653fa26f SHA512 dbef1ca464929de45f3c706e76eb9f324ea9e692cc8c924893926e07ef7d4e0dbe597bcf465a9c7fc9fca22abe0acc6784ab09658a18aeff4ba44921b52b02ff DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e -EBUILD transfig-3.2.5e-r2.ebuild 3546 BLAKE2B 2ed5fd1a33b9bbcff7dd103e51ee83061f5b5517fdedfa9330f51e48eba4e771667bf27eb57c542ff397a5b2a1f7a4d9692af32306debf3c4b041ac6329ba86b SHA512 55588bc54e4b2af5860a78d3c4c7e04b1fa7a47480333de39063918ef74211c5ce457d046134080f04e9717d77b8df5348291e239af70aa898d3cbd880d70bfe +EBUILD transfig-3.2.5e-r2.ebuild 3540 BLAKE2B 4b238a7ec2a4fd8b420b8ea95a8e1eabb1e9ad9440ebbd5089376947966fd6c94e479304decabccd7d081104dabdcd401a14c28baf54dbc0aacc706fe477b5e5 SHA512 9b3b8be47db2947b4676e77daabcc8333d5c5f676947767dfdb18b53362715cd4593926e7c2d1e7d2f9b93bdbc1486edb295b30f2192733aca0ea91d4024f023 MISC metadata.xml 484 BLAKE2B 8f0c03a4eae95a088a590133f0a911b6ff795d23aba1fddcafeceb40433b5af14c530b288552e6e97d5fd981dd37fc8491a7e4cfe5b79cf872c2fb70015d7cb6 SHA512 4c8313b75726d3fe87f68b7810f9f69a0a9fa4deddd856d5e7276bb5b419400ca583a96d59f3333edba52c71bc53f4687dcfe4e72e37e85e80a9cc95c52a733e diff --git a/media-gfx/transfig/transfig-3.2.5e-r2.ebuild b/media-gfx/transfig/transfig-3.2.5e-r2.ebuild index 3aa1cb9bbdf4..252609df7e84 100644 --- a/media-gfx/transfig/transfig-3.2.5e-r2.ebuild +++ b/media-gfx/transfig/transfig-3.2.5e-r2.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" media-libs/libpng diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest index cfcb2d3b4c1d..9520e071db04 100644 --- a/media-gfx/viewnior/Manifest +++ b/media-gfx/viewnior/Manifest @@ -2,4 +2,4 @@ AUX viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch 1669 BLAKE2B db9e54bc5 AUX viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch 2695 BLAKE2B 7b1f23195267443b5920b1e11cb1bc4f9177e86f32bc74f92f6afcc8b2a16bf42dc7f40e9865e37ca0d5bb76a3f9916654df34b41a66bd11f03540f10624c5b1 SHA512 b2921294703d2791f2bc8e71de758ae42031b14b422eab462cebb5f49c410736c67dce919358425f77ef17c941f7e4f363f932af605696cc745c40fc4fa5c9a7 DIST viewnior-1.8.tar.gz 169219 BLAKE2B 6f6da16aa987acce8a48d24a645e1c033f113bb6e291da9f17810a7a04e5007d27c2f1afe3c62cc2d192003633a4128fb04a031160fbd51efbd0bb7dfabd8970 SHA512 0f9698801172ef6b8f5df4132526b2e605e9aa9fd69cf41a091a3623de9b2e84ca857e625aaa9e83f29df318f70a13fb458bac0df11ae46837b78ef257a00bee EBUILD viewnior-1.8-r1.ebuild 1171 BLAKE2B 8de7ca3d51a65481206f8c3a1e0102b5a7567266042d2a2d441e3232bcad1a326f6064f729d96f4773787cf6f6cc03d11a6933269325048b790c273aea62e813 SHA512 99bd3b280ca8c385b6c7570af2426ee1214b839c86c3f140212be8a0c6367e4fcc9f79301cad7479f3683e5ebed9695eb14e75f257cd7ed9667bfbca07ca9e37 -MISC metadata.xml 553 BLAKE2B 7fa77da8d1dcd0a0b6d53f1de26b13ead4edaf6be6ea93858328ce412c7c97e40240aebbedd68ccc66469992b637b11d14763435e3451ac16dc1a1a72e9f2e2a SHA512 e3b2daa2db92f02e6e2c7e51828a60acd9b74a99949643e1cdc429e9f02dacf0e3f7b7d7c8bc86c10eb46fe1aaa06f3b07d8e7ddc491951f8e14f881d69c61d0 +MISC metadata.xml 326 BLAKE2B 90b664c16db713e898edc35f6e706b8319b3e873a67c078df47b8393ee923b486210608476ec49b9d0b5d147f10680a82797559e94fd21dfa3b32e3213316e22 SHA512 b7d4eb8592240f6b4b265542b5eea3203a3786be916e7b00405f6ecf9361e9d89be4bced172a9a8e31d4a60e6eebee092806c812e4db577adccd12dda2c87595 diff --git a/media-gfx/viewnior/metadata.xml b/media-gfx/viewnior/metadata.xml index d603d71cf45e..f752ae0c3f88 100644 --- a/media-gfx/viewnior/metadata.xml +++ b/media-gfx/viewnior/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gentoo@tastytea.de</email> - <name>Ronny Gutbrod</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">hellosiyan/Viewnior</remote-id> <changelog>https://siyanpanayotov.com/project/viewnior/news</changelog> diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest index c5e4a6298a65..62ad70b33a2c 100644 --- a/media-gfx/wings/Manifest +++ b/media-gfx/wings/Manifest @@ -1,4 +1,7 @@ +AUX wings-2.3-nogit.patch 410 BLAKE2B 38d8fa6fc909ba2c35b29f34a0a715c86f8539fd6646b35d221ba559ee4c1bcf5963f69bbac93a55a4af59f0747c6ff768e0ef84cd31f57cfdfcc22f203b9570 SHA512 5ad3e83553ff3930d3a5d025f59aa6b0b5f2dd7d24fecbf17e3c2a4e625d53e7ec5b5078fc9a57ec5f898382be52508a5facdc9add1850eb5b3ba3df618cf306 AUX wings.sh-r1 181 BLAKE2B d892abf053f7f0039e50057869a4a0a26438f7312dca62561fc22280b2341621e17f13c97e7031072b242db42c533f4012b21ac46645cf32e121e5aad1884774 SHA512 739b8e68a1b47a3f4adbff8a1f34b713d7b0ac2d8103d85d3fdd6020bf08e81c231d210239c140d23e1dd135ff7122bfd43327a27585a333eafab473ea1480df DIST wings-2.2.6.1.tar.bz2 3266532 BLAKE2B a3ec86925632df7d231d620a47841781f8b2e66a50d13857c57fa6389890e7a03fed8bf5e0d09b03de00d6360ee0e4129a4178aec34270367879890f9430c208 SHA512 dba4b189c80180533b7a6c10be5c236a4a9fdacaa7dc491a0d1892149f7a75e636778acc11e38ef82a06718ae705e640da2e1618ec655828d2056e6b3864aba4 +DIST wings-2.3.tar.bz2 3561319 BLAKE2B 0f3dce900dcae74516b57555f188aa578a5ea138d0e55e2b15ba946581652e470f5f596bd7e7661394674d437c8cbbe395bbf2e769af2a77d6940fddab1c86df SHA512 b5b054d974af2443cbe7d46a32cb8dfb7641054fa68aea9245e3d3100b21d223f443171572c3f371f25d937dca8cdb11870c61ba21e28632afef7886b4b2487b EBUILD wings-2.2.6.1.ebuild 1131 BLAKE2B 10b1c344453222b75ee28c17bf27327484b6d1572172bbe70a325e908f51b0ccbfb83d115c3dc4a1ad5c496358f7bce16ccb6ed90802246833ff440851972241 SHA512 859c6a5d99f12bd3732432abf5aa38cc381f5835402d7741e3dee1f5f4756920030fe5084fb583a246a21442b7b1446d795975f4bd11b0da598f80cd098eaea3 +EBUILD wings-2.3.ebuild 1304 BLAKE2B 07ac45947835b80cd6eb4ed28db44fb88b8a5f5dcd0023c99ac4974d8a645307959dedd0ad212173e4f12c63ca926d1dacb8396d2832f8cd8f04ac3c58b1483f SHA512 1a2f8ebfcb214ecfc1e3063d516b09885b34c2d44b35eb7717b5e7747fec97fb2718379609c50d8173d3fdbc7b88801e64cf9bce91bb081635deba2ab47a33a2 MISC metadata.xml 568 BLAKE2B aa2315a1a8ac463ef344365b2273b5f54c4aa5df6239c412aea142f910123aee2dac95bc606a1bde609413475e93b17305b03b64bed320aeb3e93d7421b815ec SHA512 969a180e5b170e8eb27fcb971e320c838610b462ea42a7b1b8d758c084a81658d2d8777aa0d885881388942cbf2d66eddaeacb09346e09b55c0623ce5f688e46 diff --git a/media-gfx/wings/files/wings-2.3-nogit.patch b/media-gfx/wings/files/wings-2.3-nogit.patch new file mode 100644 index 000000000000..734fbbeb717d --- /dev/null +++ b/media-gfx/wings/files/wings-2.3-nogit.patch @@ -0,0 +1,13 @@ +--- a/Makefile 2024-10-20 12:12:36.987424596 +0200 ++++ b/Makefile 2024-10-20 12:13:55.487467140 +0200 +@@ -14,10 +14,8 @@ + # Check if OpenCL package is as external dependency + CL_PATH = $(shell $(ERL) -noshell -eval 'erlang:display(code:which(cl))' -s erlang halt) + ifneq (,$(findstring non_existing, $(CL_PATH))) +-DEPS=cl + endif + +-DEPS += libigl eigen + SUBDIRS=c_src intl_tools src e3d plugins_src icons + + # diff --git a/media-gfx/wings/wings-2.3.ebuild b/media-gfx/wings/wings-2.3.ebuild new file mode 100644 index 000000000000..a822318d4c2a --- /dev/null +++ b/media-gfx/wings/wings-2.3.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit toolchain-funcs + +DESCRIPTION="Wings 3D is an advanced subdivision modeler" +HOMEPAGE="http://www.wings3d.com/" +SRC_URI="https://downloads.sourceforge.net/wings/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >dev-lang/erlang-21[wxwidgets] + dev-libs/cl + media-libs/glu + media-libs/libsdl[opengl] + virtual/opengl + dev-cpp/eigen + sci-libs/libigl +" +DEPEND=" + ${RDEPEND} +" + +PATCHES=( "${FILESDIR}"/${P}-nogit.patch ) + +src_prepare() { + sed -i -e 's# -Werror##g;s# -O3##g' $(find -name Makefile) || die + sed -i \ + -e "s|IGL_INCLUDE = .*$|IGL_INCLUDE=-I/usr/include/eigen3|" \ + c_src/Makefile \ + || die + default +} + +src_compile() { + export ERL_PATH="/usr/$(get_libdir)/erlang/lib/" + tc-export CC + # Work around parallel make issues + # Set ER_LIBS to the top source directory + emake vsn.mk + for subdir in intl_tools e3d src plugins_src icons; do + emake -C ${subdir} opt ERL_LIBS="${S}" + done + default +} + +src_install() { + WINGS_PATH=${ERL_PATH}/${P} + dodir ${WINGS_PATH} + + find -name 'Makefile*' -exec rm -f '{}' \; + + insinto ${WINGS_PATH} + doins -r e3d ebin icons plugins priv psd shaders src textures tools + + newbin "${FILESDIR}"/wings.sh-r1 wings + dodoc AUTHORS +} diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest index a8474cfd121d..0a534265aa8a 100644 --- a/media-gfx/xdot/Manifest +++ b/media-gfx/xdot/Manifest @@ -1,4 +1,4 @@ DIST xdot-1.4.tar.gz 144405 BLAKE2B bcca54099ad88ebbf82dc168d837f7343f527d8aff63d27e315e60267b4edecca97c2f69e47a6bd5889e9da7bd801ba38950f5f01ff1f0e40389551c6ded2890 SHA512 36065ca840ea0f3ffeca3d7bb16aa3f68b79ef3c7d43f0ba80d100d198f89edee1ca9cb3baff378a63c53a527c37dcccbd7262fd1aa26b7c61bc9e2c55c6e3ed -EBUILD xdot-1.4.ebuild 1063 BLAKE2B cf3114a70cd0abcb4eba2df8a352c0c2ac7e33130e69357289824cb55e610d46a7a11f9e2d12e1f9bf1bce63eccbe5d31092e0dd0a2064272007978a251d49ff SHA512 75c304e48f64a28fa76c5244a3b19375b350fa87db634149c3bbc27a94ca07705c28d5e9ff5ef0b0eb6bedd42ed9dd0218ce922465f783b3e711965dba45b611 -EBUILD xdot-9999.ebuild 1070 BLAKE2B 13305d0d59d42e99b5a05ea269a1854159b05eeac7da9b306886735b6099ac2b609ae378321aabbfc27e84cb197472f75c0c8467e81460018c058ba704d5a13e SHA512 ddbd7668100468682142a26bcfabc03fec3107199e10fb771ede3eb4d223cb7ffe44015d3896d4578906e64c3562e77789366b8b5ff9b74490499cdd27d3584f +EBUILD xdot-1.4.ebuild 1057 BLAKE2B 42d5f677249f93356a488dde0f7e41dc8efb417765f9b1938523b2c196e24c39dbbf07464c9a3e963b613d5dd9b3b905b28995af34f2f797b790ce90db87fa9f SHA512 b43f731e51139bd96526ddd2a46a6858179b5d433d766cfe01b11cadb201bee82c19ded3c0fa5f59e5347f429a209a04b52402a0f2921ff642a45509bf5f5c86 +EBUILD xdot-9999.ebuild 1064 BLAKE2B 1933ad6213a84a89974ab0543b59282ecdd149de46f6ccbdc0641306bb60c1a7a6cfba2e9745a44f3fc13cef721a38c787febd3da3c48d693177e133821f01a0 SHA512 6a251a856dd2c3a03b0a1b21efdd6d7ef1d6470dde75b0e2e8dc12ffdab150fd905f0f02805103d205f86ff5de3aac62f696067dfa3979a4f4f7245108b67bea MISC metadata.xml 399 BLAKE2B 06318ca9aa1bb3f53733542916d19d28c03133866e868aefeba88d7e6e1b7594a628488471fe7f6853e02402a14db8501e056f5df9ae1429c4eca66ab7b6a492 SHA512 16caf359c45841ae27bfdeee51c7fdd71d6282548773e6f519cbcbfe43f9fa39c65322a610d2b3d5cb4471129cfa3738e6ee66ff6b6e94b4263d918fd44ff30c diff --git a/media-gfx/xdot/xdot-1.4.ebuild b/media-gfx/xdot/xdot-1.4.ebuild index 5592a37dd4f3..ee7b623c9b55 100644 --- a/media-gfx/xdot/xdot-1.4.ebuild +++ b/media-gfx/xdot/xdot-1.4.ebuild @@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}" if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" else - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86" MY_P="${MY_PN}-${PV}" S="${WORKDIR}/${MY_P}" SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" diff --git a/media-gfx/xdot/xdot-9999.ebuild b/media-gfx/xdot/xdot-9999.ebuild index bfd164986323..35f32bc848ff 100644 --- a/media-gfx/xdot/xdot-9999.ebuild +++ b/media-gfx/xdot/xdot-9999.ebuild @@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}" if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" MY_P="${MY_PN}-${PV}" S="${WORKDIR}/${MY_P}" SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest index 68c203274efd..e132c5446291 100644 --- a/media-gfx/xli/Manifest +++ b/media-gfx/xli/Manifest @@ -4,5 +4,5 @@ AUX xli-1.17.0-fix-scale-zoom.patch 1942 BLAKE2B fefbcbec8d9dba30fc1435fc998e371 AUX xli-1.17.0-libpng14.patch 245 BLAKE2B 681fd31f8d7f812272e54dc67de31ece9a936f4608d339e9d63fe7bdc2ba257d20d7ce01fb00b120662557bdfa44b908bbeb4e136665abdadeb062c1425e7af7 SHA512 079162bfd639994ea6553b49f9370faf5becee8ec1e99a1e71f43e32968f244c5a393433fba8920a399a9eb8bc4a3ec6097903bd2eaff46bdeef55f1f90d1fcf AUX xli-security-gentoo.diff 6940 BLAKE2B 907fd85a2b248083380ae2210665dd9c251a7d528a93b1e2dffd149827f4900cab54b84b8a0be67c198a73d180cf31f4c8cdd7c4a37a3a8c5b30718babd5b1bf SHA512 b992219eb4b89bfee57429afbf67be6d6a04051b50de6e814c84c1adb209494d2faff15a228b43a992530fbeac83f15a94e9c1988982f98eabf287c26716671e DIST xli-2005-02-27.tar.gz 201011 BLAKE2B c16f40368a7c55cb7d31777662e4e9c1515232904df4f6f0e7fdc4daf44fdafaa0a3d9d8298493dac9352fa10eaf5d2984f9e66832ca0bfd07d9e6d551f4dca5 SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7 -EBUILD xli-1.17.0-r6.ebuild 2145 BLAKE2B ca8a689edcade26e9e9d362a78fd46c14eecb2b84fcfd7bbc580e43d326aa77a6b2e2262d40b586e944e842d919022bbad2afb6696b0a53a62b5a58e6c5fef38 SHA512 8d58c6f32a94984381fdd533b69246a59870f242df0f87a7e39c75596b70e6b05b172666790cbeda3a471d46867be1afe202d8f38bf78c880430e2b53a7e42a1 +EBUILD xli-1.17.0-r6.ebuild 2139 BLAKE2B 4e3407ee763f37be8113717e29d01ed5402c2c35de2ff00cc096a19b82df047fcfa6f4862475c5e5c45a947ed0e6ba617f1c418cd05765c22fe3037154aa5b50 SHA512 ff207a7cfc91c96ca136a44e4646dc88e5c0bc6d050b642b0da250f78cc2c62085cb6c70b1ea320f8297ada84ffa911a4f0d7aee72c2b4fdfb439abf3d9c3064 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5 diff --git a/media-gfx/xli/xli-1.17.0-r6.ebuild b/media-gfx/xli/xli-1.17.0-r6.ebuild index a33109d2bef3..8ce0e204bb03 100644 --- a/media-gfx/xli/xli-1.17.0-r6.ebuild +++ b/media-gfx/xli/xli-1.17.0-r6.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${SNAPSHOT}" LICENSE="HPND" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=" app-arch/bzip2:= diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest index f7b7003e9e9e..2f8f9890f0b2 100644 --- a/media-gfx/xloadimage/Manifest +++ b/media-gfx/xloadimage/Manifest @@ -10,7 +10,6 @@ AUX xloadimage-gentoo.patch 8956 BLAKE2B 9834cb47e16fb20f970e9d33a6e42fef09d5a3d DIST xloadimage-4.1-fix-build-for-clang16.patch.xz 23800 BLAKE2B 8417465020f06483c397dd86124297feb320530bd013d6f94b091ac2166da9dc45017b43a21e2ce7a6f03493188e2535294e9b79e7ebbe0062bf0f22166f13d7 SHA512 a8f40fe4a5e8750b2c2b98b1f7488275c1f0763d2814359ec8dce48d1201e78d87f189abf6fcb8fa4753828921fd0c593696ad1958345f954f740687502a896f DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586 -EBUILD xloadimage-4.1-r14.ebuild 2504 BLAKE2B 12c9a486786e1640d4697c39f4e2fb9fdb61adf775026c2023e9643c5e4191b6a4bf10bcfb8a0345a3650e178c91de58faee153bb0dceeac2c200423b80df7f9 SHA512 c57e7d7b571fc2ad4f56fdd1e7d5de1b56107782edb2703a0887c826d8ac230ce924e0c85772df15a419b1e2550e664f6d5c3716c7430a6fc95aed615e9ccb09 -EBUILD xloadimage-4.1-r15.ebuild 2488 BLAKE2B bd34e5765b9701eeec684f5da9ee6ae88d5147796c0bd44eed60dd2d409d89a3b794d95c95e5403bee9d64edebadf9fcc805e48b02986f88b5cf16c4287fded7 SHA512 a16a74df34fe271b0d3900b7bba2a3ef75e1d55781b4d02ff60e1e6d5b9fe11569e04fea86093fa5d10409ae7008ceea3db6ecff0c96ba2af526ec496061d27f -EBUILD xloadimage-4.1-r16.ebuild 2554 BLAKE2B 5480f70de2690e720a10fd614423da2346e12d29394cb990368d753ef2b07f142db0fd9f6c39d405454f05c9ca16e2a26466dcd2da204b0e7932ed147d2c1192 SHA512 a42f4aec6fbf6e19944e8db128d2e16bb8993d976bd374b637e44d7dcc55f1a13c281dfd6280682b7e54ddd0b5a4cd462bd72a91e5efa1611f8e49ff9f7fb62e +EBUILD xloadimage-4.1-r15.ebuild 2482 BLAKE2B da71736b8f2ba9eb0e539e0d0ecf72f23b1b6636d0ceadcae6711f2586e6f480214f565caabc348d32eb35eeaaa5f659746208549fdcf54de90032a0ee4f2c14 SHA512 be5ef8f4ca1934bded0a8f21fac46db5c3f00fb3c779ddd99f6fc0e6914602b8dd29ec37afa9283280ecfec2a23661c305944af4ccd0b6a4b29d98db156994dd +EBUILD xloadimage-4.1-r16.ebuild 2548 BLAKE2B 1c119a00e638d2a9df4372e0bf58ae971ba77805cbac31d8d0f7a3baf7d96b9933bb46aa846c305fae6a2f343e0587e02f5a60326b2d0a6cb5e113cc543cb184 SHA512 9003ed1adb849509a835d43925f5fc852d203dac5393ab766d4313de1dad4f633715cb60f1d3538ec93311d756792f4ea12d00fbe76587abfb13892be948962b MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5 diff --git a/media-gfx/xloadimage/xloadimage-4.1-r14.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r14.ebuild deleted file mode 100644 index ff90d31efe03..000000000000 --- a/media-gfx/xloadimage/xloadimage-4.1-r14.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="utility to view many different types of images under X11" -HOMEPAGE="https://tracker.debian.org/pkg/xloadimage" -SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz - mirror://gentoo/${P}-gentoo-r1.diff.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="tiff jpeg png" - -RDEPEND="x11-libs/libX11 - tiff? ( media-libs/tiff:= ) - png? ( media-libs/libpng:= ) - jpeg? ( media-libs/libjpeg-turbo:= )" -DEPEND="${RDEPEND} - !media-gfx/xli" - -S=${WORKDIR}/${P/-/.} - -src_prepare() { - eapply "${WORKDIR}"/${P}-gentoo-r1.diff - eapply "${FILESDIR}"/${P}-zio-shell-meta-char.diff - eapply "${FILESDIR}"/${P}-endif.patch - - # Do not define errno extern, but rather include errno.h - # <azarah@gentoo.org> (1 Jan 2003) - eapply "${FILESDIR}"/${P}-include-errno_h.patch - - eapply "${FILESDIR}"/xloadimage-gentoo.patch - - sed -i -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf || die - sed -i -e "s:^#include <varargs.h>:#include <stdarg.h>:" rlelib.c || die - - # On FreeBSD systems malloc.h is a false header asking for fixes. - # On MacOSX it would require malloc/malloc.h - # On other systems it's simply unneeded - sed -i -e 's,<malloc.h>,<stdlib.h>,' vicar.c || die - - eapply "${FILESDIR}"/${P}-unaligned-access.patch - eapply "${FILESDIR}"/${P}-ldflags_and_exit.patch - - sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die - - eapply "${FILESDIR}"/${P}-libpng15.patch - sed -i \ - -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ - png.c || die - - # One of the previous patches screws up a bracket... - eapply "${FILESDIR}"/${P}-bracket.patch - - default - - chmod +x configure || die - eautoreconf -} - -src_configure() { - # Set TIFFHeader to TIFFHeaderCommon wrt #319383 - has_version '>=media-libs/tiff-4.0.0_pre' && \ - append-flags -DTIFFHeader=TIFFHeaderCommon - - tc-export CC - econf $(use_with jpeg) \ - $(use_with png) \ - $(use_with tiff) -} - -src_compile() { - emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage -} - -src_install() { - dobin xloadimage uufilter - - dosym xloadimage /usr/bin/xsetbg - dosym xloadimage /usr/bin/xview - - insinto /etc/X11 - doins xloadimagerc - - newman xloadimage.man xloadimage.1 - newman uufilter.man uufilter.1 - - echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1 || die - doman "${T}"/xsetbg.1 - newman "${T}"/xsetbg.1 xview.1 - - dodoc README -} diff --git a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild index b1ceb5b7a604..984fe17d6d40 100644 --- a/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild +++ b/media-gfx/xloadimage/xloadimage-4.1-r15.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="tiff jpeg png" RDEPEND="x11-libs/libX11 diff --git a/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild index 461bdfe35a16..4b96c6d802fe 100644 --- a/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild +++ b/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="tiff jpeg png" RDEPEND="x11-libs/libX11 diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest index 93219a337bc4..d128f023c3e9 100644 --- a/media-gfx/xv/Manifest +++ b/media-gfx/xv/Manifest @@ -1,17 +1,7 @@ -AUX xv-3.10a-add-ldflags-20070520.patch 757 BLAKE2B a019f954f6d469075dc05c40b99075be2ef7e945aeaecb6047e35b84aee4e9f79ee8c6dc8d1175c464c49dc5a4a3dd37749e1f307184f3ad49fdbcc7d884108b SHA512 64d2d53dd301228aed398e6ec4813e6fcc37b7033f6a7e0dad49541d8ea7394ea18eb44f74a1ee08a33964bc6fcfc8000960bd3e2df7e363edc0365a71f1e8cc -AUX xv-3.10a-disable-jp2k-20070520.patch 607 BLAKE2B 6aad38e13c225442ba12eeabf44ac32374a832f44440e071f4e9a63271c3e2bf7870637a6b04044b23840cbb8dd1bdfc65c717adcc91804a47baeaf4053095c5 SHA512 e764150b153921bbb0a9dff6399efdf4ec5bec425e10529616fa0912a1bea819c5f1638b9f1ab7676ed0c51156c0e2e738c2641ff0899456cae394c67148702b -AUX xv-3.10a-fix-wait-20070520.patch 1664 BLAKE2B 405c18fb96ca239e88986e3ac60b1b1eb22e6d308fb2dd33336a649568f2495ac7cc885453ef937ff83b5a356ae878d7335617d8896540467525de2079574319 SHA512 da9ebfe21d9a9bf466b167215faed0548bd5711125ce84a8f886e9b6d6d298f48eba5385b77430cf07199f067b9e0fe23373d1951d6fe7456a927fc2aac77cc6 -AUX xv-3.10a-libpng15-r1.patch 16530 BLAKE2B 6233c9e49f021ba3e62f9a5e9da4e3601261aa51a86951d431018a16a3fe11f05f8cf6ab0ab71fdba024d4b70793e2176ef0c59ab1baeb066e120b49772030cc SHA512 f7ad73ddf83ac241565b99ea7c375b7ffe17f60ff7aa138521b887da14ec4b236a61a67068f3baf6048011a52d46b276940a3965cf34ad9dd46678ba100b6d08 -AUX xv-3.10a-osx-bsd-20070520.patch 1497 BLAKE2B 1dcd54c8de29b9552a50069e627fd9dbbd327a22a8e18a12f260c1aaec2978b536cbdc571d47f17cca3f477dd574730dca7748532e6ed41f4697fa76774d5384 SHA512 a6f1160c0658ae4f3394cf2bb0b324392593010539ac2dd52176a587c41844cd5bca61823af31633d765f3399a9cb52e0296f894a2f08060ef4c2b4d687d8b51 -AUX xv-3.10a-vdcomp-osx-20070520.patch 455 BLAKE2B fa6cfa3657f74da7254cce5e73140c2a82614df2398a66e98c57d3056b1f574fbe80b9bce925f2f0988133596fdc4ea5c580371613a23a0283e9b09343a700a9 SHA512 8e389040ae3ac52dd086fbc1858699ea4bef417053952766a5569aab4ec70dbbd674a4e26adbc9434c0b411754d9643064d4254e72fbc79f99d3aefaf35f997b -AUX xv-3.10a-wformat-security.patch 519 BLAKE2B 7b0ba8ee6dc33af787040e72fdfd4cf1d638dd556ff30c60c5983f6e8158fa63b49a66c97c919bdac5084c766df2b9587597c4f103fff3e2718cff8a006c1c05 SHA512 7e1150fdda9359e7b105729c92b8059bf5c762d468bcdaeadbb91ed75c2517b0ad627784a7a6f2bb8f7857884dc47f2d41c7c7247824fa4af8533dc023ceea52 AUX xv-5.2.0-osx-bsd.patch 2103 BLAKE2B f12287becac8bfa5227523677c6118816f9dd43fd8b41c400dd6695ea4b6c610bc713f6ffdd9d2d75f8bd2b4de1f228c5349f71d3b8f7c77f10c01ac30b77301 SHA512 e2b6673d202b20a9d88dfd7711e63f702a67de7ca56de049ab27803a76b8833745ba1057ffbc53b246d077e870bce44746d28b1ced0eca31d4d9746c2a3fe57f -DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa861d9b2b6898d6e378b4a61a57c746a8822793a8e11e54165faf859e073ef99c9fbea5aa0c4c8caa4608ef03f553003b779a4bf59c3ab6 SHA512 e2ac5a3b4d743bf142c162b00815dd9d8dcaf345d0649016b2c6441fe2329879471b19453808e677c1a0b8eeb3468295dba160b1f30eacb2a7a9d8524ce03e75 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b -DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f -DIST xv-5.2.0.tar.gz 4785784 BLAKE2B 46dc637cbbeabfe1c034c34e73040de6efebbf5f423fe429028ebfeefd2fce5af0fdaff1c52db4807b8eb88de89dae6b7f0e2c8a3522a3d9b103d5777783a52d SHA512 0af7ff6db152be849c27be9fba116513595deeca9e3eb42ec6fd74a4756d0c525b55a40de49aa37dd5d2ea4a29e6d644c8c4c709f0e1ec0a98cbc0ae7221b110 -DIST xv-6.0.0.tar.gz 5051786 BLAKE2B 42c6e06848c5cc7a3f7da1d5c5b10a7d665601f41eb79bda4b3e904c103e88592da416559adc9565c820c6402c9b03271521f515b8f7c873cc959dfd3b5652e8 SHA512 600fde882e1279b5c7147089790006bcbd4e31ba6220309a272aca43242c56062d4c85b181fb1f2d4b0497f1546347206d7827204c2ebbbabaaf3de40c50191a -EBUILD xv-3.10a-r22.ebuild 2682 BLAKE2B 108e6f933866f1b663086d58b9418d5acd1d4f07fa332359325e8bb1e2e08009549f608f1d5f3d7ddbdff634dccbda9c78edf5e2abf7757f3ab29ccacb37b4d1 SHA512 3103387c8b54716418435c1f037138995df5761220b009b31583c9537395a53de0ff9684e2f488d7d047b449e76745989951dab662cfe892541aea56e130c100 -EBUILD xv-5.2.0.ebuild 1359 BLAKE2B ce8ef5bc29eb554de83dc43061810347af9477bc7bbe7c7789d12f344deaaa9e9658273cc0e6e6f098b22dbea2c28d6d45993ea41097f2a4d63b00e3647f9724 SHA512 16873c37bfdd2b656ac0482681016eb917a405a4cae2eeb6669ae650c233072c19f28d3f42b33f7e69849252015edd91fbcc973bd52e4716dce7411d5d906a6c -EBUILD xv-6.0.0.ebuild 1465 BLAKE2B 30fcbd9c7fbcaecdf32b543b20117039b3ace64164bcda5f447f52cc15e6fd94f1a6db3e0ebfb44d38f4380c22efb06f068940db378add096274e66eec15861e SHA512 430191195ef448e2067f1ab7781dfa5f4b877b69a773ee8deec0ea5e486ac605d49dda27e7889961aeeb2bd19830c1c07b9faf2188bf080a780f95e2093910fb +DIST xv-6.0.1.tar.gz 5051856 BLAKE2B 7b7a76e211175776862312b48b1f5f91d1a901fffba2225390715c9e392a380add42eaee0429e0598dce677bbb4311e9bc1a506105b9a63595ab70e6253e6ae7 SHA512 7098a2600dc21f94ef1db3e1b23e79b0cdc989b93d792f891d7a29811037636a5887df88f1ad6df27b12be4b4b348f0cca34fe2ad0a58ed9b1228683f6b0b910 +DIST xv-6.0.2.tar.gz 5052705 BLAKE2B e25a9d5881ce2b9039e4e9f561df7392faf2149730d072085486ebe930934b7c92e7c333bc930eae8b27dea9eea5b2bcc9da2bd28c84ae6483406f66e47ca5df SHA512 81de0a4811b7bb4662e8b731e148f7f172275f0380c0bc2c2569c3a041002374a3a44a1c1b8ec2a74f1e0aaf45e8217ce0cd4e4393eb0d3f29f1e494c9a75c03 +EBUILD xv-6.0.1.ebuild 1454 BLAKE2B ceb165627e62962cb77cdd0ab225e9652aed91635652fe33e7276b42c44d9db458ce1f1412055ea263b2eb5b7c6bbc73e14265f08b440ec31afaf90b2151bbca SHA512 f80e26268b8951e221316a85bdf662d44b0005a4eebdc7c721e1fc15954c8025bc9116fde2377463893d2438389c779ecbba787f0b02bcbe8c3969cb38079b93 +EBUILD xv-6.0.2.ebuild 1459 BLAKE2B 373c543ccc3c09722add0089f67b3bacd9963396efbbf132a3c7a8b5f7d3b22b55bf321d930e5587bcab451017cb7b683ca755d93533a61cfba8e5bfa5f0ac9a SHA512 5add0e00da6333e5182c4433b9d9a3c884489a77e20c5c0e6c74925b12e4ef011407f36c5705ab9eb07867968524695f8855a67213fd2bbf539d5bc2e8eafc21 MISC metadata.xml 392 BLAKE2B e1e306f8f6bd480912d6e45b5af362d54900117ae05a21995023e6611c1410af6682af867150179ecebd9d319a9f9810723dffec59a26e3f9f9ecc0a56061127 SHA512 e8aad6d1b24943fc3aeb6533fb0dc048ea0d3edc04abe2efa9a27930698ff3ddb0185dc3a2da69e08c050c4545d907c8580add6732fd8e3258ed496784902364 diff --git a/media-gfx/xv/files/xv-3.10a-add-ldflags-20070520.patch b/media-gfx/xv/files/xv-3.10a-add-ldflags-20070520.patch deleted file mode 100644 index da53ccb8bd6b..000000000000 --- a/media-gfx/xv/files/xv-3.10a-add-ldflags-20070520.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- xv-3.10a/Makefile.orig 2008-06-16 08:32:39.000000000 -0600 -+++ xv-3.10a/Makefile 2008-06-16 08:49:19.000000000 -0600 -@@ -369,19 +369,19 @@ - - #xv: $(OBJS) $(JPEGLIB) $(TIFFLIB) - xv: $(OBJS) -- $(CC) -o xv $(CFLAGS) $(OBJS) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o xv $(OBJS) $(LIBS) - - bggen: bggen.c -- $(CC) $(CFLAGS) -o bggen bggen.c $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o bggen bggen.c $(LIBS) - - vdcomp: vdcomp.c -- $(CC) $(CFLAGS) -o vdcomp vdcomp.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -o vdcomp vdcomp.c - - xcmap: xcmap.c -- $(CC) $(CFLAGS) -o xcmap xcmap.c $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o xcmap xcmap.c $(LIBS) - - xvpictoppm: xvpictoppm.c -- $(CC) $(CFLAGS) -o xvpictoppm xvpictoppm.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -o xvpictoppm xvpictoppm.c - - - diff --git a/media-gfx/xv/files/xv-3.10a-disable-jp2k-20070520.patch b/media-gfx/xv/files/xv-3.10a-disable-jp2k-20070520.patch deleted file mode 100644 index 7e42484abf48..000000000000 --- a/media-gfx/xv/files/xv-3.10a-disable-jp2k-20070520.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- xv-3.10a/Makefile~ 2007-06-24 15:41:58 -0600 -+++ xv-3.10a/Makefile 2007-06-24 15:42:43 -0600 -@@ -176,16 +176,16 @@ - ### if, for whatever reason, you're unable to get the JasPer JPEG-2000 library - ### to compile on your machine, *COMMENT OUT* the following lines - ### --JP2K = -DDOJP2K -+#JP2K = -DDOJP2K - ### - #JP2KDIR = ../../jasper --JP2KDIR = /usr/local/lib -+#JP2KDIR = /usr/local/lib - ### - #JP2KINC = -I$(JP2KDIR) --JP2KINC = -I/usr/local/include -+#JP2KINC = -I/usr/local/include - ### - #JP2KLIB = -L$(JP2KDIR) -ljasper --JP2KLIB = $(JP2KDIR)/libjasper.a -+#JP2KLIB = $(JP2KDIR)/libjasper.a - - - ### diff --git a/media-gfx/xv/files/xv-3.10a-fix-wait-20070520.patch b/media-gfx/xv/files/xv-3.10a-fix-wait-20070520.patch deleted file mode 100644 index ec093ab309c9..000000000000 --- a/media-gfx/xv/files/xv-3.10a-fix-wait-20070520.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Nur xv-3.10a_old/xvevent.c xv-3.10a/xvevent.c ---- xv-3.10a_old/xvevent.c 2008-05-06 12:44:41.000000000 -0600 -+++ xv-3.10a/xvevent.c 2008-05-06 15:55:59.000000000 -0600 -@@ -82,7 +82,7 @@ - int retval,done,waiting; - #ifdef USE_TICKS - clock_t waitsec_ticks=0L, orgtime_ticks=0L, curtime_ticks; -- clock_t elapsed_ticks=0L, remaining_interval; -+ clock_t elapsed_ticks=0L, remaining_interval, clock_ticks_per_sec; - #else - time_t orgtime=0L, curtime; - #endif -@@ -126,7 +126,8 @@ - all pending events (ie, drawing the image the first time) - have been dealt with: START WAITING */ - #ifdef USE_TICKS -- waitsec_ticks = (clock_t)(waitsec * CLK_TCK); -+ clock_ticks_per_sec = sysconf(_SC_CLK_TCK); -+ waitsec_ticks = (clock_t)(waitsec * clock_ticks_per_sec); - orgtime_ticks = times(NULL); /* unclear if NULL valid, but OK on Linux */ - #else - orgtime = time(NULL); -@@ -168,11 +169,14 @@ - } else - elapsed_ticks = curtime_ticks - orgtime_ticks; - remaining_interval = waitsec_ticks - elapsed_ticks; -- if (remaining_interval >= (clock_t)(1 * CLK_TCK)) -+ if (remaining_interval > clock_ticks_per_sec) - sleep(1); - else { -- /* less than one second remaining: do delay in msec, then return */ -- Timer((remaining_interval * 1000L) / CLK_TCK); /* can't overflow */ -+ if (remaining_interval > 0) { -+ /* less than one second remaining: do delay in msec, then return */ -+ Timer((remaining_interval * 1000L) / clock_ticks_per_sec); /* can't overflow */ -+ } -+ - return waitloop? NEXTLOOP : NEXTQUIT; - } - #else diff --git a/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch b/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch deleted file mode 100644 index 9905c4b8ae7e..000000000000 --- a/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch +++ /dev/null @@ -1,520 +0,0 @@ ---- xv-3.10a/xvinfo.c -+++ xv-3.10a/xvinfo.c -@@ -26,7 +26,7 @@ - #define INFOHIGH 270 - - /* max length of an Info String */ --#define ISTRLEN 80 -+#define ISTRLEN 256 - - /* baseline of top line of text */ - #define TOPBASE (36 + penn_height/2 + 4 + 8 + ASCENT) ---- xv-3.10a/xvpng.c -+++ xv-3.10a/xvpng.c -@@ -31,6 +31,7 @@ - - #ifdef HAVE_PNG - -+#include "zlib.h" - #include "png.h" - - /*** Stuff for PNG Dialog box ***/ -@@ -41,7 +42,9 @@ - #define COMPRESSION 6 /* default zlib compression level, not max - (Z_BEST_COMPRESSION) */ - --#define HAVE_tRNS (info_ptr->valid & PNG_INFO_tRNS) -+/* old -+#define HAVE_tRNS (info_ptr->valid & PNG_INFO_tRNS) */ -+#define HAVE_tRNS png_get_valid(png_ptr,info_ptr,PNG_INFO_tRNS) - - #define DWIDE 86 - #define DHIGH 104 -@@ -444,6 +447,10 @@ - byte *p, *png_line; - char software[256]; - char *savecmnt; -+ /* for storing values until all are accumulated, so that the image header can be set in full */ -+ int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type; -+ png_uint_32 _width,_height; -+ png_time _mod_time; - - if ((png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, - png_xv_error, png_xv_warning)) == NULL) { -@@ -458,7 +465,7 @@ - FatalError(software); - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - return -1; - } -@@ -489,8 +496,8 @@ - png_set_filter(png_ptr, 0, filter); - } - -- info_ptr->width = w; -- info_ptr->height = h; -+ _width = w; -+ _height = h; - if (w <= 0 || h <= 0) { - SetISTR(ISTR_WARNING, "%s: image dimensions out of range (%dx%d)", - fbasename, w, h); -@@ -498,7 +505,7 @@ - return -1; - } - -- info_ptr->interlace_type = interCB.val ? 1 : 0; -+ _interlace_type = interCB.val ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE; - - linesize = 0; /* quiet a compiler warning */ - -@@ -542,40 +549,44 @@ - png_destroy_write_struct(&png_ptr, &info_ptr); - return -1; - } -- info_ptr->color_type = PNG_COLOR_TYPE_RGB; -- info_ptr->bit_depth = 8; -+ _color_type = PNG_COLOR_TYPE_RGB; -+ _bit_depth = 8; - } else /* ptype == PIC8 */ { - linesize = w; -- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; -+ _color_type = PNG_COLOR_TYPE_PALETTE; - if (numuniqcols <= 2) -- info_ptr->bit_depth = 1; -+ _bit_depth = 1; - else - if (numuniqcols <= 4) -- info_ptr->bit_depth = 2; -+ _bit_depth = 2; - else - if (numuniqcols <= 16) -- info_ptr->bit_depth = 4; -+ _bit_depth = 4; - else -- info_ptr->bit_depth = 8; -+ _bit_depth = 8; - - for (i = 0; i < numuniqcols; i++) { - palette[i].red = r1[i]; - palette[i].green = g1[i]; - palette[i].blue = b1[i]; - } -- info_ptr->num_palette = numuniqcols; -- info_ptr->palette = palette; -+/* cannot find a setter for this, unsure if it is necessary anymore... - info_ptr->valid |= PNG_INFO_PLTE; -+*/ -+ /* set the header just in case it's needed */ -+ png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type, -+ _interlace_type,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT); -+ png_set_PLTE(png_ptr,info_ptr,palette,numuniqcols); - } - } - - else if (colorType == F_GREYSCALE || colorType == F_BWDITHER) { -- info_ptr->color_type = PNG_COLOR_TYPE_GRAY; -+ _color_type = PNG_COLOR_TYPE_GRAY; - if (colorType == F_BWDITHER) { - /* shouldn't happen */ - if (ptype == PIC24) FatalError("PIC24 and B/W Stipple in WritePNG()"); - -- info_ptr->bit_depth = 1; -+ _bit_depth = 1; - if (MONO(r1[0], g1[0], b1[0]) > MONO(r1[1], g1[1], b1[1])) { - remap[0] = 1; - remap[1] = 0; -@@ -595,7 +606,7 @@ - png_destroy_write_struct(&png_ptr, &info_ptr); - return -1; - } -- info_ptr->bit_depth = 8; -+ _bit_depth = 8; - } - else /* ptype == PIC8 */ { - int low_precision; -@@ -617,7 +628,7 @@ - for (; i < 256; i++) - remap[i]=0; /* shouldn't be necessary, but... */ - -- info_ptr->bit_depth = 8; -+ _bit_depth = 8; - - /* Note that this fails most of the time because of gamma */ - /* (and that would be a bug: GRR FIXME) */ -@@ -636,7 +647,7 @@ - for (i = 0; i < numuniqcols; i++) { - remap[i] &= 0xf; - } -- info_ptr->bit_depth = 4; -+ _bit_depth = 4; - - /* try to adjust to 2-bit precision grayscale */ - -@@ -652,7 +663,7 @@ - for (i = 0; i < numuniqcols; i++) { - remap[i] &= 3; - } -- info_ptr->bit_depth = 2; -+ _bit_depth = 2; - - /* try to adjust to 1-bit precision grayscale */ - -@@ -668,7 +679,7 @@ - for (i = 0; i < numuniqcols; i++) { - remap[i] &= 1; - } -- info_ptr->bit_depth = 1; -+ _bit_depth = 1; - } - } - } -@@ -677,6 +688,9 @@ - else - png_error(png_ptr, "Unknown colorstyle in WritePNG"); - -+ png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type, -+ _interlace_type,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT); -+ - if ((text = (png_textp)malloc(sizeof(png_text)))) { - sprintf(software, "XV %s", REVDATE); - -@@ -685,20 +699,22 @@ - text->text = software; - text->text_length = strlen(text->text); - -- info_ptr->max_text = 1; -- info_ptr->num_text = 1; -- info_ptr->text = text; -+/* max_text seems to be internal only now, do not set -+ info_ptr->max_text = 1; */ -+ png_set_text(png_ptr,info_ptr,text,1); - } - - Display_Gamma = gDial.val; /* Save the current gamma for loading */ - - // GRR FIXME: add .Xdefaults option to omit writing gamma (size, cumulative errors when editing)--alternatively, modify save box to include "omit" checkbox -- info_ptr->gamma = 1.0/gDial.val; -- info_ptr->valid |= PNG_INFO_gAMA; -+ png_set_gAMA(png_ptr,info_ptr,1.0/gDial.val); -+/* doesn't seem to be a way to set valid directly anymore, unnecessary maybe.. -+ info_ptr->valid |= PNG_INFO_gAMA; */ - -+/* might need to be png_write_info_before_PLTE() ... */ - png_write_info(png_ptr, info_ptr); - -- if (info_ptr->bit_depth < 8) -+ if (_bit_depth < 8) - png_set_packing(png_ptr); - - pass=png_set_interlace_handling(png_ptr); -@@ -711,13 +727,13 @@ - int j; - p = pic; - for (j = 0; j < h; ++j) { -- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) { -+ if (_color_type == PNG_COLOR_TYPE_GRAY) { - int k; - for (k = 0; k < w; ++k) - png_line[k] = ptype==PIC24 ? MONO(p[k*3], p[k*3+1], p[k*3+2]) : - remap[pc2nc[p[k]]]; - png_write_row(png_ptr, png_line); -- } else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) { -+ } else if (_color_type == PNG_COLOR_TYPE_PALETTE) { - int k; - for (k = 0; k < w; ++k) - png_line[k] = pc2nc[p[k]]; -@@ -739,28 +755,31 @@ - (savecmnt = (char *)malloc((strlen(picComments) + 1)*sizeof(char)))) { - png_textp tp; - char *comment, *key; -+ int nt; -+ int mt; - - strcpy(savecmnt, picComments); - key = savecmnt; -+ png_get_text(png_ptr,info_ptr,&tp,&mt); /* to get 'max_text' */ - tp = text; -- info_ptr->num_text = 0; -+ nt = 0; - - comment = strchr(key, ':'); - - do { - /* Allocate a larger structure for comments if necessary */ -- if (info_ptr->num_text >= info_ptr->max_text) -+ if (nt >= mt) - { - if ((tp = -- realloc(text, (info_ptr->num_text + 2)*sizeof(png_text))) == NULL) -+ realloc(text, (nt + 2)*sizeof(png_text))) == NULL) - { - break; - } - else - { - text = tp; -- tp = &text[info_ptr->num_text]; -- info_ptr->max_text += 2; -+ tp = &text[nt]; -+ mt += 2; - } - } - -@@ -810,7 +829,7 @@ - } - - tp->compression = tp->text_length > 640 ? 0 : -1; -- info_ptr->num_text++; -+ nt++; - tp++; - } - } -@@ -834,27 +853,29 @@ - tp->text = key; - tp->text_length = q - key; - tp->compression = tp->text_length > 750 ? 0 : -1; -- info_ptr->num_text++; -+ nt++; - key = NULL; - } - } while (key && *key); -+ png_set_text(png_ptr,info_ptr,text,nt); - } - else { -- info_ptr->num_text = 0; -+ png_set_text(png_ptr,info_ptr,text,0); - } - } -- info_ptr->text = text; - -- png_convert_from_time_t(&(info_ptr->mod_time), time(NULL)); -- info_ptr->valid |= PNG_INFO_tIME; -+ png_convert_from_time_t(&_mod_time, time(NULL)); -+ png_set_tIME(png_ptr,info_ptr,&_mod_time); -+/* dunno how to set validity -+ info_ptr->valid |= PNG_INFO_tIME; */ - - png_write_end(png_ptr, info_ptr); - fflush(fp); /* just in case we core-dump before finishing... */ - - if (text) { - free(text); -- /* must do this or png_destroy_write_struct() 0.97+ will free text again: */ -- info_ptr->text = (png_textp)NULL; -+ /* must do this or png_destroy_write_struct() 0.97+ will free text again: -+ info_ptr->text = (png_textp)NULL; */ - if (savecmnt) - { - free(savecmnt); -@@ -886,6 +907,14 @@ - int pass; - int gray_to_rgb; - size_t commentsize; -+ /* temp storage vars for libpng15 migration */ -+ int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type,_num_text,_num_palette; -+ png_uint_32 _width,_height; -+ png_timep _mod_time; -+ double _gamma; -+ png_textp _text; -+ png_colorp _palette; -+ png_color_16p _background; - - fbasename = BaseName(fname); - -@@ -921,7 +950,7 @@ - FatalError("malloc failure in LoadPNG"); - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - fclose(fp); - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); - if (!read_anything) { -@@ -945,8 +974,10 @@ - #endif - png_read_info(png_ptr, info_ptr); - -- pinfo->w = pinfo->normw = info_ptr->width; -- pinfo->h = pinfo->normh = info_ptr->height; -+ png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,&_interlace_type,NULL,NULL); -+ -+ pinfo->w = pinfo->normw = _width; -+ pinfo->h = pinfo->normh = _height; - if (pinfo->w <= 0 || pinfo->h <= 0) { - SetISTR(ISTR_WARNING, "%s: image dimensions out of range (%dx%d)", - fbasename, pinfo->w, pinfo->h); -@@ -957,9 +988,9 @@ - pinfo->frmType = F_PNG; - - sprintf(pinfo->fullInfo, "PNG, %d bit ", -- info_ptr->bit_depth * info_ptr->channels); -+ _bit_depth * png_get_channels(png_ptr,info_ptr)); - -- switch(info_ptr->color_type) { -+ switch(_color_type) { - case PNG_COLOR_TYPE_PALETTE: - strcat(pinfo->fullInfo, "palette color"); - break; -@@ -983,15 +1014,17 @@ - - sprintf(pinfo->fullInfo + strlen(pinfo->fullInfo), - ", %sinterlaced. (%d bytes)", -- info_ptr->interlace_type ? "" : "non-", filesize); -+ _interlace_type ? "" : "non-", filesize); - -- sprintf(pinfo->shrtInfo, "%lux%lu PNG", info_ptr->width, info_ptr->height); -+ sprintf(pinfo->shrtInfo, "%lux%lu PNG", _width, _height); - -- if (info_ptr->bit_depth < 8) -+ if (_bit_depth < 8) - png_set_packing(png_ptr); - -- if (info_ptr->valid & PNG_INFO_gAMA) -- png_set_gamma(png_ptr, Display_Gamma, info_ptr->gamma); -+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_gAMA)) { -+ png_get_gAMA(png_ptr,info_ptr,&_gamma); -+ png_set_gamma(png_ptr, Display_Gamma, _gamma); -+ } - /* - *else - * png_set_gamma(png_ptr, Display_Gamma, 0.45); -@@ -1000,7 +1033,7 @@ - gray_to_rgb = 0; /* quiet a compiler warning */ - - if (have_imagebg) { -- if (info_ptr->bit_depth == 16) { -+ if (_bit_depth == 16) { - my_background.red = imagebgR; - my_background.green = imagebgG; - my_background.blue = imagebgB; -@@ -1013,8 +1046,8 @@ - } - png_set_background(png_ptr, &my_background, PNG_BACKGROUND_GAMMA_SCREEN, - 0, Display_Gamma); -- if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA || -- (info_ptr->color_type == PNG_COLOR_TYPE_GRAY && HAVE_tRNS)) && -+ if ((_color_type == PNG_COLOR_TYPE_GRAY_ALPHA || -+ (_color_type == PNG_COLOR_TYPE_GRAY && HAVE_tRNS)) && - (imagebgR != imagebgG || imagebgR != imagebgB)) /* i.e., colored bg */ - { - png_set_gray_to_rgb(png_ptr); -@@ -1022,8 +1055,9 @@ - gray_to_rgb = 1; - } - } else { -- if (info_ptr->valid & PNG_INFO_bKGD) { -- png_set_background(png_ptr, &info_ptr->background, -+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) { -+ png_get_bKGD(png_ptr,info_ptr,&_background); -+ png_set_background(png_ptr, _background, - PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); - } else { - my_background.red = my_background.green = my_background.blue = -@@ -1033,13 +1067,13 @@ - } - } - -- if (info_ptr->bit_depth == 16) -+ if (_bit_depth == 16) - png_set_strip_16(png_ptr); - -- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || -- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ if (_color_type == PNG_COLOR_TYPE_GRAY || -+ _color_type == PNG_COLOR_TYPE_GRAY_ALPHA) - { -- if (info_ptr->bit_depth == 1) -+ if (_bit_depth == 1) - pinfo->colType = F_BWDITHER; - else - pinfo->colType = F_GREYSCALE; -@@ -1049,9 +1083,11 @@ - pass=png_set_interlace_handling(png_ptr); - - png_read_update_info(png_ptr, info_ptr); -+ /* get HIDR again just in case the info_ptr changed */ -+ png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,&_interlace_type,NULL,NULL); - -- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB || -- info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA || gray_to_rgb) -+ if (_color_type == PNG_COLOR_TYPE_RGB || -+ _color_type == PNG_COLOR_TYPE_RGB_ALPHA || gray_to_rgb) - { - linesize = 3 * pinfo->w; - if (linesize/3 < pinfo->w) { /* know pinfo->w > 0 (see above) */ -@@ -1065,16 +1101,17 @@ - } else { - linesize = pinfo->w; - pinfo->type = PIC8; -- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || -- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { -+ if (_color_type == PNG_COLOR_TYPE_GRAY || -+ _color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { - for (i = 0; i < 256; i++) - pinfo->r[i] = pinfo->g[i] = pinfo->b[i] = i; - } else { - pinfo->colType = F_FULLCOLOR; -- for (i = 0; i < info_ptr->num_palette; i++) { -- pinfo->r[i] = info_ptr->palette[i].red; -- pinfo->g[i] = info_ptr->palette[i].green; -- pinfo->b[i] = info_ptr->palette[i].blue; -+ png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette); -+ for (i = 0; i < _num_palette; i++) { -+ pinfo->r[i] = _palette[i].red; -+ pinfo->g[i] = _palette[i].green; -+ pinfo->b[i] = _palette[i].blue; - } - } - } -@@ -1092,7 +1129,7 @@ - png_error(png_ptr, "can't allocate space for PNG image"); - } - -- png_start_read_image(png_ptr); -+ /*png_start_read_image(png_ptr); -- causes a warning and seems to be unnecessary */ - - for (i = 0; i < pass; i++) { - byte *p = pinfo->pic; -@@ -1106,22 +1143,23 @@ - - png_read_end(png_ptr, info_ptr); - -- if (info_ptr->num_text > 0) { -+ png_get_text(png_ptr,info_ptr,&_text,&_num_text); -+ if (_num_text > 0) { - commentsize = 1; - -- for (i = 0; i < info_ptr->num_text; i++) -- commentsize += strlen(info_ptr->text[i].key) + 1 + -- info_ptr->text[i].text_length + 2; -+ for (i = 0; i < _num_text; i++) -+ commentsize += strlen(_text[i].key) + 1 + -+ _text[i].text_length + 2; - - if ((pinfo->comment = malloc(commentsize)) == NULL) { - png_warning(png_ptr,"can't allocate comment string"); - } - else { - pinfo->comment[0] = '\0'; -- for (i = 0; i < info_ptr->num_text; i++) { -- strcat(pinfo->comment, info_ptr->text[i].key); -+ for (i = 0; i < _num_text; i++) { -+ strcat(pinfo->comment, _text[i].key); - strcat(pinfo->comment, "::"); -- strcat(pinfo->comment, info_ptr->text[i].text); -+ strncat(pinfo->comment, _text[i].text, _text[i].text_length); - strcat(pinfo->comment, "\n"); - } - } -@@ -1143,7 +1181,7 @@ - { - SetISTR(ISTR_WARNING,"%s: libpng error: %s", fbasename, message); - -- longjmp(png_ptr->jmpbuf, 1); -+ longjmp(png_jmpbuf(png_ptr), 1); - } - - diff --git a/media-gfx/xv/files/xv-3.10a-osx-bsd-20070520.patch b/media-gfx/xv/files/xv-3.10a-osx-bsd-20070520.patch deleted file mode 100644 index ecafd1ddf56e..000000000000 --- a/media-gfx/xv/files/xv-3.10a-osx-bsd-20070520.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- xv-3.10a/xv.h~ 2007-06-24 14:30:42 -0600 -+++ xv-3.10a/xv.h 2007-06-24 14:42:04 -0600 -@@ -158,7 +158,7 @@ - - #ifndef VMS - # include <errno.h> --# ifndef __NetBSD__ -+# if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__) - # if !(defined __GLIBC__ && __GLIBC__ >= 2) - extern int errno; /* SHOULD be in errno.h, but often isn't */ - extern char *sys_errlist[]; /* this too... */ -@@ -171,7 +171,7 @@ - #ifdef VMS - # define ERRSTR(x) strerror(x, vaxc$errno) - #else --# if defined(__BEOS__) || defined(__linux__) /* or all modern/glibc systems? */ -+# if defined(__BEOS__) || defined(__linux__) || defined(__APPLE__) /* or all modern/glibc systems? */ - # define ERRSTR(x) strerror(x) - # else - # define ERRSTR(x) sys_errlist[x] -@@ -206,6 +206,8 @@ - #ifdef NEED_MALLOC_H - # if defined(hp300) || defined(hp800) || defined(NeXT) - # include <sys/malloc.h> /* it's in "sys" on HPs and NeXT */ -+# elif defined(__APPLE__) -+# include <malloc/malloc.h> - # else - # include <malloc.h> - # endif -@@ -369,7 +371,7 @@ - * them later. */ - #ifndef VMS /* VMS hates multi-line definitions */ - # if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || \ -- defined(__bsdi__) -+ defined(__FreeBSD__) || defined(__bsdi__) || defined(__APPLE__) - # ifndef USE_MKSTEMP - # define USE_MKSTEMP /* use 'mkstemp()' instead of 'mktemp()' */ - # endif /* >> SECURITY ISSUE << */ diff --git a/media-gfx/xv/files/xv-3.10a-vdcomp-osx-20070520.patch b/media-gfx/xv/files/xv-3.10a-vdcomp-osx-20070520.patch deleted file mode 100644 index 2c82b1ae43e6..000000000000 --- a/media-gfx/xv/files/xv-3.10a-vdcomp-osx-20070520.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xv-3.10a/vdcomp.c~ 2007-06-24 14:30:42 -0600 -+++ xv-3.10a/vdcomp.c 2007-06-24 14:48:12 -0600 -@@ -123,6 +123,8 @@ - - # if defined(hp300) || defined(hp800) || defined(NeXT) - # include <sys/malloc.h> /* it's in "sys" on HPs and NeXT */ -+# elif defined(__APPLE__) -+# include <malloc/malloc.h> - # else - # include <malloc.h> /* FIXME: should explicitly list systems that NEED this, not everyone that doesn't */ - # endif diff --git a/media-gfx/xv/files/xv-3.10a-wformat-security.patch b/media-gfx/xv/files/xv-3.10a-wformat-security.patch deleted file mode 100644 index 34d2c19ebae3..000000000000 --- a/media-gfx/xv/files/xv-3.10a-wformat-security.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix errors caused by -Wformat -Werror=format-security -https://bugs.gentoo.org/show_bug.cgi?id=542134 - -* xvpbm.c:888:4: error: format not a string literal and no format arguments [-Werror=format-security] -* if (*pix) fprintf(fp,str1); - ---- xv-3.10a/xvpbm.c -+++ xv-3.10a/xvpbm.c -@@ -885,8 +885,8 @@ - } - } - else { -- if (*pix) fprintf(fp,str1); -- else fprintf(fp,str0); -+ if (*pix) fprintf(fp,"%s",str1); -+ else fprintf(fp,"%s",str0); - len+=2; - if (len>68) { fprintf(fp,"\n"); len=0; } - } diff --git a/media-gfx/xv/xv-3.10a-r22.ebuild b/media-gfx/xv/xv-3.10a-r22.ebuild deleted file mode 100644 index 9141002ec745..000000000000 --- a/media-gfx/xv/xv-3.10a-r22.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop flag-o-matic toolchain-funcs - -JUMBOV=20070520 -DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats" -HOMEPAGE="http://www.trilon.com/xv/index.html http://www.sonic.net/~roelofs/greg_xv.html" -SRC_URI="https://downloads.sourceforge.net/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz - ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz - mirror://gentoo/${P}.png.bz2" - -LICENSE="xv" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="jpeg tiff png" - -DEPEND=" - x11-libs/libXt - jpeg? ( media-libs/libjpeg-turbo:= ) - tiff? ( media-libs/tiff:= ) - png? ( - >=media-libs/libpng-1.2:= - sys-libs/zlib - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${WORKDIR}/${P}-jumbo-fix-enh-patch-${JUMBOV}.txt" - "${FILESDIR}/${P}-osx-bsd-${JUMBOV}.patch" - "${FILESDIR}/${P}-vdcomp-osx-${JUMBOV}.patch" - "${FILESDIR}/${P}-disable-jp2k-${JUMBOV}.patch" - "${FILESDIR}/${P}-fix-wait-${JUMBOV}.patch" - "${FILESDIR}/${P}-add-ldflags-${JUMBOV}.patch" - "${FILESDIR}/${P}-libpng15-r1.patch" - "${FILESDIR}/${P}-wformat-security.patch" -) - -src_prepare() { - default - - append-cppflags -DUSE_GETCWD -DLINUX -DUSLEEP - use jpeg && append-cppflags -DDOJPEG - use png && append-cppflags -DDOPNG - use tiff && append-cppflags -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX - - # Link with various image libraries depending on use flags - IMAGE_LIBS="" - use jpeg && IMAGE_LIBS="${IMAGE_LIBS} -ljpeg" - use png && IMAGE_LIBS="${IMAGE_LIBS} -lz -lpng" - use tiff && IMAGE_LIBS="${IMAGE_LIBS} -ltiff" - - sed -i \ - -e 's/\(^JPEG.*\)/#\1/g' \ - -e 's/\(^PNG.*\)/#\1/g' \ - -e 's/\(^TIFF.*\)/#\1/g' \ - -e "s/\(^LIBS = .*\)/\1${IMAGE_LIBS}/g" Makefile || die - - # 731022 - sed -i -e "s#lib -lz#$(get_libdir) -lz#" Makefile || die - - # /usr/bin/gzip => /bin/gzip - sed -i -e 's#/usr\(/bin/gzip\)#'"${EPREFIX}"'\1#g' config.h || die - - # Fix installation of ps docs - sed -i -e 's#$(DESTDIR)$(LIBDIR)#$(LIBDIR)#g' Makefile || die -} - -src_compile() { - # -Werror=lto-type-mismatch - # https://bugs.gentoo.org/859823 - # https://github.com/jasper-software/xv/issues/25 - filter-lto - - emake \ - CC="$(tc-getCC)" CCOPTS="${CPPFLAGS} ${CFLAGS}" LDFLAGS="${LDFLAGS}" \ - PREFIX="${EPREFIX}"/usr \ - DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ - LIBDIR="${T}" -} - -src_install() { - dodir /usr/bin - dodir /usr/share/man/man1 - - emake \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}"/usr \ - DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ - LIBDIR="${T}" install - - dodoc CHANGELOG BUGS IDEAS - newicon "${WORKDIR}"/${P}.png ${PN}.png - make_desktop_entry xv "" "" "Graphics;Viewer" -} diff --git a/media-gfx/xv/xv-6.0.0.ebuild b/media-gfx/xv/xv-6.0.1.ebuild index 2983ac332da6..5ab40bbd1218 100644 --- a/media-gfx/xv/xv-6.0.0.ebuild +++ b/media-gfx/xv/xv-6.0.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz - LICENSE="xv" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="jpeg tiff png webp" DEPEND=" diff --git a/media-gfx/xv/xv-5.2.0.ebuild b/media-gfx/xv/xv-6.0.2.ebuild index a1e2d3e14fb9..485e5e12aeb0 100644 --- a/media-gfx/xv/xv-5.2.0.ebuild +++ b/media-gfx/xv/xv-6.0.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake desktop flag-o-matic +inherit cmake desktop flag-o-matic xdg-utils JUMBOV=20070520 DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats" @@ -13,7 +13,7 @@ SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz - LICENSE="xv" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="jpeg tiff png webp" DEPEND=" @@ -56,3 +56,11 @@ src_install() { newicon "${WORKDIR}"/xv-3.10a.png ${PN}.png make_desktop_entry xv "" "" "Graphics;Viewer" } + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index aa51d5fa6576..ac84dfa9f858 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -1,12 +1,7 @@ -AUX zbar-0.23.90-fix-gtk-default.patch 1222 BLAKE2B 5d7bb46e1d1eafa34c75818bce154dc54528f88140d7959c0e1849c01189dd7e2019d0b1c9b254662c408eee05acc3ccc2f1d26387096745005a34bddae2a2fa SHA512 a7c2f51bde791fbf906a6226af067065dce71efe942d1c26e62ac1005577d05574fb96c4e15ed394b12acec0ca2b225aa4a97c29d59ddb305c2ff076c61fdc48 -AUX zbar-0.23.90-fix-qt5x11extras-detect.patch 641 BLAKE2B ec0b86a83a149ef2a62585ea8a4db088e5fdc63ed28ff57f358b30372dff86b898364e6c0983a689efbbd6a4df82bc9764dc2dedf1f6beb68dcc1852336bce1b SHA512 5ca82734a32d12ac2aa451cba87081f44df46a4a9afc5ff8a60adf59cce30dbdca06866313b1a511c778e690f6e40994f22e868a7a9d098d69e4c62a9b26a004 AUX zbar-0.23.90-fix-unittest.patch 2711 BLAKE2B 58d1bbebf60bb9533a7c2b40a29afa7e8229b79a925ebcd05e26c3a67c2144173baedc31f0d92d0341c51ccfb3763e95840ce2073012e7b61a0f252287d5d6b4 SHA512 cc5aaef37155ad72d6b72e05c2f53523268e15b84f573117e780e3f39cc4df3981d080558db83d0fb52d2daa47beeaab4f194e4f912e732648ac4c5bc683e11d -AUX zbar-0.23.92-py311-set-size.patch 1100 BLAKE2B be9b804d7ba1c5c1bae2a20853154da852a6ca1922f9a65f0583ea8d68f76d04e0e009c940417d24539cfb6577e47d8a6ee1d342de1a32b797afd4ebde284560 SHA512 9980027fdda6f995577c15c5c6337a45557802ed534da07208edb20cd99b8575f0c9864f1e48b2f300d973e682e73a0bac105a9eee7429db48224ddbcd15e8d1 AUX zbar-0.23.93-configure-ac-do-not-use-hardcoded-pkg-config-command.patch 2201 BLAKE2B 618def2024b4b6b3dbfdf298b0c30556a456bfc9e8f0e5bb6515a863e2b33c7603d861602be324b02af68df962f67370ecee7dd76f9a92bb129e1735e0f5b0b1 SHA512 ae3b1123d558d12690651da4ff7e77d5e805f3b2fb5372756cbb50ef18f73c87feee71aada35a2ca889e8f893d60969ed2d7a86c5e54c230902645d458e767e6 AUX zbar-0.23.93-configure-ac-use-old-way-to-detect-qt5.patch 1177 BLAKE2B 7283d87ad174c746f79a9d0531e10d5285d25d3e22c6dcc375a62377a12a22656483a69e19288e90367eeb7d31e31397c75fc7f75f3a0aede0cdec2e3bc3d317 SHA512 8a69dd84731b95ab4d5d0dc37bd83ecf7fa368e197226f0fb63dcce6dce01ef96682b0e12d06489c602d964eedc2ea69ada04b83fba2ef6c4452ca466a25b037 AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a655718b952d06ce0ec003bb08bf30979d6c467b2b50e6fb9a6cd06f95230ed4ae55e14599c276f9f41f03677b4d18167c6665c4 SHA512 d24d75f840d84488986cede3378e067ac68d218acac34a8c34888c88611df8f4b1b397cfd5ecfcda82480fd56ea2bada29d8373cc6e93ae8050b84e801c36ca7 -DIST zbar-0.23.92.tar.gz 1005358 BLAKE2B 97af3c399333abfcd64e45e6c4f38e5da6ed1540447f35f0efe9bc0fb8d296d80c964452afa29d26d22bddd8de31bc3ca6582db38afe8416e9480f11b939e040 SHA512 cae47fb199173fc1c052984865ca0e6aeab330bd6d77506a0937994d459deb4419a3e54e2dcd2e9830ffb8acf14f29e22e0a6becc9e4cfe19b07dad1babe9513 DIST zbar-0.23.93.tar.gz 1009320 BLAKE2B 7476776fbb2b2dca4fb94e4eb8c6c5ca7795e32881e93c45002679bdc048cb0bf8d880d2b31f1469a95d718c6d027b7ee0da195951645478493d6f638ae186b5 SHA512 2dd607afbb1e52346bfb740f916c8616112d14153f071f82458b7c653f647b332290a5089543abebfe1c7679eae98b349a84777185d61cfb9ff275bfecc6e08f -EBUILD zbar-0.23.92.ebuild 5477 BLAKE2B 4ad9610614f94c7bfd456ac625fb2685f9f39a6d77929fd02f19b67338f0eb46de3a88eb69c741174f0f9e46cec1aa951ec34fc57ca886a5f830cd844ef3fabf SHA512 bc55e7e43f35260f5ad30034b7859292f5518bdccb53892ae20c3b8e012d9ae6808c5ffd780273611e44a7a69a4e33b57256f3701ac08000e85904dfccc0b32c -EBUILD zbar-0.23.93.ebuild 5462 BLAKE2B d50dd9bf0aaee63310be3d6688961aea89beb524ee4319581c047ecfb7ec3fa065e7e83a270f2fa30b7b124ee29eae2c742887758ee4c40a189c12b4dc10df52 SHA512 551e4f59c81edb28b5760af67ad3164eea5b26166124e1348904caf5be22e7712536ec2eeb124b3fdd2c3491c9ee8e08624f081461ff37fa635da3c105c8957c +EBUILD zbar-0.23.93.ebuild 5460 BLAKE2B d0b4219cc9c23d5892391ddf3cf2e607f381b4b1a92e0372cde84e564743342896f3fc403e9e5d41e56e429cb37ffbc071179d4cd30495b35df844a05ddf9f09 SHA512 724d8129a8011fbce530eeffc2ec3570ad2b60a7479c991682ac02c704590ecb424ef48dd5a1957e2794a81438c8714457e2d59a35283a6f5ec5dd8fa0eb8886 MISC metadata.xml 799 BLAKE2B 8ab0acd59bd0d2a661b75724a6c5406782ec6d993dcd6ccc386ee4e6fc9f105a221d5e8c8f0a398f67c6bc9b3de23e53f41b7024220a561d405e632b979e932f SHA512 2672939457e8efcc1fb3cc94047cbb37cf8b69830144b69514c26d9bb29b23e8877d9a98f1b5b60b62c620ddc89c402e2a3c8b82ef05a07e4f08a2c2b3ca5bb4 diff --git a/media-gfx/zbar/files/zbar-0.23.90-fix-gtk-default.patch b/media-gfx/zbar/files/zbar-0.23.90-fix-gtk-default.patch deleted file mode 100644 index b1316243dd24..000000000000 --- a/media-gfx/zbar/files/zbar-0.23.90-fix-gtk-default.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 468f6bda627d683b3f40dbaf242c158409666f7e Mon Sep 17 00:00:00 2001 -From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> -Date: Sat, 13 Mar 2021 18:04:57 +0100 -Subject: [PATCH] configure.ac: fix some issues with gtk parameter - -By default, it uses Gtk3. Also, the with_gtk set to "no" -is wrong. - -Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b6f87531..30a59f72 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -492,7 +492,7 @@ AS_IF([test "x$with_npapi" != "xno"], - AM_CONDITIONAL([HAVE_NPAPI], [test "x$with_npapi" = "xyes"]) - - dnl GTK --dnl For now, defaults to GTK version 2 -+dnl For now, defaults to GTK version 3 - - AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk], -@@ -500,7 +500,7 @@ AC_ARG_WITH([gtk], - [AS_IF([test "x$with_gtk" != "xno" && test "x$with_gtk" != "xauto" && - test "x$with_gtk" != "xgtk2" && test "x$with_gtk" != "xgtk3"], - [echo "Invalid value for --with-gtk. Falling back to 'no'" -- with_gtk="xno"])], -+ with_gtk="no"])], - [with_gtk="auto"]) - - AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal]) diff --git a/media-gfx/zbar/files/zbar-0.23.90-fix-qt5x11extras-detect.patch b/media-gfx/zbar/files/zbar-0.23.90-fix-qt5x11extras-detect.patch deleted file mode 100644 index e8f6357eb486..000000000000 --- a/media-gfx/zbar/files/zbar-0.23.90-fix-qt5x11extras-detect.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur a/configure.ac b/configure.ac ---- a/configure.ac 2019-05-23 23:37:12.000000000 +0300 -+++ b/configure.ac 2020-01-22 12:27:14.190755156 +0300 -@@ -638,13 +638,9 @@ - - AC_ARG_VAR([MOC], [full path to Qt moc program]) - --AS_IF([test "x$have_x" = "xyes"], -- [qt_extra="Qt5X11Extras >= 5.0"], -- [qt_extra=""]) -- - AS_IF([test "x$with_qt" != "xno"], - [PKG_CHECK_MODULES([QT], -- [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 $qt_extra],, -+ [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0],, - [with_qt5="no" - PKG_CHECK_MODULES([QT], - [QtCore >= 4 QtGui >= 4],, diff --git a/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch b/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch deleted file mode 100644 index a51193af7777..000000000000 --- a/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream-PR: https://github.com/mchehab/zbar/pull/231 - -diff --git a/python/enum.c b/python/enum.c -index ba22ba63..4644509e 100644 ---- a/python/enum.c -+++ b/python/enum.c -@@ -50,7 +50,11 @@ static zbarEnumItem *enumitem_new(PyTypeObject *type, PyObject *args, - - /* we assume the "fast path" for a single-digit ints (see longobject.c) */ - /* this also holds if we get a small_int preallocated long */ -+#if PY_VERSION_HEX >= 0x030900A4 -+ Py_SET_SIZE(&self->val, Py_SIZE(longval)); -+#else - Py_SIZE(&self->val) = Py_SIZE(longval); -+#endif - self->val.ob_digit[0] = longval->ob_digit[0]; - Py_DECREF(longval); - #else -@@ -129,7 +133,11 @@ zbarEnumItem *zbarEnumItem_New(PyObject *byname, PyObject *byvalue, int val, - - /* we assume the "fast path" for a single-digit ints (see longobject.c) */ - /* this also holds if we get a small_int preallocated long */ -+#if PY_VERSION_HEX >= 0x030900A4 -+ Py_SET_SIZE(&self->val, Py_SIZE(longval)); -+#else - Py_SIZE(&self->val) = Py_SIZE(longval); -+#endif - self->val.ob_digit[0] = longval->ob_digit[0]; - Py_DECREF(longval); - diff --git a/media-gfx/zbar/zbar-0.23.92.ebuild b/media-gfx/zbar/zbar-0.23.92.ebuild deleted file mode 100644 index 5b8d7360950c..000000000000 --- a/media-gfx/zbar/zbar-0.23.92.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 qmake-utils virtualx - -DESCRIPTION="Library and tools for reading barcodes from images or video" -HOMEPAGE="https://github.com/mchehab/zbar" -SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv" - -REQUIRED_USE=" - introspection? ( gtk ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( - ${PYTHON_REQUIRED_USE} - X? ( imagemagick ) - ) - xv? ( X )" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - gtk? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - introspection? ( dev-libs/gobject-introspection ) - ) - imagemagick? ( - !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] ) - graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] ) - ) - jpeg? ( media-libs/libjpeg-turbo:0[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) - v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] ) - X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] ) - )" - -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.8 )" - -DEPEND="${COMMON_DEPEND} - java? ( - >=virtual/jdk-1.8 - test? ( - dev-java/hamcrest-core:1.3 - dev-java/junit:4 - ) - ) - test? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pillow[${PYTHON_USEDEP}] - ') - elibc_musl? ( sys-libs/argp-standalone ) - )" - -BDEPEND=" - app-text/xmlto - sys-devel/gettext - virtual/pkgconfig - gtk? ( dev-util/glib-utils ) - nls? ( - sys-devel/gettext - virtual/libiconv - )" - -DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog ) - -PATCHES=( - # git master - "${FILESDIR}/${PN}-0.23.90-fix-gtk-default.patch" - # TODO: upstream? - "${FILESDIR}/${PN}-0.23_fix_python_detect.patch" - "${FILESDIR}/${PN}-0.23.90-fix-unittest.patch" - "${FILESDIR}/${PN}-0.23.90-fix-qt5x11extras-detect.patch" - "${FILESDIR}/${P}-py311-set-size.patch" -) - -pkg_setup() { - if use python || use test; then - python-single-r1_pkg_setup - fi - use java && java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default - - if use python || use test; then - if use test; then - # make tests happy - # because one of the test requires loadable py module from the current ${BUILD_DIR} - sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \ - -i test/Makefile.am.inc || die - fi - - python_fix_shebang \ - examples/*.py \ - test/{test_python,barcodetest}.py # test_pygtk.py — py2 only - fi - - if use java; then - java-pkg-opt-2_src_prepare - sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \ - -i java/Makefile.am || die - fi - - # do not install {LICENSE,INSTALL,etc} doc files with 'make install' (use DOCS=() instead) - sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die - - eautoreconf -} - -multilib_src_configure() { - append-cppflags -DNDEBUG - - local myeconfargs=( - $(use_with dbus) - $(use_with gtk gtk gtk3) # avoid 'auto' - $(use_with jpeg) - $(multilib_native_use_with introspection gir) - $(multilib_native_use_with java) - $(multilib_native_use_with python python auto) - $(use_enable nls) - $(use_enable static-libs static) - $(use_enable threads pthread) - $(use_enable v4l video) - $(use_with X x) - $(use_with X xshm) - $(use_with xv xv) - ) - - if multilib_is_native_abi; then - # both must be enabled to use GraphicsMagick - if use imagemagick && use graphicsmagick; then - myeconfargs+=( - --with-graphicsmagick - --without-imagemagick - ) - elif ! use graphicsmagick && use imagemagick; then - myeconfargs+=( - --with-imagemagick - --without-graphicsmagick - ) - else - myeconfargs+=( - --without-imagemagick - --without-graphicsmagick - ) - fi - - if use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - append-cflags "$(java-pkg_get-jni-cflags)" - if use test; then # bug 629078 - myeconfargs+=( --with-java-unit ) - CLASSPATH+=":$(java-pkg_getjar --build-only junit-4 junit.jar)" - CLASSPATH+=":$(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)" - fi - fi - - if use qt5; then - myeconfargs+=( - --with-qt - --with-qt5 - ) - else - myeconfargs+=( --without-qt ) - fi - - if use test && use elibc_musl; then - append-ldflags -largp - fi - - else - myeconfargs+=( - --without-graphicsmagick - --without-imagemagick - --without-qt - ) - - # zbarimg tests with native abi only - # (this option from the patch above, stay up to date) - use test && myeconfargs+=( --without-zbarimg-tests ) - fi - - # use bash (bug 721370) - CONFIG_SHELL='/bin/bash' \ - ECONF_SOURCE="${S}" \ - MOC="$(qt5_get_bindir)"/moc \ - econf "${myeconfargs[@]}" - - # work around out-of-source build issues for multilib systems (bug 672184) - mkdir qt zbarcam || die -} - -src_test() { - virtx multilib-minimal_src_test -} - -src_install() { - if use qt5; then - local MULTILIB_WRAPPED_HEADERS=( - /usr/include/zbar/QZBar.h - /usr/include/zbar/QZBarImage.h - ) - fi - multilib-minimal_src_install -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die -} - -pkg_preinst() { - use java && java-pkg-opt-2_pkg_preinst -} diff --git a/media-gfx/zbar/zbar-0.23.93.ebuild b/media-gfx/zbar/zbar-0.23.93.ebuild index 2de79e7129ae..1bb7c4cc2030 100644 --- a/media-gfx/zbar/zbar-0.23.93.ebuild +++ b/media-gfx/zbar/zbar-0.23.93.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv" REQUIRED_USE=" |