diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-01-19 20:08:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-01-19 20:08:27 +0000 |
| commit | 2b2f431a0021b4787ca3c028cefb30ad81347778 (patch) | |
| tree | 951e0155f53027c8fd29eaba26df4f08292668d5 /media-gfx/waifu2x-ncnn-vulkan | |
| parent | d725480af7cbc67d784e5d96f973fa41e9030123 (diff) | |
gentoo auto-resync : 19:01:2024 - 20:08:27
Diffstat (limited to 'media-gfx/waifu2x-ncnn-vulkan')
3 files changed, 22 insertions, 4 deletions
diff --git a/media-gfx/waifu2x-ncnn-vulkan/Manifest b/media-gfx/waifu2x-ncnn-vulkan/Manifest index 89f55ac7f9fd..c2cf193ccaa9 100644 --- a/media-gfx/waifu2x-ncnn-vulkan/Manifest +++ b/media-gfx/waifu2x-ncnn-vulkan/Manifest @@ -1,4 +1,5 @@ AUX waifu2x-ncnn-vulkan-20210521-no-lto.patch 600 BLAKE2B a4fa9601b48d103c15ed8e93658e633cb0d63f304a5d5ad9336f0b1cdc05e58001fa80cd4ab50cb688d50037560446dd051256617dae51578dabd110586f13ab SHA512 c6bc6b33b26c9d4dbe6728685c9ff68b2b7b8bd1afdeae1e0d3283bc292eb1ccc81d7ba0cd7baaccdf4b367876140ed939e84b0dfe63e1eb1c1100094265e333 +AUX waifu2x-ncnn-vulkan-20220728-no-glslang-libs.patch 496 BLAKE2B 09a43347fa97ef20eb7c8d1b4c1192e52d162ae3f24866e16fdd731d5205a79dde570c66620ae1f24af9928b1bf96f691de9b7da735a701f32b2bef4e36518c0 SHA512 6a4c6e14203233036df1bd961bfec88111285685f4ec936ac0e08e9a6f43b6cb8158ccee7afd94bb4b15d4a255e091bffc2090807d203c62bc8b3142ac9d62e2 DIST waifu2x-ncnn-vulkan-20220728.tar.gz 34076924 BLAKE2B 6ed310d57af52286a288b151f67a989ac41f8e248b2ad5f05392781a429c9f0ff1d79e8816c8c464cb5686692c2b4fe5dc2d50c4fc713a4887d044ee3cfda199 SHA512 ea17cbbcb7318586793222c6c7139f67395c49c567b601969b829fc426eb517308509b7c1da69171fcbf8e68baa5cec3e52e98159e3c5e6c35ce47a8514dadb7 -EBUILD waifu2x-ncnn-vulkan-20220728.ebuild 1097 BLAKE2B eccda35ac9815d03c96177700816463a29e84d701e22217b55120a54c2f4515bbb078938a673cbdf2315ef838b8a0bf1ecf2899f90be5f4a2de0c14b7654dac6 SHA512 99da1941014e2627b8479d7b1f1a4488f178e530cd3aa6e436fb4fb0c0cbf152782252c97aa95f76adb62ed7d38fb14c23024d2fcc04286fa4e70a7fc58408dd +EBUILD waifu2x-ncnn-vulkan-20220728.ebuild 1100 BLAKE2B f59150f1bf79eef42bf51df8f58c395f5a33e576ddc3521d3eb4342504a8611d0fe34f78792df19cd33eb93639b5945c448ce2f6e9d8b9edf133d37f98905576 SHA512 73fae763f283c9778516c9c4a89329cb0c8c6324d207557b4187094a9dcee9c8640086cd11d8aa5e310612d2b00a38de2281577a3c71258b1d83f094db563266 MISC metadata.xml 336 BLAKE2B 9ec633b675b5bef317783ecb8249fb8621728f29ed7b3cb064292f4ef7ff4176b819975b7353f976eb9ead35bbef6a000dd91cd7fa81f9d4fa5942fc15de4dba SHA512 af5220b2144e3d08778dbee6389eaf2e2e743f76064afce713fa96ff1f596af6559d7aabad097beff1b059c5230ce0943a84f01ccfdb4c41949ff717e6bdf832 diff --git a/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20220728-no-glslang-libs.patch b/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20220728-no-glslang-libs.patch new file mode 100644 index 000000000000..7743c4267180 --- /dev/null +++ b/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20220728-no-glslang-libs.patch @@ -0,0 +1,15 @@ +With USE_SYSTEM_NCNN this seemingly(?) tries to check if glslang +libraries exists only to know if system ncnn has support which is +already ensured through DEPEND here. + +And then the checks fail[1] with modern glslang, so yank out the +unnecessary block. + +[1] https://bugs.gentoo.org/922512 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -55,3 +55,3 @@ + +-if(USE_SYSTEM_NCNN) ++if(0) + set(GLSLANG_TARGET_DIR "GLSLANG-NOTFOUND" CACHE PATH "Absolute path to glslangTargets.cmake directory") diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild index d67e89271687..333b2c58ac8d 100644 --- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild +++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,12 +20,15 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - dev-util/glslang dev-util/vulkan-headers " +BDEPEND=" + dev-util/glslang +" PATCHES=( "${FILESDIR}"/${PN}-20210521-no-lto.patch + "${FILESDIR}"/${PN}-20220728-no-glslang-libs.patch ) src_prepare() { @@ -39,7 +42,6 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake -DUSE_SYSTEM_NCNN=ON -DUSE_SYSTEM_WEBP=ON ) |