summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-10-17 18:57:13 +0000
committerDaniel Bermond2018-10-17 18:57:13 +0000
commit0468fa4b64ff48d2c63c636b05d3c0305313cf6f (patch)
tree2e10e413bdab2032d57cbb1759cffab192230a06
parent73b0480d8af2ec847286dda111ccd9a49975774d (diff)
downloadaur-0468fa4b64ff48d2c63c636b05d3c0305313cf6f.tar.gz
Remove makepkg internal function. Update provides and conflicts.
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD11
2 files changed, 6 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 969b601c77e..2fb7d3fef8c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = x264-git
pkgdesc = Open Source H264/AVC video encoder (git version)
- pkgver = 157.r2932.g303c484e
+ pkgver = 157.r2935.g545de2ff
pkgrel = 1
url = https://www.videolan.org/developers/x264.html
arch = i686
@@ -23,9 +23,6 @@ pkgbase = x264-git
conflicts = libx264
conflicts = libx264-10bit
conflicts = libx264-all
- conflicts = libx264-git
- conflicts = libx264-10bit-git
- conflicts = libx264-all-git
replaces = libx264-git
replaces = libx264-10bit-git
replaces = libx264-all-git
diff --git a/PKGBUILD b/PKGBUILD
index 6aa5842a1b8..1fca72ac8a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
# 10-bit, please see, e.g.: https://gist.github.com/l4n9th4n9/4459997
pkgname=x264-git
-pkgver=157.r2932.g303c484e
+pkgver=157.r2935.g545de2ff
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc='Open Source H264/AVC video encoder (git version)'
@@ -23,8 +23,7 @@ depends=('libavcodec.so' 'libavformat.so' 'libavutil.so' 'liblsmash.so'
'libswscale.so')
makedepends=('git' 'nasm' 'ffmpeg' 'l-smash')
provides=('x264' 'libx264' 'libx264-git' 'libx264.so')
-conflicts=('x264' 'libx264' 'libx264-10bit' 'libx264-all'
- 'libx264-git' 'libx264-10bit-git' 'libx264-all-git')
+conflicts=('x264' 'libx264' 'libx264-10bit' 'libx264-all')
replaces=('libx264-git' 'libx264-10bit-git' 'libx264-all-git')
source=("$pkgname"::'git+https://git.videolan.org/git/x264.git')
sha256sums=('SKIP')
@@ -46,7 +45,7 @@ pkgver() {
build() {
mkdir -p "$pkgname"/build-{8,10}bit
- msg2 'Building for 8-bit...'
+ printf '%s\n' ' -> Building for 8-bit...'
cd "${pkgname}/build-8bit"
../configure \
--prefix='/usr' \
@@ -57,7 +56,7 @@ build() {
--disable-gpac
make
- msg2 'Building for 10-bit...'
+ printf '%s\n' ' -> Building for 10-bit...'
cd ../build-10bit
../configure \
--prefix='/usr' \
@@ -78,7 +77,7 @@ package() {
for _depth in 10 8
do
- msg2 "Installing for ${_depth}-bit..."
+ printf '%s\n' " -> Installing for ${_depth}-bit..."
make -C "build-${_depth}bit" DESTDIR="$pkgdir" install-cli install-lib-shared
if [ "$_depth" -eq '10' ]