extra/x264 to 0.157.r2980.34c06d1-1

extra/x264/PKGBUILD

@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Maxime Gauduin <alucryd@archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
@@ -10,23 +9,18 @@
 #  - --disable-lto
 
 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
 )
@@ -44,31 +38,21 @@ replaces=(
   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}
-}
-
-prepare() {
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build
+  ./version.sh | grep X264_POINTVER | sed -r 's/^#define X264_POINTVER "([0-9]+\.[0-9]+)\.([0-9]+) (.*)"$/\1.r\2.\3/'
 }
 
 build() {
-  cd build
+  cd x264
 
   [[ $CARCH != "aarch64" ]] && CONFIG="--disable-asm"
 
-  ../x264/configure \
+  ./configure \
     --prefix=/usr \
     --enable-shared \
     --enable-pic \
@@ -77,7 +61,7 @@ build() {
 }
 
 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: