From 67d5d856cee781c2099f38594e492f8280c9d836 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 3 Oct 2018 18:33:13 +0200 Subject: [PATCH] Update build --- 0002-WAR-older-shaderc.patch | 25 ------------------------- libplacebo.spec | 9 ++++++--- 2 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 0002-WAR-older-shaderc.patch diff --git a/0002-WAR-older-shaderc.patch b/0002-WAR-older-shaderc.patch deleted file mode 100644 index 8245cff..0000000 --- a/0002-WAR-older-shaderc.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 72a8c1c547a8f40eb8a84485ab26a01b16f14fcd Mon Sep 17 00:00:00 2001 -From: Nicolas Chauvet -Date: Wed, 3 Oct 2018 12:28:48 +0200 -Subject: [PATCH 2/2] WAR older shaderc - ---- - src/spirv_shaderc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/spirv_shaderc.c b/src/spirv_shaderc.c -index c86679a..910d76c 100644 ---- a/src/spirv_shaderc.c -+++ b/src/spirv_shaderc.c -@@ -46,7 +46,7 @@ static bool shaderc_init(struct spirv_compiler *spirv) - goto error; - - shaderc_compile_options_set_optimization_level(p->opts, -- shaderc_optimization_level_performance); -+ shaderc_optimization_level_zero); - - int ver, rev; - shaderc_get_spv_version(&ver, &rev); --- -2.17.1 - diff --git a/libplacebo.spec b/libplacebo.spec index db503cc..7112462 100644 --- a/libplacebo.spec +++ b/libplacebo.spec @@ -1,19 +1,18 @@ Name: libplacebo Version: 0.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Reusable library for GPU-accelerated video/image rendering primitives License: LGPLv2+ URL: https://github.com/haasn/libplacebo Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: libplacebo-0.6.0-backports.patch -Patch1: 0002-WAR-older-shaderc.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: meson BuildRequires: lcms2-devel -BuildRequires: libshaderc-devel +BuildRequires: libshaderc-devel > 2018.0 # Use a more modern compiler toolchain on EL7 %if 0%{?rhel} == 7 BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel @@ -87,6 +86,10 @@ developing applications that use %{name}. %changelog +* Wed Oct 03 2018 Nicolas Chauvet - 0.6.0-2 +- Drop WAR patch +- Enforce the shaderc version + * Mon Oct 01 2018 Nicolas Chauvet - 0.6.0-1 - Update to 0.6.0