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

[Maxime Gauduin]

    Date: Sunday, May 7, 2017 @ 10:19:21
  Author: alucryd
Revision: 295404

upgpkg: x264 2:148.20170121-2

Modified:
  x264/trunk/PKGBUILD

----------+
 PKGBUILD |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-07 05:41:27 UTC (rev 295403)
+++ PKGBUILD	2017-05-07 10:19:21 UTC (rev 295404)
@@ -7,7 +7,7 @@
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
 pkgver=148.20170121
-pkgrel=1
+pkgrel=2
 epoch=2
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
@@ -56,26 +56,26 @@
             'libswscale.so')
   provides=('x264-10bit')
   conflicts=('x264-10bit')
-  replaces=('x264-10bit')
 
+  make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-cli
+  rename x264 x264-10bit "${pkgdir}"/usr/bin/*
   make -C ${pkgbase} DESTDIR="${pkgdir}" install-cli
-  install -m 755 ${pkgbase}-10bit/x264 "${pkgdir}"/usr/bin/x264-10bit
 }
 
 package_libx264() {
   pkgdesc='Library for encoding H264/AVC video streams'
-  provides=('libx264.so' 'x264-dev')
-  conflicts=('x264-dev')
-  replaces=('x264-dev')
+  provides=('libx264.so' 'libx264-10bit.so')
 
   install -dm 755 "${pkgdir}"/usr/lib
+  make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-lib-shared
+  rename x264 x264-10bit "${pkgdir}"/usr/lib/*
   make -C ${pkgbase} DESTDIR="${pkgdir}" install-lib-shared
 }
 
 package_libx264-10bit() {
-  pkgdesc='Library for encoding H264/AVC video streams. 10bit-depth.'
-  provides=('libx264.so' 'libx264' 'x264-dev')
-  conflicts=('libx264' 'x264-dev')
+  pkgdesc='Library for encoding H264/AVC video streams (10bit-depth)'
+  provides=('libx264' 'libx264.so')
+  conflicts=('libx264')
 
   install -dm 755 "${pkgdir}"/usr/lib
   make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-lib-shared