ffmpeg ver. bump
This commit is contained in:
@@ -93,6 +93,7 @@ def setup():
|
|||||||
--enable-vaapi \
|
--enable-vaapi \
|
||||||
--enable-vdpau \
|
--enable-vdpau \
|
||||||
--enable-omx \
|
--enable-omx \
|
||||||
|
--enable-libsrt \
|
||||||
--extra-ldflags='-lasound -lm'")
|
--extra-ldflags='-lasound -lm'")
|
||||||
|
|
||||||
def build():
|
def build():
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
From 98ea1a662ee172961feaa374fe8d26078838d250 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Philip Langdale <philipl@overt.org>
|
||||||
|
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
|
||||||
@@ -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 <glslang/Include/ResourceLimits.h>
|
||||||
|
-#include <glslang/Include/revision.h>
|
||||||
|
#include <glslang/Public/ShaderLang.h>
|
||||||
|
#include <glslang/SPIRV/GlslangToSpv.h>
|
||||||
|
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
<PISI>
|
<PISI>
|
||||||
<Source>
|
<Source>
|
||||||
<Name>ffmpeg</Name>
|
<Name>ffmpeg</Name>
|
||||||
<Homepage>http://ffmpeg.org</Homepage>
|
<Homepage>http://ffmpeg.org/</Homepage>
|
||||||
<Packager>
|
<Packager>
|
||||||
<Name>PisiLinux Community</Name>
|
<Name>PisiLinux Community</Name>
|
||||||
<Email>admins@pisilinux.org</Email>
|
<Email>admins@pisilinux.org</Email>
|
||||||
@@ -15,8 +15,9 @@
|
|||||||
<IsA>app:console</IsA>
|
<IsA>app:console</IsA>
|
||||||
<Summary>A command-line tool to record, convert and stream audio and video</Summary>
|
<Summary>A command-line tool to record, convert and stream audio and video</Summary>
|
||||||
<Description>FFmpeg is a complete solution to record, convert and stream audio and video.</Description>
|
<Description>FFmpeg is a complete solution to record, convert and stream audio and video.</Description>
|
||||||
<Archive sha1sum="b733a5b9d4586fb7c068f31796eef35680a4cee3" type="tarbz2">https://ffmpeg.org/releases/ffmpeg-4.2.4.tar.bz2</Archive>
|
<Archive sha1sum="5f36fbff86b29853e4693fb974844bfe60841167" type="tarbz2">https://ffmpeg.org/releases/ffmpeg-4.3.2.tar.bz2</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
|
<Dependency>srt-devel</Dependency>
|
||||||
<Dependency>freetype-devel</Dependency>
|
<Dependency>freetype-devel</Dependency>
|
||||||
<Dependency>fontconfig-devel</Dependency>
|
<Dependency>fontconfig-devel</Dependency>
|
||||||
<!-- <Dependency>faac-devel</Dependency> -->
|
<!-- <Dependency>faac-devel</Dependency> -->
|
||||||
@@ -106,14 +107,16 @@
|
|||||||
<!--Dependency versionFrom="4.4.0">opencv-devel</Dependency-->
|
<!--Dependency versionFrom="4.4.0">opencv-devel</Dependency-->
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
<Patches>
|
||||||
<Patch>fix_ppc_build.patch</Patch>
|
|
||||||
<Patch level="1">fix-vmaf-model-path.patch</Patch>
|
<Patch level="1">fix-vmaf-model-path.patch</Patch>
|
||||||
|
<Patch level="1">glslang_linker_flags.patch</Patch>
|
||||||
|
<Patch level="1">libavfilter_glslang.cpp.patch</Patch>
|
||||||
</Patches>
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
<Package>
|
<Package>
|
||||||
<Name>ffmpeg</Name>
|
<Name>ffmpeg</Name>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
|
<Dependency>srt</Dependency>
|
||||||
<Dependency>gsm</Dependency>
|
<Dependency>gsm</Dependency>
|
||||||
<Dependency>celt</Dependency>
|
<Dependency>celt</Dependency>
|
||||||
<!-- <Dependency>faac</Dependency> -->
|
<!-- <Dependency>faac</Dependency> -->
|
||||||
@@ -226,6 +229,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="20">
|
||||||
|
<Date>2021-04-04</Date>
|
||||||
|
<Version>4.3.2</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="19">
|
<Update release="19">
|
||||||
<Date>2021-01-28</Date>
|
<Date>2021-01-28</Date>
|
||||||
<Version>4.2.4</Version>
|
<Version>4.2.4</Version>
|
||||||
|
|||||||
Reference in New Issue
Block a user