summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDet2016-01-20 06:19:40 +0000
committerDet2016-01-20 06:19:40 +0000
commit705aeddabada94aeae753c200d5a1faced409142 (patch)
treed42afba87ea33ffa3b3edc5a2c895a2f297f987c
parent4a7ad36ff4ed48e81903637a727624cfb8850dac (diff)
downloadaur-705aeddabada94aeae753c200d5a1faced409142.tar.gz
Fix .SRCINFO
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD10
2 files changed, 15 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ef87101ad5c..5e3c936cfbd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,23 +12,18 @@ pkgbase = x264-git
makedepends = ffmpeg
makedepends = l-smash
depends = glibc
- provides = x264
- provides = libx264
- conflicts = x264
- conflicts = libx264
source = git://git.videolan.org/x264.git
md5sums = SKIP
pkgname = x264-git
pkgdesc = CLI tools for encoding H264/AVC video streams (Git)
depends = ffmpeg
- depends = liblsmash.so
+ depends = l-smash
provides = x264-10bit
provides = x264
conflicts = x264-10bit
conflicts = x264
replaces = x264-10bit
- replaces = x264
pkgname = libx264-git
pkgdesc = Library for encoding H264/AVC video streams (Git)
@@ -38,5 +33,14 @@ pkgname = libx264-git
conflicts = x264-dev
conflicts = libx264
replaces = x264-dev
- replaces = libx264
+
+pkgname = libx264-10bit-git
+ pkgdesc = Library for encoding H264/AVC video streams - 10bit-depth (Git)
+ provides = libx264.so
+ provides = libx264
+ provides = x264-dev
+ provides = libx264-10bit
+ conflicts = libx264
+ conflicts = x264-dev
+ conflicts = libx264-10bit
diff --git a/PKGBUILD b/PKGBUILD
index f8b33dcdb26..284b47f0db7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
# Build 10-bit x264 instead of 8-bit? (Better quality, but slower.)
# For comparison, see, e.g.: https://gist.github.com/l4n9th4n9/4459997
-_10bit=0 # "1" to enable. This will be auto-detected afterwards.
+_10bit=0 # "1" to enable. (This will be auto-detected afterwards.)
# To revert, uninstall 'libx264-10bit-git', or use:
@@ -22,8 +22,6 @@ url="http://www.videolan.org/developers/x264.html"
license=('GPL')
depends=('glibc')
makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
-conflicts=('x264' 'libx264')
-provides=('x264' 'libx264')
source=('git://git.videolan.org/x264.git')
md5sums=('SKIP')
@@ -72,10 +70,10 @@ build() {
package_x264-git() {
pkgdesc='CLI tools for encoding H264/AVC video streams (Git)'
- depends=('ffmpeg' 'liblsmash.so')
+ depends=('ffmpeg' 'l-smash')
provides=('x264-10bit' 'x264')
conflicts=('x264-10bit' 'x264')
- replaces=('x264-10bit' 'x264')
+ replaces=('x264-10bit')
make -C $_gitname DESTDIR="$pkgdir" install-cli
install -Dm755 $_gitname-10bit/x264 "$pkgdir"/usr/bin/x264-10bit
@@ -85,7 +83,7 @@ package_libx264-git() {
pkgdesc='Library for encoding H264/AVC video streams (Git)'
provides=('libx264.so' 'x264-dev' 'libx264')
conflicts=('x264-dev' 'libx264')
- replaces=('x264-dev' 'libx264')
+ replaces=('x264-dev')
install -d "$pkgdir"/usr/lib
make -C $_gitname DESTDIR="$pkgdir" install-lib-shared