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

[Maxime Gauduin]

    Date: Sunday, May 7, 2017 @ 12:14:01
  Author: alucryd
Revision: 295412

upgpkg: x264 2:148.20170121-4

Modified:
  x264/trunk/PKGBUILD

----------+
 PKGBUILD |   32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-07 11:40:48 UTC (rev 295411)
+++ PKGBUILD	2017-05-07 12:14:01 UTC (rev 295412)
@@ -7,7 +7,7 @@
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
 pkgver=148.20170121
-pkgrel=3
+pkgrel=4
 epoch=2
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
@@ -56,27 +56,27 @@
             'libswscale.so')
   provides=('libx264-8bit.so' 'libx264-10bit.so')
 
+  local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
+
+  install -dm 755 "${pkgdir}"/usr/lib/libx264
+
   make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-cli install-lib-shared
-  rename x264 x264-10bit "${pkgdir}"/usr/bin/*
-  rm "${pkgdir}"/usr/lib/libx264.so
-  rename libx264.so libx264-10bit.so "${pkgdir}"/usr/lib/*
-  ln -s libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264-10bit.so
+  mv "${pkgdir}"/usr/lib/libx264.so.${_ver} "${pkgdir}"/usr/lib/libx264/libx264-10bit.so.${_ver}
+  mv "${pkgdir}"/usr/bin/x264{,-10bit}
+
   make -C ${pkgbase} DESTDIR="${pkgdir}" install-cli install-lib-shared
+  mv "${pkgdir}"/usr/lib/libx264.so.${_ver} "${pkgdir}"/usr/lib/libx264/libx264-8bit.so.${_ver}
   rm "${pkgdir}"/usr/lib/libx264.so
-  rename libx264.so libx264-8bit.so "${pkgdir}"/usr/lib/*
-  ln -s libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264-8bit.so
 }
 
 package_libx264() {
   pkgdesc='Library for encoding H264/AVC video streams'
 
-  cd ${pkgbase}
+  local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
 
-  local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
-
   install -dm 755 "${pkgdir}"/usr/lib
-  ln -s libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
-  ln -s libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so.${_ver}
+  ln -s libx264/libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
+  ln -s libx264/libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so.${_ver}
 }
 
 package_libx264-10bit() {
@@ -84,13 +84,11 @@
   provides=('libx264')
   conflicts=('libx264')
 
-  cd ${pkgbase}
+  local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
 
-  local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
-
   install -dm 755 "${pkgdir}"/usr/lib
-  ln -s libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
-  ln -s libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so.${_ver}
+  ln -s libx264/libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
+  ln -s libx264/libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so.${_ver}
 }
 
 # vim: ts=2 sw=2 et: