From c960d5482509a957b53cbfb485045775f0434bce Mon Sep 17 00:00:00 2001 From: Daniel Bermond Date: Sat, 25 Feb 2023 13:43:12 -0300 Subject: [PATCH] Bring back flite1 and temporarily disable pocketsphinx A workaround was added to the flite1 to fix its build. The newly released pocketsphinx currently fails to build. Temporarily disable it until there is support by upstream ffmpeg. --- .SRCINFO | 4 ++-- PKGBUILD | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cb16638..1faf374 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = ffmpeg-full pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac) pkgver = 5.1.2 - pkgrel = 3 + pkgrel = 4 url = https://www.ffmpeg.org/ arch = x86_64 license = custom: nonfree and unredistributable @@ -110,9 +110,9 @@ pkgbase = ffmpeg-full depends = zvbi depends = chromaprint-fftw depends = davs2 + depends = flite1 depends = libklvanc-git depends = librist - depends = pocketsphinx depends = rockchip-mpp depends = shine depends = uavs3d-git diff --git a/PKGBUILD b/PKGBUILD index d227d25..52c4499 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ffmpeg-full pkgver=5.1.2 -pkgrel=3 +pkgrel=4 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)' arch=('x86_64') url='https://www.ffmpeg.org/' @@ -21,7 +21,7 @@ depends=('alsa-lib' 'aom' 'aribb24' 'avisynthplus' 'bzip2' 'celt' 'codec2' 'cuda 'sndio' 'speex' 'spirv-tools' 'srt' 'svt-av1' 'svt-hevc' 'svt-vp9' 'tesseract' 'twolame' 'v4l-utils' 'vapoursynth' 'vid.stab' 'vmaf' 'vulkan-icd-loader' 'x264' 'x265' 'xvidcore' 'xz' 'zeromq' 'zimg' 'zlib' 'zvbi' - 'chromaprint-fftw' 'davs2' 'libklvanc-git' 'librist' 'pocketsphinx' + 'chromaprint-fftw' 'davs2' 'flite1' 'libklvanc-git' 'librist' 'rockchip-mpp' 'shine' 'uavs3d-git' 'vo-amrwbenc' 'xavs' 'xavs2') makedepends=('clang' 'amf-headers' 'ffnvcodec-headers' 'nasm' 'opencl-headers' 'vulkan-headers' 'decklink-sdk') @@ -105,7 +105,7 @@ build() { --enable-libdavs2 \ --enable-libdc1394 \ --enable-libfdk-aac \ - --disable-libflite \ + --enable-libflite \ --enable-fontconfig \ --enable-libfreetype \ --enable-libfribidi \ @@ -182,7 +182,7 @@ build() { --enable-opencl \ --enable-opengl \ --disable-openssl \ - --enable-pocketsphinx \ + --disable-pocketsphinx \ --enable-sndio \ --enable-sdl2 \ --enable-vapoursynth \