summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Demers2020-05-27 13:02:59 -0400
committerAlexandre Demers2020-05-27 13:02:59 -0400
commit1d6fd3d677b6db6d31af12908c41cfd5e88e4676 (patch)
tree76fcbea99c67e51e1bebc783abcdda3452964853
parent85508ee919ca08ff32742f0a52b164db7c8317bf (diff)
downloadaur-1d6fd3d677b6db6d31af12908c41cfd5e88e4676.tar.gz
fix start time for MP3 files
Mirror what was added to native package. And removed a left over cherry-pick. Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD19
2 files changed, 12 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8909292c5ce..a237a9f623f 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 = 4.2.3
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = http://ffmpeg.org/
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 08cbef62d3d..559d88932b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
_pkgbasename=ffmpeg
pkgname=lib32-$_pkgbasename
pkgver=4.2.3
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc="Complete solution to record, convert and stream audio and video (32 bit)"
arch=('x86_64')
@@ -65,18 +65,18 @@ depends=(
'lib32-vmaf'
'lib32-xz'
'lib32-zlib'
- )
+)
makedepends=(
'ffnvcodec-headers'
'git'
'lib32-ladspa'
'yasm'
- )
+)
optdepends=(
# 'intel-media-sdk: Intel QuickSync support'
'lib32-ladspa: LADSPA filters'
'lib32-nvidia-utils: Nvidia NVDEC/NVENC support'
- )
+)
provides=(
'libavcodec.so'
'libavdevice.so'
@@ -86,22 +86,25 @@ provides=(
'libpostproc.so'
'libswresample.so'
'libswscale.so'
- )
+)
source=(
"git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver}"
"vmaf-model-path.patch"
- )
+)
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
sha256sums=(
'SKIP'
'8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d'
- )
+)
prepare() {
cd ${_pkgbasename}
# Patching if needed
- git cherry-pick -n dc0806dd25882f41f6085c8356712f95fded56c7
+
+ # lavf/mp3dec: don't adjust start time; packets are not adjusted
+ # https://crbug.com/1062037
+ git cherry-pick -n 460132c9980f8a1f501a1f69477bca49e1641233
patch -Np1 -i "${srcdir}"/vmaf-model-path.patch
}