diff options
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | 040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch | 4 | ||||
| -rw-r--r-- | 060-ffmpeg-fix-segfault-with-avisynthplus.patch | 2 | ||||
| -rw-r--r-- | PKGBUILD | 23 |
4 files changed, 34 insertions, 10 deletions
@@ -1,6 +1,6 @@ pkgbase = ffmpeg-git pkgdesc = Complete solution to record, convert and stream audio and video (git version) - pkgver = 5.1.r106894.g260d7d5a6c + pkgver = 6.1.r110336.g0dceda12e7 pkgrel = 1 url = https://www.ffmpeg.org/ arch = x86_64 @@ -11,7 +11,10 @@ pkgbase = ffmpeg-git makedepends = ffnvcodec-headers makedepends = git makedepends = ladspa + makedepends = mesa makedepends = nasm + makedepends = opencl-headers + makedepends = vulkan-headers depends = alsa-lib depends = aom depends = bzip2 @@ -25,12 +28,16 @@ pkgbase = ffmpeg-git depends = libass.so depends = libavc1394 depends = libbluray.so + depends = libbs2b.so depends = libdav1d.so depends = libdrm depends = libfreetype.so + depends = libgl depends = libiec61883 + depends = libjxl.so depends = libmfx depends = libmodplug + depends = libopenmpt.so depends = libpulse depends = librav1e.so depends = libraw1394 @@ -46,6 +53,7 @@ pkgbase = ffmpeg-git depends = libvorbisenc.so depends = libvorbis.so depends = libvpx.so + depends = libvulkan.so depends = libwebp depends = libx11 depends = libx264.so @@ -56,6 +64,7 @@ pkgbase = ffmpeg-git depends = libxv depends = libxvidcore.so depends = libzimg.so + depends = ocl-icd depends = opencore-amr depends = openjpeg2 depends = opus @@ -85,7 +94,7 @@ pkgbase = ffmpeg-git source = 040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch source = 060-ffmpeg-fix-segfault-with-avisynthplus.patch sha256sums = SKIP - sha256sums = 2df82046908015bf26bc1303275cf52ba01fa380029a54ea6415373e389e423c - sha256sums = 0d6b53940a81ebaf4e6b1a2208a178eb8a824d6a3d8e863bf9c4c7e0060d88ec + sha256sums = d1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9 + sha256sums = bf563193f450ece58a93db6840c0db33875df945fa81477b9b02fb209d3bf57a pkgname = ffmpeg-git diff --git a/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch b/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch index 83fd707e65d0..b6eb1d7394b5 100644 --- a/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch +++ b/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch @@ -1,8 +1,8 @@ --- a/libavformat/avformat.h +++ b/libavformat/avformat.h -@@ -1128,6 +1128,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); - */ +@@ -1019,6 +1019,10 @@ attribute_deprecated int64_t av_stream_get_end_pts(const AVStream *st); + #endif +// Chromium: We use the internal field first_dts vvv +int64_t av_stream_get_first_dts(const AVStream *st); diff --git a/060-ffmpeg-fix-segfault-with-avisynthplus.patch b/060-ffmpeg-fix-segfault-with-avisynthplus.patch index 8a8f9c743565..dd58e840eec1 100644 --- a/060-ffmpeg-fix-segfault-with-avisynthplus.patch +++ b/060-ffmpeg-fix-segfault-with-avisynthplus.patch @@ -1,6 +1,6 @@ --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c -@@ -125,7 +125,7 @@ static av_cold void avisynth_atexit_handler(void); +@@ -141,7 +141,7 @@ static av_cold void avisynth_atexit_handler(void); static av_cold int avisynth_load_library(void) { @@ -4,7 +4,7 @@ # Contributor: DrZaius <lou at fakeoutdoorsman.com> pkgname=ffmpeg-git -pkgver=5.1.r106894.g260d7d5a6c +pkgver=6.1.r110336.g0dceda12e7 pkgrel=1 pkgdesc='Complete solution to record, convert and stream audio and video (git version)' arch=('x86_64') @@ -24,12 +24,16 @@ depends=( libass.so libavc1394 libbluray.so + libbs2b.so libdav1d.so libdrm libfreetype.so + libgl libiec61883 + libjxl.so libmfx libmodplug + libopenmpt.so libpulse librav1e.so libraw1394 @@ -45,6 +49,7 @@ depends=( libvorbisenc.so libvorbis.so libvpx.so + libvulkan.so libwebp libx11 libx264.so @@ -55,6 +60,7 @@ depends=( libxv libxvidcore.so libzimg.so + ocl-icd opencore-amr openjpeg2 opus @@ -74,7 +80,10 @@ makedepends=( ffnvcodec-headers git ladspa + mesa nasm + opencl-headers + vulkan-headers ) optdepends=('avisynthplus: for AviSynthPlus support' 'intel-media-sdk: for Intel Quick Sync Video' @@ -88,8 +97,8 @@ source=('git+https://git.ffmpeg.org/ffmpeg.git' '040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch' '060-ffmpeg-fix-segfault-with-avisynthplus.patch') sha256sums=('SKIP' - '2df82046908015bf26bc1303275cf52ba01fa380029a54ea6415373e389e423c' - '0d6b53940a81ebaf4e6b1a2208a178eb8a824d6a3d8e863bf9c4c7e0060d88ec') + 'd1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9' + 'bf563193f450ece58a93db6840c0db33875df945fa81477b9b02fb209d3bf57a') prepare() { patch -d ffmpeg -Np1 -i "${srcdir}/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch" @@ -123,6 +132,7 @@ build() { --enable-libaom \ --enable-libass \ --enable-libbluray \ + --enable-libbs2b \ --enable-libdav1d \ --enable-libdrm \ --enable-libfreetype \ @@ -130,12 +140,14 @@ build() { --enable-libgsm \ --enable-libiec61883 \ --enable-libjack \ + --enable-libjxl \ --enable-libmfx \ --enable-libmodplug \ --enable-libmp3lame \ --enable-libopencore_amrnb \ --enable-libopencore_amrwb \ --enable-libopenjpeg \ + --enable-libopenmpt \ --enable-libopus \ --enable-libpulse \ --enable-librav1e \ @@ -160,8 +172,11 @@ build() { --enable-libzimg \ --enable-nvdec \ --enable-nvenc \ + --enable-opencl \ + --enable-opengl \ --enable-shared \ - --enable-version3 + --enable-version3 \ + --enable-vulkan make make tools/qt-faststart } |