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

[Maxime Gauduin]

    Date: Thursday, October 24, 2019 @ 20:27:22
  Author: alucryd
Revision: 365484

change naming scheme and remove dep on ffmpeg: x264 3:0.157.r2980.34c06d1-1

Modified:
  x264/trunk/PKGBUILD

----------+
 PKGBUILD |   29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-24 19:45:15 UTC (rev 365483)
+++ PKGBUILD	2019-10-24 20:27:22 UTC (rev 365484)
@@ -5,23 +5,18 @@
 # Contributor: Paul Mattal <paul at archlinux.org>
 
 pkgname=x264
-pkgver=157.r72db4377
+pkgver=0.157.r2980.34c06d1
 pkgrel=1
-epoch=2
+epoch=3
 pkgdesc='Open Source H264/AVC video encoder'
 arch=(x86_64)
 url=https://www.videolan.org/developers/x264.html
 license=(GPL)
 depends=(
-  libavcodec.so
-  libavformat.so
-  libavutil.so
   liblsmash.so
-  libswscale.so
 )
 makedepends=(
   git
-  ffmpeg
   l-smash
   nasm
 )
@@ -39,29 +34,19 @@
   libx264-10bit
   libx264-all
 )
-source=(git+https://code.videolan.org/videolan/x264.git#commit=72db437770fd1ce3961f624dd57a8e75ff65ae0b)
+source=(git+https://code.videolan.org/videolan/x264.git#commit=34c06d1c17ad968fbdda153cb772f77ee31b3095)
 sha256sums=(SKIP)
 
 pkgver() {
   cd x264
 
-  local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
-  local _rev=$(git rev-parse --short HEAD)
-
-  echo ${_ver}.r${_rev}
+  ./version.sh | grep X264_POINTVER | sed -r 's/^#define X264_POINTVER "([0-9]+\.[0-9]+)\.([0-9]+) (.*)"$/\1.r\2.\3/'
 }
 
-prepare() {
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build
-}
-
 build() {
-  cd build
+  cd x264
 
-  ../x264/configure \
+  ./configure \
     --prefix=/usr \
     --enable-shared \
     --enable-pic \
@@ -70,7 +55,7 @@
 }
 
 package() {
-  make -C build DESTDIR="${pkgdir}" install-cli install-lib-shared
+  make -C x264 DESTDIR="${pkgdir}" install-cli install-lib-shared
 }
 
 # vim: ts=2 sw=2 et: