summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Schneider2019-03-08 23:51:40 +0100
committerThomas Schneider2019-03-08 23:52:27 +0100
commitff3b296784d02d7bbf044d0b4b54b1ae33eb3613 (patch)
tree7a57e88d9838591891b3e22513489ea2ac576eec
parent2bfd920065635fbf29fabf21d7fe2667a6b6a529 (diff)
downloadaur-ff3b296784d02d7bbf044d0b4b54b1ae33eb3613.tar.gz
added conflicts array so that ffmpeg gets replaced
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3e163a831fdf..c1b080725265 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -70,6 +70,7 @@ pkgbase = ffmpeg-svt
provides = libpostproc.so
provides = libswresample.so
provides = libswscale.so
+ conflicts = ffmpeg
replaces = ffmpeg
source = git+https://git.ffmpeg.org/ffmpeg.git#tag=n4.1.1
source = 0001-Add-ability-for-ffmpeg-to-run-svt-av1-vp9.patch
diff --git a/PKGBUILD b/PKGBUILD
index ea04f8280b0e..9bba719eed48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -83,6 +83,7 @@ provides=(
libswscale.so
)
replaces=('ffmpeg')
+conflicts=('ffmpeg')
source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver}
0001-Add-ability-for-ffmpeg-to-run-svt-av1-vp9.patch)
sha256sums=('SKIP'