summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-10-17 18:56:45 +0000
committerDaniel Bermond2018-10-17 18:56:45 +0000
commit6e59bacb94b1187fa1c86925969e1b758e957032 (patch)
tree9c4b45c78be918eab3c6440845677c7e7f51b9f9
parent7639af6d0234e7c984c9a6c6ed2ce764a5b7d259 (diff)
downloadaur-6e59bacb94b1187fa1c86925969e1b758e957032.tar.gz
Remove makepkg internal function. Update provides and conflicts.
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD11
2 files changed, 6 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 649d73f7de5b..bb54d8d5f172 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = x264-noffmpeg
pkgdesc = Open Source H264/AVC video encoder (no ffmpeg dependency)
pkgver = 155.r2917.g0a84d986
- pkgrel = 1
+ pkgrel = 2
url = https://www.videolan.org/developers/x264.html
arch = i686
arch = x86_64
@@ -14,14 +14,9 @@ pkgbase = x264-noffmpeg
provides = libx264
provides = libx264.so
conflicts = x264
- conflicts = x264-git
- conflicts = x264-noffmpeg-git
conflicts = libx264
conflicts = libx264-10bit
conflicts = libx264-all
- conflicts = libx264-git
- conflicts = libx264-10bit-git
- conflicts = libx264-all-git
source = x264-noffmpeg::git+https://git.videolan.org/git/x264.git#commit=0a84d986e7020f8344f00752e3600b9769cc1e85
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index cec8c532f9e4..b35aa599fccd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ _commit='0a84d986e7020f8344f00752e3600b9769cc1e85'
pkgname=x264-noffmpeg
pkgver=155.r2917.g0a84d986
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
pkgdesc='Open Source H264/AVC video encoder (no ffmpeg dependency)'
url='https://www.videolan.org/developers/x264.html'
@@ -20,8 +20,7 @@ license=('GPL')
depends=('liblsmash.so')
makedepends=('git' 'nasm' 'l-smash')
provides=('x264' 'libx264' 'libx264.so')
-conflicts=('x264' 'x264-git' 'x264-noffmpeg-git' 'libx264' 'libx264-10bit'
- 'libx264-all' 'libx264-git' 'libx264-10bit-git' 'libx264-all-git')
+conflicts=('x264' 'libx264' 'libx264-10bit' 'libx264-all')
source=("$pkgname"::"git+https://git.videolan.org/git/x264.git#commit=${_commit}")
sha256sums=('SKIP')
@@ -42,7 +41,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' \
@@ -56,7 +55,7 @@ build() {
--disable-gpac
make
- msg2 'Building for 10-bit...'
+ printf '%s\n' ' -> Building for 10-bit...'
cd ../build-10bit
../configure \
--prefix='/usr' \
@@ -80,7 +79,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' ]