1
0
forked from ports/contrib

libplacebo: 2.72.0 -> 2.72.2

This commit is contained in:
Danny Rawlins 2020-11-13 18:28:50 +11:00
parent fe3bc77b5a
commit e36b0815df
3 changed files with 6 additions and 83 deletions

View File

@ -1,6 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3zIQ8nmMm2jZI5LZ8xI23IaU9SsfPY3QvhlaLjDWQwyUlyulLl+2hUk46VMzgU41cVLGYafZZ/D4du9airnUQQE=
SHA256 (Pkgfile) = 22dc56f80c8f436e8e3368dd683113de72de74887a527bcd0d4430cb55a7bb07
RWSagIOpLGJF37rDFU37GaY3csce/Gw3bDDVoLOx6W3UUxkV3pMiYte0M6YT59/RGxB+lI3bsr8iqmTZf+tuRcLqyaIoUJzdQg4=
SHA256 (Pkgfile) = ae0919fae6d3ed197266b22260fb665f8fd96fa031c18f03fb0d76d33b0b56e5
SHA256 (.footprint) = 4bb8793710d63c580ba4d5f55a4d3137ef2fe98f80af4739176dfdf0483874c2
SHA256 (libplacebo-v2.72.0.tar.gz) = e570c5692cd974c43acf430f6b3fe348814f5052c3a1f7a74a1ba10a69ac2715
SHA256 (glslang_header_include_path.patch) = f0b4e20a44394b1994590d881709ffe663435f2012970b93e5d2f7cf5f8f8003
SHA256 (libplacebo-v2.72.2.tar.gz) = 5d3c51bb98d9727a255234a522f631f00d62a9e87115fb14251d991fc5076979

View File

@ -5,15 +5,11 @@
# Optional: libepoxy
name=libplacebo
version=2.72.0
release=2
source=(https://code.videolan.org/videolan/libplacebo/-/archive/v$version/$name-v$version.tar.gz
glslang_header_include_path.patch)
version=2.72.2
release=1
source=(https://code.videolan.org/videolan/libplacebo/-/archive/v$version/$name-v$version.tar.gz)
build() {
patch -d $name-v$version -p1 -i $SRC/glslang_header_include_path.patch
CXXFLAGS+=" -I/usr/include/glslang" \
meson setup build $name-v$version \
--prefix=/usr \
--buildtype=plain \

View File

@ -1,72 +0,0 @@
diff -pruN libplacebo-v2.72.0.orig/src/glsl/glslang.cc libplacebo-v2.72.0/src/glsl/glslang.cc
--- libplacebo-v2.72.0.orig/src/glsl/glslang.cc 2020-11-08 18:06:34.161048329 +1100
+++ libplacebo-v2.72.0/src/glsl/glslang.cc 2020-11-08 18:07:28.970375008 +1100
@@ -23,7 +23,7 @@ extern "C" {
}
#include <glslang/Include/ResourceLimits.h>
-#include <glslang/Include/revision.h>
+#include <glslang/build_info.h>
#include <glslang/Public/ShaderLang.h>
#include <SPIRV/GlslangToSpv.h>
@@ -36,7 +36,7 @@ static int pl_glslang_refcount;
int pl_glslang_version()
{
- return GLSLANG_PATCH_LEVEL;
+ return GLSLANG_VERSION_MAJOR;
}
bool pl_glslang_init()
@@ -78,7 +78,7 @@ struct pl_glslang_res *pl_glslang_compil
if (api_ver >= EShTargetVulkan_1_1)
spirv_version = EShTargetSpv_1_3;
-#if GLSLANG_PATCH_LEVEL >= 3667
+#if GLSLANG_VERSION_MAJOR >= 11
if (api_ver >= EShTargetVulkan_1_2)
spirv_version = EShTargetSpv_1_5;
#endif
@@ -200,7 +200,7 @@ const TBuiltInResource DefaultTBuiltInRe
/* .MaxCullDistances = */ 8,
/* .MaxCombinedClipAndCullDistances = */ 8,
/* .MaxSamples = */ 4,
-#if GLSLANG_PATCH_LEVEL >= 2892
+#if GLSLANG_VERSION_MAJOR >= 11
/* .maxMeshOutputVerticesNV = */ 256,
/* .maxMeshOutputPrimitivesNV = */ 512,
/* .maxMeshWorkGroupSizeX_NV = */ 32,
@@ -211,6 +211,9 @@ const TBuiltInResource DefaultTBuiltInRe
/* .maxTaskWorkGroupSizeZ_NV = */ 1,
/* .maxMeshViewCountNV = */ 4,
#endif
+#if GLSLANG_VERSION_MAJOR >= 11
+ /* .maxDualSourceDrawBuffersEXT = */ 1,
+#endif
/* .limits = */ {
/* .nonInductiveForLoops = */ 1,
diff -pruN libplacebo-v2.72.0.orig/src/meson.build libplacebo-v2.72.0/src/meson.build
--- libplacebo-v2.72.0.orig/src/meson.build 2020-11-08 18:06:34.161048329 +1100
+++ libplacebo-v2.72.0/src/meson.build 2020-11-08 18:06:43.350935445 +1100
@@ -49,7 +49,7 @@ endif
# work-arounds for glslang braindeath
glslang_combined = disabler()
-glslang_min_ver = 2763
+glslang_min_ver = 11
glslang_req = get_option('glslang')
if glslang_req.auto() and shaderc.found()
@@ -83,8 +83,8 @@ else
endif
if glslang_found
- glslang_ver = cxx.get_define('GLSLANG_PATCH_LEVEL',
- prefix: '#include <glslang/Include/revision.h>'
+ glslang_ver = cxx.get_define('GLSLANG_VERSION_MAJOR',
+ prefix: '#include <glslang/build_info.h>'
).to_int()
if glslang_ver >= glslang_min_ver