From 3ad0a4619950efcdb234f117cb58611443537534 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 12 Jul 2022 01:31:22 +0100 Subject: gentoo auto-resync : 12:07:2022 - 01:31:22 --- dev-libs/Manifest.gz | Bin 94809 -> 94807 bytes dev-libs/intel-compute-runtime/Manifest | 6 +- .../intel-compute-runtime-22.22.23355.ebuild | 79 --------------------- .../intel-compute-runtime-22.23.23405.ebuild | 2 +- .../intel-compute-runtime-22.27.23681.ebuild | 79 +++++++++++++++++++++ dev-libs/ncnn/Manifest | 3 - dev-libs/ncnn/files/ncnn-fix-glslang-include.patch | 9 --- dev-libs/ncnn/ncnn-20220420.ebuild | 73 ------------------- 8 files changed, 83 insertions(+), 168 deletions(-) delete mode 100644 dev-libs/intel-compute-runtime/intel-compute-runtime-22.22.23355.ebuild create mode 100644 dev-libs/intel-compute-runtime/intel-compute-runtime-22.27.23681.ebuild delete mode 100644 dev-libs/ncnn/files/ncnn-fix-glslang-include.patch delete mode 100644 dev-libs/ncnn/ncnn-20220420.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 421daf7feb9c..6e43e27b8ee3 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest index cdb58510940e..05ef567f1d01 100644 --- a/dev-libs/intel-compute-runtime/Manifest +++ b/dev-libs/intel-compute-runtime/Manifest @@ -1,12 +1,12 @@ AUX intel-compute-runtime-22.24.23453-remove-fortify-sources.patch 1078 BLAKE2B 933cd6b5b3f9aefde4b416960151458eb7845f422e493ab40257330c88b55e1866cf0ff59338ec708d705750ca88c87d54014d51d9492c3dadba7525b523ab56 SHA512 ee831418acb9ba5deba95dc2e013119a0cfe7db533710108063dc67cd0a4030a4419bbad0a007fdab445eba14036fdcae26ea0b4ce675ebb20f402620b880de8 -DIST intel-compute-runtime-22.22.23355.tar.gz 5498680 BLAKE2B 81368ca9a5151305a5eb656ecca6a8d51129df2f567631d72fc5965c66b367e843bcf7b89a201702aa78e430d60e706079eba48a11cfd2b6a82e7a34d7ac5789 SHA512 72813ebd5de38d31f9ceb8087c38337d1bd0bb35256b86f3f3d7f3adc5ebe73b3cdc04bf653a522e25098b38c3b867f62fc3590eedf17e11d2fc03c2aa2b22e2 DIST intel-compute-runtime-22.23.23405.tar.gz 5515173 BLAKE2B eafb5a4ed8a221bc5290576a137f371f2f9d3cebbe1e689f3d1ce41f9430a5242d82ae78799f523f29685c3a731570e4a6766f804faa0f6bb7bae365cb5d6573 SHA512 38ffadd9130717acb0e8d6492b2bb4d8d5c962b151784a92c85d6249cbab1014dcd418bf5110eccc1640334c1ab0d171b7028d2f0d95d606733b42a319bf2f0b DIST intel-compute-runtime-22.24.23453.tar.gz 5521386 BLAKE2B c025539c0d2a0ac492ddc5893c0d077523bbc0c0e1dcdb3d086ff381b36f26d0a7b24aecb0ba04e915e443eafecbaf171ef54fc0c455e57b0ae622ef164f4056 SHA512 fb57348ef4cad48b7d09bf8db64a874a63bdbbd586323c25b7c9cf7461bfd62c1cd061c4b989c52466e5d364fde9dec2335bf7e244baadd573888ba904ba867c DIST intel-compute-runtime-22.25.23529.tar.gz 5542277 BLAKE2B da718987fd3f3239b6cfc60914f02cc67b7174cb92f3a12e5d8f78b39631892b1c69368eb89590c3a7dfc9e930eb8254ec33c43028073cffac06bd3f718164bb SHA512 5ad80357a27cba76b95099ce5a0edc5271d7328769d6e84039fa94f94be99f02cf4890ee05702db18e28beba6fadea46aa2f0eb236ed8c27cb95bee075f2f6d6 DIST intel-compute-runtime-22.26.23599.tar.gz 5574368 BLAKE2B 6302ced3e75d7d31a55c20e0c08f915fc2d3df149a843115ce925c62b50e2c9b47fc61ea48ad45a52967703f3d9e31ff23cd4e61d1666e5cf072d7c84c0ef416 SHA512 1ce2b0e9d3886ab51636265c7e1a91bbe817e27995d8e2d96fc4b67633c89f11232005f18f81a462f76fa67d9298fce51a335b9c4545d8b461019cd9e487b4dc -EBUILD intel-compute-runtime-22.22.23355.ebuild 1904 BLAKE2B 5ae9938b50ead43d244d4f3ea2bad42d595da7b8e60c4f817a80abb562bed48336ff7fc0135e82ad3e1eab3367234fc10782473de618e49a627bf771f80ccd1b SHA512 a885b8a43eae56cd9d980e9b576ba9f64c463ea71e87223d18c88721288623e8d35405b820c0f9bb15d539f03cf616fa01e3b33aa81605991f904079434c5d18 -EBUILD intel-compute-runtime-22.23.23405.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7 +DIST intel-compute-runtime-22.27.23681.tar.gz 5593740 BLAKE2B 5d627623e7b0ec89aacb5dfee7442803254c233382a2b242f0f856d51256a60d614e6a3d88ec5c0d494ad25211adb5d75a13b5ff86739795e46aa50e7a9686e4 SHA512 1269126ff447f7c0e1ec9e33ef5245476afe44812a2b6ded86f6219ae61c74bf862a152a740684638b12cdcffce454af3a3be5b4b16c3b7f9c0e7b660b73701a +EBUILD intel-compute-runtime-22.23.23405.ebuild 1904 BLAKE2B 5ae9938b50ead43d244d4f3ea2bad42d595da7b8e60c4f817a80abb562bed48336ff7fc0135e82ad3e1eab3367234fc10782473de618e49a627bf771f80ccd1b SHA512 a885b8a43eae56cd9d980e9b576ba9f64c463ea71e87223d18c88721288623e8d35405b820c0f9bb15d539f03cf616fa01e3b33aa81605991f904079434c5d18 EBUILD intel-compute-runtime-22.24.23453.ebuild 1969 BLAKE2B 29374964a21a978e56c0df9cf4e2e8804dcef0c67bac97f6a0a72c2261e2b8b413606682025afc972287c72fa46180b936de9ee028e5f5a70322d750a371acc7 SHA512 7ca5c87ba4a6ec1b81873f32141816ff2e2ba1594a0b39c33264db3edb92af6df6d2f255d5157dc2101d05562ffca498c9310cbd2957c6f69e943449097678e6 EBUILD intel-compute-runtime-22.25.23529.ebuild 1969 BLAKE2B 29374964a21a978e56c0df9cf4e2e8804dcef0c67bac97f6a0a72c2261e2b8b413606682025afc972287c72fa46180b936de9ee028e5f5a70322d750a371acc7 SHA512 7ca5c87ba4a6ec1b81873f32141816ff2e2ba1594a0b39c33264db3edb92af6df6d2f255d5157dc2101d05562ffca498c9310cbd2957c6f69e943449097678e6 EBUILD intel-compute-runtime-22.26.23599.ebuild 1969 BLAKE2B 29374964a21a978e56c0df9cf4e2e8804dcef0c67bac97f6a0a72c2261e2b8b413606682025afc972287c72fa46180b936de9ee028e5f5a70322d750a371acc7 SHA512 7ca5c87ba4a6ec1b81873f32141816ff2e2ba1594a0b39c33264db3edb92af6df6d2f255d5157dc2101d05562ffca498c9310cbd2957c6f69e943449097678e6 +EBUILD intel-compute-runtime-22.27.23681.ebuild 1969 BLAKE2B 29374964a21a978e56c0df9cf4e2e8804dcef0c67bac97f6a0a72c2261e2b8b413606682025afc972287c72fa46180b936de9ee028e5f5a70322d750a371acc7 SHA512 7ca5c87ba4a6ec1b81873f32141816ff2e2ba1594a0b39c33264db3edb92af6df6d2f255d5157dc2101d05562ffca498c9310cbd2957c6f69e943449097678e6 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.22.23355.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.22.23355.ebuild deleted file mode 100644 index 0bbb025dbde7..000000000000 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.22.23355.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_BUILD_TYPE="Release" -MY_PN="${PN/intel-/}" -MY_P="${MY_PN}-${PV}" - -inherit cmake flag-o-matic - -DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver" -HOMEPAGE="https://github.com/intel/compute-runtime" -SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" -IUSE="+l0 +vaapi" - -RDEPEND=">=media-libs/gmmlib-22.0.2:=" - -DEPEND=" - ${DEPEND} - dev-libs/intel-metrics-library:= - dev-libs/libnl:3 - dev-libs/libxml2:2 - >=dev-util/intel-graphics-compiler-1.0.11061-r1 - >=dev-util/intel-graphics-system-controller-0.2.4:= - media-libs/mesa - >=virtual/opencl-3 - l0? ( >=dev-libs/level-zero-1.7.15 ) - vaapi? ( - x11-libs/libdrm[video_cards_intel] - x11-libs/libva - ) -" - -BDEPEND="virtual/pkgconfig" - -DOCS=( "README.md" "FAQ.md" ) - -src_prepare() { - default - - # Remove '-Werror' from default - set -e '/Werror/d' -i CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - # See https://github.com/intel/compute-runtime/issues/531 - filter-flags -flto=* -flto - - local mycmakeargs=( - -DCCACHE_ALLOWED="OFF" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DCMAKE_INSTALL_LIBDIR="$(get_libdir)" - -DBUILD_WITH_L0="$(usex l0)" - -DDISABLE_LIBVA="$(usex !vaapi)" - -DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include" - -DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include" - -DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors" - -DSUPPORT_DG1="ON" - -Wno-dev - - # See https://github.com/intel/intel-graphics-compiler/issues/204 - # -DNEO_DISABLE_BUILTINS_COMPILATION="ON" - - # If enabled, tests are automatically run during - # the compile phase and we cannot run them because - # they require permissions to access the hardware. - -DSKIP_UNIT_TESTS="1" - ) - - cmake_src_configure -} diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.23.23405.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.23.23405.ebuild index bdc8a84baf08..0bbb025dbde7 100644 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.23.23405.ebuild +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.23.23405.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="+l0 +vaapi" RDEPEND=">=media-libs/gmmlib-22.0.2:=" diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.27.23681.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.27.23681.ebuild new file mode 100644 index 000000000000..077189e165cf --- /dev/null +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.27.23681.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_BUILD_TYPE="Release" +MY_PN="${PN/intel-/}" +MY_P="${MY_PN}-${PV}" + +inherit cmake flag-o-matic + +DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver" +HOMEPAGE="https://github.com/intel/compute-runtime" +SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+l0 +vaapi" + +RDEPEND=">=media-libs/gmmlib-22.0.2:=" + +DEPEND=" + ${DEPEND} + dev-libs/intel-metrics-library:= + dev-libs/libnl:3 + dev-libs/libxml2:2 + >=dev-util/intel-graphics-compiler-1.0.11061-r1 + >=dev-util/intel-graphics-system-controller-0.2.4:= + media-libs/mesa + >=virtual/opencl-3 + l0? ( >=dev-libs/level-zero-1.7.15 ) + vaapi? ( + x11-libs/libdrm[video_cards_intel] + x11-libs/libva + ) +" + +BDEPEND="virtual/pkgconfig" + +DOCS=( "README.md" "FAQ.md" ) + +PATCHES=( "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" ) + +src_prepare() { + # Remove '-Werror' from default + sed -e '/Werror/d' -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # See https://github.com/intel/compute-runtime/issues/531 + filter-flags -flto=* -flto + + local mycmakeargs=( + -DCCACHE_ALLOWED="OFF" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_INSTALL_LIBDIR="$(get_libdir)" + -DBUILD_WITH_L0="$(usex l0)" + -DDISABLE_LIBVA="$(usex !vaapi)" + -DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include" + -DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include" + -DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors" + -DSUPPORT_DG1="ON" + -Wno-dev + + # See https://github.com/intel/intel-graphics-compiler/issues/204 + # -DNEO_DISABLE_BUILTINS_COMPILATION="ON" + + # If enabled, tests are automatically run during + # the compile phase and we cannot run them because + # they require permissions to access the hardware. + -DSKIP_UNIT_TESTS="1" + ) + + cmake_src_configure +} diff --git a/dev-libs/ncnn/Manifest b/dev-libs/ncnn/Manifest index 83a20bd8414e..53a0e811c996 100644 --- a/dev-libs/ncnn/Manifest +++ b/dev-libs/ncnn/Manifest @@ -1,6 +1,3 @@ -AUX ncnn-fix-glslang-include.patch 281 BLAKE2B ae6293b2c16ee870d65cde7398cfe615ba3cbfa682edd5da0e92072d80f37f46f0fdc84648bb3757a266e1406d3289025344cff462ae2c3d84e232460db40759 SHA512 7e424a89b3d2a8b9cd4630e2ea8fd789569bef9bfcbea39c11fecf2cb0d9ece9639bd01e88735715d28fe7d92aa5eee9231d59cade55829f8d4af7e33a4f4adf -DIST ncnn-20220420.tar.gz 12158916 BLAKE2B fcecf395e54ff683bb8301365d805b99439b3797493e419fa8c99a325ebd1dfd80e65b08cffd9283fe453010a0cdde221aeeffa37e154335d2f6d7f6c6b9b138 SHA512 7c567bcd75cf36be7fbb16dba7f978ae965478afed8948e9e1c6f8c681ea678f769e64fae337a5c1d0bc1549bf922c1761b51a7822153a1eb4d267ef8adf1ecd DIST ncnn-20220701.tar.gz 12220010 BLAKE2B 3038500683c9ea1634777cb4158aea0d6c6e640cb4a31302b99c546f000fb91f5d75d01328cf35896b7579dc3172512d120612f973ae9881b4f95d101607adcb SHA512 4b7f539213c8f06a426d1633e881ceeabee84b5419e890eaa95447868a511cad8a4528d1e311c87ed322ccabbcfb38cc1725592fb6299ef9be7e068c43bbd0b2 -EBUILD ncnn-20220420.ebuild 1683 BLAKE2B c642f997a2dacfe882a15e299947a4728959e6165fa1fa446f043c70cc80201ca760a9be7ec21ed8c35439b87eab3dc7a0d930ffbec24c8f06940ade84708551 SHA512 ce3330ae73163f1cb5479b8ae7ee38a5e0ac3381e9127ce2442fe43eea565be46779cee315c159815c202531b827dfc6b59116375fec0c0c10c2db787525d714 EBUILD ncnn-20220701.ebuild 1174 BLAKE2B fe9edb1f5dc122818d92dee5367be47e71e0c6d9b0110508df53db5d877071f9471a331c825d2ad32e103b42f27853c17e24d81bbeea4d8a67f8c46597574b44 SHA512 6ec4aab6d503977628a50796bd9578594cc497de778fcd35b3de7b9aead780f9b2243409ce0f2b31b3406f8f3d3a9115a0a40e0b213d6869254f8c45b2c12dd3 MISC metadata.xml 602 BLAKE2B 09d7cf6d8eb19d516ac8f53f220808b16610320d8307cb19e34db48160d7e7a300fa3d773b8082a6a35972aad3e4831386b4f68cd754883d377fd4e1b2273d78 SHA512 b85b8572b6f5cdf569ea2137336026c071897f0d9c19fe8b44fb0745c5ca79dead6e2092d7b71a3bcf804eda20dfcfc78f79ee4e5c22eb58e565fb959085f4a6 diff --git a/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch b/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch deleted file mode 100644 index 00eb01f03fc3..000000000000 --- a/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch +++ /dev/null @@ -1,9 +0,0 @@ -Needed to use system's glslang rather than bundled. -https://github.com/Tencent/ncnn/issues/2622 ---- a/src/gpu.cpp -+++ b/src/gpu.cpp -@@ -23,3 +23,3 @@ - #include "glslang/SPIRV/GlslangToSpv.h" --#include "glslang/glslang/Public/ShaderLang.h" -+#include "glslang/Public/ShaderLang.h" - diff --git a/dev-libs/ncnn/ncnn-20220420.ebuild b/dev-libs/ncnn/ncnn-20220420.ebuild deleted file mode 100644 index da09a4cf9ffd..000000000000 --- a/dev-libs/ncnn/ncnn-20220420.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="High-performance neural network inference framework" -HOMEPAGE="https://github.com/Tencent/ncnn/" -SRC_URI="https://github.com/Tencent/ncnn/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD ZLIB" -SLOT="0/${PV}" # currently has unstable ABI that often requires rebuilds -KEYWORDS="~amd64 ~x86" -IUSE="tools +vulkan" - -# Need the static library to run tests + skip vulkan / GPU: -# -DNCNN_BUILD_TESTS=ON -DNCNN_SHARED_LIB=OFF -DNCNN_VULKAN=OFF -RESTRICT="test" - -RDEPEND=" - dev-util/glslang - tools? ( dev-libs/protobuf:= ) - vulkan? ( media-libs/vulkan-loader )" -DEPEND=" - ${RDEPEND} - vulkan? ( dev-util/vulkan-headers )" - -PATCHES=( - "${FILESDIR}"/${PN}-fix-glslang-include.patch -) - -DOCS=( README.md docs/. ) - -src_prepare() { - cmake_src_prepare - - sed -i "/DESTINATION/s| lib| $(get_libdir)|" src/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=ON # for tools - -DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake - -DNCNN_BUILD_EXAMPLES=OFF - -DNCNN_BUILD_TOOLS=$(usex tools) - -DNCNN_PYTHON=OFF # missing portalocker, and nothing needs this for now - -DNCNN_SHARED_LIB=ON - -DNCNN_SYSTEM_GLSLANG=ON - -DNCNN_VERSION=${PV} # avoids libncnn.so.*.%Y%m%d (build date) - -DNCNN_VULKAN=$(usex vulkan) - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use tools; then - local tools=( - caffe/caffe2ncnn - darknet/darknet2ncnn - mxnet/mxnet2ncnn - ncnn2mem - ncnnmerge - ncnnoptimize - onnx/onnx2ncnn - quantize/{ncnn2int8,ncnn2table} - ) - dobin "${tools[@]/#/${BUILD_DIR}/tools/}" - fi -} -- cgit v1.2.3