diff options
Diffstat (limited to 'subprojects/packagefiles/libplacebo')
3 files changed, 3 insertions, 81 deletions
diff --git a/subprojects/packagefiles/libplacebo/compiler_warnings.diff b/subprojects/packagefiles/libplacebo/compiler_warnings.diff deleted file mode 100644 index f3ec3af..0000000 --- a/subprojects/packagefiles/libplacebo/compiler_warnings.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/include/libplacebo/utils/libav_internal.h b/src/include/libplacebo/utils/libav_internal.h -index 06b151b..67ac387 100644 ---- a/src/include/libplacebo/utils/libav_internal.h -+++ b/src/include/libplacebo/utils/libav_internal.h -@@ -59,11 +59,14 @@ PL_LIBAV_API enum pl_color_system pl_system_from_av(enum AVColorSpace spc) - case AVCOL_SPC_SMPTE170M: return PL_COLOR_SYSTEM_BT_601; - case AVCOL_SPC_SMPTE240M: return PL_COLOR_SYSTEM_SMPTE_240M; - case AVCOL_SPC_YCGCO: return PL_COLOR_SYSTEM_YCGCO; -+ case AVCOL_SPC_YCGCO_RE: return PL_COLOR_SYSTEM_UNKNOWN; // missing -+ case AVCOL_SPC_YCGCO_RO: return PL_COLOR_SYSTEM_UNKNOWN; // missing - case AVCOL_SPC_BT2020_NCL: return PL_COLOR_SYSTEM_BT_2020_NC; - case AVCOL_SPC_BT2020_CL: return PL_COLOR_SYSTEM_BT_2020_C; - case AVCOL_SPC_SMPTE2085: return PL_COLOR_SYSTEM_UNKNOWN; // missing - case AVCOL_SPC_CHROMA_DERIVED_NCL: return PL_COLOR_SYSTEM_UNKNOWN; // missing - case AVCOL_SPC_CHROMA_DERIVED_CL: return PL_COLOR_SYSTEM_UNKNOWN; // missing -+ case AVCOL_SPC_IPT_C2: return PL_COLOR_SYSTEM_UNKNOWN; // missing - // Note: this colorspace is confused between PQ and HLG, which libav* - // requires inferring from other sources, but libplacebo makes explicit. - // Default to PQ as it's the more common scenario. diff --git a/subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff b/subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff index ba59ad8..e859a21 100644 --- a/subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff +++ b/subprojects/packagefiles/libplacebo/d3d11_scaling_none.diff @@ -1,13 +1,13 @@ diff --git a/src/d3d11/swapchain.c b/src/d3d11/swapchain.c -index 8a53632..bbe5182 100644 +index dd3c0cc..ed151bf 100644 --- a/src/d3d11/swapchain.c +++ b/src/d3d11/swapchain.c -@@ -456,7 +456,8 @@ static HRESULT create_swapchain_1_2(struct d3d11_ctx *ctx, +@@ -466,7 +466,8 @@ static HRESULT create_swapchain_1_2(struct d3d11_ctx *ctx, .Format = format, .SampleDesc.Count = 1, .BufferUsage = DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT, - .Flags = params->flags, -+ .Scaling = DXGI_SCALING_NONE, ++ .Scaling = flip ? DXGI_SCALING_NONE : DXGI_SCALING_STRETCH, + .Flags = params->flags }; diff --git a/subprojects/packagefiles/libplacebo/dependency_version_override.diff b/subprojects/packagefiles/libplacebo/dependency_version_override.diff deleted file mode 100644 index 1ee6169..0000000 --- a/subprojects/packagefiles/libplacebo/dependency_version_override.diff +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/src/d3d11/meson.build b/src/d3d11/meson.build -index d4c4b44..ef96256 100644 ---- a/src/d3d11/meson.build -+++ b/src/d3d11/meson.build -@@ -5,7 +5,7 @@ d3d11_headers_extra = [ # needed internally - cc.check_header('dxgi1_6.h', required: d3d11), - ] - d3d11_deps = [ -- dependency('spirv-cross-c-shared', version: '>=0.29.0', required: d3d11), -+ dependency('spirv-cross-c-shared', required: d3d11), - cc.find_library('version', required: d3d11), - ] - -diff --git a/src/glsl/meson.build b/src/glsl/meson.build -index b1f4c8d..9b3a5bb 100644 ---- a/src/glsl/meson.build -+++ b/src/glsl/meson.build -@@ -1,5 +1,5 @@ - # shaderc --shaderc = dependency('shaderc', version: '>=2019.1', required: get_option('shaderc')) -+shaderc = dependency('shaderc', required: get_option('shaderc')) - components.set('shaderc', shaderc.found()) - if shaderc.found() - build_deps += shaderc -@@ -29,8 +29,9 @@ if glslang_req.auto() and shaderc.found() - - elif not glslang_req.disabled() - -+ prefer_static = get_option('prefer_static') - glslang_deps = [ -- cxx.find_library('glslang-default-resource-limits', required: false) -+ dependency('glslang-default-resource-limits', static: prefer_static) - ] - - # meson doesn't respect generator expressions in INTERFACE_LINK_LIBRARIES -@@ -38,13 +39,12 @@ elif not glslang_req.disabled() - # TODO: Use the following once it's fixed - # glslang = dependency('glslang', method: 'cmake', modules: ['glslang::SPIRV']) - -- prefer_static = get_option('prefer_static') - found_lib = false - foreach arg : [[prefer_static, false], [not prefer_static, glslang_req]] - static = arg[0] - required = arg[1] - -- spirv = cxx.find_library('SPIRV', required: required, static: static) -+ spirv = dependency('SPIRV', static: static) - - if not spirv.found() - continue -@@ -54,7 +54,7 @@ elif not glslang_req.disabled() - - # Glslang 15.0.0 moved some code around, add also linking to glslang, while - # this is not needed for older versions, it will still work. -- glslang_deps += cxx.find_library('glslang', required: required, static: static) -+ glslang_deps += dependency('glslang', static: static) - - if static - glslang_deps += [ |