diff options
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | FFmpeg-devel-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch | 13 | ||||
| -rw-r--r-- | PKGBUILD | 18 |
3 files changed, 29 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = ffmpeg-compat-57 pkgdesc = Compatibility package for ffmpeg to provide versions 57 of libavcodec, libavdevice and libavformat, not anymore provided by the ffmpeg package pkgver = 3.4.2 - pkgrel = 2 + pkgrel = 3 url = http://ffmpeg.org/ arch = i686 arch = x86_64 @@ -39,6 +39,7 @@ pkgbase = ffmpeg-compat-57 depends = v4l-utils depends = xz depends = zlib + depends = libxv depends = libomxil-bellagio depends = libass.so depends = libbluray.so @@ -65,10 +66,12 @@ pkgbase = ffmpeg-compat-57 source = http://ffmpeg.org/releases/ffmpeg-3.4.2.tar.xz source = http://ffmpeg.org/releases/ffmpeg-3.4.2.tar.xz.asc source = fs56089.patch + source = FFmpeg-devel-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8 sha256sums = 2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740 sha256sums = SKIP sha256sums = 0bfcd12d1992903f21c146ae56d9ad89b52818cfb2303197ee905347c25a5427 + sha256sums = 5aeba39dcc8b23502e214310542f45ccc5fbcdb8104e88c9feca515fce1ae404 pkgname = ffmpeg-compat-57 diff --git a/FFmpeg-devel-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch b/FFmpeg-devel-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch new file mode 100644 index 000000000000..65a21ef2520b --- /dev/null +++ b/FFmpeg-devel-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch @@ -0,0 +1,13 @@ +diff --git a/libavutil/mem.h b/libavutil/mem.h +index 55ae573ac9..5fb1a02dd9 100644 +--- a/libavutil/mem.h ++++ b/libavutil/mem.h +@@ -339,7 +339,7 @@ av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size) + * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be + * correctly aligned. + */ +-av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size); ++int av_reallocp_array(void *ptr, size_t nmemb, size_t size); + + /** + * Reallocate the given buffer if it is not large enough, otherwise do nothing. @@ -1,8 +1,8 @@ -# Maintainer: Muflone http://www.muflone.com/contacts/english/ - +# Contributor: Muflone http://www.muflone.com/contacts/english/ +# Maintainer: Matthew Sexton <wsdmatty@gmail.com> pkgname=ffmpeg-compat-57 pkgver=3.4.2 -pkgrel=2 +pkgrel=3 pkgdesc="Compatibility package for ffmpeg to provide versions 57 of libavcodec, libavdevice and libavformat, not anymore provided by the ffmpeg package" arch=('i686' 'x86_64') url="http://ffmpeg.org/" @@ -11,7 +11,7 @@ depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm' 'jack' 'lame' 'libavc1394' 'libiec61883' 'libmodplug' 'libpulse' 'libraw1394' 'libsoxr' 'libssh' 'libtheora' 'libvdpau' 'libwebp' 'libx11' 'libxcb' 'libxml2' 'opencore-amr' 'openjpeg2' 'opus' 'sdl2' - 'speex' 'v4l-utils' 'xz' 'zlib' + 'speex' 'v4l-utils' 'xz' 'zlib' 'libxv' 'libomxil-bellagio' 'libass.so' 'libbluray.so' 'libfreetype.so' 'libva-drm.so' 'libva.so' 'libva-x11.so' 'libvidstab.so' 'libvorbisenc.so' 'libvorbis.so' @@ -21,10 +21,12 @@ provides=('libavcodec.so=57' 'libavdevice.so=57' 'libavfilter.so=6' 'libavformat.so=57' 'libavresample.so=3' 'libavutil.so=55' 'libpostproc.so=54' 'libswresample.so=2' 'libswscale.so=4') source=("http://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc} - "fs56089.patch") + "fs56089.patch" + "FFmpeg-devel-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch") sha256sums=('2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740' 'SKIP' - '0bfcd12d1992903f21c146ae56d9ad89b52818cfb2303197ee905347c25a5427') + '0bfcd12d1992903f21c146ae56d9ad89b52818cfb2303197ee905347c25a5427' + '5aeba39dcc8b23502e214310542f45ccc5fbcdb8104e88c9feca515fce1ae404') validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') prepare() { @@ -33,6 +35,10 @@ prepare() { # https://bugs.archlinux.org/task/56089 # Backport of http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=a606f27f4c610708fa96e35eed7b7537d3d8f712 patch -Np1 -i ../fs56089.patch + + # https://patchwork.ffmpeg.org/patch/11148/ + # Fixes invalid attribute warning during build with gcc9 + patch -Np1 -i ../FFmpeg-devel-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch } build() { |