From 6c9dc10e04cd513437e046ccca0e51a3d6d4dc7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 17 May 2024 00:01:35 +0100 Subject: gentoo auto-resync : 17:05:2024 - 00:01:35 --- media-libs/Manifest.gz | Bin 69200 -> 69202 bytes media-libs/shaderc/Manifest | 4 +- media-libs/shaderc/shaderc-2023.8.ebuild | 79 --------------------- media-libs/shaderc/shaderc-2024.1.ebuild | 79 +++++++++++++++++++++ media-libs/vulkan-layers/Manifest | 9 ++- .../vulkan-layers-1.3.250-Build-shared-libs.patch | 13 ---- .../vulkan-layers/vulkan-layers-1.3.275.ebuild | 60 ---------------- .../vulkan-layers/vulkan-layers-1.3.280.0.ebuild | 2 +- .../vulkan-layers/vulkan-layers-1.3.283.0.ebuild | 60 ++++++++++++++++ media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 4 +- media-libs/vulkan-loader/Manifest | 6 +- .../vulkan-loader/vulkan-loader-1.3.275.ebuild | 59 --------------- .../vulkan-loader/vulkan-loader-1.3.280.0.ebuild | 2 +- .../vulkan-loader/vulkan-loader-1.3.283.0.ebuild | 59 +++++++++++++++ 14 files changed, 211 insertions(+), 225 deletions(-) delete mode 100644 media-libs/shaderc/shaderc-2023.8.ebuild create mode 100644 media-libs/shaderc/shaderc-2024.1.ebuild delete mode 100644 media-libs/vulkan-layers/files/vulkan-layers-1.3.250-Build-shared-libs.patch delete mode 100644 media-libs/vulkan-layers/vulkan-layers-1.3.275.ebuild create mode 100644 media-libs/vulkan-layers/vulkan-layers-1.3.283.0.ebuild delete mode 100644 media-libs/vulkan-loader/vulkan-loader-1.3.275.ebuild create mode 100644 media-libs/vulkan-loader/vulkan-loader-1.3.283.0.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 10cdc8932518..342fc0489a75 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest index 52cd25baa989..87db27ac60bf 100644 --- a/media-libs/shaderc/Manifest +++ b/media-libs/shaderc/Manifest @@ -1,6 +1,6 @@ AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed -DIST shaderc-2023.8.tar.gz 227238 BLAKE2B 334bda3bdff510ac97f97fa710e18ca9a2c807d1e71973aaf4493112dca3adb69c7a83c0590c65db3e6dffab82f500058162d3190e5822a01ea2d611db771857 SHA512 2a5e59a2bb6c4b5462758d824747fee0edaf177dc64f30fe698fd2d2cc21cddab1a19ec2b2d63bd3d2e209330a13519f399395398379370b15daa39e6ee6b2bf DIST shaderc-2024.0.tar.gz 227125 BLAKE2B f11f2acad796f41015d4738b964526f119e944b1cfa2103ab3452adcf5790a04adbd10f9d55423b3ce567e87f64eb241067c786c4a7b76bb884aa70c100d0eb8 SHA512 ca80b22a80bf1a222e6deecbe63f99c6eed980c6c31b4f7981b6c8dc5637b7271c861543566e01aaf945df40da095b63a69f2e22f061a41faad2ecca5dc187ae -EBUILD shaderc-2023.8.ebuild 1903 BLAKE2B dd37e5098ccdcfb8d7335e4e44cfc810a651891694dadcb4f42cd236643512d8b895def9bd2d2ce2072317830213d05bf67986ca3bd76feb8c21b518a89137e3 SHA512 0775b542b9dabdf8ffbf7e5136234c7f5cde58b4a2d8a4412ed13ef3cb8635d61e46e3da5fa5b75210e81195825aa3faee29881883e774ce89689eda62c0d13b +DIST shaderc-2024.1.tar.gz 227211 BLAKE2B a4c9790cb117e4cf2d528ed294ef0599dc3c17ac367a4f658254ff9e161f82b3338a2d70a033fabcdb7a2925c2f4668ee89cfff0d4b88cd2b22fcfb3f2786ea9 SHA512 017d8625c66da7eb5b431f595b27a4ddf146aaa12ef56777cb8c3f7f0f15eb01c3286e5905c5268de55d07cc19d5ffae4d4c08987d105b0a6be74616a467b736 EBUILD shaderc-2024.0.ebuild 1899 BLAKE2B 8bcd86131d201a2a4f67236fffddf896b13dffc4043af087f1615f50797026109e67cf8d035d0af1cf4cb04d374264579f81874bcea4fb9eb941f0c9c6283651 SHA512 c2743b91ee7c6cbff07c9a085a548513e654698a42c14c0c533e9cbc40c03e41b1ec784bdf298bd6be430d49c8f815be0e65d8e0566ddbfd35e35bda3b0bcf82 +EBUILD shaderc-2024.1.ebuild 1902 BLAKE2B d063baa561ba9c2c5e6c0de6f5cc2b313f9b4993f5c40cb0b10bcc5c8b8ff627bff0194ff7f7f7fe704341ac65e201eb8c491dd723effd8b1045e4c4c4b00d72 SHA512 cad7e6ff1eceec95c810c0f13f47a18a94a6ac0db6095af956b7cabde403a3d99f493dce582a949ea72af9015820c0dfba44d9ae8f002295bc234c5d14ccfb84 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70 diff --git a/media-libs/shaderc/shaderc-2023.8.ebuild b/media-libs/shaderc/shaderc-2023.8.ebuild deleted file mode 100644 index 2b1207255575..000000000000 --- a/media-libs/shaderc/shaderc-2023.8.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) -inherit cmake-multilib multibuild python-any-r1 - -DESCRIPTION="Collection of tools, libraries and tests for shader compilation" -HOMEPAGE="https://github.com/google/shaderc" -EGIT_COMMIT="${PV}" -SRC_URI="https://github.com/google/${PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~loong ppc64 ~riscv x86" -IUSE="doc" - -RDEPEND=" - ~dev-util/glslang-1.3.275:=[${MULTILIB_USEDEP}] - ~dev-util/spirv-tools-1.3.275[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - ~dev-util/spirv-headers-1.3.275" - -BDEPEND="doc? ( dev-ruby/asciidoctor )" - -PATCHES=( - "${FILESDIR}"/${PN}-2020.4-fix-build.patch -) - -# https://github.com/google/shaderc/issues/470 -RESTRICT=test - -src_prepare() { - cmake_comment_add_subdirectory examples - - # Unbundle glslang, spirv-headers, spirv-tools - cmake_comment_add_subdirectory third_party - sed -i \ - -e "s|\$|${EPREFIX}/usr/bin/spirv-dis|" \ - glslc/test/CMakeLists.txt || die - - # Disable git versioning - sed -i -e '/build-version/d' glslc/CMakeLists.txt || die - - # Manually create build-version.inc as we disabled git versioning - cat <<- EOF > glslc/src/build-version.inc || die - "${P}\n" - "$(best_version dev-util/spirv-tools)\n" - "$(best_version dev-util/glslang)\n" - EOF - - cmake_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DSHADERC_SKIP_TESTS="true" - -DSHADERC_ENABLE_WERROR_COMPILE="false" - ) - cmake_src_configure -} - -multilib_src_compile() { - if multilib_is_native_abi && use doc; then - cmake_src_compile glslc_doc_README - fi - cmake_src_compile -} - -multilib_src_install() { - if multilib_is_native_abi; then - use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" ) - fi - cmake_src_install -} diff --git a/media-libs/shaderc/shaderc-2024.1.ebuild b/media-libs/shaderc/shaderc-2024.1.ebuild new file mode 100644 index 000000000000..7bc994a4ae41 --- /dev/null +++ b/media-libs/shaderc/shaderc-2024.1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake-multilib python-any-r1 + +DESCRIPTION="Collection of tools, libraries and tests for shader compilation" +HOMEPAGE="https://github.com/google/shaderc" +EGIT_COMMIT="${PV}" +SRC_URI="https://github.com/google/${PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86" +IUSE="doc" + +RDEPEND=" + ~dev-util/glslang-1.3.283.0:=[${MULTILIB_USEDEP}] + ~dev-util/spirv-tools-1.3.283.0[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + ~dev-util/spirv-headers-1.3.283.0" + +BDEPEND="doc? ( dev-ruby/asciidoctor )" + +PATCHES=( + "${FILESDIR}"/${PN}-2020.4-fix-build.patch +) + +# https://github.com/google/shaderc/issues/470 +RESTRICT=test + +src_prepare() { + cmake_comment_add_subdirectory examples + + # Unbundle glslang, spirv-headers, spirv-tools + cmake_comment_add_subdirectory third_party + sed -i \ + -e "s|\$|${EPREFIX}/usr/bin/spirv-dis|" \ + glslc/test/CMakeLists.txt || die + + # Disable git versioning + sed -i -e '/build-version/d' glslc/CMakeLists.txt || die + + # Manually create build-version.inc as we disabled git versioning + cat <<- EOF > glslc/src/build-version.inc || die + "${P}\n" + "$(best_version dev-util/spirv-tools)\n" + "$(best_version dev-util/glslang)\n" + EOF + + cmake_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DSHADERC_SKIP_TESTS="true" + -DSHADERC_ENABLE_WERROR_COMPILE="false" + ) + cmake_src_configure +} + +multilib_src_compile() { + if multilib_is_native_abi && use doc; then + cmake_src_compile glslc_doc_README + fi + cmake_src_compile +} + +multilib_src_install() { + if multilib_is_native_abi; then + use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" ) + fi + cmake_src_install +} diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest index f5bdf31423fc..856aa2f79c20 100644 --- a/media-libs/vulkan-layers/Manifest +++ b/media-libs/vulkan-layers/Manifest @@ -1,7 +1,6 @@ -AUX vulkan-layers-1.3.250-Build-shared-libs.patch 333 BLAKE2B 557bfc8dc1639f31b873ec950dc9d99f4632d953b7c3d104d0b69b68985a0d214a4d5eb42a64d28aeed41a889515305f47f8a1b3646501d36f99d67c79f24789 SHA512 ddd30ac012cfa0e1ea7cbc84c11d4398272c9f2314bb8f0d3a3758f89162239feaff0e1044284a730a8288754dd1b6cab99b98e28199457a81137a7a22601413 -DIST vulkan-layers-1.3.275.tar.gz 5280585 BLAKE2B a9707dc18c4802b1f6fd851ec7b16201035c1809c7e42fcd2d3f08dd7de162a18ee240f9269e233a67c93b49bd69f3babda73265bb9ac343e2924b19fa6288dd SHA512 755bdde7e7129b7a3ed06a4bebdaf11212288802119e0dc224aab63491de30c9b1c25972bdafd4fedbfea43bf6c29cdbc409374e57fbf0331798530a8ae94a70 DIST vulkan-layers-1.3.280.0.tar.gz 5465068 BLAKE2B c0b568b59cb8a17bea7dd1c1522c0a72279ad6a07f2f11383bc069f141fbb179529dd4ccd34b2a7a9a9a4af0e173ebbc49541a42c2b32ea8b54d90302f7ee449 SHA512 b397d4aa5406e25eb241a72f006fb05554d8ec96eec4c31ed08ef34d0b362f8e544a2e8bcf044112bdbb2733f2a9f50bf8b63aff64e143e450fa01298dc7838a -EBUILD vulkan-layers-1.3.275.ebuild 1644 BLAKE2B 5d03caef5de18f10040bbe5fcfa23526c51684ef95fd9953efdfaa1b217cf11d5e6561ffeb14390c62ab32ea6bd38fcd002120b3a4b0fed80d386ffde9d9f08b SHA512 bd2e9eced89d8161eca83c07d27342abb68e147d60094285437c83aeb9089ff30eef038ff8d70679f24a71eb18f772532df5d91b1223306a02107e9c75dee537 -EBUILD vulkan-layers-1.3.280.0.ebuild 1642 BLAKE2B 4517006574e08e8cde690412194b53e460b9992225c2be8567f5cc928b9f7a1293f819844ca19af7c75dc8bddab52a1f01c55ebaed7406f238fb3462564638a1 SHA512 9c03531659613e889b4985a3485d2244f32c7af853c70bf8d3acf592409edb0823d9df01455735f0700b6acd5024d76210487a1d924083cc674a565489226a67 -EBUILD vulkan-layers-9999.ebuild 1646 BLAKE2B 624c9d714e188a4865ac48e7ef1408bfd60e9d079d2036f3ae782daa6f0209218bb341d479873f481d4a270c26042b1c68152a2eafacfb8bc7a69a611ba4c8ac SHA512 0c80de23d7d1d5fbd9636f4d860c845d8874fac759edf3875a0a1022866759a8ec8362b1b20408fd5b1b5363cd67e820d311b0459f347c6cdfbfaf6392aaf4a1 +DIST vulkan-layers-1.3.283.0.tar.gz 5230566 BLAKE2B c16a4af62900a4b053f7dd60da5279bc088cd297f22bc247be2718cc3187136b60e90530298c068fdd384c9135e83f91f3ffd7b3db9f12555d6dd88b6e9b66ef SHA512 fc2ca2c79be8e01fc39a7802644d5e10b5196317eaac246a17b73093409739e771ac267c1ed8aad08ba68afdebc583702980f195a5f93421a0c041da3f4b6e49 +EBUILD vulkan-layers-1.3.280.0.ebuild 1640 BLAKE2B 49009411de0d6c2be662406cdd1bc527ac1706f0650439ce12f6b8e52172d5bf409a1f0a90338f9a469200b4b0a69e37d59662a746984aa4af383e72b67f5f10 SHA512 cf6779d49fb87776dfc772b0ac8e74c4e0c753c3a9544beb808622fafc39e851c083d2936aaedea0e821c2a0fed9315eecea9f8b951b3308a59fd699d0891167 +EBUILD vulkan-layers-1.3.283.0.ebuild 1644 BLAKE2B a3052e0b2c2822c79c9a8459e947840e3ae5d203c2a9ff903e737b1ce446610a078475ab5a67b6c21fea8b5c4e861ae6f80139f6ed2bce2d6e7d57e858b36b74 SHA512 943561dfc9ece07319fa56ca3b44745aa9e1102487a68207dbadb6a0a9b13ec485298fd9f16bbae454e6660da97ed3769772d9cd321e3ab0ec1ca468e37d23b0 +EBUILD vulkan-layers-9999.ebuild 1644 BLAKE2B a3052e0b2c2822c79c9a8459e947840e3ae5d203c2a9ff903e737b1ce446610a078475ab5a67b6c21fea8b5c4e861ae6f80139f6ed2bce2d6e7d57e858b36b74 SHA512 943561dfc9ece07319fa56ca3b44745aa9e1102487a68207dbadb6a0a9b13ec485298fd9f16bbae454e6660da97ed3769772d9cd321e3ab0ec1ca468e37d23b0 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095 diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.250-Build-shared-libs.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.250-Build-shared-libs.patch deleted file mode 100644 index 0a5e242a542a..000000000000 --- a/media-libs/vulkan-layers/files/vulkan-layers-1.3.250-Build-shared-libs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt -index 06b53ff9b..97e388765 100644 ---- a/layers/CMakeLists.txt -+++ b/layers/CMakeLists.txt -@@ -166,7 +166,7 @@ if (VVL_CODEGEN) - ) - endif() - --add_library(vvl MODULE) -+add_library(vvl SHARED) - - target_sources(vvl PRIVATE - best_practices/best_practices_error_enums.h diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.275.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.275.ebuild deleted file mode 100644 index c9810ee2b3ef..000000000000 --- a/media-libs/vulkan-layers/vulkan-layers-1.3.275.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN=Vulkan-ValidationLayers -PYTHON_COMPAT=( python3_{9..12} ) -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" - EGIT_SUBMODULES=() - inherit git-r3 -else - SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.0.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" - S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0 -fi - -DESCRIPTION="Vulkan Validation Layers" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="wayland X" - -RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - >=dev-cpp/robin-hood-hashing-3.11.5 - ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] - ~dev-util/spirv-headers-${PV} - ~dev-util/vulkan-headers-${PV} - ~dev-util/vulkan-utility-libraries-${PV}:=[${MULTILIB_USEDEP}] - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( - x11-libs/libX11:=[${MULTILIB_USEDEP}] - x11-libs/libXrandr:=[${MULTILIB_USEDEP}] - ) -" - -PATCHES="${FILESDIR}/${PN}-1.3.250-Build-shared-libs.patch" - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" - -DCMAKE_SKIP_RPATH=ON - -DBUILD_WERROR=OFF - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - -DBUILD_TESTS=OFF - ) - cmake_src_configure -} - -multilib_src_install_all() { - find "${ED}" -type f -name \*.a -delete || die -} diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.280.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.280.0.ebuild index 5c106026e5ef..ca10d7658eb2 100644 --- a/media-libs/vulkan-layers/vulkan-layers-1.3.280.0.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-1.3.280.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} fi diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.283.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.283.0.ebuild new file mode 100644 index 000000000000..81a4ba180a76 --- /dev/null +++ b/media-libs/vulkan-layers/vulkan-layers-1.3.283.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=Vulkan-ValidationLayers +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake-multilib python-any-r1 + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} +fi + +DESCRIPTION="Vulkan Validation Layers" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="wayland X" + +RDEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + >=dev-cpp/robin-hood-hashing-3.11.5 + ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] + ~dev-util/spirv-headers-${PV} + ~dev-util/vulkan-headers-${PV} + ~dev-util/vulkan-utility-libraries-${PV}:=[${MULTILIB_USEDEP}] + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + ) +" + +QA_SONAME="/usr/lib[^/]*/libVkLayer_khronos_validation.so" + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" + -DCMAKE_SKIP_RPATH=ON + -DBUILD_WERROR=OFF + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DBUILD_TESTS=OFF + ) + cmake_src_configure +} + +multilib_src_install_all() { + find "${ED}" -type f -name \*.a -delete || die +} diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild index 8e97234b84e0..81a4ba180a76 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 MY_PN=Vulkan-ValidationLayers -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake-multilib python-any-r1 if [[ ${PV} == *9999* ]]; then @@ -24,7 +24,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="wayland X" -RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]" +RDEPEND="~dev-util/spirv-tools-${PV}[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} ${PYTHON_DEPS} >=dev-cpp/robin-hood-hashing-3.11.5 diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest index 3cad8eb4f7bf..48a3d96ee8bb 100644 --- a/media-libs/vulkan-loader/Manifest +++ b/media-libs/vulkan-loader/Manifest @@ -1,6 +1,6 @@ -DIST vulkan-loader-1.3.275.tar.gz 1701415 BLAKE2B c92cc2d3ff3c90eaaa820f0f857030ab6f957d0691f7cbaf53985bd4d4c6f0f2b4222623740bd2c433c2e0116545af37b8ac9959b554b800ca95a978fd1b14b5 SHA512 7af0110083ab827e4ea8b4ea3e3ce00d9387f27f5725cefd426fa4dee4b80bc83210248c2968577a90bb82de8efb1a68691a1bdb93769f2f04600c5a3d3eff91 DIST vulkan-loader-1.3.280.0.tar.gz 1702731 BLAKE2B 65b4af33af1f8bbf50fdf95bee1018195961c8d553494981459d9cc4b158ec9d78316ce0d91b8eba1c0679d73ce685adaabebcd2ece1aaf47440e40f8848b083 SHA512 8ec98e0da867f829e048e100a97d7b94a3c40f56f858e3eb81f11f6f58e20e59da6ca8785a9642958ff3b698c618b9968407028cc66dfa0ad296576bf9db45ca -EBUILD vulkan-loader-1.3.275.ebuild 1546 BLAKE2B 7d3b40829acc8939a7d592fe6db0d9cda8419aa342879c4ee99de6c8c65518e1b95bc58776f259dec45403c418c7d2662b58865832a9b683bfe686d8b427f911 SHA512 5a49910f2e06cc373dc101fbfbff0415a8c65d20ec46f21e4fdd19735b08138cedc7aba7594e88cca591b512d1ecab23a64acea2b4e37c6efc94da98944bbc69 -EBUILD vulkan-loader-1.3.280.0.ebuild 1548 BLAKE2B 3652f5ada73b173bf925bfe37f355ca2b6fe14b7bd4d7ae06d0563cbf8e4ac20405d0cfae145c8ed978a1cec0f3b7208e847e072f817efc01e58121b6cc9e6e4 SHA512 918a38cb2e84ea87798325de5752e45f1b1fd79f1342b2a53f05c46b004a994ec08a5cf24bd9d12a4d60a6db34c0ddea6a5fc64a4be68af51226d97a13ea441c +DIST vulkan-loader-1.3.283.0.tar.gz 1713233 BLAKE2B 13b01518f08a206ad9a66ba74bbfa5d5199deb556e1beb2d5bcd63780f399d526d9f5ff83d0bc809e47702fd1413e799e34a3e81f00b1f27f93a08aff16aab3e SHA512 0e62cc29a28e9d0898aa0a29b05158f75116f5a86468e879499503a20e95e49791150a0a458317223a04c65dfbc1fdcd22e71596a8cf939a5d38f9bf186851d6 +EBUILD vulkan-loader-1.3.280.0.ebuild 1546 BLAKE2B 7d3b40829acc8939a7d592fe6db0d9cda8419aa342879c4ee99de6c8c65518e1b95bc58776f259dec45403c418c7d2662b58865832a9b683bfe686d8b427f911 SHA512 5a49910f2e06cc373dc101fbfbff0415a8c65d20ec46f21e4fdd19735b08138cedc7aba7594e88cca591b512d1ecab23a64acea2b4e37c6efc94da98944bbc69 +EBUILD vulkan-loader-1.3.283.0.ebuild 1552 BLAKE2B 2f42ef99792fb97542b7695ae89d396c5c2f0e2a16bd05e29ed019fce1795953b5795b54e7f42a4caf3e60bffa74a2cdf4a2df11fddfeb49a81cfd9f1aab0300 SHA512 a6fe7d5f1697dd1abfef7ffe42d53f208f9d4a956942fb3f96ce4ad54ca6ed9c950fdfdd205a16043bff91d77c29e2926cd70e61865d54baa8e150c98712fb7f EBUILD vulkan-loader-9999.ebuild 1552 BLAKE2B 2f42ef99792fb97542b7695ae89d396c5c2f0e2a16bd05e29ed019fce1795953b5795b54e7f42a4caf3e60bffa74a2cdf4a2df11fddfeb49a81cfd9f1aab0300 SHA512 a6fe7d5f1697dd1abfef7ffe42d53f208f9d4a956942fb3f96ce4ad54ca6ed9c950fdfdd205a16043bff91d77c29e2926cd70e61865d54baa8e150c98712fb7f MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34 diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.275.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.275.ebuild deleted file mode 100644 index 0f0644b9342d..000000000000 --- a/media-libs/vulkan-loader/vulkan-loader-1.3.275.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN=Vulkan-Loader -inherit flag-o-matic cmake-multilib toolchain-funcs - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" - EGIT_SUBMODULES=() - inherit git-r3 -else - SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" - S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} -fi - -DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="layers wayland X" - -DEPEND=" - ~dev-util/vulkan-headers-${PV} - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( - x11-libs/libX11:=[${MULTILIB_USEDEP}] - x11-libs/libXrandr:=[${MULTILIB_USEDEP}] - ) -" -PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" - -multilib_src_configure() { - # Integrated clang assembler doesn't work with x86 - Bug #698164 - if tc-is-clang && [[ ${ABI} == x86 ]]; then - append-cflags -fno-integrated-as - fi - - local mycmakeargs=( - -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" - -DCMAKE_SKIP_RPATH=ON - -DBUILD_TESTS=OFF - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" - ) - cmake_src_configure -} - -multilib_src_install() { - keepdir /etc/vulkan/icd.d - - cmake_src_install -} diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.280.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.280.0.ebuild index 86ce2aac0b53..0f0644b9342d 100644 --- a/media-libs/vulkan-loader/vulkan-loader-1.3.280.0.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.3.280.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} fi diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.283.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.283.0.ebuild new file mode 100644 index 000000000000..ca20e66ef4a1 --- /dev/null +++ b/media-libs/vulkan-loader/vulkan-loader-1.3.283.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=Vulkan-Loader +inherit flag-o-matic cmake-multilib toolchain-funcs + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} +fi + +DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" +HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="layers wayland X" + +DEPEND=" + ~dev-util/vulkan-headers-${PV} + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + ) +" +PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" + +multilib_src_configure() { + # Integrated clang assembler doesn't work with x86 - Bug #698164 + if tc-is-clang && [[ ${ABI} == x86 ]]; then + append-cflags -fno-integrated-as + fi + + local mycmakeargs=( + -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" + -DCMAKE_SKIP_RPATH=ON + -DBUILD_TESTS=OFF + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" + ) + cmake_src_configure +} + +multilib_src_install() { + keepdir /etc/vulkan/icd.d + + cmake_src_install +} -- cgit v1.2.3