[arch-commits] Commit in x264/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

    Date: Sunday, September 7, 2014 @ 12:31:09
  Author: bpiotrowski
Revision: 221091

upgpkg: x264 1:142.20140826-1

- update to latest commit from stable branch
- move header files to libx264*, as x264 pulls too many dependencies thanks to ffmpeg

Modified:
  x264/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-07 10:21:23 UTC (rev 221090)
+++ PKGBUILD	2014-09-07 10:31:09 UTC (rev 221091)
@@ -5,8 +5,8 @@
 # Contributor: Paul Mattal <paul at archlinux.org>
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
-pkgver=142.20140311
-pkgrel=6
+pkgver=142.20140826
+pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
@@ -13,7 +13,7 @@
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git' 'ffmpeg')
-source=(git://git.videolan.org/x264.git#commit=b7a50c16)
+source=(git://git.videolan.org/x264.git#commit=021c0dc6c95c)
 md5sums=('SKIP')
 
 pkgver() {
@@ -25,7 +25,6 @@
 }
 
 prepare() {
-  sed -i 's/install-lib-dev$//g' $pkgname/Makefile
   cp -r $pkgname $pkgname-10bit
 }
 
@@ -45,11 +44,11 @@
 package_x264() {
   pkgdesc='CLI tools for encoding H264/AVC video streams'
   depends=('glibc' 'ffmpeg')
-  provides=('x264-dev' 'x264-10bit')
-  conflicts=('x264-dev' 'x264-10bit')
-  replaces=('x264-dev' 'x264-10bit')
+  provides=('x264-10bit')
+  conflicts=('x264-10bit')
+  replaces=('x264-10bit')
 
-  make -C $pkgbase DESTDIR="$pkgdir" install-cli install-lib-dev
+  make -C $pkgbase DESTDIR="$pkgdir" install-cli
   install -Dm755 $pkgbase-10bit/x264 "$pkgdir"/usr/bin/x264-10bit
 }
 
@@ -56,6 +55,9 @@
 package_libx264() {
   pkgdesc='Library for encoding H264/AVC video streams'
   depends=('glibc')
+  provides=('x264-dev')
+  conflicts=('x264-dev')
+  replaces=('x264-dev')
 
   install -d "$pkgdir"/usr/lib
   make -C $pkgbase DESTDIR="$pkgdir" install-lib-shared
@@ -64,8 +66,8 @@
 package_libx264-10bit() {
   pkgdesc='Library for encoding H264/AVC video streams. 10bit-depth.'
   depends=('glibc')
-  provides=('libx264')
-  conflicts=('libx264')
+  provides=('libx264' 'x264-dev')
+  conflicts=('libx264' 'x264-dev')
 
   install -d "$pkgdir"/usr/lib
   make -C $pkgbase-10bit DESTDIR="$pkgdir" install-lib-shared