summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Demers2018-04-16 14:58:20 -0400
committerAlexandre Demers2018-04-16 14:58:20 -0400
commit784a96798e4ba0cd0baa7905bdddcacc5e5efded (patch)
tree1b47a256975c058b19be6e144845a738f24f08be
parent24db8642f1ba5f2002f9a460287084091bae1bff (diff)
downloadaur-784a96798e4ba0cd0baa7905bdddcacc5e5efded.tar.gz
Adding missing patch used in native package
Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>
-rw-r--r--.SRCINFO29
-rw-r--r--PKGBUILD41
-rw-r--r--fs56089.patch14
3 files changed, 55 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e86eb1795af..2d87a7df069 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = lib32-ffmpeg
pkgdesc = Complete solution to record, convert and stream audio and video (32 bit)
pkgver = 3.4.2
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = http://ffmpeg.org/
arch = x86_64
@@ -13,33 +13,38 @@ pkgbase = lib32-ffmpeg
depends = lib32-alsa-lib
depends = lib32-fontconfig
depends = lib32-fribidi
+ depends = lib32-gmp
depends = lib32-gnutls
depends = lib32-gsm
+ depends = lib32-jack
depends = lib32-lame
- depends = lib32-libass
depends = lib32-libavc1394
- depends = lib32-libbluray
depends = lib32-libiec61883
depends = lib32-libmodplug
depends = lib32-libpulse
- depends = lib32-jack
+ depends = lib32-libraw1394
depends = lib32-libtheora
depends = lib32-libva
depends = lib32-libvdpau
depends = lib32-libwebp
+ depends = lib32-libxml2
depends = lib32-opencore-amr
- depends = lib32-openjpeg
depends = lib32-openjpeg2
depends = lib32-opus
depends = lib32-sdl2
depends = lib32-speex
depends = lib32-v4l-utils
- depends = lib32-libxv
- depends = lib32-xvidcore
+ depends = lib32-xz
depends = lib32-zlib
+ depends = lib32-libomxil-bellagio
+ depends = lib32-libass
+ depends = lib32-libbluray
+ depends = lib32-freetype2
depends = lib32-libvorbis
- depends = lib32-libx264
depends = lib32-libvpx
+ depends = lib32-libx264
+ depends = lib32-xvidcore
+ depends = lib32-libxv
optdepends = lib32-ladspa: LADSPA filters
provides = libavcodec.so
provides = libavdevice.so
@@ -50,11 +55,13 @@ pkgbase = lib32-ffmpeg
provides = libpostproc.so
provides = libswresample.so
provides = libswscale.so
- source = http://ffmpeg.org/releases/ffmpeg-3.4.2.tar.bz2
- source = http://ffmpeg.org/releases/ffmpeg-3.4.2.tar.bz2.asc
+ 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
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
- sha256sums = eb0370bf223809b9ebb359fed5318f826ac038ce77933b3afd55ab1a0a21785a
+ sha256sums = 2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740
sha256sums = SKIP
+ sha256sums = 7fdfacfe805b7f2c2c38de45c94772e49eca54fbb71918f74cd1226cfff8e9d2
pkgname = lib32-ffmpeg
diff --git a/PKGBUILD b/PKGBUILD
index ceeef41bf38..cfddb540eee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
_pkgbasename=ffmpeg
pkgname=lib32-$_pkgbasename
pkgver=3.4.2
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc="Complete solution to record, convert and stream audio and video (32 bit)"
arch=('x86_64')
@@ -17,33 +17,39 @@ depends=("$_pkgbasename"
'lib32-alsa-lib'
'lib32-fontconfig'
'lib32-fribidi'
+ 'lib32-gmp'
'lib32-gnutls'
'lib32-gsm'
+ 'lib32-jack'
'lib32-lame'
- 'lib32-libass'
'lib32-libavc1394'
- 'lib32-libbluray'
'lib32-libiec61883'
'lib32-libmodplug'
'lib32-libpulse'
- 'lib32-jack'
+ 'lib32-libraw1394'
'lib32-libtheora'
'lib32-libva'
'lib32-libvdpau'
'lib32-libwebp'
+ 'lib32-libxml2'
'lib32-opencore-amr'
- 'lib32-openjpeg'
'lib32-openjpeg2'
'lib32-opus'
'lib32-sdl2'
'lib32-speex'
'lib32-v4l-utils'
- 'lib32-libxv'
- 'lib32-xvidcore'
+ 'lib32-xz'
'lib32-zlib'
+ 'lib32-libomxil-bellagio'
+ 'lib32-libass'
+ 'lib32-libbluray'
+ 'lib32-freetype2'
'lib32-libvorbis'
- 'lib32-libx264'
'lib32-libvpx'
+ 'lib32-libx264'
+# 'lib32-x265'
+ 'lib32-xvidcore'
+ 'lib32-libxv'
)
makedepends=('lib32-ladspa' 'lib32-libvdpau' 'yasm')
optdepends=('lib32-ladspa: LADSPA filters')
@@ -53,14 +59,24 @@ provides=(
'libswscale.so'
)
source=(
- "http://ffmpeg.org/releases/$_pkgbasename-$pkgver.tar.bz2"{,.asc}
+ "http://ffmpeg.org/releases/$_pkgbasename-$pkgver.tar.xz"{,.asc}
+ 'fs56089.patch'
)
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
sha256sums=(
- 'eb0370bf223809b9ebb359fed5318f826ac038ce77933b3afd55ab1a0a21785a'
+ '2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740'
'SKIP'
+ '7fdfacfe805b7f2c2c38de45c94772e49eca54fbb71918f74cd1226cfff8e9d2'
)
+prepare() {
+ cd ${_pkgbasename}-${pkgver}
+
+ # https://bugs.archlinux.org/task/56089
+ # Backport of http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=a606f27f4c610708fa96e35eed7b7537d3d8f712
+ patch -Np1 -i ../fs56089.patch
+}
+
build() {
cd ${_pkgbasename}-${pkgver}
@@ -101,13 +117,16 @@ build() {
--enable-libwebp \
--enable-libx264 \
--enable-libxcb \
+ --enable-libxml2 \
--enable-libxvid \
--enable-shared \
- --enable-version3
+ --enable-version3 \
+ --enable-omx
# --enable-libx265 \
# --enable-libssh \
# --enable-libsoxr \
+# --enable-libx265 \
# --enable-libvidstab \
make
diff --git a/fs56089.patch b/fs56089.patch
index 6aca38f9f96..a0773726027 100644
--- a/fs56089.patch
+++ b/fs56089.patch
@@ -4,7 +4,7 @@ diff -rupN ffmpeg-3.4.orig/libavformat/aviobuf.c ffmpeg-3.4/libavformat/aviobuf.
@@ -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;
@@ -24,12 +24,12 @@ diff -rupN ffmpeg-3.4.orig/libavformat/aviobuf.c ffmpeg-3.4/libavformat/aviobuf.
+}
+
/* 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
@@ -45,12 +45,12 @@ diff -rupN ffmpeg-3.4.orig/libavformat/aviobuf.c ffmpeg-3.4/libavformat/aviobuf.
- 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);
@@ -79,6 +79,6 @@ diff -rupN ffmpeg-3.4.orig/libavformat/version.h ffmpeg-3.4/libavformat/version.
+#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