Date: Monday, February 11, 2019 @ 08:13:00 Author: alucryd Revision: 345959
archrelease: copy trunk to extra-x86_64 Added: ffmpeg/repos/extra-x86_64/PKGBUILD (from rev 345958, ffmpeg/trunk/PKGBUILD) Deleted: ffmpeg/repos/extra-x86_64/PKGBUILD ffmpeg/repos/extra-x86_64/fs56089.patch ---------------+ PKGBUILD | 288 ++++++++++++++++++++++++++++---------------------------- fs56089.patch | 84 ---------------- 2 files changed, 144 insertions(+), 228 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-02-11 08:12:51 UTC (rev 345958) +++ PKGBUILD 2019-02-11 08:13:00 UTC (rev 345959) @@ -1,144 +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.1 -pkgrel=3 -epoch=1 -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 - libdrm - libfreetype.so - libiec61883 - 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 - v4l-utils - xz - zlib -) -makedepends=( - ffnvcodec-headers - git - ladspa - nasm -) -optdepends=('ladspa: LADSPA filters') -provides=( - libavcodec.so - libavdevice.so - libavfilter.so - libavformat.so - libavutil.so - libpostproc.so - libswresample.so - libswscale.so -) -source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver}) -sha256sums=(SKIP) - -build() { - cd ffmpeg - - ./configure \ - --prefix='/usr' \ - --disable-debug \ - --disable-static \ - --disable-stripping \ - --enable-fontconfig \ - --enable-gmp \ - --enable-gnutls \ - --enable-gpl \ - --enable-ladspa \ - --enable-libaom \ - --enable-libass \ - --enable-libbluray \ - --enable-libdrm \ - --enable-libfreetype \ - --enable-libfribidi \ - --enable-libgsm \ - --enable-libiec61883 \ - --enable-libjack \ - --enable-libmodplug \ - --enable-libmp3lame \ - --enable-libopencore_amrnb \ - --enable-libopencore_amrwb \ - --enable-libopenjpeg \ - --enable-libopus \ - --enable-libpulse \ - --enable-libsoxr \ - --enable-libspeex \ - --enable-libssh \ - --enable-libtheora \ - --enable-libv4l2 \ - --enable-libvidstab \ - --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 345958, ffmpeg/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-02-11 08:13:00 UTC (rev 345959) @@ -0,0 +1,144 @@ +# 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.1.1 +pkgrel=1 +epoch=1 +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 + libdrm + libfreetype.so + libiec61883 + 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 + v4l-utils + xz + zlib +) +makedepends=( + ffnvcodec-headers + git + ladspa + nasm +) +optdepends=('ladspa: LADSPA filters') +provides=( + libavcodec.so + libavdevice.so + libavfilter.so + libavformat.so + libavutil.so + libpostproc.so + libswresample.so + libswscale.so +) +source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver}) +sha256sums=('SKIP') + +build() { + cd ffmpeg + + ./configure \ + --prefix='/usr' \ + --disable-debug \ + --disable-static \ + --disable-stripping \ + --enable-fontconfig \ + --enable-gmp \ + --enable-gnutls \ + --enable-gpl \ + --enable-ladspa \ + --enable-libaom \ + --enable-libass \ + --enable-libbluray \ + --enable-libdrm \ + --enable-libfreetype \ + --enable-libfribidi \ + --enable-libgsm \ + --enable-libiec61883 \ + --enable-libjack \ + --enable-libmodplug \ + --enable-libmp3lame \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libopenjpeg \ + --enable-libopus \ + --enable-libpulse \ + --enable-libsoxr \ + --enable-libspeex \ + --enable-libssh \ + --enable-libtheora \ + --enable-libv4l2 \ + --enable-libvidstab \ + --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: fs56089.patch =================================================================== --- fs56089.patch 2019-02-11 08:12:51 UTC (rev 345958) +++ fs56089.patch 2019-02-11 08:13:00 UTC (rev 345959) @@ -1,84 +0,0 @@ -diff -rupN ffmpeg-3.4.orig/libavformat/aviobuf.c ffmpeg-3.4/libavformat/aviobuf.c ---- ffmpeg-3.4.orig/libavformat/aviobuf.c 2017-11-02 14:57:16.078834563 +0100 -+++ ffmpeg-3.4/libavformat/aviobuf.c 2017-11-02 15:02:52.549816990 +0100 -@@ -531,6 +531,24 @@ void avio_write_marker(AVIOContext *s, i - s->last_time = time; - } - -+static int read_packet_wrapper(AVIOContext *s, uint8_t *buf, int size) -+{ -+ int ret; -+ -+ if (!s->read_packet) -+ return AVERROR_EOF; -+ ret = s->read_packet(s->opaque, buf, size); -+#if FF_API_OLD_AVIO_EOF_0 -+ if (!ret && !s->max_packet_size) { -+ av_log(NULL, AV_LOG_WARNING, "Invalid return value 0 for stream protocol\n"); -+ ret = AVERROR_EOF; -+ } -+#else -+ av_assert2(ret || s->max_packet_size); -+#endif -+ return ret; -+} -+ - /* Input stream */ - - static void fill_buffer(AVIOContext *s) -@@ -569,10 +587,7 @@ static void fill_buffer(AVIOContext *s) - len = s->orig_buffer_size; - } - -- if (s->read_packet) -- len = s->read_packet(s->opaque, dst, len); -- else -- len = 0; -+ len = read_packet_wrapper(s, dst, len); - if (len <= 0) { - /* do not modify buffer if EOF reached so that a seek back can - be done without rereading data */ -@@ -644,8 +659,7 @@ int avio_read(AVIOContext *s, unsigned c - if (len == 0 || s->write_flag) { - if((s->direct || size > s->buffer_size) && !s->update_checksum) { - // bypass the buffer and read data directly into buf -- if(s->read_packet) -- len = s->read_packet(s->opaque, buf, size); -+ len = read_packet_wrapper(s, buf, size); - - if (len <= 0) { - /* do not modify buffer if EOF reached so that a seek back can -@@ -711,7 +725,7 @@ int avio_read_partial(AVIOContext *s, un - return -1; - - if (s->read_packet && s->write_flag) { -- len = s->read_packet(s->opaque, buf, size); -+ len = read_packet_wrapper(s, buf, size); - if (len > 0) - s->pos += len; - return len; -diff -rupN ffmpeg-3.4.orig/libavformat/avio.h ffmpeg-3.4/libavformat/avio.h ---- ffmpeg-3.4.orig/libavformat/avio.h 2017-11-02 14:57:16.078834563 +0100 -+++ ffmpeg-3.4/libavformat/avio.h 2017-11-02 14:59:15.602300896 +0100 -@@ -452,6 +452,8 @@ void avio_free_directory_entry(AVIODirEn - * @param write_flag Set to 1 if the buffer should be writable, 0 otherwise. - * @param opaque An opaque pointer to user-specific data. - * @param read_packet A function for refilling the buffer, may be NULL. -+ * For stream protocols, must never return 0 but rather -+ * a proper AVERROR code. - * @param write_packet A function for writing the buffer contents, may be NULL. - * The function may not change the input buffers content. - * @param seek A function for seeking to specified byte position, may be NULL. -diff -rupN ffmpeg-3.4.orig/libavformat/version.h ffmpeg-3.4/libavformat/version.h ---- ffmpeg-3.4.orig/libavformat/version.h 2017-11-02 14:57:16.082167807 +0100 -+++ ffmpeg-3.4/libavformat/version.h 2017-11-02 15:04:01.704627612 +0100 -@@ -97,6 +97,9 @@ - #ifndef FF_API_OLD_ROTATE_API - #define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 58) - #endif -+#ifndef FF_API_OLD_AVIO_EOF_0 -+#define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 58) -+#endif - - - #ifndef FF_API_R_FRAME_RATE