From 4dc9bfa1f12673bbf1343e64af7e0cd715534a9f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Nov 2023 22:29:52 +0000 Subject: gentoo auto-resync : 25:11:2023 - 22:29:52 --- dev-util/Manifest.gz | Bin 70294 -> 70297 bytes dev-util/apitrace/Manifest | 2 +- dev-util/apitrace/apitrace-9.0-r3.ebuild | 88 ----------------- dev-util/apitrace/apitrace-9.0-r4.ebuild | 88 +++++++++++++++++ dev-util/intel_clc/Manifest | 4 - dev-util/intel_clc/intel_clc-23.3.0_rc3-r1.ebuild | 115 ---------------------- dev-util/intel_clc/intel_clc-23.3.0_rc4.ebuild | 115 ---------------------- 7 files changed, 89 insertions(+), 323 deletions(-) delete mode 100644 dev-util/apitrace/apitrace-9.0-r3.ebuild create mode 100644 dev-util/apitrace/apitrace-9.0-r4.ebuild delete mode 100644 dev-util/intel_clc/intel_clc-23.3.0_rc3-r1.ebuild delete mode 100644 dev-util/intel_clc/intel_clc-23.3.0_rc4.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 3e8603821d13..6934357e7631 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest index 2c251d87fedf..2eaa2540c6d4 100644 --- a/dev-util/apitrace/Manifest +++ b/dev-util/apitrace/Manifest @@ -3,5 +3,5 @@ AUX apitrace-9.0-disable-multiarch.patch 1796 BLAKE2B c687c87b23f3711bd9ac70a345 AUX apitrace-9.0-libc-dlopen-glibc-2.34.patch 785 BLAKE2B 0339c808f83ecb18e42fe643a0de01b3f8566251e805bc5eace16f7d77571cde85d9cd2eef24e408202591a7b7ad0f1ec2c090b4ce8525b54057dd55cf08009c SHA512 54a7cf81370de87b28e18840b7644aa764d67096268d49324cc25b2f0cf256eb44e4da10cd63fc5fae8b8fcfac4d9eccb840b24778accb3e76c992eda06e2af7 AUX apitrace-9.0-pkgconfig-waffle.patch 542 BLAKE2B a547dc8e71d6e6e781c685fad942bda6799d3d98c0e29a83ad65b0659c50d5ae81f35fee3e6abf1fb36f970db426785b0bcd15f30308ed3bad8b6ff5f4f152cd SHA512 1f3ef8e15a17f7684d6768e16656aef5ce32b173c8420ed2ccb29dd831f18bcee23189a6738ed0e89a990ca04303f1c16d024f429fba90836d967f1fc8486834 DIST apitrace-9.0.tar.gz 3623693 BLAKE2B 885cfd22d1cc82e36f7f0d65b816784986a8a693d04b483c059d3cffb0328c2cbbfd043793b964cea84d7b09a0dc8dda5f464099e91df26fd5eecef4bbeb28cc SHA512 4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c -EBUILD apitrace-9.0-r3.ebuild 2376 BLAKE2B 5fa755929add91a9f8ee7a92a21bf453616531d0a64ae5a548aa1b30ddc91403220621b2f54006293f081353f41bc9fe11ac2558b5370bc1d742c3ac30a37f98 SHA512 9d0d84f299e44446a7e011e956cf56a377ad9b116222dd87ad14cbb7154e440be8c37ff2e761187d9389d6cdf098cbada96ad5a56871bd84212ea70c159a5c8e +EBUILD apitrace-9.0-r4.ebuild 2379 BLAKE2B a1a1955a93e706181b651274a2db11e035e96eeebd264106fa3b8dab5631ded939fdbfc87c1ad47dce17a6604ac3194b1c8a1e592a6655e36e9f47a6703f68e0 SHA512 637b1320248f409d6a7555b2de67c63a407c2397bd63b6a6bcfed71c0ac7bfb5145f7be2c6e589a5ccdb78a6ed8db6ae02b5dc6385c43b654448e8687de6d3da MISC metadata.xml 250 BLAKE2B a9437881337420620edfaa0a3f4e7660a47100479c9d360dfb3b8304eaa085d5f2bb97ea8d823fc6be282fd4f2964cf12d189ec0e6d18a09ea513809e5bd5cde SHA512 284c9edd2a7f91f48402414ec05379f5a9a40ca67f02ddc4dbf3bbc45f83cfe01aa54442af0016dcf8495bb6291423def988f0bba616c5a5024011c4e97fde57 diff --git a/dev-util/apitrace/apitrace-9.0-r3.ebuild b/dev-util/apitrace/apitrace-9.0-r3.ebuild deleted file mode 100644 index a0e487e61f88..000000000000 --- a/dev-util/apitrace/apitrace-9.0-r3.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -inherit cmake-multilib multilib python-single-r1 - -DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs" -HOMEPAGE="https://github.com/apitrace/apitrace" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="qt5 X" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS} - app-arch/brotli:=[${MULTILIB_USEDEP}] - >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] - media-libs/libpng:0= - media-libs/mesa[egl(+),gles1,gles2,X?,${MULTILIB_USEDEP}] - >=media-libs/waffle-1.6.0-r1[egl,${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - sys-process/procps:=[${MULTILIB_USEDEP}] - X? ( x11-libs/libX11 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5[-gles2-only] - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5[-gles2-only] - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - # TODO: upstream - "${FILESDIR}"/${P}-disable-multiarch.patch - "${FILESDIR}"/${P}-brotli-unbundle.patch - "${FILESDIR}"/${P}-libc-dlopen-glibc-2.34.patch - "${FILESDIR}"/${P}-pkgconfig-waffle.patch -) - -src_prepare() { - cmake_src_prepare - - # The apitrace code grubs around in the internal zlib structures. - # We have to extract this header and clean it up to keep that working. - # Do not be surprised if a zlib upgrade breaks things ... - rm -rf thirdparty/{brotli,snappy,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die -} - -src_configure() { - my_configure() { - local mycmakeargs=( - -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF} - -DENABLE_X11=$(usex X) - -DENABLE_EGL=ON - -DENABLE_CLI=ON - -DENABLE_GUI=$(multilib_native_usex qt5) - -DENABLE_STATIC_SNAPPY=OFF - -DENABLE_WAFFLE=ON - -DPython3_EXECUTABLE="${PYTHON}" - ) - cmake_src_configure - } - - multilib_foreach_abi my_configure -} - -src_install() { - MULTILIB_CHOST_TOOLS=( - /usr/bin/apitrace$(get_exeext) - /usr/bin/eglretrace$(get_exeext) - ) - use X && MULTILIB_CHOST_TOOLS+=( /usr/bin/glretrace$(get_exeext) ) - - cmake-multilib_src_install - - make_libgl_symlinks() { - dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so - dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 - dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 - } - use X && multilib_foreach_abi make_libgl_symlinks -} diff --git a/dev-util/apitrace/apitrace-9.0-r4.ebuild b/dev-util/apitrace/apitrace-9.0-r4.ebuild new file mode 100644 index 000000000000..673e673282b0 --- /dev/null +++ b/dev-util/apitrace/apitrace-9.0-r4.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +inherit cmake-multilib multilib python-single-r1 + +DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs" +HOMEPAGE="https://github.com/apitrace/apitrace" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="qt5 X" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + app-arch/brotli:=[${MULTILIB_USEDEP}] + >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] + media-libs/libpng:0= + media-libs/mesa[egl(+),gles1,gles2,X?,${MULTILIB_USEDEP}] + >=media-libs/waffle-1.6.0-r1[egl(+),${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + sys-process/procps:=[${MULTILIB_USEDEP}] + X? ( x11-libs/libX11 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5[-gles2-only] + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5[-gles2-only] + ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + # TODO: upstream + "${FILESDIR}"/${P}-disable-multiarch.patch + "${FILESDIR}"/${P}-brotli-unbundle.patch + "${FILESDIR}"/${P}-libc-dlopen-glibc-2.34.patch + "${FILESDIR}"/${P}-pkgconfig-waffle.patch +) + +src_prepare() { + cmake_src_prepare + + # The apitrace code grubs around in the internal zlib structures. + # We have to extract this header and clean it up to keep that working. + # Do not be surprised if a zlib upgrade breaks things ... + rm -rf thirdparty/{brotli,snappy,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die +} + +src_configure() { + my_configure() { + local mycmakeargs=( + -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF} + -DENABLE_X11=$(usex X) + -DENABLE_EGL=ON + -DENABLE_CLI=ON + -DENABLE_GUI=$(multilib_native_usex qt5) + -DENABLE_STATIC_SNAPPY=OFF + -DENABLE_WAFFLE=ON + -DPython3_EXECUTABLE="${PYTHON}" + ) + cmake_src_configure + } + + multilib_foreach_abi my_configure +} + +src_install() { + MULTILIB_CHOST_TOOLS=( + /usr/bin/apitrace$(get_exeext) + /usr/bin/eglretrace$(get_exeext) + ) + use X && MULTILIB_CHOST_TOOLS+=( /usr/bin/glretrace$(get_exeext) ) + + cmake-multilib_src_install + + make_libgl_symlinks() { + dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so + dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1 + dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2 + } + use X && multilib_foreach_abi make_libgl_symlinks +} diff --git a/dev-util/intel_clc/Manifest b/dev-util/intel_clc/Manifest index 04a65b35d6c4..6c8e7b0dea3c 100644 --- a/dev-util/intel_clc/Manifest +++ b/dev-util/intel_clc/Manifest @@ -1,8 +1,4 @@ -DIST mesa-23.3.0-rc3.tar.xz 19192936 BLAKE2B a54ac02b99bf00e4dae34938fd37d5314ae0fd9dee4b2f8928119bcc5a6b4e00add8ad61da3569b9993b37014433fb38a66d945e77184d86aaf0cd79e8afb42b SHA512 be70ce2ba0051685e9585944dcfc8c66d33f68827781d6d003a98b4409bd9e28d00eef730e0eded5c1c14a600219411753c14c7e5e34190bbe8b65b5bf28fabd -DIST mesa-23.3.0-rc4.tar.xz 19214260 BLAKE2B e52912990f31a22a2c3492690331c695d66783ad583bc5e13ebca6c6328b7a679fb7f008f2a5fcd374f98887dfa012fe6daad31fb9a686142376215920418be5 SHA512 4b54131831fd4b73348e282cf1854d8c10f948c1468c1c069c147172a104b44a6253815a8f1487e5ec72c147a78b438286145a4683c18a64550f0405a8197d52 DIST mesa-23.3.0-rc5.tar.xz 19227440 BLAKE2B 844eb3dacc6f579f1a7bff74fc20ec22021ac33dcdd716488487e66e9ef8c6be4a5eaf7260628eec58baa55fd70bfe4a6223e83ea8b163d6e16dd8677af3c7e3 SHA512 f1c2421ab262da422ed9ac5ca08b0e1c41264373e022de9413c65e1e7e8ee929979d1c80741497a0acba1d118665a7f6076e24139be0c9c70f3fe8f5d319c187 -EBUILD intel_clc-23.3.0_rc3-r1.ebuild 2490 BLAKE2B 4014ea3e51d805146f77430bddfe197c63d61410691ba13967297ba2e2f74095a02ac5152e32c84e03161a67c34c9d6890ebc8ce63e581dd4f3b30383d0629b1 SHA512 e242609ba880c1bf7f3dc0c2e4c3bf70023abb4f016ae807b6215b051c5719a5e18a137c80d8d890bba3275f9bdc039edfa863371abb0d794ecd24621014c5bb -EBUILD intel_clc-23.3.0_rc4.ebuild 2490 BLAKE2B 4014ea3e51d805146f77430bddfe197c63d61410691ba13967297ba2e2f74095a02ac5152e32c84e03161a67c34c9d6890ebc8ce63e581dd4f3b30383d0629b1 SHA512 e242609ba880c1bf7f3dc0c2e4c3bf70023abb4f016ae807b6215b051c5719a5e18a137c80d8d890bba3275f9bdc039edfa863371abb0d794ecd24621014c5bb EBUILD intel_clc-23.3.0_rc5.ebuild 2490 BLAKE2B 4014ea3e51d805146f77430bddfe197c63d61410691ba13967297ba2e2f74095a02ac5152e32c84e03161a67c34c9d6890ebc8ce63e581dd4f3b30383d0629b1 SHA512 e242609ba880c1bf7f3dc0c2e4c3bf70023abb4f016ae807b6215b051c5719a5e18a137c80d8d890bba3275f9bdc039edfa863371abb0d794ecd24621014c5bb EBUILD intel_clc-9999.ebuild 2490 BLAKE2B 4014ea3e51d805146f77430bddfe197c63d61410691ba13967297ba2e2f74095a02ac5152e32c84e03161a67c34c9d6890ebc8ce63e581dd4f3b30383d0629b1 SHA512 e242609ba880c1bf7f3dc0c2e4c3bf70023abb4f016ae807b6215b051c5719a5e18a137c80d8d890bba3275f9bdc039edfa863371abb0d794ecd24621014c5bb MISC metadata.xml 388 BLAKE2B 0558cfe706987a93605fb383bc2c30ff4f4cf5837ca19afd3e16d9702ea7dcd3d575579d53aacb531e1d421c8b1692eb4607d713793a89240223c031d7781a31 SHA512 e0375912a94fa92b49ed78d9a88c4eacc8b441d8b2fa117a48df2d8a958f1cf91279299aca109e24f76b27ca04f0067f83e5b8e4141f85ac64d379bca0945d2a diff --git a/dev-util/intel_clc/intel_clc-23.3.0_rc3-r1.ebuild b/dev-util/intel_clc/intel_clc-23.3.0_rc3-r1.ebuild deleted file mode 100644 index cf18be99437e..000000000000 --- a/dev-util/intel_clc/intel_clc-23.3.0_rc3-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit llvm meson python-any-r1 - -MY_PV="${PV/_/-}" - -DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V" -HOMEPAGE="https://mesa3d.org/" - -if [[ ${PV} == 9999 ]]; then - S="${WORKDIR}/intel_clc-${MY_PV}" - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" - inherit git-r3 -else - S="${WORKDIR}/mesa-${MY_PV}" - SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz" - KEYWORDS="~amd64" -fi - -LICENSE="MIT SGI-B-2.0" -SLOT="0" -IUSE="debug" - -RDEPEND=" - dev-libs/libclc - dev-util/spirv-tools - >=sys-libs/zlib-1.2.8:= - x11-libs/libdrm -" -DEPEND="${RDEPEND} - dev-libs/expat -" -BDEPEND=" - ${PYTHON_DEPS} - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") - virtual/pkgconfig -" - -# 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. Specify LLVM_MAX_SLOT (inclusive), e.g. 16. -# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15. -LLVM_MAX_SLOT="16" -LLVM_MIN_SLOT="15" -PER_SLOT_DEPSTR=" - ( - dev-util/spirv-llvm-translator:@SLOT@ - sys-devel/clang:@SLOT@ - sys-devel/llvm:@SLOT@ - ) -" -LLVM_DEPSTR=" - || ( - $(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do - echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}" - done) - ) - =dev-python/mako-0.8.0[${PYTHON_USEDEP}]" -} - -pkg_setup() { - llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_configure() { - PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" - - local emesonargs=( - -Dllvm=enabled - -Dshared-llvm=enabled - -Dintel-clc=enabled - - -Dgallium-drivers='' - -Dvulkan-drivers='' - - # Set platforms empty to avoid the default "auto" setting. If - # platforms is empty meson.build will add surfaceless. - -Dplatforms='' - - -Dglx=disabled - -Dzstd=disabled - - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - ) - meson_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc -} diff --git a/dev-util/intel_clc/intel_clc-23.3.0_rc4.ebuild b/dev-util/intel_clc/intel_clc-23.3.0_rc4.ebuild deleted file mode 100644 index cf18be99437e..000000000000 --- a/dev-util/intel_clc/intel_clc-23.3.0_rc4.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit llvm meson python-any-r1 - -MY_PV="${PV/_/-}" - -DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V" -HOMEPAGE="https://mesa3d.org/" - -if [[ ${PV} == 9999 ]]; then - S="${WORKDIR}/intel_clc-${MY_PV}" - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" - inherit git-r3 -else - S="${WORKDIR}/mesa-${MY_PV}" - SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz" - KEYWORDS="~amd64" -fi - -LICENSE="MIT SGI-B-2.0" -SLOT="0" -IUSE="debug" - -RDEPEND=" - dev-libs/libclc - dev-util/spirv-tools - >=sys-libs/zlib-1.2.8:= - x11-libs/libdrm -" -DEPEND="${RDEPEND} - dev-libs/expat -" -BDEPEND=" - ${PYTHON_DEPS} - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") - virtual/pkgconfig -" - -# 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. Specify LLVM_MAX_SLOT (inclusive), e.g. 16. -# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15. -LLVM_MAX_SLOT="16" -LLVM_MIN_SLOT="15" -PER_SLOT_DEPSTR=" - ( - dev-util/spirv-llvm-translator:@SLOT@ - sys-devel/clang:@SLOT@ - sys-devel/llvm:@SLOT@ - ) -" -LLVM_DEPSTR=" - || ( - $(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do - echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}" - done) - ) - =dev-python/mako-0.8.0[${PYTHON_USEDEP}]" -} - -pkg_setup() { - llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_configure() { - PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" - - local emesonargs=( - -Dllvm=enabled - -Dshared-llvm=enabled - -Dintel-clc=enabled - - -Dgallium-drivers='' - -Dvulkan-drivers='' - - # Set platforms empty to avoid the default "auto" setting. If - # platforms is empty meson.build will add surfaceless. - -Dplatforms='' - - -Dglx=disabled - -Dzstd=disabled - - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - ) - meson_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc -} -- cgit v1.2.3