Uyanide/ffmpeg-PKGBUILD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to version 6.1

Browse Source 
Also in this update:
- add missing libharfbuzz
- add libopenvino
- add depends that were implicitly satisfied
This commit is contained in:
Daniel Bermond
2023-11-14 21:00:44 -03:00
parent 2d119be453
commit 09b95fa8b5
4 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.SRCINFO
+17 -16
View File
@@ -1,7 +1,7 @@
pkgbase = ffmpeg-full pkgbase = ffmpeg-full
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac) pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)
pkgver = 6.0 pkgver = 6.1
pkgrel = 5 pkgrel = 1
url = https://www.ffmpeg.org/ url = https://www.ffmpeg.org/
arch = x86_64 arch = x86_64
license = custom: nonfree and unredistributable license = custom: nonfree and unredistributable
@@ -17,6 +17,7 @@ pkgbase = ffmpeg-full
depends = aribb24 depends = aribb24
depends = avisynthplus depends = avisynthplus
depends = bzip2 depends = bzip2
depends = cairo
depends = celt depends = celt
depends = codec2 depends = codec2
depends = cuda depends = cuda
@@ -26,10 +27,12 @@ pkgbase = ffmpeg-full
depends = freetype2 depends = freetype2
depends = frei0r-plugins depends = frei0r-plugins
depends = fribidi depends = fribidi
depends = glib2
depends = glslang depends = glslang
depends = gmp depends = gmp
depends = gnutls depends = gnutls
depends = gsm depends = gsm
depends = harfbuzz
depends = jack depends = jack
depends = kvazaar depends = kvazaar
depends = ladspa depends = ladspa
@@ -58,6 +61,7 @@ pkgbase = ffmpeg-full
depends = libplacebo depends = libplacebo
depends = libpulse depends = libpulse
depends = librabbitmq-c depends = librabbitmq-c
depends = libraw1394
depends = librsvg depends = librsvg
depends = libsoxr depends = libsoxr
depends = libssh depends = libssh
@@ -81,6 +85,7 @@ pkgbase = ffmpeg-full
depends = opencore-amr depends = opencore-amr
depends = openh264 depends = openh264
depends = openjpeg2 depends = openjpeg2
depends = openvino
depends = opus depends = opus
depends = rav1e depends = rav1e
depends = rtmpdump depends = rtmpdump
@@ -130,26 +135,22 @@ pkgbase = ffmpeg-full
provides = libswresample.so provides = libswresample.so
provides = ffmpeg provides = ffmpeg
conflicts = ffmpeg conflicts = ffmpeg
source = https://ffmpeg.org/releases/ffmpeg-6.0.tar.xz source = https://ffmpeg.org/releases/ffmpeg-6.1.tar.xz
source = https://ffmpeg.org/releases/ffmpeg-6.0.tar.xz.asc source = https://ffmpeg.org/releases/ffmpeg-6.1.tar.xz.asc
source = 010-ffmpeg-add-svt-hevc-geb24a06.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/eb24a06ba4ee4948f219a3246b88439a8090bd37/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch source = 010-ffmpeg-add-svt-hevc-g6cca5b9.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/6cca5b932623d3a1953b165ae6b093ca1325ac44/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
source = 030-ffmpeg-add-svt-vp9-gaaa8140.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/aaa8140c8cdf6c073eaa6aaa5d003d1535fd0059/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch source = 020-ffmpeg-add-svt-hevc-docs-g6cca5b9.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/6cca5b932623d3a1953b165ae6b093ca1325ac44/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
source = 030-ffmpeg-add-svt-vp9-g43ef8e5.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/43ef8e5e96932421858762392adbbab57c84aebf/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
source = 040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch source = 040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
source = 060-ffmpeg-fix-segfault-with-avisynthplus.patch source = 060-ffmpeg-fix-segfault-with-avisynthplus.patch
source = 070-ffmpeg-binutils2.41-fix.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb
source = 080-ffmpeg-nvenc-fix-010.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/03823ac0c6a38bd6ba972539e3203a592579792f
source = 090-ffmpeg-nvenc-fix-020.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d2b46c1ef768bc31ba9180f6d469d5b8be677500
source = LICENSE source = LICENSE
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8 validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
sha256sums = 57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082 sha256sums = 488c76e57dd9b3bee901f71d5c95eaf1db4a5a31fe46a28654e837144207c270
sha256sums = SKIP sha256sums = SKIP
sha256sums = e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a sha256sums = e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a
sha256sums = d8b91ea5f07d0208cbe0290567083808708014a1953fda322d13cb619349c9ee sha256sums = a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81
sha256sums = d1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9 sha256sums = 0433016c8523c7ce159523946a76c8fa06a926f33f94b70e8de7c2082d14178c
sha256sums = bf563193f450ece58a93db6840c0db33875df945fa81477b9b02fb209d3bf57a sha256sums = 7d5ce8058b143bae1be10a06d79ac0f1a72daf00cf648309450d83bea249a6b1
sha256sums = fec03e133521486ca258ae34ddf093eb6aab23f848c4332c367aadbfeaefda04 sha256sums = 0e277c0d5e33612ca7a11025958133b17bfbe23168b0aee5bd07f674f6fd7440
sha256sums = aa8c43efac4c0dfc462af887b56bdb177cf09dd8b2dffea5c83a4dbfc35e0917
sha256sums = 3fe87a3bd193f16a191ff795ae8ad62d930e48d7b379fc627043717a6bdf3e93
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36 sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
pkgname = ffmpeg-full pkgname = ffmpeg-full
040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
+2 -2
View File
@@ -1,6 +1,6 @@
--- a/libavformat/avformat.h --- a/libavformat/avformat.h
+++ b/libavformat/avformat.h +++ b/libavformat/avformat.h
@@ -1019,6 +1019,10 @@ attribute_deprecated @@ -1030,6 +1030,10 @@ attribute_deprecated
int64_t av_stream_get_end_pts(const AVStream *st); int64_t av_stream_get_end_pts(const AVStream *st);
#endif #endif
@@ -13,7 +13,7 @@
/** /**
--- a/libavformat/utils.c --- a/libavformat/utils.c
+++ b/libavformat/utils.c +++ b/libavformat/utils.c
@@ -55,6 +55,13 @@ int ff_unlock_avformat(void) @@ -56,6 +56,13 @@ int ff_unlock_avformat(void)
return ff_mutex_unlock(&avformat_mutex) ? -1 : 0; return ff_mutex_unlock(&avformat_mutex) ? -1 : 0;
} }
060-ffmpeg-fix-segfault-with-avisynthplus.patch
+1 -1
View File
@@ -1,6 +1,6 @@
--- a/libavformat/avisynth.c --- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c +++ b/libavformat/avisynth.c
@@ -141,7 +141,7 @@ static av_cold void avisynth_atexit_handler(void); @@ -142,7 +142,7 @@ static av_cold void avisynth_atexit_handler(void);
static av_cold int avisynth_load_library(void) static av_cold int avisynth_load_library(void)
{ {
PKGBUILD
+21 -21
View File
@@ -2,10 +2,10 @@
# Contributor: Iacopo Isimbaldi <isiachi@rhye.it> # Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
pkgname=ffmpeg-full pkgname=ffmpeg-full
pkgver=6.0 pkgver=6.1
pkgrel=5 pkgrel=1
_svt_hevc_ver='eb24a06ba4ee4948f219a3246b88439a8090bd37' _svt_hevc_ver='6cca5b932623d3a1953b165ae6b093ca1325ac44'
_svt_vp9_ver='aaa8140c8cdf6c073eaa6aaa5d003d1535fd0059' _svt_vp9_ver='43ef8e5e96932421858762392adbbab57c84aebf'
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)' pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)'
arch=('x86_64') arch=('x86_64')
url='https://www.ffmpeg.org/' url='https://www.ffmpeg.org/'
@@ -16,6 +16,7 @@ depends=(
'aribb24' 'aribb24'
'avisynthplus' 'avisynthplus'
'bzip2' 'bzip2'
'cairo'
'celt' 'celt'
'codec2' 'codec2'
'cuda' 'cuda'
@@ -25,10 +26,12 @@ depends=(
'freetype2' 'freetype2'
'frei0r-plugins' 'frei0r-plugins'
'fribidi' 'fribidi'
'glib2'
'glslang' 'glslang'
'gmp' 'gmp'
'gnutls' 'gnutls'
'gsm' 'gsm'
'harfbuzz'
'jack' 'jack'
'kvazaar' 'kvazaar'
'ladspa' 'ladspa'
@@ -57,6 +60,7 @@ depends=(
'libplacebo' 'libplacebo'
'libpulse' 'libpulse'
'librabbitmq-c' 'librabbitmq-c'
'libraw1394'
'librsvg' 'librsvg'
'libsoxr' 'libsoxr'
'libssh' 'libssh'
@@ -80,6 +84,7 @@ depends=(
'opencore-amr' 'opencore-amr'
'openh264' 'openh264'
'openjpeg2' 'openjpeg2'
'openvino'
'opus' 'opus'
'rav1e' 'rav1e'
'rtmpdump' 'rtmpdump'
@@ -128,42 +133,36 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
conflicts=('ffmpeg') conflicts=('ffmpeg')
source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc} source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
"010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch" "010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
#"020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch" "020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch"
"030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch" "030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch"
'040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch' '040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch'
'060-ffmpeg-fix-segfault-with-avisynthplus.patch' '060-ffmpeg-fix-segfault-with-avisynthplus.patch'
'070-ffmpeg-binutils2.41-fix.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb'
'080-ffmpeg-nvenc-fix-010.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/03823ac0c6a38bd6ba972539e3203a592579792f'
'090-ffmpeg-nvenc-fix-020.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d2b46c1ef768bc31ba9180f6d469d5b8be677500'
'LICENSE') 'LICENSE')
sha256sums=('57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082' sha256sums=('488c76e57dd9b3bee901f71d5c95eaf1db4a5a31fe46a28654e837144207c270'
'SKIP' 'SKIP'
'e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a' 'e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a'
'd8b91ea5f07d0208cbe0290567083808708014a1953fda322d13cb619349c9ee' 'a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81'
'd1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9' '0433016c8523c7ce159523946a76c8fa06a926f33f94b70e8de7c2082d14178c'
'bf563193f450ece58a93db6840c0db33875df945fa81477b9b02fb209d3bf57a' '7d5ce8058b143bae1be10a06d79ac0f1a72daf00cf648309450d83bea249a6b1'
'fec03e133521486ca258ae34ddf093eb6aab23f848c4332c367aadbfeaefda04' '0e277c0d5e33612ca7a11025958133b17bfbe23168b0aee5bd07f674f6fd7440'
'aa8c43efac4c0dfc462af887b56bdb177cf09dd8b2dffea5c83a4dbfc35e0917'
'3fe87a3bd193f16a191ff795ae8ad62d930e48d7b379fc627043717a6bdf3e93'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36') '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
prepare() { prepare() {
rm -f "ffmpeg-${pkgver}/libavcodec/"libsvt_{hevc,vp9}.c rm -f "ffmpeg-${pkgver}/libavcodec/"libsvt_{hevc,vp9}.c
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"
#patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/060-ffmpeg-fix-segfault-with-avisynthplus.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/060-ffmpeg-fix-segfault-with-avisynthplus.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/070-ffmpeg-binutils2.41-fix.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/080-ffmpeg-nvenc-fix-010.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/090-ffmpeg-nvenc-fix-020.patch"
} }
build() { build() {
cd "ffmpeg-${pkgver}" cd "ffmpeg-${pkgver}"
printf '%s\n' ' -> Running ffmpeg configure script...' printf '%s\n' ' -> Running ffmpeg configure script...'
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}:}/opt/intel/openvino/runtime/lib/intel64/pkgconfig"
./configure \ ./configure \
--prefix='/usr' \ --prefix='/usr' \
--extra-cflags='-I/opt/cuda/include' \ --extra-cflags='-I/opt/cuda/include' \
@@ -205,9 +204,10 @@ build() {
--enable-libdc1394 \ --enable-libdc1394 \
--enable-libfdk-aac \ --enable-libfdk-aac \
--enable-libflite \ --enable-libflite \
--enable-fontconfig \ --enable-libfontconfig \
--enable-libfreetype \ --enable-libfreetype \
--enable-libfribidi \ --enable-libfribidi \
--enable-libharfbuzz \
--enable-libglslang \ --enable-libglslang \
--enable-libgme \ --enable-libgme \
--enable-libgsm \ --enable-libgsm \
@@ -226,7 +226,7 @@ build() {
--enable-libopenh264 \ --enable-libopenh264 \
--enable-libopenjpeg \ --enable-libopenjpeg \
--enable-libopenmpt \ --enable-libopenmpt \
--disable-libopenvino \ --enable-libopenvino \
--enable-libopus \ --enable-libopus \
--enable-libplacebo \ --enable-libplacebo \
--enable-libpulse \ --enable-libpulse \