aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHunter Sezen <orbea@riseup.net>2019-08-24 07:24:36 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2019-08-24 07:24:36 +0700
commit54bd8f5fe3ed5b03e9eb875ffeb9644a12b7a3fb (patch)
tree90b10bccdb07466e2f9d6c58e48077a8b5473d4e
parent85c0c5cf11271d29b2141c3d2745dc95dfc7ba6e (diff)
graphics/libplacebo: Fix build with SPIRV-Tools.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--graphics/libplacebo/README6
-rw-r--r--graphics/libplacebo/libplacebo.SlackBuild6
-rw-r--r--graphics/libplacebo/libplacebo.info2
-rw-r--r--graphics/libplacebo/spirv-tools.patch12
4 files changed, 22 insertions, 4 deletions
diff --git a/graphics/libplacebo/README b/graphics/libplacebo/README
index a428084a15203..8e22d6275a115 100644
--- a/graphics/libplacebo/README
+++ b/graphics/libplacebo/README
@@ -1,5 +1,7 @@
libplacebo is essentially the core rendering algorithms and ideas of mpv
turned into a library.
-libplacebo can be built without the vulkan-sdk and shaderc, but will be
-missing most features.
+shaderc is an optional dependency.
+
+libplacebo can be built without the vulkan-sdk, but most features will
+be missing.
diff --git a/graphics/libplacebo/libplacebo.SlackBuild b/graphics/libplacebo/libplacebo.SlackBuild
index f1d6a413a6f4b..551cdd665348c 100644
--- a/graphics/libplacebo/libplacebo.SlackBuild
+++ b/graphics/libplacebo/libplacebo.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=libplacebo
VERSION=${VERSION:-1.18.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -78,6 +78,10 @@ else
RELEASE=plain
fi
+# Fixes the SPIRV-tools build
+# https://code.videolan.org/videolan/libplacebo/issues/67
+patch -p1 < $CWD/spirv-tools.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
meson \
diff --git a/graphics/libplacebo/libplacebo.info b/graphics/libplacebo/libplacebo.info
index 002911368e625..0cbb9db109a54 100644
--- a/graphics/libplacebo/libplacebo.info
+++ b/graphics/libplacebo/libplacebo.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://code.videolan.org/videolan/libplacebo/-/archive/v1.18.0/libpla
MD5SUM="bc1758d2056092728bd95d9c511d37d1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="meson shaderc"
+REQUIRES="meson vulkan-sdk"
MAINTAINER="Hunter Sezen"
EMAIL="orbea@riseup.net"
diff --git a/graphics/libplacebo/spirv-tools.patch b/graphics/libplacebo/spirv-tools.patch
new file mode 100644
index 0000000000000..f16ae57871c4d
--- /dev/null
+++ b/graphics/libplacebo/spirv-tools.patch
@@ -0,0 +1,12 @@
+diff -ur libplacebo-v1.18.0.orig/src/meson.build libplacebo-v1.18.0/src/meson.build
+--- libplacebo-v1.18.0.orig/src/meson.build 2019-02-14 10:11:33.000000000 -0800
++++ libplacebo-v1.18.0/src/meson.build 2019-08-09 07:23:04.838656296 -0700
+@@ -63,6 +63,8 @@
+ cxx.find_library('OGLCompiler', required: glslang_req),
+ cxx.find_library('OSDependent', required: glslang_req),
+ cxx.find_library('SPIRV', required: glslang_req),
++ cxx.find_library('SPIRV-Tools', required: glslang_req),
++ cxx.find_library('SPIRV-Tools-opt', required: glslang_req),
+ cxx.find_library('SPVRemapper', required: glslang_req),
+ ]
+