summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Widawsky2019-09-08 18:23:05 -0700
committerBen Widawsky2019-09-08 18:23:05 -0700
commit8405108a035c9d895040a643f3f4faaac3235c0c (patch)
treeb3f801c422c5054477d890576c7455fe532bc166
parent73fa6539cfbe1e5265b15745d6f0319a52da9452 (diff)
downloadaur-8405108a035c9d895040a643f3f4faaac3235c0c.tar.gz
Update to 4.2.1
Merge some minor changes from upstream while here
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD9
2 files changed, 10 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 279c0b83c235..3eeee9ba42d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ffmpeg-libfdk_aac
pkgdesc = Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)
- pkgver = 4.2
+ pkgver = 4.2.1
pkgrel = 1
epoch = 1
url = https://ffmpeg.org/
@@ -70,9 +70,9 @@ pkgbase = ffmpeg-libfdk_aac
provides = libpostproc.so
provides = libswresample.so
provides = libswscale.so
- provides = ffmpeg=4.2
+ provides = ffmpeg=4.2.1
conflicts = ffmpeg
- source = git+https://git.ffmpeg.org/ffmpeg.git#tag=n4.2
+ source = git+https://git.ffmpeg.org/ffmpeg.git#tag=cbb3c9497549f8856d8cd37ac63af1406a784e58
sha256sums = SKIP
pkgname = ffmpeg-libfdk_aac
diff --git a/PKGBUILD b/PKGBUILD
index dafce651e89c..e76a89c1f982 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
_name=ffmpeg
pkgname=ffmpeg-libfdk_aac
-pkgver=4.2
+pkgver=4.2.1
pkgrel=1
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)'
@@ -86,8 +86,13 @@ provides=(
"ffmpeg=$pkgver"
)
conflicts=("$_name")
-source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver})
+source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=cbb3c9497549f8856d8cd37ac63af1406a784e58)
sha256sums=('SKIP')
+pkgver() {
+ cd ffmpeg
+
+ git describe --tags | sed 's/^n//'
+}
build() {
cd ffmpeg