Date: Tuesday, July 14, 2020 @ 21:59:01 Author: foutrelis Revision: 391920
archrelease: copy trunk to extra-x86_64 Added: ffmpeg/repos/extra-x86_64/PKGBUILD (from rev 391919, ffmpeg/trunk/PKGBUILD) ffmpeg/repos/extra-x86_64/vmaf-model-path.patch (from rev 391919, ffmpeg/trunk/vmaf-model-path.patch) Deleted: ffmpeg/repos/extra-x86_64/PKGBUILD ffmpeg/repos/extra-x86_64/vmaf-model-path.patch -----------------------+ PKGBUILD | 362 +++++++++++++++++++++++------------------------- vmaf-model-path.patch | 26 +-- 2 files changed, 193 insertions(+), 195 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-07-14 21:58:57 UTC (rev 391919) +++ PKGBUILD 2020-07-14 21:59:01 UTC (rev 391920) @@ -1,182 +0,0 @@ -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Ionut Biru <ib...@archlinux.org> -# Contributor: Tom Newsom <jeeps...@gmx.co.uk> -# Contributor: Paul Mattal <p...@archlinux.org> - -pkgname=ffmpeg -pkgver=4.2.3 -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 - libomxil-bellagio - libpulse - libraw1394 - 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 - opencore-amr - openjpeg2 - opus - sdl2 - speex - srt - v4l-utils - vmaf - xz - zlib -) -makedepends=( - avisynthplus - 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=d3b963cc41824a3c5b2758ac896fb23e20a87875 -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 - - # backport avisynthplus support - git show 6d8cddd1c67758636843f6a08295b3896c2e9ef8 -- libavformat/avisynth.c | git apply - - git show 56f59246293de417d27ea7e27cb9a7727ee579fb -- libavformat/avisynth.c | git apply - - - patch -Np1 -i "${srcdir}"/vmaf-model-path.patch -} - -build() { - cd ffmpeg - - ./configure \ - --prefix=/usr \ - --disable-debug \ - --disable-static \ - --disable-stripping \ - --enable-avisynth \ - --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-libsoxr \ - --enable-libspeex \ - --enable-libsrt \ - --enable-libssh \ - --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-nvdec \ - --enable-nvenc \ - --enable-omx \ - --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/extra-x86_64/PKGBUILD (from rev 391919, ffmpeg/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-07-14 21:59:01 UTC (rev 391920) @@ -0,0 +1,180 @@ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> +# Contributor: Paul Mattal <p...@archlinux.org> + +pkgname=ffmpeg +pkgver=4.3.1 +pkgrel=1 +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 + libomxil-bellagio + libpulse + librav1e.so + libraw1394 + 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 + opencore-amr + openjpeg2 + opus + sdl2 + speex + srt + v4l-utils + vmaf + xz + zlib +) +makedepends=( + avisynthplus + 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=6b6b9e593dd4d3aaf75f48d40a13ef03bdef9fdb +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 + + patch -Np1 -i "${srcdir}"/vmaf-model-path.patch +} + +build() { + cd ffmpeg + + ./configure \ + --prefix=/usr \ + --disable-debug \ + --disable-static \ + --disable-stripping \ + --enable-avisynth \ + --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-libsoxr \ + --enable-libspeex \ + --enable-libsrt \ + --enable-libssh \ + --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-nvdec \ + --enable-nvenc \ + --enable-omx \ + --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: Deleted: vmaf-model-path.patch =================================================================== --- vmaf-model-path.patch 2020-07-14 21:58:57 UTC (rev 391919) +++ vmaf-model-path.patch 2020-07-14 21:59:01 UTC (rev 391920) @@ -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/extra-x86_64/vmaf-model-path.patch (from rev 391919, ffmpeg/trunk/vmaf-model-path.patch) =================================================================== --- vmaf-model-path.patch (rev 0) +++ vmaf-model-path.patch 2020-07-14 21:59:01 UTC (rev 391920) @@ -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},