summaryrefslogtreecommitdiffstats
path: root/source/l/ffmpeg
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-08-29 18:55:59 +0000
committer Eric Hameleers <alien@slackware.com>2023-08-29 21:29:22 +0200
commit38c180f03785251a6371717428ee78f64ae64d50 (patch)
tree4e9b0d2216b0fd8ff7c45bb20de224a2cf6e56bd /source/l/ffmpeg
parent568c271aef987a6cc0bdd7e8d61e9b268d96ffa5 (diff)
downloadcurrent-38c180f03785251a6371717428ee78f64ae64d50.tar.gz
current-38c180f03785251a6371717428ee78f64ae64d50.tar.xz
Tue Aug 29 18:55:59 UTC 202320230829185559
a/coreutils-9.4-x86_64-1.txz: Upgraded. d/cbindgen-0.25.0-x86_64-1.txz: Upgraded. l/ffmpeg-5.1.3-x86_64-2.txz: Rebuilt. Patched and recompiled against vulkan-sdk-1.3.250.0. Thanks to lucabon. l/pipewire-0.3.79-x86_64-1.txz: Upgraded. xfce/xfce4-whiskermenu-plugin-2.8.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/ffmpeg')
-rwxr-xr-xsource/l/ffmpeg/ffmpeg.SlackBuild5
-rw-r--r--source/l/ffmpeg/ffmpeg.vulkan.diff15
2 files changed, 19 insertions, 1 deletions
diff --git a/source/l/ffmpeg/ffmpeg.SlackBuild b/source/l/ffmpeg/ffmpeg.SlackBuild
index d5a01a20c..e85d9982f 100755
--- a/source/l/ffmpeg/ffmpeg.SlackBuild
+++ b/source/l/ffmpeg/ffmpeg.SlackBuild
@@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=ffmpeg
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -188,6 +188,9 @@ zcat $CWD/add-av_stream_get_first_dts-for-chromium.patch.gz | patch -p1 --verbos
# Upstream patch to build with binutils-2.41:
cat $CWD/effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch | patch -p1 --verbose || exit 1
+# Build against recent Vulkan:
+zcat $CWD/ffmpeg.vulkan.diff.gz | patch -p1 --verbose || exit 1
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/source/l/ffmpeg/ffmpeg.vulkan.diff b/source/l/ffmpeg/ffmpeg.vulkan.diff
new file mode 100644
index 000000000..afd963664
--- /dev/null
+++ b/source/l/ffmpeg/ffmpeg.vulkan.diff
@@ -0,0 +1,15 @@
+--- ./configure.orig 2023-03-26 09:21:00.000000000 -0500
++++ ./configure 2023-08-29 13:13:08.176019532 -0500
+@@ -6551,10 +6551,10 @@
+ enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
+ enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
+ enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
+- -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \
++ -lglslang -lMachineIndependent -lHLSL -lGenericCodeGen \
+ -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ||
+ require spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
+- -lglslang -lOSDependent -lHLSL -lOGLCompiler \
++ -lglslang -lHLSL \
+ -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; }
+ enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
+ require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }