[arch-commits] Commit in ffmpeg/repos/staging-x86_64 (5 files)
Evangelos Foutras
foutrelis at gemini.archlinux.org
Sun Jan 23 18:06:35 UTC 2022
Date: Sunday, January 23, 2022 @ 18:06:35
Author: foutrelis
Revision: 435003
archrelease: copy trunk to staging-x86_64
Added:
ffmpeg/repos/staging-x86_64/PKGBUILD
(from rev 435002, ffmpeg/trunk/PKGBUILD)
ffmpeg/repos/staging-x86_64/add-av_stream_get_first_dts-for-chromium.patch
(from rev 435002, ffmpeg/trunk/add-av_stream_get_first_dts-for-chromium.patch)
ffmpeg/repos/staging-x86_64/vmaf-model-path.patch
(from rev 435002, ffmpeg/trunk/vmaf-model-path.patch)
Deleted:
ffmpeg/repos/staging-x86_64/PKGBUILD
ffmpeg/repos/staging-x86_64/vmaf-model-path.patch
------------------------------------------------+
PKGBUILD | 383 +++++++++++------------
add-av_stream_get_first_dts-for-chromium.patch | 44 ++
vmaf-model-path.patch | 26 -
3 files changed, 251 insertions(+), 202 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-01-23 18:06:27 UTC (rev 435002)
+++ PKGBUILD 2022-01-23 18:06:35 UTC (rev 435003)
@@ -1,189 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-# Contributor: Paul Mattal <paul at archlinux.org>
-
-pkgname=ffmpeg
-pkgver=5.0
-pkgrel=2
-epoch=2
-pkgdesc='Complete solution to record, convert and stream audio and video'
-arch=(x86_64)
-url=https://ffmpeg.org/
-license=(GPL3)
-depends=(
- alsa-lib
- aom
- bzip2
- fontconfig
- fribidi
- gmp
- gnutls
- gsm
- jack
- lame
- libass.so
- libavc1394
- libbluray.so
- libdav1d.so
- libdrm
- libfreetype.so
- libiec61883
- libmfx
- libmodplug
- libpulse
- librav1e.so
- libraw1394
- librsvg-2.so
- libsoxr
- libssh
- libtheora
- libva.so
- libva-drm.so
- libva-x11.so
- libvdpau
- libvidstab.so
- libvorbisenc.so
- libvorbis.so
- libvpx.so
- libwebp
- libx11
- libx264.so
- libx265.so
- libxcb
- libxext
- libxml2
- libxv
- libxvidcore.so
- libzimg.so
- opencore-amr
- openjpeg2
- opus
- sdl2
- speex
- srt
- svt-av1
- v4l-utils
- vmaf
- xz
- zlib
-)
-makedepends=(
- amf-headers
- avisynthplus
- clang
- ffnvcodec-headers
- git
- ladspa
- nasm
-)
-optdepends=(
- 'avisynthplus: AviSynthPlus support'
- 'intel-media-sdk: Intel QuickSync support'
- 'ladspa: LADSPA filters'
- 'nvidia-utils: Nvidia NVDEC/NVENC support'
-)
-provides=(
- libavcodec.so
- libavdevice.so
- libavfilter.so
- libavformat.so
- libavutil.so
- libpostproc.so
- libswresample.so
- libswscale.so
-)
-_tag=390d6853d0ef408007feb39c0040682c81c02751
-source=(
- git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag}
- vmaf-model-path.patch
-)
-sha256sums=(
- SKIP
- 8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d
-)
-
-pkgver() {
- cd ffmpeg
-
- git describe --tags | sed 's/^n//'
-}
-
-prepare() {
- cd ffmpeg
- git cherry-pick -n 988f2e9eb063db7c1a678729f58aab6eba59a55b # fix nvenc on older gpus
- patch -Np1 -i "${srcdir}"/vmaf-model-path.patch
-}
-
-build() {
- cd ffmpeg
-
- ./configure \
- --prefix=/usr \
- --disable-debug \
- --disable-static \
- --disable-stripping \
- --enable-amf \
- --enable-avisynth \
- --enable-cuda-llvm \
- --enable-lto \
- --enable-fontconfig \
- --enable-gmp \
- --enable-gnutls \
- --enable-gpl \
- --enable-ladspa \
- --enable-libaom \
- --enable-libass \
- --enable-libbluray \
- --enable-libdav1d \
- --enable-libdrm \
- --enable-libfreetype \
- --enable-libfribidi \
- --enable-libgsm \
- --enable-libiec61883 \
- --enable-libjack \
- --enable-libmfx \
- --enable-libmodplug \
- --enable-libmp3lame \
- --enable-libopencore_amrnb \
- --enable-libopencore_amrwb \
- --enable-libopenjpeg \
- --enable-libopus \
- --enable-libpulse \
- --enable-librav1e \
- --enable-librsvg \
- --enable-libsoxr \
- --enable-libspeex \
- --enable-libsrt \
- --enable-libssh \
- --enable-libsvtav1 \
- --enable-libtheora \
- --enable-libv4l2 \
- --enable-libvidstab \
- --enable-libvmaf \
- --enable-libvorbis \
- --enable-libvpx \
- --enable-libwebp \
- --enable-libx264 \
- --enable-libx265 \
- --enable-libxcb \
- --enable-libxml2 \
- --enable-libxvid \
- --enable-libzimg \
- --enable-nvdec \
- --enable-nvenc \
- --enable-shared \
- --enable-version3
-
- make
- make tools/qt-faststart
- make doc/ff{mpeg,play}.1
-}
-
-package() {
- make DESTDIR="${pkgdir}" -C ffmpeg install install-man
- install -Dm 755 ffmpeg/tools/qt-faststart "${pkgdir}"/usr/bin/
-}
-
-# vim: ts=2 sw=2 et:
Copied: ffmpeg/repos/staging-x86_64/PKGBUILD (from rev 435002, ffmpeg/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-01-23 18:06:35 UTC (rev 435003)
@@ -0,0 +1,194 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Paul Mattal <paul at archlinux.org>
+
+pkgname=ffmpeg
+pkgver=5.0
+pkgrel=3
+epoch=2
+pkgdesc='Complete solution to record, convert and stream audio and video'
+arch=(x86_64)
+url=https://ffmpeg.org/
+license=(GPL3)
+depends=(
+ alsa-lib
+ aom
+ bzip2
+ fontconfig
+ fribidi
+ gmp
+ gnutls
+ gsm
+ jack
+ lame
+ libass.so
+ libavc1394
+ libbluray.so
+ libdav1d.so
+ libdrm
+ libfreetype.so
+ libiec61883
+ libmfx
+ libmodplug
+ libpulse
+ librav1e.so
+ libraw1394
+ librsvg-2.so
+ libsoxr
+ libssh
+ libtheora
+ libva.so
+ libva-drm.so
+ libva-x11.so
+ libvdpau
+ libvidstab.so
+ libvorbisenc.so
+ libvorbis.so
+ libvpx.so
+ libwebp
+ libx11
+ libx264.so
+ libx265.so
+ libxcb
+ libxext
+ libxml2
+ libxv
+ libxvidcore.so
+ libzimg.so
+ opencore-amr
+ openjpeg2
+ opus
+ sdl2
+ speex
+ srt
+ svt-av1
+ v4l-utils
+ vmaf
+ xz
+ zlib
+)
+makedepends=(
+ amf-headers
+ avisynthplus
+ clang
+ ffnvcodec-headers
+ git
+ ladspa
+ nasm
+)
+optdepends=(
+ 'avisynthplus: AviSynthPlus support'
+ 'intel-media-sdk: Intel QuickSync support'
+ 'ladspa: LADSPA filters'
+ 'nvidia-utils: Nvidia NVDEC/NVENC support'
+)
+provides=(
+ libavcodec.so
+ libavdevice.so
+ libavfilter.so
+ libavformat.so
+ libavutil.so
+ libpostproc.so
+ libswresample.so
+ libswscale.so
+)
+_tag=390d6853d0ef408007feb39c0040682c81c02751
+source=(
+ git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag}
+ vmaf-model-path.patch
+ add-av_stream_get_first_dts-for-chromium.patch
+)
+sha256sums=(
+ SKIP
+ 8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d
+ 91973c465f01446a999f278f0c2a3763304994dba1ac35de0e4c72f12f39409e
+)
+
+pkgver() {
+ cd ffmpeg
+
+ git describe --tags | sed 's/^n//'
+}
+
+prepare() {
+ cd ffmpeg
+ git cherry-pick -n 988f2e9eb063db7c1a678729f58aab6eba59a55b # fix nvenc on older gpus
+ patch -Np1 -i "${srcdir}"/vmaf-model-path.patch
+
+ # https://crbug.com/1251779
+ patch -Np1 -i "${srcdir}"/add-av_stream_get_first_dts-for-chromium.patch
+}
+
+build() {
+ cd ffmpeg
+
+ ./configure \
+ --prefix=/usr \
+ --disable-debug \
+ --disable-static \
+ --disable-stripping \
+ --enable-amf \
+ --enable-avisynth \
+ --enable-cuda-llvm \
+ --enable-lto \
+ --enable-fontconfig \
+ --enable-gmp \
+ --enable-gnutls \
+ --enable-gpl \
+ --enable-ladspa \
+ --enable-libaom \
+ --enable-libass \
+ --enable-libbluray \
+ --enable-libdav1d \
+ --enable-libdrm \
+ --enable-libfreetype \
+ --enable-libfribidi \
+ --enable-libgsm \
+ --enable-libiec61883 \
+ --enable-libjack \
+ --enable-libmfx \
+ --enable-libmodplug \
+ --enable-libmp3lame \
+ --enable-libopencore_amrnb \
+ --enable-libopencore_amrwb \
+ --enable-libopenjpeg \
+ --enable-libopus \
+ --enable-libpulse \
+ --enable-librav1e \
+ --enable-librsvg \
+ --enable-libsoxr \
+ --enable-libspeex \
+ --enable-libsrt \
+ --enable-libssh \
+ --enable-libsvtav1 \
+ --enable-libtheora \
+ --enable-libv4l2 \
+ --enable-libvidstab \
+ --enable-libvmaf \
+ --enable-libvorbis \
+ --enable-libvpx \
+ --enable-libwebp \
+ --enable-libx264 \
+ --enable-libx265 \
+ --enable-libxcb \
+ --enable-libxml2 \
+ --enable-libxvid \
+ --enable-libzimg \
+ --enable-nvdec \
+ --enable-nvenc \
+ --enable-shared \
+ --enable-version3
+
+ make
+ make tools/qt-faststart
+ make doc/ff{mpeg,play}.1
+}
+
+package() {
+ make DESTDIR="${pkgdir}" -C ffmpeg install install-man
+ install -Dm 755 ffmpeg/tools/qt-faststart "${pkgdir}"/usr/bin/
+}
+
+# vim: ts=2 sw=2 et:
Copied: ffmpeg/repos/staging-x86_64/add-av_stream_get_first_dts-for-chromium.patch (from rev 435002, ffmpeg/trunk/add-av_stream_get_first_dts-for-chromium.patch)
===================================================================
--- add-av_stream_get_first_dts-for-chromium.patch (rev 0)
+++ add-av_stream_get_first_dts-for-chromium.patch 2022-01-23 18:06:35 UTC (rev 435003)
@@ -0,0 +1,44 @@
+From 95aab0fd83619408995720ce53d7a74790580220 Mon Sep 17 00:00:00 2001
+From: "liberato at chromium.org" <liberato at chromium.org>
+Date: Wed, 7 Jul 2021 19:01:22 -0700
+Subject: [PATCH] Add av_stream_get_first_dts for Chromium
+
+[foutrelis: adjust for new FFStream struct replacing AVStreamInternal]
+---
+ libavformat/avformat.h | 4 ++++
+ libavformat/utils.c | 7 +++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/libavformat/avformat.h b/libavformat/avformat.h
+index cd7b0d941c..b4a6dce885 100644
+--- a/libavformat/avformat.h
++++ b/libavformat/avformat.h
+@@ -1010,6 +1010,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
+ */
+ int64_t av_stream_get_end_pts(const AVStream *st);
+
++// Chromium: We use the internal field first_dts vvv
++int64_t av_stream_get_first_dts(const AVStream *st);
++// Chromium: We use the internal field first_dts ^^^
++
+ #define AV_PROGRAM_RUNNING 1
+
+ /**
+diff --git a/libavformat/utils.c b/libavformat/utils.c
+index de7580c32d..0ef0fe530e 100644
+--- a/libavformat/utils.c
++++ b/libavformat/utils.c
+@@ -121,6 +121,13 @@ int64_t av_stream_get_end_pts(const AVStream *st)
+ return AV_NOPTS_VALUE;
+ }
+
++// Chromium: We use the internal field first_dts vvv
++int64_t av_stream_get_first_dts(const AVStream *st)
++{
++ return cffstream(st)->first_dts;
++}
++// Chromium: We use the internal field first_dts ^^^
++
+ struct AVCodecParserContext *av_stream_get_parser(const AVStream *st)
+ {
+ return st->internal->parser;
Deleted: vmaf-model-path.patch
===================================================================
--- vmaf-model-path.patch 2022-01-23 18:06:27 UTC (rev 435002)
+++ vmaf-model-path.patch 2022-01-23 18:06:35 UTC (rev 435003)
@@ -1,13 +0,0 @@
-diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c
-index 249e50c720..9b791e19b1 100644
---- a/libavfilter/vf_libvmaf.c
-+++ b/libavfilter/vf_libvmaf.c
-@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext {
- #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
-
- static const AVOption libvmaf_options[] = {
-- {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
-+ {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
- {"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
- {"log_fmt", "Set the format of the log (xml or json).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
- {"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
Copied: ffmpeg/repos/staging-x86_64/vmaf-model-path.patch (from rev 435002, ffmpeg/trunk/vmaf-model-path.patch)
===================================================================
--- vmaf-model-path.patch (rev 0)
+++ vmaf-model-path.patch 2022-01-23 18:06:35 UTC (rev 435003)
@@ -0,0 +1,13 @@
+diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c
+index 249e50c720..9b791e19b1 100644
+--- a/libavfilter/vf_libvmaf.c
++++ b/libavfilter/vf_libvmaf.c
+@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext {
+ #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
+
+ static const AVOption libvmaf_options[] = {
+- {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
++ {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
+ {"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+ {"log_fmt", "Set the format of the log (xml or json).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+ {"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
More information about the arch-commits
mailing list