summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Demers2020-05-26 19:45:46 -0400
committerAlexandre Demers2020-05-26 19:45:46 -0400
commit85508ee919ca08ff32742f0a52b164db7c8317bf (patch)
tree863d645488023388e1f994143eb79b016ad4edad
parent196970d78ea55d9e194a156539b1ecdee4b97be7 (diff)
downloadaur-85508ee919ca08ff32742f0a52b164db7c8317bf.tar.gz
Update to 4.2.3
Keep binary files. This package is not a library only, so it should have kept these files from the beginning. Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD17
2 files changed, 16 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8ec11ce7d0d..8909292c5ce 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.2
- pkgrel = 7
+ pkgver = 4.2.3
+ pkgrel = 1
epoch = 1
url = http://ffmpeg.org/
arch = x86_64
@@ -67,7 +67,7 @@ pkgbase = lib32-ffmpeg
provides = libpostproc.so
provides = libswresample.so
provides = libswscale.so
- source = git+https://git.ffmpeg.org/ffmpeg.git#tag=n4.2.2
+ source = git+https://git.ffmpeg.org/ffmpeg.git#tag=n4.2.3
source = vmaf-model-path.patch
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index a75bb9d2003..08cbef62d3d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
_pkgbasename=ffmpeg
pkgname=lib32-$_pkgbasename
-pkgver=4.2.2
-pkgrel=7
+pkgver=4.2.3
+pkgrel=1
epoch=1
pkgdesc="Complete solution to record, convert and stream audio and video (32 bit)"
arch=('x86_64')
@@ -103,7 +103,7 @@ prepare() {
# Patching if needed
git cherry-pick -n dc0806dd25882f41f6085c8356712f95fded56c7
- patch -Np1 -i "${srcdir}/vmaf-model-path.patch"
+ patch -Np1 -i "${srcdir}"/vmaf-model-path.patch
}
build() {
@@ -119,6 +119,7 @@ build() {
--disable-debug \
--disable-static \
--disable-stripping \
+ --enable-avisynth \
--enable-fontconfig \
--enable-gmp \
--enable-gnutls \
@@ -172,5 +173,13 @@ package() {
cd ${_pkgbasename}
make DESTDIR="${pkgdir}" install
- rm -r "$pkgdir"/usr/{include,share,bin}
+
+ # Keep files in bin since this is not a library only package.
+ # Use the same naming scheme as proposed in Arch's wiki: https://wiki.archlinux.org/index.php/32-bit_package_guidelines
+ # which is "--program-suffix="-32" with Autoconf
+ for i in "${pkgdir}/usr/bin/"*; do
+ mv "$i" "$i"-32
+ done
+
+ rm -r "${pkgdir}"/usr/{include,share}
}