diff --git a/multimedia/video/ffmpeg/actions.py b/multimedia/video/ffmpeg/actions.py index 223b2fdbcd..fb2956c64f 100644 --- a/multimedia/video/ffmpeg/actions.py +++ b/multimedia/video/ffmpeg/actions.py @@ -93,6 +93,7 @@ def setup(): --enable-vaapi \ --enable-vdpau \ --enable-omx \ + --enable-libsrt \ --extra-ldflags='-lasound -lm'") def build(): diff --git a/multimedia/video/ffmpeg/files/glslang_linker_flags.patch b/multimedia/video/ffmpeg/files/glslang_linker_flags.patch new file mode 100644 index 0000000000..9826b50f51 --- /dev/null +++ b/multimedia/video/ffmpeg/files/glslang_linker_flags.patch @@ -0,0 +1,33 @@ +From 98ea1a662ee172961feaa374fe8d26078838d250 Mon Sep 17 00:00:00 2001 +From: Philip Langdale +Date: Mon, 17 Aug 2020 16:19:39 -0700 +Subject: [PATCH] configure: Add additional glslang libraries to make linking + work + +The latest builds of glslang introduce new libraries that need to be +linked for all symbols to be fully resolved. + +This change will break building against older installations of glslang +and it's very hard to tell them apart as the library change upstream +was not accompanied by any version bump and no official release has +been made with this change it - just lots of people packaging up git +snapshots. So, apologies in advance. +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 9ff246b..f13d1a8 100755 +--- a/configure ++++ b/configure +@@ -6308,7 +6308,7 @@ enabled fontconfig && enable libfontconfig + enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit + 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 && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ ++enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ + enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu || + require libgme gme/gme.h gme_new_emu -lgme -lstdc++; } + enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do +-- +2.7.4 diff --git a/multimedia/video/ffmpeg/files/libavfilter_glslang.cpp.patch b/multimedia/video/ffmpeg/files/libavfilter_glslang.cpp.patch new file mode 100644 index 0000000000..44028b258d --- /dev/null +++ b/multimedia/video/ffmpeg/files/libavfilter_glslang.cpp.patch @@ -0,0 +1,14 @@ +X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff_plain/6f84e92172a12f14d24c4467b2e58611afd726bd..4dab04622a6cf2a31da26a51dedb60ec44ac89a4:/libavfilter/glslang.cpp + +diff --git a/libavfilter/glslang.cpp b/libavfilter/glslang.cpp +index 497df6e..125eb5c 100644 +--- a/libavfilter/glslang.cpp ++++ b/libavfilter/glslang.cpp +@@ -24,7 +24,6 @@ extern "C" { + } + + #include +-#include + #include + #include + diff --git a/multimedia/video/ffmpeg/pspec.xml b/multimedia/video/ffmpeg/pspec.xml index e3f05ddd20..b482b7f969 100644 --- a/multimedia/video/ffmpeg/pspec.xml +++ b/multimedia/video/ffmpeg/pspec.xml @@ -3,7 +3,7 @@ ffmpeg - http://ffmpeg.org + http://ffmpeg.org/ PisiLinux Community admins@pisilinux.org @@ -15,8 +15,9 @@ app:console A command-line tool to record, convert and stream audio and video FFmpeg is a complete solution to record, convert and stream audio and video. - https://ffmpeg.org/releases/ffmpeg-4.2.4.tar.bz2 + https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2 + srt-devel freetype-devel fontconfig-devel @@ -106,14 +107,16 @@ - fix_ppc_build.patch fix-vmaf-model-path.patch + glslang_linker_flags.patch + libavfilter_glslang.cpp.patch ffmpeg + srt gsm celt @@ -226,6 +229,13 @@ + + 2021-04-04 + 4.3.2 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-01-28 4.2.4