Update to 9.0
This commit is contained in:
@@ -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 = 8.1.2
|
pkgver = 9.0
|
||||||
pkgrel = 1.1
|
pkgrel = 2.1
|
||||||
url = https://ffmpeg.org/
|
url = https://ffmpeg.org/
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
license = LicenseRef-nonfree-and-unredistributable
|
license = LicenseRef-nonfree-and-unredistributable
|
||||||
@@ -11,11 +11,13 @@ pkgbase = ffmpeg-full
|
|||||||
makedepends = cuda
|
makedepends = cuda
|
||||||
makedepends = ffnvcodec-headers
|
makedepends = ffnvcodec-headers
|
||||||
makedepends = git
|
makedepends = git
|
||||||
|
makedepends = glslang
|
||||||
makedepends = gmp
|
makedepends = gmp
|
||||||
makedepends = libgl
|
makedepends = libgl
|
||||||
makedepends = lv2
|
makedepends = lv2
|
||||||
makedepends = nasm
|
makedepends = nasm
|
||||||
makedepends = opencl-headers
|
makedepends = opencl-headers
|
||||||
|
makedepends = spirv-headers
|
||||||
makedepends = vulkan-headers
|
makedepends = vulkan-headers
|
||||||
depends = alsa-lib
|
depends = alsa-lib
|
||||||
depends = aom
|
depends = aom
|
||||||
@@ -29,7 +31,6 @@ pkgbase = ffmpeg-full
|
|||||||
depends = fribidi
|
depends = fribidi
|
||||||
depends = glib2
|
depends = glib2
|
||||||
depends = glibc
|
depends = glibc
|
||||||
depends = glslang
|
|
||||||
depends = gnutls
|
depends = gnutls
|
||||||
depends = harfbuzz
|
depends = harfbuzz
|
||||||
depends = jack
|
depends = jack
|
||||||
@@ -108,21 +109,21 @@ pkgbase = ffmpeg-full
|
|||||||
provides = libswscale.so
|
provides = libswscale.so
|
||||||
provides = libswresample.so
|
provides = libswresample.so
|
||||||
conflicts = ffmpeg
|
conflicts = ffmpeg
|
||||||
source = https://ffmpeg.org/releases/ffmpeg-8.1.2.tar.xz
|
source = https://ffmpeg.org/releases/ffmpeg-9.0.tar.xz
|
||||||
source = https://ffmpeg.org/releases/ffmpeg-8.1.2.tar.xz.asc
|
source = https://ffmpeg.org/releases/ffmpeg-9.0.tar.xz.asc
|
||||||
source = git+https://github.com/lensfun/lensfun.git
|
source = git+https://github.com/lensfun/lensfun.git
|
||||||
source = https://github.com/ggml-org/whisper.cpp/archive/v1.9.1/whisper.cpp-1.9.1.tar.gz
|
source = https://github.com/ggml-org/whisper.cpp/archive/v1.9.2/whisper.cpp-1.9.2.tar.gz
|
||||||
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 = 050-ffmpeg-fix-cuda-nvcc-with-gcc14.patch
|
source = 050-ffmpeg-fix-cuda-nvcc-with-gcc14.patch
|
||||||
source = 060-ffmpeg-whisper.cpp-fix-pkgconfig.patch
|
source = 060-ffmpeg-whisper.cpp-fix-pkgconfig.patch
|
||||||
source = LICENSE
|
source = LICENSE
|
||||||
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
|
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
|
||||||
sha256sums = 464beb5e7bf0c311e68b45ae2f04e9cc2af88851abb4082231742a74d97b524c
|
sha256sums = 7f607a00dd0d28a729d5a4811205812eef01cf6ef6155025febb6f36a9062d52
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
sha256sums = 147267177eef7b22ec3d2476dd514d1b12e160e176230b740e3d1bd600118447
|
sha256sums = a6abd064fcca8b85e794d205abf328c522e9451db43a3eadc178b883b7d0e9cd
|
||||||
sha256sums = 95223dda645c15b3daf79cd4d55df5d4ac46207f749973396bb761b743586ed6
|
sha256sums = cd1aa93e78800247b4516a01ef391106acb362957bd1e56f85d64906343cddac
|
||||||
sha256sums = 1bbd783da8483e2cffe99715125dddbd88c81ae36f28eee5ae7df5705c448077
|
sha256sums = 4a9a672f67cc0e5dd63bd7659f5a5198cd981e60bbbc1b9a63277758be6a7fdf
|
||||||
sha256sums = 8d834668c277071dabe91db2a38bf2c02cd73cc5be0ceeb0ed1e176ab9525c68
|
sha256sums = 8d834668c277071dabe91db2a38bf2c02cd73cc5be0ceeb0ed1e176ab9525c68
|
||||||
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
|
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/libavformat/avformat.h
|
--- a/libavformat/avformat.h
|
||||||
+++ b/libavformat/avformat.h
|
+++ b/libavformat/avformat.h
|
||||||
@@ -1178,6 +1178,10 @@ typedef struct AVStreamGroup {
|
@@ -1229,6 +1229,10 @@ typedef struct AVStreamGroup {
|
||||||
|
|
||||||
struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
|
struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -7112,7 +7112,7 @@ if [ -z "$nvccflags" ]; then
|
@@ -7200,7 +7200,7 @@ if [ -z "$nvccflags" ]; then
|
||||||
nvccflags=$nvccflags_default
|
nvccflags=$nvccflags_default
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
# Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
|
# Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
|
||||||
|
|
||||||
pkgname=ffmpeg-full
|
pkgname=ffmpeg-full
|
||||||
pkgver=8.1.2
|
pkgver=9.0
|
||||||
pkgrel=1.1
|
pkgrel=2.1
|
||||||
_whispercpp_ver='1.9.1'
|
_whispercpp_ver='1.9.2'
|
||||||
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://ffmpeg.org/'
|
url='https://ffmpeg.org/'
|
||||||
@@ -22,7 +22,6 @@ depends=(
|
|||||||
'fribidi'
|
'fribidi'
|
||||||
'glib2'
|
'glib2'
|
||||||
'glibc'
|
'glibc'
|
||||||
'glslang'
|
|
||||||
'gnutls'
|
'gnutls'
|
||||||
'harfbuzz'
|
'harfbuzz'
|
||||||
'jack'
|
'jack'
|
||||||
@@ -100,11 +99,13 @@ makedepends=(
|
|||||||
'cuda'
|
'cuda'
|
||||||
'ffnvcodec-headers'
|
'ffnvcodec-headers'
|
||||||
'git'
|
'git'
|
||||||
|
'glslang'
|
||||||
'gmp'
|
'gmp'
|
||||||
'libgl'
|
'libgl'
|
||||||
'lv2'
|
'lv2'
|
||||||
'nasm'
|
'nasm'
|
||||||
'opencl-headers'
|
'opencl-headers'
|
||||||
|
'spirv-headers'
|
||||||
'vulkan-headers')
|
'vulkan-headers')
|
||||||
provides=(
|
provides=(
|
||||||
'ffmpeg'
|
'ffmpeg'
|
||||||
@@ -123,12 +124,12 @@ source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
|
|||||||
'050-ffmpeg-fix-cuda-nvcc-with-gcc14.patch'
|
'050-ffmpeg-fix-cuda-nvcc-with-gcc14.patch'
|
||||||
'060-ffmpeg-whisper.cpp-fix-pkgconfig.patch'
|
'060-ffmpeg-whisper.cpp-fix-pkgconfig.patch'
|
||||||
'LICENSE')
|
'LICENSE')
|
||||||
sha256sums=('464beb5e7bf0c311e68b45ae2f04e9cc2af88851abb4082231742a74d97b524c'
|
sha256sums=('7f607a00dd0d28a729d5a4811205812eef01cf6ef6155025febb6f36a9062d52'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'147267177eef7b22ec3d2476dd514d1b12e160e176230b740e3d1bd600118447'
|
'a6abd064fcca8b85e794d205abf328c522e9451db43a3eadc178b883b7d0e9cd'
|
||||||
'95223dda645c15b3daf79cd4d55df5d4ac46207f749973396bb761b743586ed6'
|
'cd1aa93e78800247b4516a01ef391106acb362957bd1e56f85d64906343cddac'
|
||||||
'1bbd783da8483e2cffe99715125dddbd88c81ae36f28eee5ae7df5705c448077'
|
'4a9a672f67cc0e5dd63bd7659f5a5198cd981e60bbbc1b9a63277758be6a7fdf'
|
||||||
'8d834668c277071dabe91db2a38bf2c02cd73cc5be0ceeb0ed1e176ab9525c68'
|
'8d834668c277071dabe91db2a38bf2c02cd73cc5be0ceeb0ed1e176ab9525c68'
|
||||||
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
|
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
|
||||||
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
|
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
|
||||||
@@ -150,7 +151,7 @@ build() {
|
|||||||
'-DCMAKE_BUILD_TYPE:STRING=None'
|
'-DCMAKE_BUILD_TYPE:STRING=None'
|
||||||
"-DCMAKE_INSTALL_PREFIX:PATH=${_stagingdir}"
|
"-DCMAKE_INSTALL_PREFIX:PATH=${_stagingdir}"
|
||||||
'-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON'
|
'-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON'
|
||||||
'-Wno-dev')
|
'-Wno-author')
|
||||||
|
|
||||||
# ffmpeg requires lensfun git master, but lensfun-git package wrongly installs its files to non-standard locations:
|
# ffmpeg requires lensfun git master, but lensfun-git package wrongly installs its files to non-standard locations:
|
||||||
# https://aur.archlinux.org/cgit/aur.git/commit/?h=lensfun-git&id=7b7a2d4890df59cde62c7dbfde3cefd7868a2707
|
# https://aur.archlinux.org/cgit/aur.git/commit/?h=lensfun-git&id=7b7a2d4890df59cde62c7dbfde3cefd7868a2707
|
||||||
@@ -166,8 +167,8 @@ build() {
|
|||||||
-e 's/\(-llensfun\)/\1 -lglib-2.0 -lstdc++/' \
|
-e 's/\(-llensfun\)/\1 -lglib-2.0 -lstdc++/' \
|
||||||
-e '/Cflags: /s/$/ -DCONF_LENSFUN_STATIC/' "${_pkgconfigdir}/lensfun.pc"
|
-e '/Cflags: /s/$/ -DCONF_LENSFUN_STATIC/' "${_pkgconfigdir}/lensfun.pc"
|
||||||
|
|
||||||
# whisper.cpp AUR package conflicts with imagemagick at the time of writing
|
# using whisper-cpp package from the official repositories will cause a circular dependency with ffmpeg,
|
||||||
# building it locally as a static library for the time being, as imagemagick is a commonly used package (high usage in pkgstats)
|
# building it locally as a static library for the time being
|
||||||
cmake -B build/whisper.cpp -S "whisper.cpp-${_whispercpp_ver}" \
|
cmake -B build/whisper.cpp -S "whisper.cpp-${_whispercpp_ver}" \
|
||||||
"${_cmake_opts[@]}" \
|
"${_cmake_opts[@]}" \
|
||||||
-DWHISPER_BUILD_EXAMPLES:BOOL='OFF' \
|
-DWHISPER_BUILD_EXAMPLES:BOOL='OFF' \
|
||||||
@@ -218,7 +219,6 @@ build() {
|
|||||||
--enable-libfontconfig \
|
--enable-libfontconfig \
|
||||||
--enable-libfreetype \
|
--enable-libfreetype \
|
||||||
--enable-libfribidi \
|
--enable-libfribidi \
|
||||||
--enable-libglslang \
|
|
||||||
--enable-libharfbuzz \
|
--enable-libharfbuzz \
|
||||||
--enable-libjack \
|
--enable-libjack \
|
||||||
--enable-libjxl \
|
--enable-libjxl \
|
||||||
@@ -237,7 +237,6 @@ build() {
|
|||||||
--enable-librsvg \
|
--enable-librsvg \
|
||||||
--enable-librubberband \
|
--enable-librubberband \
|
||||||
--enable-librtmp \
|
--enable-librtmp \
|
||||||
--disable-libshaderc \
|
|
||||||
--enable-libsnappy \
|
--enable-libsnappy \
|
||||||
--enable-sndio \
|
--enable-sndio \
|
||||||
--enable-libsoxr \
|
--enable-libsoxr \
|
||||||
|
|||||||
Reference in New Issue
Block a user