diff options
Diffstat (limited to 'media-libs')
52 files changed, 2016 insertions, 264 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 35b04b636a22..29af07510c34 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest index 86180bf7989a..2719d2ee2a72 100644 --- a/media-libs/allegro/Manifest +++ b/media-libs/allegro/Manifest @@ -6,7 +6,7 @@ AUX allegro-4.4.3.1-texinfo-encoding.patch 778 BLAKE2B 7bd9538fb2fbded6e425ef6bb DIST allegro-4.4.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d1621fa84616968595c1284c73a86160cdbad201eece5bd026bb7ac13753568b6915295646b86e536b5d26c0394e2d1f SHA512 c5a552ab710226493447eb2547b3d7559badb96f511fbefd315b665b7486013a6710c83b69363eb09f90f53ef4278fe7b90cfee88d90d88f0fe8dc7df7606729 DIST allegro-5.2.6.0.tar.gz 7867726 BLAKE2B 3f21372442e5b8c802ac179019a11648febdcecddfda864559e1e9621f99c9ff7584fb422594c6fd3a1c352c892533c825faef10e35ecbf97058396fbb46fc7d SHA512 a475de67b0e6c727295cc51e113859eb0c57825a240e70bc45cd3b000c40518932b89cecdd13ba957416136db4ee9a9363adb5d3bfa7c8acda04ee95de6ba721 DIST allegro-5.2.7.0.tar.gz 7911231 BLAKE2B 9cc588a42d461ce06db94c1dd57642a2e9445c4930fcc164f2da57edfb463552a279a5e50f46740561a88c974c96605bb09fcc596e7bc6afb5e30b18ff7b74d5 SHA512 300bb951c661e7a220d913cca4116aba99afdcb5346af7c57b09bbdfa892d446cd64fde54397c57edb3c5f57d3380fbc2b6c4d9c9e17f48ff8180cfbf59e7d99 -EBUILD allegro-4.4.3.1.ebuild 2970 BLAKE2B 9286e322b7397b7ad99f42170b6e260d586e896af3396bb5e8d315d1a120ad0445dacf22825ea180264cec3236ffa967f5346695a13e2a934d70e63894619505 SHA512 caa42406b233bec316d1f57285cec04928f470cc4ac57c0a6b50a5ccf39816b43d4fc376bf06f46daa954af6795b06a811851a50124fc8259d2a93b293aaa594 +EBUILD allegro-4.4.3.1.ebuild 2977 BLAKE2B cb8b478a8970c24c7fd7c2a6c8650d9263762d3e67971c94e33466ecf95a357a8e9df3de78a8618730c97d48cff6e638b242f55718a2ea66dc07911af966950b SHA512 e9fbde100e978f62058f446378b0514e62e315a8e2a869623168e3bbcd4f057d67a9b7524028d6d1fd8afbb423043486942701fb215d37d7dd35c50e5f2c56ef EBUILD allegro-5.2.6.0.ebuild 2969 BLAKE2B cbc457b3bc7486368625b4e68f0e2113bf2ec6d7c8c06ac2a04f2f52845c3d24bbb35ebb421d3a036daaec70d08384a803fd6b9c18af3d6407f05c1af55b8ef5 SHA512 ae3061752943fadcfd1500014476f164699233d54a4d1f853f852476fd0e65d04a6f4942283a9bbff37fc29020506f987a80b8e8d792f9978c084f633d7d43fa -EBUILD allegro-5.2.7.0.ebuild 3237 BLAKE2B 6601d15cfbdf58a24fc157d5c23cffff5de5621716f68c9cad05125157b377962d1821a8fb7cde3b81f8d89f4b4dc50df716a09074e8c1564a767b47d3a31c0e SHA512 0f12764cc79847fdf4211389916053fe0805bfb34df335ff8618048b59db2beb17954af6d3f8d781a560e712c83daf147559ca5089a39d94e07ba958ae1b72b6 +EBUILD allegro-5.2.7.0.ebuild 3244 BLAKE2B ae90976458b74539cdcb9260ebd7195a1912b41e0250abf0525b06d3bcfef02311e47ad65031672c9d777a86e5a287165b54a889e7ac0a668ba4412107304aea SHA512 35371b138febed8ee87b66fdda167bbd84f31b573382e6b648d16d77aa78cb20cf10f7acacff8059577068cc46172167e08d9b015b36848deddbd2f5c3d37a51 MISC metadata.xml 1093 BLAKE2B 8cc4e85959faafa86e52e526676ae7bc69cbdfde6ea829db073f27dd2bf205130618673dca511f02b2d57ded95261ee5b47ffd337c6e1ce8f15a02a82929e77c SHA512 b66c3f858aba247b1ec1c0e77ff8bbf9fb11f2b98e827984af1fbdaa5af5a396e463aab40eeecdbde27e10be2c4c4ff836b197ed6dbb2afd6be30303004070ae diff --git a/media-libs/allegro/allegro-4.4.3.1.ebuild b/media-libs/allegro/allegro-4.4.3.1.ebuild index d5f82c7961d7..4c4d839a1c30 100644 --- a/media-libs/allegro/allegro-4.4.3.1.ebuild +++ b/media-libs/allegro/allegro-4.4.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.g LICENSE="Allegro MIT GPL-2+ ZLIB" SLOT="0" -KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86" +KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 ~riscv x86" IUSE="alsa doc fbcon jack jpeg opengl oss png svga vga vorbis X" RDEPEND=" diff --git a/media-libs/allegro/allegro-5.2.7.0.ebuild b/media-libs/allegro/allegro-5.2.7.0.ebuild index c6241370e13b..f577c06555da 100644 --- a/media-libs/allegro/allegro-5.2.7.0.ebuild +++ b/media-libs/allegro/allegro-5.2.7.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.g LICENSE="BSD ZLIB" SLOT="5" -KEYWORDS="amd64 ~arm64 ppc ppc64 x86" +KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86" IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama" RESTRICT="!test? ( test )" diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest index c17688bb2659..3ba86eef00dc 100644 --- a/media-libs/devil/Manifest +++ b/media-libs/devil/Manifest @@ -6,5 +6,5 @@ AUX devil-1.7.8-libpng14.patch 1221 BLAKE2B 970fa563cbfc333b7529392d52d1cd640ed7 AUX devil-1.7.8-nvtt-glut.patch 2493 BLAKE2B 4f96f75a6a49c1cdd4b3b89101be693ce4aa851c54aed3d09db752cece3c909085a53ef26e530dad70c70c00b522656ee4b2d6f5c3f83a22244d7eb4999d6566 SHA512 c9adacd0b2c2c1d8980ee87b69b27f0bd3f7f3285ef695499ee90bf4aff55cd8f65c990590478a45d02257c8bb9f01ccc463afe9313efe31a02ee67e15b3207f AUX devil-1.7.8-restrict.patch 587 BLAKE2B 265496bb262c945812182764903497d3b4b851eb48980d32197a7d732337ded032272544f7aef1cd725a796093ed274bf38b43bb4138b3bf199de2601a9c5732 SHA512 9370a94406e98979266d027857d7dd04069eefb6e2ccfb52d254b9eb658d932e5e7e9bd3a38aad57099b870c54aaa0a2d8b337f9bad42d06f6521c10d0a6f8db DIST DevIL-1.7.8.tar.gz 2051993 BLAKE2B 7c06549f7d90965fe6dcd7c6b460119a8491ca50f3103c745195fa5483885878717e9ae417eda51f25cbb60c0a96be180b12727115212709199ded13156ecb3e SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e -EBUILD devil-1.7.8-r2.ebuild 2127 BLAKE2B 2182ec8999f3ec83b93dc1e247a61f5ed2f383d54b8901f40ec1c11e933916235d725e60f8a8423a6f7cc4eb131f225014c015187dcd3fa28d1a600b3372c570 SHA512 e98887fbb86ee933bba86c1b3538e34a3ebb0b6361b4e49b554a85a69feeb1dd652233565c13043c5763781a6a63330c12f0d3b15ff91951b23b7a46fab9778f +EBUILD devil-1.7.8-r2.ebuild 2142 BLAKE2B d9ef2e6223ea2de918726a6f73f6cb342aea5a092be8a2e0ead630bcf0ef31af3f6ef79ef043c0e9eca2b8701d9ce2462b801bb8405acc92f0c6aacfc1dab14a SHA512 0539a865a64ffc14e0afec959e28277c81bd83f1c4e31155bd43b24429000e983e839e71c8b8639b2145ee374d94ec2c0501b9752b9bb01483c87d5f910331e4 MISC metadata.xml 499 BLAKE2B 44a05534504849bd393e8b60ca5d7ce0e1b7862fea7bf120ca7f1d4f38d21e9d4566b3037fc9dc9d403f7b8732c175693d3594fb1603d53642354f3a07cf8951 SHA512 68440791a1c641a6983d297e924bee78038905b1ee383592b220f0ef51980d8f9eb237a6d70b0d848781d08e72fe02f4b4f36691d37a72b4003ea59fe3764cfc diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild index fad8f814c325..2e70bc70215e 100644 --- a/media-libs/devil/devil-1.7.8-r2.ebuild +++ b/media-libs/devil/devil-1.7.8-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86" IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt openexr opengl png sdl static-libs tiff X xpm" RDEPEND=" @@ -30,11 +30,11 @@ RDEPEND=" sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libXext - x11-libs/libX11 - x11-libs/libXrender ) + x11-libs/libX11 + x11-libs/libXrender ) xpm? ( x11-libs/libXpm )" -DEPEND="${RDEPEND} - virtual/pkgconfig +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig X? ( x11-base/xorg-proto )" PATCHES=( @@ -86,5 +86,5 @@ src_install() { default # package provides .pc files - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die } diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index 3d88e09937fd..7e1cdd3ca6a2 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -3,8 +3,12 @@ AUX freetype-2.10.4-dont_hardcode_libtool.patch 1312 BLAKE2B 7cd7d9f5284a54a9667 AUX freetype-2.10.4-slibtool_build_fix.patch 1262 BLAKE2B b2e3fc0565f5b90c00628d44ec3d1633c3ccce0df3effabaf9e36636b78067d03c899c86a100e11df27ca299daf4afdc815924430b04a42bcabb4104d7f4a8b7 SHA512 5fd4fce61c4f1f78fc6e19477e89b8f989ad17a50ff48c49841f6a7499e0843525a489e622db8064799749b53e62f0177bbfde519fe03813eedd7ca6e752f238 AUX ft2demos-2.10.4-install_target.patch 1647 BLAKE2B 4409123fbb089c1312ff90ebbb32c70f3a0025d96b705dd6be24bdf33fa0b1956e512549c39e5b378c2a6f4a4cb8e7708c096c786fbf0bcc3e037f691f9aad21 SHA512 5d77f5892f7ce4ab1bc3dcbfb04cd86f2fc54e347c2b3ce7e701995b0f75efc0164797b18454b645a0cc1cc8b0f41816b5bca19d786a66f3bc145fa0ca2cd8b1 DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f +DIST freetype-2.11.0.tar.xz 2256640 BLAKE2B ed14b566b8ac31a85dde4c8d26dd8b001f6a2cb506cfafd550b31bb90a3f592376d6f9f6bbe1b6c21e27e4ad23d0eafa7ea886211174b978e101fb6a77261324 SHA512 bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d DIST freetype-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8 +DIST freetype-doc-2.11.0.tar.xz 2070604 BLAKE2B a45fa2e97574868fc4f08c646cb815152dde462538a32fddfc5ddccb32343286765f3952b9fc8b66204dfeb62470d4fada1a2338c377efa1c716ab9c5885fd60 SHA512 5bddaec4f237a9f6e63dbed5f65d0b5ffe0a414ea2d6e1c3bb1142baf5535cee7e7c282b6af8c630e772ffc196b8c4bf8e18bc21a72749a09b6af388287c7301 DIST ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac83793da787e688ad8446fceac1ce315014bde03d4271fc5a1b7bd1d3250255f5faced92beade6e4ed78c896db80d SHA512 d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8 -EBUILD freetype-2.10.4.ebuild 6744 BLAKE2B 0ca789f56a698d01a7de9d0a285d8d09568ee50d66ce044963fa1c8cf6c8a601d8d042d09b82c2c3c2918ad35149d590cff81051b750eabd0e7979b25e9d64f9 SHA512 517942a03670269d1184fad384cb2ee77b84d2192ecbcb3fa28deee9e7148eef965b0a55c941994cf54e971034ad20367a1d8c69852fdc04f6eb924fdfe7893b -EBUILD freetype-9999.ebuild 7204 BLAKE2B 8fddb4b9232c960abb584841ca406c43820b994f6ed19d8c238dd8770b9afa4b151ead08c28539314de18f8f0818c19b7caf8e02f29ca0697b8b48d2c9ad6eb7 SHA512 d22668dc29e767cff3545c9e41bf132d9637fbcc55a0ffaed696432e24914f9901d169e1422084e294815eb09990ee97da217efbddf24397834f259e5af91e54 +DIST ft2demos-2.11.0.tar.xz 257316 BLAKE2B fa59eeeba502733db940965a1affe8fc9ecefd68d3d31dd8c8a94b769310d53975403f7a7c4c6ca6f381b10f9b3057698bd09fff9adafa26981192478d3ca602 SHA512 9c5727bf479afafc1c765a131875b88b0e656d1db986f95c021b0386f5c4cc6135db7584a5d553363dcf52dfc9c9199cd1f3da2cc6644f58de85848b058fd531 +EBUILD freetype-2.10.4.ebuild 6685 BLAKE2B ff901fcd11233f9c6a985704ff2296d86331618e02097274edc12fa792d9a11de530eb6f761514b4d03e11b00d42c993c73b3936a9b9bfa0cab15c9eea36f501 SHA512 e991118b3868791a4dd4cac750d4a31935766a97cc4998a0561f0a296f54e8bae7da7057226642e83cf61199dbaa463c17f97422edd73f30a65ad9dafd9ce750 +EBUILD freetype-2.11.0.ebuild 7145 BLAKE2B f07030afe12ba89b7a67cf9a38e01968f814dcd14411c0917dfee7fec3fb1349b733446ee6f7a279efba38237b39b4293470b3e30a44553bb03411807a726ace SHA512 18d39d3e1eb0e5cc4af16baf26880a30125bc6516fa71d4df16e27291f89591ecbf7659368e7c80ba4d0d352f721d6c456cde3c2147686031bd7017b638d9e33 +EBUILD freetype-9999.ebuild 7149 BLAKE2B d9698283807a6799874f8a091e1defce0493d4595b59fe4b9eae558523bcdea09576342dbb5ea4c8c67982a74391e9ac2aa6c6d39f3ae29db752cbf12e5214d5 SHA512 faf5616c0a855be291e1613cc0c2082bda0092e106c053989a333c4b7d3ed2ef7d41094e7e174f516aed831e0701e378ba3bacebbd0a95022bed000b0b1fdc30 MISC metadata.xml 1613 BLAKE2B 93afe7641d11f06f2b6c87348498fe292b50f1b6240019532bc8639bf2b70c0511014c720e3fc7fe0e0f033bb4449745df0a489597750e4d99695798bbbdf2b1 SHA512 ee0c14554af76884f8efced54d2dd7b0dcb90c3aeb8e6ed638956a79d840bc825c32af49230f56e7659bdfc4cfe761068c0ebf31ee3cd28f79078cd5738e052e diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild index 828493a8d241..4bec88e1dd43 100644 --- a/media-libs/freetype/freetype-2.10.4.ebuild +++ b/media-libs/freetype/freetype-2.10.4.ebuild @@ -43,7 +43,6 @@ DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig " -PDEPEND="infinality? ( media-libs/fontconfig-infinality )" PATCHES=( "${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966 diff --git a/media-libs/freetype/freetype-2.11.0.ebuild b/media-libs/freetype/freetype-2.11.0.ebuild new file mode 100644 index 000000000000..7f20a7b5a1dd --- /dev/null +++ b/media-libs/freetype/freetype-2.11.0.ebuild @@ -0,0 +1,246 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs + +DESCRIPTION="High-quality and portable font engine" +HOMEPAGE="https://www.freetype.org/" +IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs utils" + +if [[ "${PV}" != 9999 ]] ; then + SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz + mirror://nongnu/freetype/${P/_/}.tar.xz + utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz + mirror://nongnu/freetype/ft2demos-${PV}.tar.xz ) + doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz + mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + IUSE+=" doc" +else + inherit autotools git-r3 +fi + +LICENSE="|| ( FTL GPL-2+ )" +SLOT="2" + +RDEPEND=" + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] ) + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] ) + png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] ) + utils? ( + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] + ) + )" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966 +) + +_egit_repo_handler() { + if [[ "${PV}" == 9999 ]] ; then + local phase="${1}" + case ${phase} in + fetch|unpack) + :; + ;; + *) + die "Please use this function with either \"fetch\" or \"unpack\"" + ;; + esac + + local EGIT_REPO_URI + EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git" + git-r3_src_${phase} + if use utils ; then + EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git" + local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" + git-r3_src_${phase} + fi + else + default + fi +} + +src_fetch() { + _egit_repo_handler ${EBUILD_PHASE} +} + +src_unpack() { + _egit_repo_handler ${EBUILD_PHASE} + + if [[ "${PV}" == 9999 ]] ; then + # Need to copy stuff from dlg subproject (#758902) + local dlg_inc_dir="${S}/subprojects/dlg/include/dlg" + local dlg_src_dir="${S}/subprojects/dlg/src/dlg" + local dlg_dest_dir="${S}/include" + mkdir -p "${dlg_dest_dir}/dlg" || die + cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die + cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die + fi +} + +src_prepare() { + if [[ "${PV}" == 9999 ]] ; then + # Do NOT automagically mess with submodules!!! + sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die + # inspired by shipped autogen.sh script + eval $(sed -n \ + -e 's/^#define *\(FREETYPE_MAJOR\) *\([0-9][0-9]*\).*/\1=\2/p' \ + -e 's/^#define *\(FREETYPE_MINOR\) *\([0-9][0-9]*\).*/\1=\2/p' \ + -e 's/^#define *\(FREETYPE_PATCH\) *\([0-9][0-9]*\).*/\1=\2/p' \ + include/freetype/freetype.h || die) + FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}" + [[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}" + pushd builds/unix &>/dev/null || die + sed -e "s;@VERSION@;${FREETYPE};" \ + < configure.raw > configure.ac || die + # eautoheader produces broken ftconfig.in + AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf + unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE + popd &>/dev/null || die + fi + + default + + # This is the same as the 01 patch from infinality + sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die + + enable_option() { + sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \ + include/${PN}/config/ftoption.h \ + || die "unable to enable option $1" + } + + disable_option() { + sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \ + include/${PN}/config/ftoption.h \ + || die "unable to disable option $1" + } + + # Will be the new default for >=freetype-2.7.0 + disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" + + if use infinality && use cleartype-hinting ; then + enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )" + elif use infinality ; then + enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1" + elif use cleartype-hinting ; then + enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2" + fi + + # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1" + # via environment (new since v2.8) + enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES + + # See https://freetype.org/patents.html (expired!) + enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + if ! use adobe-cff ; then + enable_option CFF_CONFIG_OPTION_OLD_ENGINE + fi + + if use debug ; then + enable_option FT_DEBUG_LEVEL_TRACE + enable_option FT_DEBUG_MEMORY + fi + + if use utils ; then + cd "${WORKDIR}/ft2demos-${PV}" || die + # Disable tests needing X11 when USE="-X". (bug #177597) + if ! use X ; then + sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die + fi + cd "${S}" || die + fi + + # we need non-/bin/sh to run configure + if [[ -n ${CONFIG_SHELL} ]] ; then + sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \ + "${S}"/builds/unix/configure || die + fi + + elibtoolize --patch-only +} + +multilib_src_configure() { + append-flags -fno-strict-aliasing + type -P gmake &> /dev/null && export GNUMAKE=gmake + + local myeconfargs=( + --disable-freetype-config + --enable-biarch-config + --enable-shared + $(use_with brotli) + $(use_with bzip2) + $(use_with harfbuzz) + $(use_with png) + $(use_enable static-libs static) + + # avoid using libpng-config + LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" + LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" + ) + + case ${CHOST} in + mingw*|*-mingw*) ;; + # Workaround windows mis-detection: bug #654712 + # Have to do it for both ${CHOST}-windres and windres + *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;; + esac + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use utils ; then + einfo "Building utils" + # fix for Prefix, bug #339334 + emake \ + X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ + FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi && use utils ; then + einfo "Installing utils" + emake DESTDIR="${D}" FT2DEMOS=1 \ + TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install + fi +} + +multilib_src_install_all() { + if use fontforge ; then + # Probably fontforge needs less but this way makes things simplier... + einfo "Installing internal headers required for fontforge" + local header + find src/truetype include/freetype/internal -name '*.h' | \ + while read header ; do + mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die + cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die + done + fi + + dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} + if [[ "${PV}" != 9999 ]] && use doc ; then + docinto html + dodoc -r docs/* + fi + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild index 1caabaa6c63d..85c3544019b3 100644 --- a/media-libs/freetype/freetype-9999.ebuild +++ b/media-libs/freetype/freetype-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs @@ -42,7 +42,6 @@ DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig " -PDEPEND="infinality? ( media-libs/fontconfig-infinality )" PATCHES=( "${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966 @@ -61,10 +60,10 @@ _egit_repo_handler() { esac local EGIT_REPO_URI - EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git" + EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git" git-r3_src_${phase} if use utils ; then - EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git" + EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git" local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" git-r3_src_${phase} fi diff --git a/media-libs/gupnp-dlna/Manifest b/media-libs/gupnp-dlna/Manifest index 7c71f48a2081..9497f0b4f748 100644 --- a/media-libs/gupnp-dlna/Manifest +++ b/media-libs/gupnp-dlna/Manifest @@ -1,3 +1,5 @@ DIST gupnp-dlna-0.10.5.tar.xz 329468 BLAKE2B 045c890bc05e7a8e8321c46b333b27ec112b470f484961b24dad5652c0d065db52187c4ac19ed392319e12d2cf7b835b43304edf1307ffc3bb5f2c5c7baded4c SHA512 060e997dc85d840722bc31c8eb2c7f986151220ac6f3de9e073f4dd62fdd57ffa049b628080832d6b96c1988f49eacc29d539f738ed61797019264f68ebf7680 +DIST gupnp-dlna-0.11.0.tar.xz 87920 BLAKE2B 8391503c66da267d936563b1b39b1f390bdeb2d4511a900fb99faf968307026e857b66d2f43dd14309e9e4e9790801538947f6c8506391c0da39db6a7b854a6b SHA512 26aad6eb3f7705fa586552a1e4d6931b3ff28b6dbcfd7a626dea297ffd90e67f02957b68e0bb6c80e4fd445dbba1bd47dc47bcf8ac389ff2bb0622cd9ca7f3d1 EBUILD gupnp-dlna-0.10.5.ebuild 1522 BLAKE2B 24ddc3af27cf3342545772827ba1f17844c14f0c2ab9cf7564e5d8d8988163d7582bb5e8d7872ac16443e58356d9bddde3ecfa19ccb2729ebc5c6ba689815937 SHA512 c738ba044bff0cac84ac42b29b4470118ddb69e7006d4f362f684058864a1223df9f3e4b18e5f8739c3ff0a2886c0ba3032e01658a7b4e93ddf55dd8fa096fa0 +EBUILD gupnp-dlna-0.11.0.ebuild 1092 BLAKE2B 1f3dab8d9de1c4b1613626a7d86d3bd176a3cc22743af6daaf77e0484e107dd92701cf111fb78aa307bf2b2f853909510c19af15eadb81d6e087c6a63a226d6c SHA512 694b609ec782e2c1637668ab8e76314a81405335bf3f67339f00bdfe3e3851866b487a1eb58de0b10d0a0ecde420b9c63b4a542b79cb4087d653f606b8e57c43 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild new file mode 100644 index 000000000000..53b0232ab7d5 --- /dev/null +++ b/media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_USE_DEPEND="vapigen" + +inherit gnome.org meson vala + +DESCRIPTION="Library providing DLNA-related functionality for MediaServers" +HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp-dlna" + +LICENSE="LGPL-2" +SLOT="2.0/4" # subslot: soname version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="gtk-doc +introspection" + +RDEPEND=" + >=dev-libs/glib-2.34:2 + >=dev-libs/libxml2-2.5:2 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0[introspection?] + introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + introspection? ( $(vala_depend) ) +" + +src_prepare() { + use introspection && vala_src_prepare + default +} + +src_configure() { + local emesonargs=( + -Dgstreamer_backend=enabled + -Ddefault_backend=gstreamer + $(meson_use introspection) + $(meson_use introspection vapi) + $(meson_use gtk-doc gtk_doc) + ) + meson_src_configure +} diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest index f3f573b7a234..0eb2a6685054 100644 --- a/media-libs/harfbuzz/Manifest +++ b/media-libs/harfbuzz/Manifest @@ -1,7 +1,7 @@ DIST harfbuzz-2.8.1.tar.gz 17939717 BLAKE2B 4e6eeb0beb45e88386d994eb219479a2ed68bd1b78af3becb4ef1c89152e21924319b415e194f57c7aa4acf8031ab4ae35725b873f36b6f816aaa33a7bbb86d9 SHA512 16e43b9182d3ebd2394c2c0e0df815ca9e715d55dc7e46de4eafcde49ddf59cccae69a5340e05c8aa2ee6bc2ba46d1cffae8252d1b2a004ffe9d70c62628cf73 DIST harfbuzz-2.8.2.tar.gz 18506485 BLAKE2B 39a43d643339a5bc27d886e418695d2864ad7b9094dc508f5ccf52bf635b340adb7ec6958a15349e0b2580444ec98c5850e4022f708287fbe44cb7ea90065881 SHA512 51eee8c8fa6f839512e0dfc5c80ae8ed1e09d747d0ffc6736e5a1cbf86de956322f23e6ea25a90985e2317e98229a133e208da2a7b5177d65894cc64706ee8d4 -EBUILD harfbuzz-2.8.1.ebuild 2492 BLAKE2B fa89daa0b745c7b5035bcb4e94dfee1e8d7bcdaac1a59e2f394a5f705254fe463922251d95e87868c78e8d4123fda3bb946757a18054cd86337de1484a6a679d SHA512 582d14b536c6a9bddfe6a74b00e0e30672d5e4fc86786cf7dfa5d6fb52432b2fc31ad081c44f7b1a4c07d8f2b5362a0448ef04bc28827e836a1b648e0254f20b -EBUILD harfbuzz-2.8.2-r1.ebuild 2562 BLAKE2B 6f1ba8d515f3387f59bd2b3c443d61984eebc495bacd241fce9feca138e3139f7617b0ef49ad96dcd737936a3f8951d72ad9ae983e52a6e6d48450c855845e67 SHA512 a455f7884e3569d42b4bd8331fe8e11cf76e8d6321add9ccd850f80d478177ca9e55aa5284377c91a3df670e3038690c5b7925324e6ef82148e003569952b48b -EBUILD harfbuzz-2.8.2.ebuild 2500 BLAKE2B 93be2b3189be9c9b6506e0741743c0c76231aaccf619d1021cccd00bafc2c8506f8e3209d849a8762b2c12e9f4accb9bd9492de81228cb99d7da1c510e682a15 SHA512 a0d35c7158d698fe597be089897aaeeb22ed2f1a61e0f2d72fd42562d8466482e04736f46ca493f07cb10d88a39e70bfd36bf4d7346a359bc54bb1ac0f5aea2d -EBUILD harfbuzz-9999.ebuild 2562 BLAKE2B 6f1ba8d515f3387f59bd2b3c443d61984eebc495bacd241fce9feca138e3139f7617b0ef49ad96dcd737936a3f8951d72ad9ae983e52a6e6d48450c855845e67 SHA512 a455f7884e3569d42b4bd8331fe8e11cf76e8d6321add9ccd850f80d478177ca9e55aa5284377c91a3df670e3038690c5b7925324e6ef82148e003569952b48b +EBUILD harfbuzz-2.8.1.ebuild 2497 BLAKE2B 89bb2b0796c1a151efc58f43abb0c87df3829361be12e37d43652dae4c002efd29405c61e2e66350ac5ae8b75693f385ce4594d8e480d7a389a3311af4c41621 SHA512 8093198447adef9c164c8fb8d7f9a39a39bfd3ca43e2210a2d4edfe6e51716378c009f0aa5b64e5560f4f174021b8b525d9a3d2837aea53eba6059efd1cf336e +EBUILD harfbuzz-2.8.2-r1.ebuild 2567 BLAKE2B c3d727edc7b320f54dd2e09d29f49bd57717c4db4e49123869cf0bfc2eb28475587ef78ddd24222afca5a6e92fe4076efad2bcb8ae63fdb0f2ec4d21e74af36a SHA512 c677139803efe70c41326932b7d26b7567ece5cb97d334314a73176fccb68452bcc99fb72fb6aa677ebc79855678af6e1201e2d17cc73ad9349d230cb676a09d +EBUILD harfbuzz-2.8.2.ebuild 2505 BLAKE2B e1cecf62258e0ea429215a93982370049e83d1675270fcda4c2fdf7b62f313aa5779b30a974c7b1a110644387044d022e040a5d864372e623b29ff920e836779 SHA512 9026825422ce7bab7773a9e6803b7f43cb65c192f83d0286244730fb06eefc63f8e61e39cbd30431c24b74df30897ad4fed5ca7ad0a6ae3bd658f5ce325e5eee +EBUILD harfbuzz-9999.ebuild 2567 BLAKE2B c3d727edc7b320f54dd2e09d29f49bd57717c4db4e49123869cf0bfc2eb28475587ef78ddd24222afca5a6e92fe4076efad2bcb8ae63fdb0f2ec4d21e74af36a SHA512 c677139803efe70c41326932b7d26b7567ece5cb97d334314a73176fccb68452bcc99fb72fb6aa677ebc79855678af6e1201e2d17cc73ad9349d230cb676a09d MISC metadata.xml 817 BLAKE2B c5e4059fe45c0727f6fc831402f6ea0617ffcd70db271b8c36365c8f815347ba12f6a0193ebef2ebb614ef382ddf690e686997045f0eb6e9ec3ebced9147c475 SHA512 9516b81d89c29a1545555925a377c303c69842808915a1a4e376dce77af29a9f9d1f1c0eb0cf4ae5f6698378bffbb81943df5add554cf8a4207fc4aa0978ab84 diff --git a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild index 453389b63317..4cb7ec1c415f 100644 --- a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild +++ b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild @@ -78,7 +78,7 @@ multilib_src_configure() { local emesonargs=( $(meson_native_use_feature cairo) -Dcoretext="disabled" - $(meson_native_use_feature doc) + $(meson_native_use_feature doc docs) -Dfontconfig="disabled" #609300 $(meson_native_use_feature introspection) $(meson_use static-libs static) diff --git a/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild index e77ca3c2cf7a..86a480282559 100644 --- a/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild +++ b/media-libs/harfbuzz/harfbuzz-2.8.2-r1.ebuild @@ -87,7 +87,7 @@ multilib_src_configure() { $(meson_feature truetype freetype) $(meson_native_use_feature cairo) - $(meson_native_use_feature doc) + $(meson_native_use_feature doc docs) $(meson_native_use_feature introspection) $(meson_use experimental experimental_api) diff --git a/media-libs/harfbuzz/harfbuzz-2.8.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.2.ebuild index 9f52c19d3421..91e50bcaf5b1 100644 --- a/media-libs/harfbuzz/harfbuzz-2.8.2.ebuild +++ b/media-libs/harfbuzz/harfbuzz-2.8.2.ebuild @@ -78,7 +78,7 @@ multilib_src_configure() { local emesonargs=( $(meson_native_use_feature cairo) -Dcoretext="disabled" - $(meson_native_use_feature doc) + $(meson_native_use_feature doc docs) -Dfontconfig="disabled" #609300 $(meson_native_use_feature introspection) $(meson_use static-libs static) diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild index e77ca3c2cf7a..86a480282559 100644 --- a/media-libs/harfbuzz/harfbuzz-9999.ebuild +++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild @@ -87,7 +87,7 @@ multilib_src_configure() { $(meson_feature truetype freetype) $(meson_native_use_feature cairo) - $(meson_native_use_feature doc) + $(meson_native_use_feature doc docs) $(meson_native_use_feature introspection) $(meson_use experimental experimental_api) diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest index 6cf3905ad375..9ffbb45cfd23 100644 --- a/media-libs/ilmbase/Manifest +++ b/media-libs/ilmbase/Manifest @@ -2,5 +2,5 @@ AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e5 DIST ilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412 DIST ilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40 EBUILD ilmbase-2.5.6.ebuild 1080 BLAKE2B 6d186c002551cde60e7c6d2642bbea2087e247a6619cbb625558130bb7c743b3c4d9dae94c7078165eb78be1c51d4f02301706a67cb71b63e111403eb80a871e SHA512 1431d949d5687df526a45d8bc41e0e6c958c15d4e0c873e82548ab5f22414fcfedd5a12a59fee6a105b92813c14decc4271cba7c6e68acf2fe4017b675525359 -EBUILD ilmbase-2.5.7.ebuild 1091 BLAKE2B d8ef6e5ff67d0f6482d9e6f29d300e26f373443cfddd325cdd06cf7f4423ed4b5294e264271045806fc2d477f6818009d5ba6ec198873153f3dc331508285605 SHA512 f3cf1d268678b80252696ffd59640cccf1f7d73ef45ac8c2aa3274a377a60337bcdc776098ebe68ab9d623418d8da212cc2f9bd4501b37d042d493d72e8fbe15 +EBUILD ilmbase-2.5.7.ebuild 1090 BLAKE2B c7bb12c40a49c20ed403985f85d50b27f8da9d68bf5682ee09e766bbcb3072fdf112f00724d3ba2f316856d619cab9110c69a253b0169d304d529411e89e66a8 SHA512 e57f77c2d2fded932af373aa3e1d29696cd4184ae6a6354b8c04b1a14eb5c14b3506fbac0fb18d79e618881b0631f97d42e7c2a625ac62e36f17b97e86333255 MISC metadata.xml 691 BLAKE2B 9c6c8f6eb00b3959cbae60225c3d094b9abcb55b0c755dff4906a4d81c1b87bc38fff9e5d306a20a82c8fbd8419e203e0c89889f3be7b1486594527183ab5143 SHA512 2adb19e5ae0e25184c26b0787aa7275e8707dd79609f5d4b6f6723cc2f64e64fec4954296d2bfefd3edff341b3c0a22b60da6069ddb636a422110b157af353c6 diff --git a/media-libs/ilmbase/ilmbase-2.5.7.ebuild b/media-libs/ilmbase/ilmbase-2.5.7.ebuild index 937df9029dd0..f4151651546a 100644 --- a/media-libs/ilmbase/ilmbase-2.5.7.ebuild +++ b/media-libs/ilmbase/ilmbase-2.5.7.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/openexr-${PV}/IlmBase" LICENSE="BSD" SLOT="0/25" # based on SONAME -KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" IUSE="large-stack static-libs test" RESTRICT="!test? ( test )" diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest index b3f514ef42b9..1b1ebe7c07a0 100644 --- a/media-libs/imlib/Manifest +++ b/media-libs/imlib/Manifest @@ -10,5 +10,5 @@ AUX imlib-1.9.15.patch 2253 BLAKE2B 8ab175dd3c22790dadde804d6de2f78497a1553a0b6c AUX imlib-security.patch 13040 BLAKE2B 65eb4e5435dea0bba755ae21548fd7c25cc65a0f5ac7130905cf064c2f59b3dbe21d1cdd90de25e9f7e27fa1905bb51a38845b8ec92cff86cff6fbed789309d4 SHA512 a75537267e9e276920fbc0360cd4832f727c6c9857401889bdb1466f3088c98e5ea2ef84a94a5873a3c12dda0b9aed36a5e2039fece87e51154a3b773d97aa5c DIST gtk-1-for-imlib.m4.bz2 2742 BLAKE2B af16f586cbfb53522bb53b55d551d21ddf765e06694bebe93637b24c31bfdfff95f7ef250e66b784d7371bb309e4939c7db40c0ba1f1b1d73526e16cf745a93f SHA512 83708af1c7d7cf10960463b785bad096d77e985be5907dd59c73c2cb86c4b89fb5453a02ffddca1519185b91d205dbd96c4c4c1df4da4b67e64bad413cd8a40e DIST imlib-1.9.15.tar.bz2 683242 BLAKE2B 16cc11d2ddc69af7201215454c465d104354b63b4e0b1d8aadd07daf889368478dce28ea8ecf6b16daef3019891fcf7a794abccf02b236d1a6c737b0e9db08d3 SHA512 f50d9141b3c54b44921aa09c0a5ea848aefaa904efdd6da132dace42604671f8dbd3e4b71a596f054f0db4525ba2002864b5e5b21f8805cf1b5514b661ac254a -EBUILD imlib-1.9.15-r5.ebuild 2139 BLAKE2B c9a89a74b66b6cc50ba454f6a48d6077cc7fdf57287d115156b7487ca8ede1136944883df43391b1435f42149d837551bfd137f96910b966cc548412a5eb509b SHA512 dcf9c97d784e85866c7c8bddad1e4c14d9bee96cd98abd5b29e073a2142e4e01cb58a2ed2ac736b30b96ebad038ebdb3bdb15d8158062ce9b3d5b3ba743ba6b6 +EBUILD imlib-1.9.15-r5.ebuild 2146 BLAKE2B a4a29abbd10945eb2f73420c9197480b01ef866e50f0dbb96d76d66b4a704513f60ab1feaf66d477d81c96ae120e1643e41cc76d598980b926fa314100c46c0d SHA512 8d13720a5b9f36c97f809e306e653c3b5cd8543de68b8f977eb708f0eca97b2d0632b657979e809a32a1c86dddb0c0e726feb444bcadaa12cb41c18419086879 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/media-libs/imlib/imlib-1.9.15-r5.ebuild b/media-libs/imlib/imlib-1.9.15-r5.ebuild index 90044b6e28b8..638c7d6d914d 100644 --- a/media-libs/imlib/imlib-1.9.15-r5.ebuild +++ b/media-libs/imlib/imlib-1.9.15-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="doc static-libs" RDEPEND=" diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest index dc7a692b7952..f54b7affad21 100644 --- a/media-libs/libao/Manifest +++ b/media-libs/libao/Manifest @@ -2,5 +2,5 @@ AUX libao-1.2.2-automagic_sndio_oss.patch 1407 BLAKE2B 8a67faac3b2d4a617683af689 AUX libao-1.2.2-implicit.patch 530 BLAKE2B 085b0782f7ba13088cac1d063183d6c0a6b5bf784e9ba90d1e2d1587579d78a6d58b5754733e2e2749815562513b0be0898f0709719eb6f7f55d5389040165bb SHA512 fac9d6628ad132215935190ba0d55f5837c638572988426996e3fb91053fed06739dbd57bea2518e11459af4f6e941e45d46bc3094aa2919318386dd93a448c8 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a EBUILD libao-1.2.2-r1.ebuild 1523 BLAKE2B c5234b18ee4fee0d71c12f22fb6143b0426dea17282d2b6fae84550a6707101316080d2cf8fdcd89f55e7bd40d88e6a50ff5d508da30bfdee62a371fa6720ff7 SHA512 c1823efe1bebe94ff7c5ee1352db03b1f07aaa47d849db9bc4a089679115c8e8f75ade6e6ff07a64db9ab192d0be2655b35e7eb3881efdb4fcc6f79566f63780 -EBUILD libao-1.2.2-r2.ebuild 1676 BLAKE2B 6361cdc5748b06d7ba2c07718955aebf109fa2e2373a625de6f1724dd0f8699124694647cfe06982620018ac8a40be90a281bc8d13307650ff63d0d61e3f4473 SHA512 3855db86f275be862fd7646364704dd4ffad3740c6faecd3d2f6422d546bed4e9288a648a58cd735ff5f109c239aa14121fa7716cf9ddc080983e0d22ea5b85d +EBUILD libao-1.2.2-r2.ebuild 1675 BLAKE2B 74dc839aba3d44d1824c83a284af5089ac672be4bff6129f841e69ab720acaf03e7bac91be969316df531daa4c19bd380ca6ffcf4b8d12ad33423396ea9aa577 SHA512 384f262d8865d81ec3e6c566a7dd1b4c235e07cb670e5b3ec320022adeceac895563ddfa3282a683eb71085b6664f319acb7c19457fc18db34fdb8df105c05ef MISC metadata.xml 334 BLAKE2B 31591836828157d48ba8a49c8b44fee8a42b0a78f0c95c451fa0dc347c36b1508115bbc14abb0b84246edda5da8b733d9d126fdf2850cc35c54620e105e76e8d SHA512 f3d4066c208ef45f754e0fc0c30e895c7cb06ee8a2fa21265d09d90b3937917d0ed156e88f7d75b9441361282677171980112c3e1a088442abf20bf66fb3d813 diff --git a/media-libs/libao/libao-1.2.2-r2.ebuild b/media-libs/libao/libao-1.2.2-r2.ebuild index 9adab706b812..5b5237e87e93 100644 --- a/media-libs/libao/libao-1.2.2-r2.ebuild +++ b/media-libs/libao/libao-1.2.2-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris" IUSE="alsa nas mmap pulseaudio sndio" RDEPEND=" diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest index 546be135e7ee..9dbc52c473dd 100644 --- a/media-libs/libffado/Manifest +++ b/media-libs/libffado/Manifest @@ -1,3 +1,3 @@ DIST libffado-2.4.4.tgz 1228417 BLAKE2B 70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526 SHA512 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80 -EBUILD libffado-2.4.4-r1.ebuild 2644 BLAKE2B b3e90f86152e3a3f4df3e582565a48f2b369f059b2f2c66f82e52ef945e3f337e691684ce7ab91b8b70618e1b56dbafc23c95b785af36dd39095f29539212d01 SHA512 d65e46ee301a29e2dfe53a353914f7d97aec77eb880ef50af97034a3289a14f44af71e2798b7dafd6774298747d73d229dc1ae5d8db11a258b9f7eec3c2745b7 +EBUILD libffado-2.4.4-r1.ebuild 2632 BLAKE2B e6e761a324ba3d8348bb30ee1c1f6dede49169d7cb07626da0cd4386424804259f4f7724d25d87efbcd2bacc11fd0119e6b15afdfda8a959e9b59446a4be3533 SHA512 d48260769dd69f9fcb327e8761b611e954987e4db53b769be36a9ba772387c289a894b40e320aefa3e56702b15cf49f9386ff9efd647e3c5f2d5c4dec6e4723e MISC metadata.xml 596 BLAKE2B 4e8cd1f78c34bc23f8f93a0e37df668e8cfb3afff1e0468ac6e5d90ddcd7bde6d6056f602ca1b6d8979223a439c2a81f99b4abf620615c7fc96d27e0e03f4ab9 SHA512 317d5a82f6594de45b1c4006d70204c4f44f085868521673ca9f92e97db4d6e6c3f02cd7aed39b772f5abfc251dc833a52d72938b2eaa4963824c7454d62c703 diff --git a/media-libs/libffado/libffado-2.4.4-r1.ebuild b/media-libs/libffado/libffado-2.4.4-r1.ebuild index 88abda7bfe6d..4baea5208b92 100644 --- a/media-libs/libffado/libffado-2.4.4-r1.ebuild +++ b/media-libs/libffado/libffado-2.4.4-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..9} ) inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal @@ -37,8 +37,8 @@ CDEPEND="${PYTHON_DEPS} sys-libs/libraw1394[${MULTILIB_USEDEP}] qt5? ( $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] - dev-python/PyQt5[dbus,${PYTHON_MULTI_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/PyQt5[dbus,${PYTHON_USEDEP}] ') x11-misc/xdg-utils )" diff --git a/media-libs/libkeyfinder/Manifest b/media-libs/libkeyfinder/Manifest index 92c53fcb2270..69d6a70f4c6b 100644 --- a/media-libs/libkeyfinder/Manifest +++ b/media-libs/libkeyfinder/Manifest @@ -1,3 +1,5 @@ DIST libkeyfinder-2.2.4.tar.gz 79053 BLAKE2B 4d30931451625b00e1ecc2bfb6349497887ab805b5a986e05dbc51fb007a2aededcefbf9fc18c1beb7a7bc4e368c763a658979b5c5c6f7e91f4a21797ad414d7 SHA512 6673b9a81dbfa3693fc4e7af4e5fc0f351f0c60b00fdafeb9e3437e2f77b5fec7d1e78e3989ff1daca72770a1d3cdbe3837508718b8e8aba3ac3f3d56af81a56 +DIST libkeyfinder-2.2.5.tar.gz 79220 BLAKE2B a0a9b6b0d392d8da7be479e30a733f64f0c0723a1890a969ff1cc0ffc56599778148f7fe081724e83f1b3cc2217bb52f46418ed328da7d34d9229aabf24cbaef SHA512 54463d1f1111dc474d3e43723fddd5579ea1a3842f99f43e50e85622a1d6ee6fe42b22c300ce5ba5807cf6b2d7067af741773af95974a42c5d863c53165893eb EBUILD libkeyfinder-2.2.4.ebuild 626 BLAKE2B 8e8ccfefe5732c82eec1b155ebdb52ab05dea92dca7bbd2b5a54edc463cbdc0f808beabc133412536d646b1e2957ba1b5e705aff1043309bcb27a53d5e5829b5 SHA512 5384f945acb1f6323faad9e043c911e737c1d00542a901bcf12ce73a87a8714e3a26f79c28e0a40f63b2debc63bb71021e2e57d2fc8d9bddf2b0afa787192d88 +EBUILD libkeyfinder-2.2.5.ebuild 626 BLAKE2B 8e8ccfefe5732c82eec1b155ebdb52ab05dea92dca7bbd2b5a54edc463cbdc0f808beabc133412536d646b1e2957ba1b5e705aff1043309bcb27a53d5e5829b5 SHA512 5384f945acb1f6323faad9e043c911e737c1d00542a901bcf12ce73a87a8714e3a26f79c28e0a40f63b2debc63bb71021e2e57d2fc8d9bddf2b0afa787192d88 MISC metadata.xml 259 BLAKE2B 91d2cc7f9ffec656984dd18988a2590a831985a51c93d540af04f796a82b49fedb3adbd5eae9c4c502aa8b4132252c0816589d47d7e8030d9e943dd852f3503d SHA512 1884a7f7d50806bd4addad63ca916f7e27388c953e6345e15fe20d500c217f5f0fcc05fcfa6e20220c28a870801f5e8aab538f5c7f8f211d27de27c98abdb600 diff --git a/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild b/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild new file mode 100644 index 000000000000..b102bfc23bfe --- /dev/null +++ b/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild @@ -0,0 +1,34 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Musical key detection library for digital audio" +HOMEPAGE="https://github.com/mixxxdj/libkeyfinder" +SRC_URI="https://github.com/mixxxdj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + sci-libs/fftw:3.0 +" +DEPEND="${RDEPEND}" + +src_prepare() { + sed -i -e "s/NAMES fftw /NAMES /" \ + cmake/FindFFTW3.cmake || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=OFF + ) + + cmake_src_configure +} diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest index 451348a0c7af..8d04789c78f6 100644 --- a/media-libs/libmng/Manifest +++ b/media-libs/libmng/Manifest @@ -1,4 +1,4 @@ AUX libmng-2.0.3-jpeg-9a.patch 1378 BLAKE2B 72a3cdd738dd480bb216589bdfc1b935cf966c2e6d3e1029eaef539f67cd8e01977de71dd0c0e22321238af2963a615ca180c3efda3096cdb4fceedffc6e8db3 SHA512 d30bc5aeb586b88698695762594a238e339e5790831fea45d0ef54c8107951791c87662fa555454528ea8591dd5f42c55ff4225c1b8f83228c925eccd6f0eb71 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6 -EBUILD libmng-2.0.3-r1.ebuild 1176 BLAKE2B bfe03984708e67885728e396aa1bd88319c2331ddb0e412927526a2f99c6d5d44688c6c8a768572c0589fe3e722a428043812eee7fd977c10656b528e322a312 SHA512 1d7dbcaf2e1d99b647710c426b2d784ceb94992762457d9a6fd842b534d24aaa5a7faaeca0ca5329c76dff2dc56c6bea63577afdb9567dd4dfe9074a55c45294 +EBUILD libmng-2.0.3-r1.ebuild 1183 BLAKE2B a1a32690bb385d1da40ed6e37c5f0d4407647d2bcda137f2bf0abe88e29730f789a9012f1e2ddd0750eb5f93e935d96c566b3005014371b74ed45b7bc8116200 SHA512 bfc98412688d2261182198cc2172d8713c61133713b550717db4994112106e10181d12575d21dd3afae431ceeb5e8dd689ace57e4b148953ac3e3c96ef5a6825 MISC metadata.xml 291 BLAKE2B a9b24a9ed6218970d09a574357f76445e0966a927f5d12cf72b2be8b01a7dc6070562bdcb13d7f341b16ea695d45bf0330eb8a9e416593f79eff1fd5171638b1 SHA512 662be34d4175954a83c5dafae699a79ddefd0faef98f541d0c7ab1cccf930e1e980f9cb1c9efe085dafe4ed6373a254aee9d5f2f936b537da29acfa0cf5ea02c diff --git a/media-libs/libmng/libmng-2.0.3-r1.ebuild b/media-libs/libmng/libmng-2.0.3-r1.ebuild index 2a462dcbbc22..572fba4d19bd 100644 --- a/media-libs/libmng/libmng-2.0.3-r1.ebuild +++ b/media-libs/libmng/libmng-2.0.3-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libmng/${P}.tar.xz" LICENSE="libmng" SLOT="0/2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="lcms" RDEPEND=" diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest index c35e1564c4f6..0565c76f0f9c 100644 --- a/media-libs/libsidplayfp/Manifest +++ b/media-libs/libsidplayfp/Manifest @@ -1,3 +1,5 @@ DIST libsidplayfp-2.2.0.tar.gz 794840 BLAKE2B 1641808e5821f824186b0fd7108dde67ca476724dd4c554dbcca9acd2778c1384e9fbc016658c2c399dbe001100f56658b56234e23032a90aaa75a8faed92792 SHA512 29412410ba1690ad6c9e98f172a0cc49e5d1cb828329da152aa76472ef524932d8b2b35f48f831dbfad08d0c78be22440fd939a1e38b7046cf37fbd34555c683 +DIST libsidplayfp-2.2.1.tar.gz 793924 BLAKE2B a1f11cc4100f18bdd1732c704ac87093d5626627f3b6fc215292e43e63061a79ca8870c3e5a6ea945e24f40a4207d3173e7fed5e05ea52981784389bcfb2af29 SHA512 34a8f6abf6a60ea3fa774e5884736e6dfdff1de9290b656e4ae783e1e15d7b197b03bf400ca0018fd569cfc16a2e30ccb41d0008e800c30f895cd6e3432b048e EBUILD libsidplayfp-2.2.0.ebuild 665 BLAKE2B 563e14bd896eb511e1ce667406a261d5c52ab95b0373da739fd03027637bf1f1fc5acc63f5402a40748c3bc6a13920f7e92de8ee837ac3dc325ef04a83746c56 SHA512 65e3fb6b69d93de476b10cbe0c19581e3354d005eb4c3abb89e3f1ec883e8f9b7c75c169dc8cc86157b78817ea2d0a67ab2d1b11fc4a09dd2991a446b317de05 +EBUILD libsidplayfp-2.2.1.ebuild 667 BLAKE2B 967fc98eaf34234ffa21cc42000363ebd8c897d16aa627b8620f1042759d08edafdd7882d038e42e1d8d64650ab84073d52365ddb9722137b2e07123fb9f0ce9 SHA512 90a1367d0ce9d9022c83636dd8ed761606abb211580c882ad1fc83992d1e3b7161a1b5a2ccdd7c55bf494518fc2d27580d8a249ed7df98374a0f519a5de418eb MISC metadata.xml 338 BLAKE2B 8f2f847b878e42e85fed57021162ccfd8cb8b54e6c285cea2691b9dd89ab320a59e4df38ae12414eaa81d7f781f81fd6d102e37f0121f98a2d9355ac8e9c131a SHA512 8f2ffc3fd7b2b6af0143e4125cad702a68da198e0433fd3d22775ca1f64d8689acf3cc0fdbd205d7fc0815b95c1c88fa1cca71c3f5572f3aa3b25bb8b3a9b76e diff --git a/media-libs/libsidplayfp/libsidplayfp-2.2.1.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.2.1.ebuild new file mode 100644 index 000000000000..219eebf19780 --- /dev/null +++ b/media-libs/libsidplayfp/libsidplayfp-2.2.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Library for the sidplay2 fork with resid-fp" +HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/" +SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/6" +KEYWORDS="~amd64 ~hppa ~x86" +IUSE="static-libs" + +src_prepare() { + default + # fix automagic. warning: modifying .ac triggers maintainer mode. + sed -i -e 's:doxygen:dIsAbLe&:' configure || die +} + +src_configure() { + econf \ + $(use_enable static-libs static) +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest index abafcfa2aba7..ab59495dcf4b 100644 --- a/media-libs/lv2/Manifest +++ b/media-libs/lv2/Manifest @@ -1,3 +1,3 @@ DIST lv2-1.18.2.tar.bz2 538345 BLAKE2B 824c7bc2ce62de858308d856d0f89c6285c183764be3727eba5074f42543a1bb8a5e1cdd8a85bf0a4ba1103e1243c843013bd516d2d6e7ade09c46380bca3cee SHA512 d5bdcf94d3cf9a569e29964002a038ae73cd6ae7f09f7d973f8fd74858c8cf9d01bbed85ae8bf0a00efcb2b3611357a64571222a89972091941449c36d76b0ef -EBUILD lv2-1.18.2.ebuild 1364 BLAKE2B 883cb424f35f350d20353917654aa72789f177a2af186a8cc0b2c2db126a79ecca24f1696fa63ddc3fea7c13ec850e4e56aa6dba6033372f024d94df5161a0a2 SHA512 f8a0f05fa0781ca71b814989cf8405b99ac446dd7249cd2f7486415d93d5e5b74a5be6222afd57151b3e1c8c7378fbf697657bb53bcbdec16b576fca5b23f1bb +EBUILD lv2-1.18.2.ebuild 1344 BLAKE2B ca4f75798164a38b7475229cafe087f9e0f2995d4fe4a5d5978c90cad059e475d1f7765960be93fe8bbbf241bd696e1200f286f555b37026d13d81d8bb273d1f SHA512 57d251c8b3f607bcd2ad9a47f326b07159f4c6896e99bb19b17e39916d0b68fb823071c4ceecab8d00717709552d2907ab291ef7245e97016028da3bf968515e MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d diff --git a/media-libs/lv2/lv2-1.18.2.ebuild b/media-libs/lv2/lv2-1.18.2.ebuild index 9ee27fda790e..24693c0ff469 100644 --- a/media-libs/lv2/lv2-1.18.2.ebuild +++ b/media-libs/lv2/lv2-1.18.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8,9} ) PYTHON_REQ_USE='threads(+)' inherit python-single-r1 waf-utils multilib-build multilib-minimal @@ -33,9 +33,9 @@ DEPEND=" RDEPEND=" ${CDEPEND} $(python_gen_cond_dep ' - dev-python/lxml[${PYTHON_MULTI_USEDEP}] - dev-python/pygments[${PYTHON_MULTI_USEDEP}] - dev-python/rdflib[${PYTHON_MULTI_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/rdflib[${PYTHON_USEDEP}] ') " DOCS=( "README.md" "NEWS" ) diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 7c203b479829..aff0f08412f4 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,8 +1,12 @@ DIST mesa-20.3.5.tar.xz 14367412 BLAKE2B 7bad876ce702158e727a752eda6722e7165b497fd3a485dae4e989f22b13288a93f51bcd5e6a69b979f0bbe41599fa237c08f3bbb81cb9c6dc4c06827f8ad5f4 SHA512 481e710ed80d8f215a8d541cfe51b960862c2403c2b9e7e6932c8236b8decb5d478871d6c73559d6d795ada143803764f3a93b2329588c80f62e2e5ec98c78a9 DIST mesa-21.0.3.tar.xz 14710004 BLAKE2B f2165da4487824931d8ff90e4f13624546a297b0d3577d69b7cfd6078a965282b4a732cb720cbb08ea83a3a987603cfe67876fb18022fa444b011fcc9b7df352 SHA512 4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f DIST mesa-21.1.4.tar.xz 15254812 BLAKE2B 7ec6177ad4fb6f053553b634c9ff03c5d618d0212fd77c2fda8803197bef529c74ccf3c3ae75a810ba1d57862f08405c6df702e41f6cb0fd202833ce7b9efef0 SHA512 1f4e2d8ba2c3c02bad5468687752d7e87d6e79c4a0e6ec4b2741a57fb270d18ae4712aaa07a9e09a2d3348540f5a26cdbe05464cd52adb8df1e2e28a581b2b53 +DIST mesa-21.1.5.tar.xz 15286704 BLAKE2B 3cf5577e3c47e07ad52460383843e2f9147b76128301c7e993e71d0e84b39b0d968dbb4176b13c283f0e9c9f18823ec001ea39a874e0a5b077c9d573a05486bf SHA512 d9e0e1b6a1d717febee2aa67b06620c9a21e061ea7e594be5b4c382db1ed6f5acf5d13a75a9f2bba9c32621466ebc816708606e16e8b34700d987158fd8f0b7b +DIST mesa-21.2.0-rc2.tar.xz 15599008 BLAKE2B 546ea33262b5349f3267ae68f9e2dfb636573ef962c636669241c904f0756187a4caf8cd4150307d2d7243f7bf3e0aa723571f36b7387635fe717363f62d105d SHA512 1701489fa56731170c9ef1ba209498f5c6219cfcc6a1a55c3c387497df997c089d17c66ce621609f6346bfc1b3b3c836280f448a3233ac35eef60b4b5a48424b EBUILD mesa-20.3.5.ebuild 14915 BLAKE2B 73f85b8bbbbbbfba3be499ba55ffa2bcdb5e6f860049819502957e803c2760edf3e45ada1f103f58752e77177065ad12d81ea72c36f96c19c6ebc87d1fe03ab9 SHA512 0b1dd3fad90392be514da0d347efe19b35fe82d13ca02d959f56e625d00a9beb917c83c678e7d6ad419dc81b6fc32e0dd8ca6f95f5fd77484872af464f9ae52b EBUILD mesa-21.0.3.ebuild 14826 BLAKE2B 1c9793f1dc8b7769406d49d02fcf152c2b21a446972fb754871ec5103ddab1eb93bfc52aed895bbc74b9c7a6743c360d5cbcbc0d1ede2cd28307eb243803a77b SHA512 3b5db1497b6b99412353134139bfd2abac642989d1570d4c8d2172dd82e63aeed6ef1bc1d7ce0c2653288a6c7bd8a6315494ed152deb627fc3eb304a6d5f9be7 EBUILD mesa-21.1.4.ebuild 14936 BLAKE2B 8cd4c9305cab8084015db25061a5098f1e686e83001f75d25eb2aa9dae82f2c545d3c43d36aa769e46dbd85a555c23b103fb148b2af5957334bfea4435be45eb SHA512 e8a8255ba66aef51e74de4a2490affd4bdf75db8d0e94452d7df2e3cb47052d35f6b4f9865fe3236328a9d8679712277fb3de9ff5c0a6c7f1a895449c4da8b96 -EBUILD mesa-9999.ebuild 14877 BLAKE2B 09baa10ab66a17a1c2ce4f320c2e97843d15a75e1a9e43c74a94fb9ba9bc316f5bd8188c35ccf686823f838e33c9bbcfb6183432d253281eaf1eee17f825142f SHA512 f50d925183fdb79f6494c71ca10e6d409ca7adee1b58eb7ebec50bc4d07f8d34ff4c95d311ab8e2618836342ea70bdfc5232b63b62c6819fc1e64011b5384450 +EBUILD mesa-21.1.5.ebuild 14940 BLAKE2B 9f807ce55721b04414263282a07b055520f4dc6f56da01271ae2c9f3e8f837f6fb056f4ac1073cf382ff2aa713d0782d7b60f9217f424f593dcc76e447c33efd SHA512 ab0dc007520319f7cc591b784d59e315785691ab081d00a1ae5e8658011e2e1fe293cacece60850217f13a1493dd49d83e8ecb71cece3a6790025f4d66f3a392 +EBUILD mesa-21.2.0_rc2.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c +EBUILD mesa-9999.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a diff --git a/media-libs/mesa/mesa-21.1.5.ebuild b/media-libs/mesa/mesa-21.1.5.ebuild new file mode 100644 index 000000000000..2849134b7198 --- /dev/null +++ b/media-libs/mesa/mesa-21.1.5.ebuild @@ -0,0 +1,556 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit llvm meson-multilib python-any-r1 linux-info + +OPENGL_DIR="xorg-x11" + +MY_P="${P/_/-}" + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" + inherit git-r3 +else + SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="MIT" +SLOT="0" +RESTRICT=" + !test? ( test ) +" + +RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm + lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan + vulkan-overlay wayland +X xa xvmc zink +zstd" + +REQUIRED_USE=" + d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) + gles1? ( egl ) + gles2? ( egl ) + osmesa? ( gallium ) + vulkan? ( dri3 + video_cards_radeonsi? ( llvm ) ) + vulkan-overlay? ( vulkan ) + wayland? ( egl gbm ) + video_cards_freedreno? ( gallium ) + video_cards_intel? ( classic ) + video_cards_i915? ( || ( classic gallium ) ) + video_cards_i965? ( classic ) + video_cards_iris? ( gallium ) + video_cards_lima? ( gallium ) + video_cards_nouveau? ( || ( classic gallium ) ) + video_cards_panfrost? ( gallium ) + video_cards_radeon? ( || ( classic gallium ) + gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) + video_cards_r100? ( classic ) + video_cards_r200? ( classic ) + video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) + video_cards_r600? ( gallium ) + video_cards_radeonsi? ( gallium llvm ) + video_cards_v3d? ( gallium ) + video_cards_vc4? ( gallium ) + video_cards_virgl? ( gallium ) + video_cards_vivante? ( gallium gbm ) + video_cards_vmware? ( gallium ) + xa? ( X ) + xvmc? ( X ) + zink? ( gallium vulkan ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105" +RDEPEND=" + >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] + gallium? ( + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + llvm? ( + video_cards_radeonsi? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_r600? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_radeon? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + ) + lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) + opencl? ( + >=virtual/opencl-3[${MULTILIB_USEDEP}] + dev-libs/libclc + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + vaapi? ( + >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + ) + vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) + xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) + ) + selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) + wayland? ( + >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.8 + ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] + video_cards_intel? ( + !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + ) + video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes:=[${MULTILIB_USEDEP}] + ) + zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done +RDEPEND="${RDEPEND} + video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) +" + +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling one than more slot +# simultaneously. +# +# How to use it: +# 1. List all the working slots (with min versions) in ||, newest first. +# 2. Update the := to specify *max* version, e.g. < 10. +# 3. Specify LLVM_MAX_SLOT, e.g. 9. +LLVM_MAX_SLOT="12" +LLVM_DEPSTR=" + || ( + sys-devel/llvm:12[${MULTILIB_USEDEP}] + sys-devel/llvm:11[${MULTILIB_USEDEP}] + sys-devel/llvm:10[${MULTILIB_USEDEP}] + ) + <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}] +" +LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} +CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} +CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} +RDEPEND="${RDEPEND} + gallium? ( + llvm? ( + opencl? ( + video_cards_r600? ( + ${CLANG_DEPSTR_AMDGPU} + ) + !video_cards_r600? ( + video_cards_radeonsi? ( + ${CLANG_DEPSTR_AMDGPU} + ) + ) + !video_cards_r600? ( + !video_cards_radeonsi? ( + video_cards_radeon? ( + ${CLANG_DEPSTR_AMDGPU} + ) + ) + ) + !video_cards_r600? ( + !video_cards_radeon? ( + !video_cards_radeonsi? ( + ${CLANG_DEPSTR} + ) + ) + ) + ) + !opencl? ( + video_cards_r600? ( + ${LLVM_DEPSTR_AMDGPU} + ) + !video_cards_r600? ( + video_cards_radeonsi? ( + ${LLVM_DEPSTR_AMDGPU} + ) + ) + !video_cards_r600? ( + !video_cards_radeonsi? ( + video_cards_radeon? ( + ${LLVM_DEPSTR_AMDGPU} + ) + ) + ) + !video_cards_r600? ( + !video_cards_radeon? ( + !video_cards_radeonsi? ( + ${LLVM_DEPSTR} + ) + ) + ) + ) + ) + ) +" +unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} + +DEPEND="${RDEPEND} + valgrind? ( dev-util/valgrind ) + X? ( + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-base/xorg-proto + ) +" +BDEPEND=" + ${PYTHON_DEPS} + opencl? ( + >=sys-devel/gcc-4.6 + ) + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] ) +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +QA_WX_LOAD=" +x86? ( + usr/lib*/libglapi.so.0.0.0 + usr/lib*/libGLESv1_CM.so.1.1.0 + usr/lib*/libGLESv2.so.2.0.0 + usr/lib*/libGL.so.1.2.0 + usr/lib*/libOSMesa.so.8.0.0 + usr/lib/libGLX_mesa.so.0.0.0 +)" + +llvm_check_deps() { + local flags=${MULTILIB_USEDEP} + if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi + then + flags+=",llvm_targets_AMDGPU(-)" + fi + + if use opencl; then + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 + fi + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" +} + +pkg_pretend() { + if use vulkan; then + if ! use video_cards_i965 && + ! use video_cards_iris && + ! use video_cards_radeonsi && + ! use video_cards_v3d; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d" + fi + fi + + if use opencl; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" + fi + fi + + if use vaapi; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau" + fi + fi + + if use vdpau; then + if ! use video_cards_r300 && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau" + fi + fi + + if use xa; then + if ! use video_cards_freedreno && + ! use video_cards_nouveau && + ! use video_cards_vmware; then + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" + fi + fi + + if use xvmc; then + if ! use video_cards_r600 && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" + fi + fi + + if ! use gallium; then + use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium" + use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" + use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" + use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium" + use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium" + use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium" + use xa && ewarn "Ignoring USE=xa since USE does not contain gallium" + use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium" + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi + + if use osmesa && ! use llvm; then + ewarn "OSMesa will be slow without enabling USE=llvm" + fi +} + +python_check_deps() { + has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" +} + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + if use video_cards_i965 || + use video_cards_iris || + use video_cards_radeonsi; then + if kernel_is -ge 5 11 3; then + CONFIG_CHECK="~KCMP" + elif kernel_is -ge 5 11; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + elif kernel_is -ge 5 10 20; then + CONFIG_CHECK="~KCMP" + else + CONFIG_CHECK="~CHECKPOINT_RESTORE" + fi + linux-info_pkg_setup + fi + + if use gallium && use llvm; then + llvm_pkg_setup + fi + python-any-r1_pkg_setup +} + +multilib_src_configure() { + local emesonargs=() + + if use classic; then + # Intel code + dri_driver_enable video_cards_i915 i915 + dri_driver_enable video_cards_i965 i965 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + dri_driver_enable video_cards_intel i915 i965 + fi + + # Nouveau code + dri_driver_enable video_cards_nouveau nouveau + + # ATI code + dri_driver_enable video_cards_r100 r100 + dri_driver_enable video_cards_r200 r200 + if ! use video_cards_r100 && \ + ! use video_cards_r200; then + dri_driver_enable video_cards_radeon r100 r200 + fi + fi + + local platforms + use X && platforms+="x11" + use wayland && platforms+=",wayland" + emesonargs+=(-Dplatforms=${platforms#,}) + + if use X || use egl; then + emesonargs+=(-Dglvnd=true) + else + emesonargs+=(-Dglvnd=false) + fi + + if use gallium; then + emesonargs+=( + $(meson_feature llvm) + $(meson_feature lm-sensors lmsensors) + $(meson_feature unwind libunwind) + ) + + if use video_cards_iris || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_use d3d9 gallium-nine)) + else + emesonargs+=(-Dgallium-nine=false) + fi + + if use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_feature vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=disabled) + fi + + if use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_feature vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=disabled) + fi + + if use video_cards_freedreno || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_feature xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=disabled) + fi + + if use video_cards_r600 || + use video_cards_nouveau; then + emesonargs+=($(meson_feature xvmc gallium-xvmc)) + else + emesonargs+=(-Dgallium-xvmc=disabled) + fi + + if use video_cards_freedreno || + use video_cards_lima || + use video_cards_panfrost || + use video_cards_v3d || + use video_cards_vc4 || + use video_cards_vivante; then + gallium_enable -- kmsro + fi + + gallium_enable -- swrast + gallium_enable video_cards_lima lima + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_v3d v3d + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable video_cards_nouveau nouveau + gallium_enable zink zink + + # Only one i915 driver (classic vs gallium). Default to classic. + if ! use classic; then + gallium_enable video_cards_i915 i915 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + gallium_enable video_cards_intel i915 + fi + fi + + gallium_enable video_cards_iris iris + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && \ + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_virgl virgl + + # opencl stuff + emesonargs+=( + -Dgallium-opencl="$(usex opencl icd disabled)" + ) + fi + + if use vulkan; then + vulkan_enable video_cards_i965 intel + vulkan_enable video_cards_iris intel + vulkan_enable video_cards_radeonsi amd + vulkan_enable video_cards_v3d broadcom + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + local vulkan_layers + use vulkan && vulkan_layers+="device-select" + use vulkan-overlay && vulkan_layers+=",overlay" + emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + + emesonargs+=( + $(meson_use test build-tests) + -Dglx=$(usex X dri disabled) + -Dshared-glapi=enabled + $(meson_feature dri3) + $(meson_feature egl) + $(meson_feature gbm) + $(meson_feature gles1) + $(meson_feature gles2) + $(meson_use osmesa) + $(meson_use selinux) + $(meson_feature zstd) + -Dvalgrind=$(usex valgrind auto false) + -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +multilib_src_test() { + meson_src_test -t 100 +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +dri_driver_enable() { + if [[ $1 == -- ]] || use $1; then + shift + DRI_DRIVERS+=("$@") + fi +} + +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +} diff --git a/media-libs/mesa/mesa-21.2.0_rc2.ebuild b/media-libs/mesa/mesa-21.2.0_rc2.ebuild new file mode 100644 index 000000000000..e3fd921bbaa0 --- /dev/null +++ b/media-libs/mesa/mesa-21.2.0_rc2.ebuild @@ -0,0 +1,552 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} ) + +inherit llvm meson-multilib python-any-r1 linux-info + +MY_P="${P/_/-}" + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" + inherit git-r3 +else + SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="MIT" +SLOT="0" +RESTRICT=" + !test? ( test ) +" + +RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + +classic d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm + lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan + vulkan-overlay wayland +X xa xvmc zink +zstd" + +REQUIRED_USE=" + d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) + gles1? ( egl ) + gles2? ( egl ) + osmesa? ( gallium ) + vulkan? ( video_cards_radeonsi? ( llvm ) ) + vulkan-overlay? ( vulkan ) + wayland? ( egl gbm ) + video_cards_freedreno? ( gallium ) + video_cards_intel? ( classic ) + video_cards_i915? ( || ( classic gallium ) ) + video_cards_i965? ( classic ) + video_cards_iris? ( gallium ) + video_cards_lima? ( gallium ) + video_cards_nouveau? ( || ( classic gallium ) ) + video_cards_panfrost? ( gallium ) + video_cards_radeon? ( || ( classic gallium ) + gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) + video_cards_r100? ( classic ) + video_cards_r200? ( classic ) + video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) + video_cards_r600? ( gallium ) + video_cards_radeonsi? ( gallium llvm ) + video_cards_v3d? ( gallium ) + video_cards_vc4? ( gallium ) + video_cards_virgl? ( gallium ) + video_cards_vivante? ( gallium gbm ) + video_cards_vmware? ( gallium ) + xa? ( X ) + xvmc? ( X ) + zink? ( gallium vulkan ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107" +RDEPEND=" + >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] + gallium? ( + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + llvm? ( + video_cards_radeonsi? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_r600? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_radeon? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + ) + lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) + opencl? ( + >=virtual/opencl-3[${MULTILIB_USEDEP}] + dev-libs/libclc + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + vaapi? ( + >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + ) + vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) + xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) + ) + selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) + wayland? ( + >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.8 + ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] + video_cards_intel? ( + !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + ) + video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes:=[${MULTILIB_USEDEP}] + ) + zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done +RDEPEND="${RDEPEND} + video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) +" + +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling one than more slot +# simultaneously. +# +# How to use it: +# 1. List all the working slots (with min versions) in ||, newest first. +# 2. Update the := to specify *max* version, e.g. < 10. +# 3. Specify LLVM_MAX_SLOT, e.g. 9. +LLVM_MAX_SLOT="12" +LLVM_DEPSTR=" + || ( + sys-devel/llvm:12[${MULTILIB_USEDEP}] + sys-devel/llvm:11[${MULTILIB_USEDEP}] + ) + <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}] +" +LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} +CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} +CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} +RDEPEND="${RDEPEND} + gallium? ( + llvm? ( + opencl? ( + video_cards_r600? ( + ${CLANG_DEPSTR_AMDGPU} + ) + !video_cards_r600? ( + video_cards_radeonsi? ( + ${CLANG_DEPSTR_AMDGPU} + ) + ) + !video_cards_r600? ( + !video_cards_radeonsi? ( + video_cards_radeon? ( + ${CLANG_DEPSTR_AMDGPU} + ) + ) + ) + !video_cards_r600? ( + !video_cards_radeon? ( + !video_cards_radeonsi? ( + ${CLANG_DEPSTR} + ) + ) + ) + ) + !opencl? ( + video_cards_r600? ( + ${LLVM_DEPSTR_AMDGPU} + ) + !video_cards_r600? ( + video_cards_radeonsi? ( + ${LLVM_DEPSTR_AMDGPU} + ) + ) + !video_cards_r600? ( + !video_cards_radeonsi? ( + video_cards_radeon? ( + ${LLVM_DEPSTR_AMDGPU} + ) + ) + ) + !video_cards_r600? ( + !video_cards_radeon? ( + !video_cards_radeonsi? ( + ${LLVM_DEPSTR} + ) + ) + ) + ) + ) + ) +" +unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} + +DEPEND="${RDEPEND} + valgrind? ( dev-util/valgrind ) + X? ( + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-base/xorg-proto + ) +" +BDEPEND=" + ${PYTHON_DEPS} + opencl? ( + >=sys-devel/gcc-4.6 + ) + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] ) +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +QA_WX_LOAD=" +x86? ( + usr/lib*/libglapi.so.0.0.0 + usr/lib*/libGLESv1_CM.so.1.1.0 + usr/lib*/libGLESv2.so.2.0.0 + usr/lib*/libGL.so.1.2.0 + usr/lib*/libOSMesa.so.8.0.0 + usr/lib/libGLX_mesa.so.0.0.0 +)" + +llvm_check_deps() { + local flags=${MULTILIB_USEDEP} + if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi + then + flags+=",llvm_targets_AMDGPU(-)" + fi + + if use opencl; then + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 + fi + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" +} + +pkg_pretend() { + if use vulkan; then + if ! use video_cards_i965 && + ! use video_cards_iris && + ! use video_cards_radeonsi && + ! use video_cards_v3d; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d" + fi + fi + + if use opencl; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" + fi + fi + + if use vaapi; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau" + fi + fi + + if use vdpau; then + if ! use video_cards_r300 && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau" + fi + fi + + if use xa; then + if ! use video_cards_freedreno && + ! use video_cards_nouveau && + ! use video_cards_vmware; then + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" + fi + fi + + if use xvmc; then + if ! use video_cards_r600 && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" + fi + fi + + if ! use gallium; then + use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium" + use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" + use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" + use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium" + use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium" + use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium" + use xa && ewarn "Ignoring USE=xa since USE does not contain gallium" + use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium" + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi + + if use osmesa && ! use llvm; then + ewarn "OSMesa will be slow without enabling USE=llvm" + fi +} + +python_check_deps() { + has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" +} + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + if use video_cards_i965 || + use video_cards_iris || + use video_cards_radeonsi; then + if kernel_is -ge 5 11 3; then + CONFIG_CHECK="~KCMP" + elif kernel_is -ge 5 11; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + elif kernel_is -ge 5 10 20; then + CONFIG_CHECK="~KCMP" + else + CONFIG_CHECK="~CHECKPOINT_RESTORE" + fi + linux-info_pkg_setup + fi + + if use gallium && use llvm; then + llvm_pkg_setup + fi + python-any-r1_pkg_setup +} + +multilib_src_configure() { + local emesonargs=() + + if use classic; then + # Intel code + dri_driver_enable video_cards_i915 i915 + dri_driver_enable video_cards_i965 i965 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + dri_driver_enable video_cards_intel i915 i965 + fi + + # Nouveau code + dri_driver_enable video_cards_nouveau nouveau + + # ATI code + dri_driver_enable video_cards_r100 r100 + dri_driver_enable video_cards_r200 r200 + if ! use video_cards_r100 && \ + ! use video_cards_r200; then + dri_driver_enable video_cards_radeon r100 r200 + fi + fi + + local platforms + use X && platforms+="x11" + use wayland && platforms+=",wayland" + emesonargs+=(-Dplatforms=${platforms#,}) + + if use X || use egl; then + emesonargs+=(-Dglvnd=true) + else + emesonargs+=(-Dglvnd=false) + fi + + if use gallium; then + emesonargs+=( + $(meson_feature llvm) + $(meson_feature lm-sensors lmsensors) + $(meson_feature unwind libunwind) + ) + + if use video_cards_iris || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_use d3d9 gallium-nine)) + else + emesonargs+=(-Dgallium-nine=false) + fi + + if use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_feature vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=disabled) + fi + + if use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_feature vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=disabled) + fi + + if use video_cards_freedreno || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_feature xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=disabled) + fi + + if use video_cards_r600 || + use video_cards_nouveau; then + emesonargs+=($(meson_feature xvmc gallium-xvmc)) + else + emesonargs+=(-Dgallium-xvmc=disabled) + fi + + if use video_cards_freedreno || + use video_cards_lima || + use video_cards_panfrost || + use video_cards_v3d || + use video_cards_vc4 || + use video_cards_vivante; then + gallium_enable -- kmsro + fi + + gallium_enable -- swrast + gallium_enable video_cards_lima lima + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_v3d v3d + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable video_cards_nouveau nouveau + gallium_enable zink zink + + # Only one i915 driver (classic vs gallium). Default to classic. + if ! use classic; then + gallium_enable video_cards_i915 i915 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + gallium_enable video_cards_intel i915 + fi + fi + + gallium_enable video_cards_iris iris + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && \ + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_virgl virgl + + # opencl stuff + emesonargs+=( + -Dgallium-opencl="$(usex opencl icd disabled)" + ) + fi + + if use vulkan; then + vulkan_enable video_cards_i965 intel + vulkan_enable video_cards_iris intel + vulkan_enable video_cards_radeonsi amd + vulkan_enable video_cards_v3d broadcom + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + local vulkan_layers + use vulkan && vulkan_layers+="device-select" + use vulkan-overlay && vulkan_layers+=",overlay" + emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + + emesonargs+=( + $(meson_use test build-tests) + -Dglx=$(usex X dri disabled) + -Dshared-glapi=enabled + -Ddri3=enabled + $(meson_feature egl) + $(meson_feature gbm) + $(meson_feature gles1) + $(meson_feature gles2) + $(meson_use osmesa) + $(meson_use selinux) + $(meson_feature zstd) + -Dvalgrind=$(usex valgrind auto disabled) + -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +multilib_src_test() { + meson_src_test -t 100 +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +dri_driver_enable() { + if [[ $1 == -- ]] || use $1; then + shift + DRI_DRIVERS+=("$@") + fi +} + +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +} diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index b3ab8d6070d6..e3fd921bbaa0 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit llvm meson-multilib python-any-r1 linux-info @@ -33,17 +33,16 @@ for card in ${VIDEO_CARDS}; do done IUSE="${IUSE_VIDEO_CARDS} - +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm + +classic d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd" REQUIRED_USE=" - d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) + d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) osmesa? ( gallium ) - vulkan? ( dri3 - video_cards_radeonsi? ( llvm ) ) + vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) @@ -71,7 +70,7 @@ REQUIRED_USE=" zink? ( gallium vulkan ) " -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105" +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107" RDEPEND=" >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] @@ -507,7 +506,7 @@ multilib_src_configure() { $(meson_use test build-tests) -Dglx=$(usex X dri disabled) -Dshared-glapi=enabled - $(meson_feature dri3) + -Ddri3=enabled $(meson_feature egl) $(meson_feature gbm) $(meson_feature gles1) @@ -515,7 +514,7 @@ multilib_src_configure() { $(meson_use osmesa) $(meson_use selinux) $(meson_feature zstd) - -Dvalgrind=$(usex valgrind auto false) + -Dvalgrind=$(usex valgrind auto disabled) -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest index 2f110b0a32b7..902cfb6454b6 100644 --- a/media-libs/opencolorio/Manifest +++ b/media-libs/opencolorio/Manifest @@ -8,6 +8,8 @@ AUX opencolorio-1.1.1-no-werror.patch 349 BLAKE2B 79788a964466a884754dbdead8e252 AUX opencolorio-1.1.1-yaml-cpp-boost-check.patch 1891 BLAKE2B 01331aeef0cde9cf4420f13dc1a2ec2bddf46e519e736a6fb653792074b412ab5d6cca364e4e4619b7b868891eee0786bc0c75df748eb8ac724410e61aa6c52a SHA512 4ddb466a56a27db82f5b83dbb96e42f6b6cf0749168459dd32e922345d6011f09961592f7d5611253cbad5d78952d52f1cdabfed011b4c376faafc0becc7422b DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33 DIST opencolorio-2.0.0.tar.gz 9892414 BLAKE2B fdff2e144eadb444624f059f7582ea99d4e2dbd53cad5b89f92d19c7ca9dda2ff9ec4f8c8d00e6ac083da21134f9bc783b297c553a8e7d11936c936e5c41a2f3 SHA512 7110a1a30a5fa64b81d7fc5e33234673aaddbad5e19ce7f21436c590edd7d2ce767650c9a934011a96e53132c030bd0b654fcf93ad79c1bfc8c050762c57f6d0 +DIST opencolorio-2.0.1.tar.gz 9945107 BLAKE2B cb4b152205642abd847b7263db838dbb922004017b9f19f7b2bd81d97f64e6f7d008c5a3f734475f510180ae9cc3a84688631e69c0587e0c77599b75b07d9159 SHA512 5787cc4cadb0a1832c925712ca0dfef6e843082b9461460e1798326c6fceaa97bee78e5298651e6a8a3662b348eab5ab9791e94c3efcac337da07229fb559338 EBUILD opencolorio-1.1.1.ebuild 2624 BLAKE2B 46b336fa43c481d6170d8c2f5d95607d9967a7a8190f759371f9941a7c360de5bcbdc933797e9b7176c4abe5011dbe8f28d9683c12d573e308427bc9ee851018 SHA512 c7c6818dd52502fdfc5ed8e4c472ad4734e0f3ff3f733320e531ba586fd253de1bca13ed15588ceb379c7bdd7cc0416758aac10249e2841b956545cdbb80f67e EBUILD opencolorio-2.0.0.ebuild 2773 BLAKE2B f1469f1917fa14f9cec3a9e5bb799a8c4a38b670a5fae43f9468fe7f97f0e49fdffd49f77958e0dee2d2b8367492fa61642b8177bc06290bd37e256cf72d49e4 SHA512 e527cc50a8d148ddb36ebb9d2e661e2be3c5b0558b7d8b8eaa4b2fc935a835954cffab1fb17f60a985b193818f3951d3e305398885ea329713fa7acfb3048650 +EBUILD opencolorio-2.0.1.ebuild 2685 BLAKE2B 5001664e0d729861378707bba636f8af2cb89592a10ffe10b091a5c04d89aff567b8ef67baf6914e670b8b95d16c9dbab8ff720d436533a8f8cdfdb3e08718f0 SHA512 f9aa4dc1c2335c828635ad578df7bba3fe9d4c208cae3208d51f6eac03aa6894884bfc3327d1877547a9ef77b3c7e4239becec172e85048a2fe694fbefdf66d0 MISC metadata.xml 459 BLAKE2B bc35128a9a20ab016e973d569c001276541d90d4a1872e6cf27877847d8b7e66c28439afcc220dc9bbf31aeae64a14e6f31b8a3683bc0fdee88d4b03781fc537 SHA512 2dda915dd0266e50dc8308eeef37e84287f9caa9d34c4027fe15793f788d1dc354e79e3f46514f15dfd89c40da40da0424af6fec22bce07b638add76ef61b5c9 diff --git a/media-libs/opencolorio/opencolorio-2.0.1.ebuild b/media-libs/opencolorio/opencolorio-2.0.1.ebuild new file mode 100644 index 000000000000..ecaac6c1a4aa --- /dev/null +++ b/media-libs/opencolorio/opencolorio-2.0.1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit cmake flag-o-matic python-single-r1 + +DESCRIPTION="A color management framework for visual effects and animation" +HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO" +SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/OpenColorIO-${PV}" + +KEYWORDS="~amd64" +LICENSE="BSD" +SLOT="0" +IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test" +REQUIRED_USE=" + doc? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +RDEPEND=" + dev-cpp/pystring + dev-python/pybind11 + media-libs/ilmbase + dev-cpp/yaml-cpp:= + dev-libs/tinyxml + opengl? ( + media-libs/lcms:2 + >=media-libs/openimageio-2.2.13.0 + media-libs/glew:= + media-libs/freeglut + virtual/opengl + ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-util/cmake-3.16.2-r1 + virtual/pkgconfig + doc? ( + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/testresources[${PYTHON_USEDEP}] + ') + ) +" + +# Restricting tests, bugs #439790 and #447908 +RESTRICT="test" + +CMAKE_BUILD_TYPE=RelWithDebInfo + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + sed -i -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die + sed -i -e "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die +} + +src_configure() { + # Missing features: + # - Truelight and Nuke are not in portage for now, so their support are disabled + # - Java bindings was not tested, so disabled + # Notes: + # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl) + # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl) + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DOCIO_BUILD_STATIC=$(usex static-libs) + -DOCIO_BUILD_DOCS=$(usex doc) + -DOCIO_BUILD_APPS=$(usex opengl) + -DOCIO_BUILD_PYTHON=$(usex python) + -DOCIO_BUILD_JAVA=OFF + -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2) + -DOCIO_BUILD_TESTS=$(usex test) + -DOCIO_BUILD_GPU_TESTS=$(usex test) + -DOCIO_BUILD_FROZEN_DOCS=$(usex doc) + -DOCIO_INSTALL_EXT_PACKAGES=NONE + ) + + # We need this to work around asserts that can trigger even in proper use cases. + # See https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235 + append-flags -DNDEBUG + + cmake_src_configure +} diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index f2968976dff1..a080ce0b9ba3 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -13,7 +13,7 @@ DIST opencv-4.5.1_contrib.tar.gz 60602431 BLAKE2B 629e820e74147f442f8264c6102288 DIST opencv-4.5.2.tar.gz 88925795 BLAKE2B 625d3e1d98d4438ebfa165e595fc661658ae1f218d3c50c0b8dfedf936019093c1e61ead86b19c643205f0d77e40c69ea15c3d95454129a23a2c4e17885b65f3 SHA512 07788ec49801bdab963a057871e81fc2b081149c75764810197766d987e54db0d6fd142d2397bbbacefcea6a8be100235ea886ee7e5d5c07ed1156e76249dfec DIST opencv-4.5.2_contrib.tar.gz 60800680 BLAKE2B d96b3c440090d3ab26f99a3822d1d85581e370dc0fde7cf3a0ff89e79cd598942be7d9bc9f892510f2d66474ceb59c645483a94131ccbbe09f1cf4eeaaa44879 SHA512 72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44 -EBUILD opencv-4.5.0.ebuild 20509 BLAKE2B f0c9cdab62f516faf0b992bc7feb508c2889f552bbc520cc93f564782f54583ad6816ef9db9b1ad812dd84f75dd99a3d8fe5412b27fb3b659f6aa141abc4c4a3 SHA512 78ca91218694de32ba693650225e0fd84ba0ebe9451be348dde52bac27972d87449b49633f318333dda838e31a5d043351493531e88ff88945a41460f50011a5 -EBUILD opencv-4.5.1.ebuild 20596 BLAKE2B d371a3b93a3efd2db319aa547f1384b77d43483f1538d981ec091f2699a4798e54035a7ee89c9462af857d8109f04da9a5d5fa0903b2a7d103f78ecfd746994e SHA512 deb18e47fb7c9a003701aecc2343b8735fc0d437e415b77a04b40231c4270ece20beed4e5e49f2698a41fae086eeb53a0bf897082e64f858bddc214b40201a17 -EBUILD opencv-4.5.2.ebuild 20601 BLAKE2B f065985f61e9519b12a9900fc115358f1769dd8dffbb57dd3a3d1aecaf4352df18d647d0d4525266e9ac75dc838d6a45bc7f879f024d2bbdb45fbefa86033604 SHA512 8af05e9ea0ed6795f9259eb1d5b83d2bb0462ee3e7c608d4aea207058ec6c1e5ef15689dd851ad0ac33f1c77dbbf77a0d3962d10f73e92a77b10579a3f925985 +EBUILD opencv-4.5.0-r1.ebuild 20519 BLAKE2B d49c3660825ac597bbdb2d8262b9c024c734931140533de7fabab3d561cd0bbaa4c832af41e9063c2eab76729febdce7598307ff694004fd71127ee0f4560c60 SHA512 4612b55bbfc160b42b97d684bc8053e6f499bd460a8a7c5c6ab30e092597e47c5433f7c02176ad80a8c6045568de5b5336bd862dd6e4c3c74b8957bc42642fcf +EBUILD opencv-4.5.1-r1.ebuild 20606 BLAKE2B d1bdbff23f18fe325f0912704939383e9c03d278e33b5606eebf78049c374a6c2f64d4e8f28b169ac8f191d78115238fb2ac9772080dbbff09330188928b72fe SHA512 fb4cae4db0090c83d6a06eaf2761a639d5c87b1020b88e9795afc49a914fbf1a69bb62f1604a0681a9a13816983b22679523ac80d6f502b66e10555de318e1ae +EBUILD opencv-4.5.2-r1.ebuild 20611 BLAKE2B 18288e0af05a7476ecf83db758e70e922d179ed0cd96a47570d6652cc9a407ba0cb947c1c855a84f96177901262e2df5f00888f7db451f97902e2aee768f4bb0 SHA512 597f8cb0c7676347c1def2faf9e7f23d695565af4cd920d8d7031839ece247dc61908f3e9f54b5dad37c1e05b381762874cf1f61c143c6e0be75ebff81f3a39b MISC metadata.xml 3185 BLAKE2B 107d18573676738a6ca8bec19250a4fdc2f839fb183757c19d042effe46825326346cf9090c86bc4e382bfefd05c81735886ad15b91539b1fca7896deb22a8de SHA512 51cf777192755265ed3d5fb4e7a83ba3c5e36c6e40165b770cba1a6b91183bd9e59360cd0130a2e159534c6fed90d8270787c5d204a6066e84d7a1b93e3e4f14 diff --git a/media-libs/opencv/opencv-4.5.0.ebuild b/media-libs/opencv/opencv-4.5.0-r1.ebuild index afbb574ddd3b..80cfca7c7c30 100644 --- a/media-libs/opencv/opencv-4.5.0.ebuild +++ b/media-libs/opencv/opencv-4.5.0-r1.ebuild @@ -117,7 +117,7 @@ RDEPEND=" virtual/lapack ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) - openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] ) + openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] ) opengl? ( virtual/opengl[${MULTILIB_USEDEP}] virtual/glu[${MULTILIB_USEDEP}] diff --git a/media-libs/opencv/opencv-4.5.1.ebuild b/media-libs/opencv/opencv-4.5.1-r1.ebuild index 05513b4f1742..8e273550454b 100644 --- a/media-libs/opencv/opencv-4.5.1.ebuild +++ b/media-libs/opencv/opencv-4.5.1-r1.ebuild @@ -119,7 +119,7 @@ RDEPEND=" virtual/lapack ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) - openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] ) + openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] ) opengl? ( virtual/opengl[${MULTILIB_USEDEP}] virtual/glu[${MULTILIB_USEDEP}] diff --git a/media-libs/opencv/opencv-4.5.2.ebuild b/media-libs/opencv/opencv-4.5.2-r1.ebuild index 1fee51d33a51..d978b3421497 100644 --- a/media-libs/opencv/opencv-4.5.2.ebuild +++ b/media-libs/opencv/opencv-4.5.2-r1.ebuild @@ -119,7 +119,7 @@ RDEPEND=" virtual/lapack ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) - openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] ) + openexr? ( <media-libs/openexr-3.0.0:0=[${MULTILIB_USEDEP}] ) opengl? ( virtual/opengl[${MULTILIB_USEDEP}] virtual/glu[${MULTILIB_USEDEP}] diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest index 88a0a26ef324..9b7c37ace5bc 100644 --- a/media-libs/openexr/Manifest +++ b/media-libs/openexr/Manifest @@ -1,10 +1,12 @@ AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857 AUX openexr-2.5.7-0001-disable-testRgba-on-sparc.patch 937 BLAKE2B e2e432649100457a3273b50aa6725625ac50f48bf95bb04b85a2587a44d4c9e87662a36b68c3b7ac0c741068223e439fb51c1b69d5ae8f852794b0a7ee238d4a SHA512 8c640d67f2db6ed2789b8e25dd25e6ba8db6b3ed0ddb2138027ca579b3fe5db43b60d5bffc4de3f31ba60521c6479cf89f1ff7a8b2bbba97dd22c13279b92f81 AUX openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch 687 BLAKE2B 49aaf9d5282ad878ec415413106540d4a92aecceebbc9a03e30a4289377ec1d8ec4e1bacf49e0cec80a44e75f7f345c885c4746092c4dc3d57b03b317631d4d5 SHA512 9bcb62eec3bdf05ba54dff037ccd71e5e1dcd37831246f95d7803f1710b7335d930292dd27b5a6ddd927c45e7734d61d3a42a637fdf7e83724830f21b3d3db9e +AUX openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch 6235 BLAKE2B bbde922a018390d11685ef76c3202419c639f8075adfbe5952bed585055376375fb2bd31463c140500feee1867245d6a6f7c59888d1d0f06979834dc181dc45c SHA512 ab3a405f119ce1f6e478923e99203a8ee6122d9a585f5d667555aefa6402e85def2df8410c88a20eb3e4b1c298f9f90f7a2ddd9377f75b57d40485a2ac9890c8 +AUX openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch 9741 BLAKE2B f92fd894f339bce71fa1b63437fafa033c0f4d3bc164534b824ed44e00d1c23de2191b44168952d89969d4a36b7635476740543b0b093c048680fffb6a2e54aa SHA512 a5ba9b29cd63d6bd65adf3a181dbada23720a98ff683262f08be88aaff4cbfce6286e5067e666db08978b9617a61a1d05503cbac25aa86b26f632b384bd63a43 DIST openexr-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412 DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40 -DIST openexr-3.0.1.tar.gz 25059445 BLAKE2B 76bce1ff830b5e32362bfaf91d39945add171c5c1f453968b2fa8ba41e0996064d3a104eb7759cea87477e96e8a52d548743c7d83f5c6131dd38aecdd47bd6dd SHA512 e450c55d150e4c0a8a9147f78fe1c73ea9134976444f8c77c832d0671d4c3796f96fee74d23f26cdb9383e658a33d6d57c989e9207d1edfc8556ad688ff25a5b +DIST openexr-3.0.5.tar.gz 25060148 BLAKE2B 24b5601e27342eeff831219f75416797c30afb1ca28ae0a0692d97169297584da503d016c6dda80f63bd5bb9c9a31dc7f91d7713e6fc217a2760af2c662406f0 SHA512 7a0f83320ad5e1d8f8414b5175a64eef3c6b06a7ccd7d66d0aa21472ea22146e2617ff10c20e04203fc2a3326d8bac2d95023bec315badb03e6a006596b64595 EBUILD openexr-2.5.6.ebuild 1690 BLAKE2B eab42b0f5ce389e642e80fc4a53a3721d883d22332f5e773a86aa19ae85cf0f0002b38e9cc0266f2dc00c1b8aac722957a987e266efbdb304dda674fcc958e9a SHA512 100e7b271952985f3e576aca1965345a7ed5dfbbef070cb22ba1d8907a22de436a57b2eeb2500707c11db1ed2e1179778e75820b651309557ef5d20cc73da87c -EBUILD openexr-2.5.7.ebuild 2121 BLAKE2B 617e588fa2578ec358c5b4f21f03f2c3feb7ecd7141fd6e45e652021b58bee0694c2fae2efbb23513bb5903e6d7fa94e143de25cf716c816782f986231331692 SHA512 d0a0fdf11f53bbd2ecbc82d5ebbecae3aef73ae4fc127ea529506bf74432baea18358e6b3686d2ef1ee3fbebd444e629c77c6e6015975fc37f36fd5506bdc5f7 -EBUILD openexr-3.0.1.ebuild 1913 BLAKE2B cc37bc00d13d64d5eb0787c165f051572b92ecb23798e6e753e5a723143ad4e93081b04877bbe2232b4480564b751b6be4b584d535bea5e303c703482fbe1684 SHA512 147d8abb4af8ba2f56ffc17632436e42621da0289fe0b0585299da55c16e7055d454e13db0da8011f25ccac878034e741d1f5b227013388a67d28b6ffa18c5a3 +EBUILD openexr-2.5.7.ebuild 2120 BLAKE2B c31fbd571fc53343e733419e90f84ad1648506acb8bd66d87bf239bbe1e22c588c0e0cd906ac43c27f82936e1c42c33e990619655961220e9e7219aaae0d00c1 SHA512 56db8658cde7e044056949d4a4704435ce4f8fea3519e3d1c823f92cd2579d29a2a6c6ca2e3393ced9a77628e36962b35303ef01be06dc491dbcd5eea5ed7b7b +EBUILD openexr-3.0.5.ebuild 2147 BLAKE2B 4620226043268d73a1e290003849584d46604e42b04e18cf67ed918a41cb376b5951387a485cef227295ee4630d3e137a829081baf7c16ab53d701ec96bac88c SHA512 198c920c8457c94148a9880c7ab4c843bb3cedad6c60b6d42305962e251885ef2ea81c3ef0f584d42f663584832e448e65d6c971bfd2184fc27e77e10683d6dd MISC metadata.xml 796 BLAKE2B dacf5230d89550bae31517f5babc9cf7ea99ef94ab223e4acf1abb39d1042d146e71352f4b55a6bebff88689f32efc3d098f5d7ac04a207211f784a9b5e2ed30 SHA512 3deb6a5e83a03fabbbfce2845529a7c2f1aacdc6038ffb4a35ed16bd3f93521ea490ff0fc1576291b5e1d84d19dc4d4123aecf228e270e6b55b01c09ea2a6b56 diff --git a/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch b/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch new file mode 100644 index 000000000000..30991f423b00 --- /dev/null +++ b/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch @@ -0,0 +1,119 @@ +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Fri, 2 Jul 2021 17:46:33 +0200 +Subject: [PATCH] changes needed for proper slotting + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + cmake/CMakeLists.txt | 8 ++++---- + cmake/LibraryDefine.cmake | 8 ++++---- + cmake/OpenEXR.pc.in | 4 ++-- + cmake/OpenEXRLibraryDefine.cmake | 8 ++++---- + 4 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index 2014d27..7dfb2f2 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -200,7 +200,7 @@ if(OPENEXR_INSTALL_PKG_CONFIG) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig + ) + endfunction() +- openexr_pkg_config_help(OpenEXR.pc.in) ++ openexr_pkg_config_help(OpenEXR-${OpenEXR_VERSION_MAJOR}.pc.in) + else() + message(STATUS "-- pkg-config generation disabled") + endif() +@@ -220,7 +220,7 @@ include(CMakePackageConfigHelpers) + if(OPENEXR_INSTALL) + configure_package_config_file(${PROJECT_NAME}Config.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake +- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR} + ) + write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" + VERSION ${PROJECT_VERSION} +@@ -229,11 +229,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR} + ) + + install(EXPORT ${PROJECT_NAME} +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR} + FILE ${PROJECT_NAME}Targets.cmake + NAMESPACE ${PROJECT_NAME}:: + EXPORT_LINK_INTERFACE_LIBRARIES +diff --git a/cmake/LibraryDefine.cmake b/cmake/LibraryDefine.cmake +index aa5bb46..2767420 100644 +--- a/cmake/LibraryDefine.cmake ++++ b/cmake/LibraryDefine.cmake +@@ -79,8 +79,8 @@ function(OPENEXR_DEFINE_LIBRARY libname) + install(TARGETS ${libname} + EXPORT ${PROJECT_NAME} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + PUBLIC_HEADER + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR} +@@ -90,8 +90,8 @@ function(OPENEXR_DEFINE_LIBRARY libname) + string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) + set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") +- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")") ++ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") ++ install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")") + set(verlibname) + set(baselibname) + endif() +diff --git a/cmake/OpenEXR.pc.in b/cmake/OpenEXR.pc.in +index 7d9bb7c..c7e1dd6 100644 +--- a/cmake/OpenEXR.pc.in ++++ b/cmake/OpenEXR.pc.in +@@ -5,9 +5,9 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ ++libdir=@libdir@/@OPENEXR_OUTPUT_SUBDIR@ + includedir=@includedir@ +-OpenEXR_includedir=@includedir@/OpenEXR ++OpenEXR_includedir=@includedir@/@OPENEXR_OUTPUT_SUBDIR@ + libsuffix=@LIB_SUFFIX_DASH@ + + Name: OpenEXR +diff --git a/cmake/OpenEXRLibraryDefine.cmake b/cmake/OpenEXRLibraryDefine.cmake +index 8022e2e..9f919c8 100644 +--- a/cmake/OpenEXRLibraryDefine.cmake ++++ b/cmake/OpenEXRLibraryDefine.cmake +@@ -54,8 +54,8 @@ function(OPENEXR_DEFINE_LIBRARY libname) + install(TARGETS ${libname} + EXPORT ${PROJECT_NAME} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + PUBLIC_HEADER + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR} +@@ -65,8 +65,8 @@ function(OPENEXR_DEFINE_LIBRARY libname) + string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) + set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") +- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR} ${baselibname} -> ${verlibname}\")") ++ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") ++ install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR}/${OPENEXR_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")") + set(verlibname) + set(baselibname) + endif() +-- +2.32.0 + diff --git a/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch b/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch new file mode 100644 index 000000000000..d6c6b532c879 --- /dev/null +++ b/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch @@ -0,0 +1,229 @@ +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Sat, 22 May 2021 17:04:12 +0200 +Subject: [PATCH] add version to binaries for slotting + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + src/bin/exr2aces/CMakeLists.txt | 10 +++++----- + src/bin/exrenvmap/CMakeLists.txt | 10 +++++----- + src/bin/exrheader/CMakeLists.txt | 10 +++++----- + src/bin/exrmakepreview/CMakeLists.txt | 10 +++++----- + src/bin/exrmaketiled/CMakeLists.txt | 10 +++++----- + src/bin/exrmultipart/CMakeLists.txt | 10 +++++----- + src/bin/exrmultiview/CMakeLists.txt | 10 +++++----- + src/bin/exrstdattr/CMakeLists.txt | 10 +++++----- + 8 files changed, 40 insertions(+), 40 deletions(-) + +diff --git a/src/bin/exr2aces/CMakeLists.txt b/src/bin/exr2aces/CMakeLists.txt +index 72c4e1c..ede5973 100644 +--- a/src/bin/exr2aces/CMakeLists.txt ++++ b/src/bin/exr2aces/CMakeLists.txt +@@ -1,14 +1,14 @@ + # SPDX-License-Identifier: BSD-3-Clause + # Copyright (c) Contributors to the OpenEXR Project. + +-add_executable(exr2aces main.cpp) +-target_link_libraries(exr2aces OpenEXR::OpenEXR) +-set_target_properties(exr2aces PROPERTIES ++add_executable(exr2aces-${OpenEXR_VERSION_MAJOR} main.cpp) ++target_link_libraries(exr2aces-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) ++set_target_properties(exr2aces-${OpenEXR_VERSION_MAJOR} PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" + ) + if(OPENEXR_INSTALL_TOOLS) +- install(TARGETS exr2aces DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ install(TARGETS exr2aces-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + if(WIN32 AND BUILD_SHARED_LIBS) +- target_compile_definitions(exr2aces PRIVATE OPENEXR_DLL) ++ target_compile_definitions(exr2aces-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) + endif() +diff --git a/src/bin/exrenvmap/CMakeLists.txt b/src/bin/exrenvmap/CMakeLists.txt +index bbd26c0..cbe8401 100644 +--- a/src/bin/exrenvmap/CMakeLists.txt ++++ b/src/bin/exrenvmap/CMakeLists.txt +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: BSD-3-Clause + # Copyright (c) Contributors to the OpenEXR Project. + +-add_executable( exrenvmap ++add_executable( exrenvmap-${OpenEXR_VERSION_MAJOR} + makeLatLongMap.cpp + readInputImage.cpp + resizeImage.cpp +@@ -11,13 +11,13 @@ add_executable( exrenvmap + EnvmapImage.cpp + ) + +-target_link_libraries(exrenvmap OpenEXR::OpenEXR) +-set_target_properties(exrenvmap PROPERTIES ++target_link_libraries(exrenvmap-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) ++set_target_properties(exrenvmap-${OpenEXR_VERSION_MAJOR} PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" + ) + if(OPENEXR_INSTALL_TOOLS) +- install(TARGETS exrenvmap DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ install(TARGETS exrenvmap-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + if(WIN32 AND BUILD_SHARED_LIBS) +- target_compile_definitions(exrenvmap PRIVATE OPENEXR_DLL) ++ target_compile_definitions(exrenvmap-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) + endif() +diff --git a/src/bin/exrheader/CMakeLists.txt b/src/bin/exrheader/CMakeLists.txt +index c427445..b8b0e9a 100644 +--- a/src/bin/exrheader/CMakeLists.txt ++++ b/src/bin/exrheader/CMakeLists.txt +@@ -1,14 +1,14 @@ + # SPDX-License-Identifier: BSD-3-Clause + # Copyright (c) Contributors to the OpenEXR Project. + +-add_executable(exrheader main.cpp) +-target_link_libraries(exrheader OpenEXR::OpenEXR) +-set_target_properties(exrheader PROPERTIES ++add_executable(exrheader-${OpenEXR_VERSION_MAJOR} main.cpp) ++target_link_libraries(exrheader-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) ++set_target_properties(exrheader-${OpenEXR_VERSION_MAJOR} PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" + ) + if(OPENEXR_INSTALL_TOOLS) +- install(TARGETS exrheader DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ install(TARGETS exrheader-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + if(WIN32 AND BUILD_SHARED_LIBS) +- target_compile_definitions(exrheader PRIVATE OPENEXR_DLL) ++ target_compile_definitions(exrheader-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) + endif() +diff --git a/src/bin/exrmakepreview/CMakeLists.txt b/src/bin/exrmakepreview/CMakeLists.txt +index bb8b548..03c0687 100644 +--- a/src/bin/exrmakepreview/CMakeLists.txt ++++ b/src/bin/exrmakepreview/CMakeLists.txt +@@ -1,17 +1,17 @@ + # SPDX-License-Identifier: BSD-3-Clause + # Copyright (c) Contributors to the OpenEXR Project. + +-add_executable(exrmakepreview ++add_executable(exrmakepreview-${OpenEXR_VERSION_MAJOR} + main.cpp + makePreview.cpp + ) +-target_link_libraries(exrmakepreview OpenEXR::OpenEXR) +-set_target_properties(exrmakepreview PROPERTIES ++target_link_libraries(exrmakepreview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) ++set_target_properties(exrmakepreview-${OpenEXR_VERSION_MAJOR} PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" + ) + if(OPENEXR_INSTALL_TOOLS) +- install(TARGETS exrmakepreview DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ install(TARGETS exrmakepreview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + if(WIN32 AND BUILD_SHARED_LIBS) +- target_compile_definitions(exrmakepreview PRIVATE OPENEXR_DLL) ++ target_compile_definitions(exrmakepreview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) + endif() +diff --git a/src/bin/exrmaketiled/CMakeLists.txt b/src/bin/exrmaketiled/CMakeLists.txt +index 6c8dfa5..7116b54 100644 +--- a/src/bin/exrmaketiled/CMakeLists.txt ++++ b/src/bin/exrmaketiled/CMakeLists.txt +@@ -1,18 +1,18 @@ + # SPDX-License-Identifier: BSD-3-Clause + # Copyright (c) Contributors (c) to the OpenEXR Project. + +-add_executable(exrmaketiled ++add_executable(exrmaketiled-${OpenEXR_VERSION_MAJOR} + makeTiled.cpp + main.cpp + Image.cpp + ) +-target_link_libraries(exrmaketiled OpenEXR::OpenEXR) +-set_target_properties(exrmaketiled PROPERTIES ++target_link_libraries(exrmaketiled-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) ++set_target_properties(exrmaketiled-${OpenEXR_VERSION_MAJOR} PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" + ) + if(OPENEXR_INSTALL_TOOLS) +- install(TARGETS exrmaketiled DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ install(TARGETS exrmaketiled-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + if(WIN32 AND BUILD_SHARED_LIBS) +- target_compile_definitions(exrmaketiled PRIVATE OPENEXR_DLL) ++ target_compile_definitions(exrmaketiled-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) + endif() +diff --git a/src/bin/exrmultipart/CMakeLists.txt b/src/bin/exrmultipart/CMakeLists.txt +index 7f8fc1b..dad8c8d 100644 +--- a/src/bin/exrmultipart/CMakeLists.txt ++++ b/src/bin/exrmultipart/CMakeLists.txt +@@ -1,14 +1,14 @@ + # SPDX-License-Identifier: BSD-3-Clause + # Copyright (c) Contributors to the OpenEXR Project. + +-add_executable(exrmultipart exrmultipart.cpp) +-target_link_libraries(exrmultipart OpenEXR::OpenEXR) +-set_target_properties(exrmultipart PROPERTIES ++add_executable(exrmultipart-${OpenEXR_VERSION_MAJOR} exrmultipart.cpp) ++target_link_libraries(exrmultipart-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) ++set_target_properties(exrmultipart-${OpenEXR_VERSION_MAJOR} PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" + ) + if(OPENEXR_INSTALL_TOOLS) +- install(TARGETS exrmultipart DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ install(TARGETS exrmultipart-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + if(WIN32 AND BUILD_SHARED_LIBS) +- target_compile_definitions(exrmultipart PRIVATE OPENEXR_DLL) ++ target_compile_definitions(exrmultipart-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) + endif() +diff --git a/src/bin/exrmultiview/CMakeLists.txt b/src/bin/exrmultiview/CMakeLists.txt +index bbac3a6..eba48c1 100644 +--- a/src/bin/exrmultiview/CMakeLists.txt ++++ b/src/bin/exrmultiview/CMakeLists.txt +@@ -1,18 +1,18 @@ + # SPDX-License-Identifier: BSD-3-Clause + # Copyright (c) Contributors to the OpenEXR Project. + +-add_executable(exrmultiview ++add_executable(exrmultiview-${OpenEXR_VERSION_MAJOR} + makeMultiView.cpp + main.cpp + Image.cpp + ) +-target_link_libraries(exrmultiview OpenEXR::OpenEXR) +-set_target_properties(exrmultiview PROPERTIES ++target_link_libraries(exrmultiview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) ++set_target_properties(exrmultiview-${OpenEXR_VERSION_MAJOR} PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" + ) + if(OPENEXR_INSTALL_TOOLS) +- install(TARGETS exrmultiview DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ install(TARGETS exrmultiview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + if(WIN32 AND BUILD_SHARED_LIBS) +- target_compile_definitions(exrmultiview PRIVATE OPENEXR_DLL) ++ target_compile_definitions(exrmultiview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) + endif() +diff --git a/src/bin/exrstdattr/CMakeLists.txt b/src/bin/exrstdattr/CMakeLists.txt +index 79205fc..35ac580 100644 +--- a/src/bin/exrstdattr/CMakeLists.txt ++++ b/src/bin/exrstdattr/CMakeLists.txt +@@ -1,14 +1,14 @@ + # SPDX-License-Identifier: BSD-3-Clause + # Copyright (c) Contributors to the OpenEXR Project. + +-add_executable(exrstdattr main.cpp) +-target_link_libraries(exrstdattr OpenEXR::OpenEXR) +-set_target_properties(exrstdattr PROPERTIES ++add_executable(exrstdattr-${OpenEXR_VERSION_MAJOR} main.cpp) ++target_link_libraries(exrstdattr-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) ++set_target_properties(exrstdattr-${OpenEXR_VERSION_MAJOR} PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" + ) + if(OPENEXR_INSTALL_TOOLS) +- install(TARGETS exrstdattr DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ install(TARGETS exrstdattr-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + if(WIN32 AND BUILD_SHARED_LIBS) +- target_compile_definitions(exrstdattr PRIVATE OPENEXR_DLL) ++ target_compile_definitions(exrstdattr-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) + endif() +-- +2.31.1 + diff --git a/media-libs/openexr/openexr-2.5.7.ebuild b/media-libs/openexr/openexr-2.5.7.ebuild index 8a5f1c968b22..d9bb63b65698 100644 --- a/media-libs/openexr/openexr-2.5.7.ebuild +++ b/media-libs/openexr/openexr-2.5.7.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${P}/OpenEXR" LICENSE="BSD" SLOT="0/25" # based on SONAME -KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" IUSE="cpu_flags_x86_avx doc examples static-libs utils test" RESTRICT="!test? ( test )" diff --git a/media-libs/openexr/openexr-3.0.1.ebuild b/media-libs/openexr/openexr-3.0.5.ebuild index 5b225425f836..242e04c95413 100644 --- a/media-libs/openexr/openexr-3.0.1.ebuild +++ b/media-libs/openexr/openexr-3.0.5.ebuild @@ -3,43 +3,48 @@ EAPI=7 -CMAKE_ECLASS=cmake -inherit cmake-multilib flag-o-matic toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs + +MY_PN=OpenEXR +MY_PV=$(ver_cut 1) +MY_P=${MY_PN}-${MY_PV} DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" HOMEPAGE="https://www.openexr.com/" SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -#S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="BSD" -SLOT="0/27" # based on SONAME +SLOT="3/29" # based on SONAME # imath needs keywording: arm{,64}, hppa, ia64, ppc{,64}, sparc, x64-macos, x86-solaris KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads" RESTRICT="!test? ( test )" RDEPEND=" - !media-libs/ilmbase - dev-libs/imath:= - sys-libs/zlib[${MULTILIB_USEDEP}] + ~dev-libs/imath-${PV}:= + sys-libs/zlib " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch + "${FILESDIR}"/${P}-0002-add-version-to-binaries-for-slotting.patch +) + DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md ) -#src_prepare() { +src_prepare() { # Fix path for testsuite -# sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests" + sed -e "s:/var/tmp/:${T}:" \ + -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests" -# if use abi_x86_32 && use test; then -# eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch" -# fi + cmake_src_prepare -# multilib_foreach_abi cmake_src_prepare -#} + mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die +} -multilib_src_configure() { +src_configure() { local mycmakeargs=( -DBUILD_SHARED_LIBS=$(usex !static-libs) -DBUILD_TESTING=$(usex test) @@ -49,17 +54,24 @@ multilib_src_configure() { -DOPENEXR_INSTALL_EXAMPLES=$(usex examples) -DOPENEXR_INSTALL_PKG_CONFIG=ON -DOPENEXR_INSTALL_TOOLS=$(usex utils) + -DOPENEXR_OUTPUT_SUBDIR="${MY_P}" -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy ) + use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON ) + cmake_src_configure } -multilib_src_install_all() { +src_install() { if use doc; then DOCS+=( docs/*.pdf ) fi - einstalldocs - use examples && docompress -x /usr/share/doc/${PF}/examples + cmake_src_install + + cat > "${T}"/99${PN}3 <<-EOF || die + LDPATH=/usr/$(get_libdir)/${MY_P} + EOF + doenvd "${T}"/99${PN}3 } diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest index 3ac34ce4a32a..ed8c5942bccb 100644 --- a/media-libs/portaudio/Manifest +++ b/media-libs/portaudio/Manifest @@ -5,5 +5,5 @@ DIST pa_stable_v190700_20210406.tgz 1462695 BLAKE2B 2e00cc0f7bfccf732bd3256b4379 DIST portaudio-19.06.00-audacity-portmixer.patch 8722 BLAKE2B 2b69bcf26e55be46d354dc44756fd03b16031fa86a334b776eb4326a4c64a7e22abd6bf60794847526102391c8e65813b41338cf94c647e3e9b68d82ea5dc5f5 SHA512 f693aef477b516c7a03eb021260cbecb23200422a927a117e3e59a1b4e6c6c2983fbea8ee3a3714ebc55728933654bd7909327a0bab4450ccf4e6a02c86a63b5 DIST portaudio-19.07.00-audacity.patch.bz2 2750 BLAKE2B 479cdc76615b60e454a6712c26bd4ac9d9e577f83d4c11a8f3e75c0a1c13ab0a443c91441a57da8cd2b9656649bd53ee0d2e23c23fd788ba7f95c67985b941c6 SHA512 d0e40b5df2b498ce3d9c56b0c7a896cd22ac3dd79b4ab3ebac151a82a824f7e74d62c3848c3ad0f3c499c9d1262b9c1f9cbfc2c5fdd0a5f20e9570357b7670b2 EBUILD portaudio-19.06.00-r3.ebuild 1686 BLAKE2B 6dce2932001d865f65a4c84eb143666b33f6ffc5205b9e4e5d9a1a3eed980cb849b856600d60f311696751c463494641ce83a766be94738ffbc45720423fcefe SHA512 40d0ffea3bee3e14d09cf05c762a4a9a783817d0128bca890160df9a23012a8eb9770d873bfef6c5eebf00b051fe6719a9bb61068e9328e7e4031a12e1834b72 -EBUILD portaudio-19.07.00-r2.ebuild 1739 BLAKE2B f9a4f6596e331ae87b0939f7d3d44c6e952cda0e8b6e7fee647ba74d479fc1575239b4136c4dc0271a636bb48aeacdc9ac96c7ae0ee9a3a59a13036296a58651 SHA512 cf10b1439dca837e09490a4e3d2709f63f2859ddbaf44ae8c3a9283eda04163a8cfbb3bb95e41df2e4ce51cbb895e6b4ef9d729c7472d61a2d31088bf35451be +EBUILD portaudio-19.07.00-r2.ebuild 1736 BLAKE2B 6dca4b1fef9306568fb81e04932506133d7c688bb68667e7991eb580264c383344c7d1ea2b6a822e169de69473301439af054a00457ea4c031dfaa453215e704 SHA512 4368aaf1ab4a0fcd73817cfb1b8f645a35604e59ad3b3bc4e8d7c2bd84d4b0d372a29ea57e5305f7c4ad2e3035fcd85c985a93acdd7bb46dcaf4ee0d13fbf8ce MISC metadata.xml 337 BLAKE2B 2cb92258419e17576d907f759334b87c17eadf1402a9fbf73bb781602b7c1e73485a3f3c094d4166ec79d7d8b5b4ab10302da160bef0f66fe00abc1d08d9e363 SHA512 032d3d8605d98fb6b1a3c32647ffd15d2d8600be271628f417100b5e5dc9e751e93b3fe0d9b75699f80db127b1baf5eaa37c534af7637d74ebd8fc06cde19ad9 diff --git a/media-libs/portaudio/portaudio-19.07.00-r2.ebuild b/media-libs/portaudio/portaudio-19.07.00-r2.ebuild index 50eddce6d970..a0e7627a2800 100644 --- a/media-libs/portaudio/portaudio-19.07.00-r2.ebuild +++ b/media-libs/portaudio/portaudio-19.07.00-r2.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="alsa +cxx debug doc jack oss static-libs" RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest index 293ccda7926d..978431bc221d 100644 --- a/media-libs/rubberband/Manifest +++ b/media-libs/rubberband/Manifest @@ -1,4 +1,3 @@ -AUX rubberband-1.9.1-build.patch 6538 BLAKE2B 9387ebba5a8a06f6ea11dfa16c9b37fb2bc607a4982a6b77ad62e59fce597e7d4c358c0795c471a5e8b74cb553da31239cff50b2ac367e702e04262a66c462a0 SHA512 64677e108c17e35739a2e86a473c08b3d1e575daee14db124bec013e348120538e29e9a6829f7ec905998f7ba8f4386e8aea8591642bf45cf3be0f6e657b828f AUX rubberband-1.9.2-build.patch 6707 BLAKE2B a88eb8a5c647f4d8006f51fc627dca0ab02d1712b920a3c6c41b8981aa13ac5d7155bfd11e33577cb7b1e49a079ca5ea9840d37aaf477deffa0dea609b03fed7 SHA512 035f5549c902c1517ad5e09ee472eca578eed7d7f87f7ee20166dc46f495d5abaebc32902472b9ac6a3a367176c130bfa6fc743159b9efa3227873a16d8b4877 DIST rubberband-1.9.2.tar.bz2 164178 BLAKE2B dc8e5b4c773dbb5c556331fa56e6cf4a5dd3f8a0fc7dcfed1fbe53d1a7635f12db6a884e775fbff8022e252d98b4e14a46a2395a5d4cb7645522ddf3e6b5482f SHA512 b1c763ab2a428aa2f1f8e5d0be6e9eb669808059ee5389e94f12de25f1a05cd89022656d98906c90b616773da11ab1f596ae2c5a9d300118e88049e1443121f2 EBUILD rubberband-1.9.2.ebuild 1320 BLAKE2B a5aed87ad51ebd6db178862b58eaf6dcd783fd18e6b0dc7479a85e67350c433cdf6ea2febf662fdac1920767e5e802e020bde2e6954d11ec726d146352d02642 SHA512 5392bc5bcb1a46696207161b557a78f6b0fcfa12f32bd360ea3d73da0bbe00c0e3c1d5840a3dcae390e9b16eccf106814eec0ae97560646bbb69fbb9b61a76cd diff --git a/media-libs/rubberband/files/rubberband-1.9.1-build.patch b/media-libs/rubberband/files/rubberband-1.9.1-build.patch deleted file mode 100644 index 2d8faaee795b..000000000000 --- a/media-libs/rubberband/files/rubberband-1.9.1-build.patch +++ /dev/null @@ -1,177 +0,0 @@ -diff --git a/meson.build b/meson.build -index 65ee113..0c089fa 100644 ---- a/meson.build -+++ b/meson.build -@@ -97,14 +97,21 @@ endforeach - - fftw3_dep = dependency('fftw3', version: '>= 3.0.0', required: false) - samplerate_dep = dependency('samplerate', version: '>= 0.1.8', required: false) --sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false) --vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false) -+if get_option('programs') -+ sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false) -+endif -+if get_option('vamp') -+ vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false) -+endif - thread_dep = dependency('threads') --have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args) --have_jni = cpp.has_header('jni.h', args: extra_include_args) -- --javac = find_program('javac', required: false) --jar = find_program('jar', required: false) -+if get_option('ladspa') -+ have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args) -+endif -+if get_option('jni') -+ have_jni = cpp.has_header('jni.h', args: extra_include_args) -+ javac = find_program('javac', required: false) -+ jar = find_program('jar', required: false) -+endif - - - # Check FFT and resampler options and set up dependencies and paths -@@ -255,37 +262,41 @@ if ipp_needed - endif - endif # ipp_needed - --if not vamp_dep.found() -- vamp_dep = cpp.find_library('VampPluginSDK', -- dirs: get_option('extra_lib_dirs'), -- has_headers: ['vamp-sdk.h'], -- header_args: extra_include_args, -- required: false) -+if get_option('vamp') - if not vamp_dep.found() -- vamp_dep = cpp.find_library('vamp-sdk', -+ vamp_dep = cpp.find_library('VampPluginSDK', - dirs: get_option('extra_lib_dirs'), - has_headers: ['vamp-sdk.h'], - header_args: extra_include_args, - required: false) -+ if not vamp_dep.found() -+ vamp_dep = cpp.find_library('vamp-sdk', -+ dirs: get_option('extra_lib_dirs'), -+ has_headers: ['vamp-sdk.h'], -+ header_args: extra_include_args, -+ required: false) -+ endif - endif -+ have_vamp = true - endif --have_vamp = vamp_dep.found() -- --if not sndfile_dep.found() -- sndfile_dep = cpp.find_library('sndfile', -- dirs: get_option('extra_lib_dirs'), -- has_headers: ['sndfile.h'], -- header_args: extra_include_args, -- required: false) -+ -+if get_option('programs') - if not sndfile_dep.found() -- sndfile_dep = cpp.find_library('sndfile-1', -+ sndfile_dep = cpp.find_library('sndfile', - dirs: get_option('extra_lib_dirs'), - has_headers: ['sndfile.h'], - header_args: extra_include_args, - required: false) -+ if not sndfile_dep.found() -+ sndfile_dep = cpp.find_library('sndfile-1', -+ dirs: get_option('extra_lib_dirs'), -+ has_headers: ['sndfile.h'], -+ header_args: extra_include_args, -+ required: false) -+ endif - endif -+ have_sndfile = true - endif --have_sndfile = sndfile_dep.found() - - - # General platform and compiler expectations -@@ -386,8 +397,10 @@ endif - # And the build targets: Static and dynamic libraries, command-line - # utility, LADSPA plugin, Vamp plugin, JNI library - --message('Will build Rubber Band Library static library') --target_summary += { 'Static library': [ true, 'Name: ' + rubberband_static_name ] } -+if get_option('static') -+ message('Will build Rubber Band Library static library') -+ target_summary += { 'Static library': [ true, 'Name: ' + rubberband_static_name ] } -+endif - rubberband_static = static_library( - rubberband_static_name, - library_sources, -@@ -425,7 +438,7 @@ else - message('Not building Rubber Band Library dynamic library: no_shared option set') - endif - --if have_jni and javac.found() and jar.found() -+if get_option('jni') - target_summary += { 'JNI library': [ true, 'Name: ' + rubberband_jni_name ] } - message('Will build Java Native Interface') - rubberband_jni = shared_library( -@@ -460,7 +473,7 @@ if have_jni and javac.found() and jar.found() - ) - else - target_summary += { 'JNI library': false } -- if not have_jni -+ if not get_option('jni') - message('Not building Java Native Interface: jni.h header not found') - else - message('Not building Java Native Interface: Java compiler not found') -@@ -474,7 +487,7 @@ install_headers( - subdir: 'rubberband' - ) - --if have_ladspa -+if get_option('ladspa') - target_summary += { 'LADSPA plugin': [ true, 'Name: ' + rubberband_ladspa_name ] } - message('Will build LADSPA plugin') - rubberband_ladspa = shared_library( -@@ -509,7 +522,7 @@ else - message('Not building LADSPA plugin: ladspa.h header not found') - endif - --if have_vamp -+if get_option('vamp') - target_summary += { 'Vamp plugin': [ true, 'Name: ' + rubberband_vamp_name ] } - message('Will build Vamp plugin') - rubberband_vamp = shared_library( -@@ -541,7 +554,7 @@ else - message('Not building Vamp plugin: Vamp dependency not found') - endif - --if have_sndfile -+if get_option('programs') - target_summary += { 'Command-line utility': [ true, 'Name: ' + rubberband_program_name ] } - message('Will build command-line utility') - rubberband_program = executable( -diff --git a/meson_options.txt b/meson_options.txt -index 1703806..cd637f1 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -31,3 +31,22 @@ option('no_shared', - value: 'false', - description: 'Do not build shared libraries. On Windows this will also ensure that the static library is called simply rubberband.lib, not rubberband-static.lib as it is in the default build.') - -+option('jni', -+ type: 'boolean', -+ value: 'false') -+ -+option('ladspa', -+ type: 'boolean', -+ value: 'false') -+ -+option('programs', -+ type: 'boolean', -+ value: 'false') -+ -+option('static', -+ type: 'boolean', -+ value: 'false') -+ -+option('vamp', -+ type: 'boolean', -+ value: 'false') |