Update to 2.2.0-1, use meson build system

2 files changed, 23 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 481fdce5ba06..e2c9983647d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = libva-intel-driver-hybrid
-	pkgdesc = VA-API implementation for Intel G45 and HD Graphics family with wrapper support for the hybrid codec driver
-	pkgver = 2.1.0
+	pkgdesc = VA-API implementation for Intel G45 and HD Graphics family
+	pkgver = 2.2.0
 	pkgrel = 1
 	url = https://01.org/linuxmedia/vaapi
-	arch = i686
 	arch = x86_64
 	license = MIT
-	depends = glibc
-	depends = libva>=2.0.0
+	makedepends = git
+	makedepends = meson
+	depends = libva
 	depends = libdrm
 	optdepends = intel-hybrid-codec-driver: Provides codecs with partial HW acceleration
 	provides = libva-intel-driver
 	conflicts = libva-intel-driver
 	replaces = libva-driver-intel
-	source = https://github.com/01org/intel-vaapi-driver/releases/download/2.1.0/intel-vaapi-driver-2.1.0.tar.bz2
-	sha256sums = ecfaf2ccc4b9af7340e002d2ef807d1e33051d4992f1983f5f4d60e516f86bdf
+	source = git+https://github.com/intel/intel-vaapi-driver.git#tag=2.2.0
+	sha256sums = SKIP
 
 pkgname = libva-intel-driver-hybrid
 
diff --git a/PKGBUILD b/PKGBUILD
index 0de5efd8a77f..39ca6e01c02f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,41 @@
 # This package is based on libva-intel-driver just with the hybrid codec flag
 # Maintainer: DetMittens
-# Contributor: Maxime Gauduin <alucryd@archlinux.org> Maintainer of libva-intel-driver-hybrid
+# Contributor: Maxime Gauduin <alucryd@archlinux.org> Maintainer of libva-intel-driver in extra
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 
 pkgname=libva-intel-driver-hybrid
-pkgver=2.1.0
+pkgver=2.2.0
 pkgrel=1
-pkgdesc='VA-API implementation for Intel G45 and HD Graphics family with wrapper support for the hybrid codec driver'
-arch=('i686' 'x86_64')
+pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
+arch=('x86_64')
 url='https://01.org/linuxmedia/vaapi'
 license=('MIT')
-depends=('glibc' 'libva>=2.0.0' 'libdrm')
-optdepends=('intel-hybrid-codec-driver: Provides codecs with partial HW acceleration')
+depends=('libva' 'libdrm')
+makedepends=('git' 'meson')
 replaces=('libva-driver-intel')
+optdepends=('intel-hybrid-codec-driver: Provides codecs with partial HW acceleration')
 conflicts=('libva-intel-driver')
 provides=('libva-intel-driver')
-source=("https://github.com/01org/intel-vaapi-driver/releases/download/${pkgver}/intel-vaapi-driver-${pkgver}.tar.bz2")
-sha256sums=('ecfaf2ccc4b9af7340e002d2ef807d1e33051d4992f1983f5f4d60e516f86bdf')
+source=("git+https://github.com/intel/intel-vaapi-driver.git#tag=${pkgver}")
+sha256sums=('SKIP')
 
 prepare() {
-  cd intel-vaapi-driver-${pkgver}
-
   # Only relevant if intel-gpu-tools is installed,
   # since then the shaders will be recompiled
-  sed -i '1s/python$/&2/' src/shaders/gpp.py
+  sed -i '1s/python$/&2/' intel-vaapi-driver/src/shaders/gpp.py
+  # Fix undefined variable in src/meson.build
+  sed -i 's/2.2.0/2.2.0.0/' intel-vaapi-driver/meson.build
 }
 
 build() {
-  cd intel-vaapi-driver-${pkgver}
-
-  ./configure \
-    --prefix='/usr' \
-    --enable-hybrid-codec
-  make
+  arch-meson -Denable_hybrid_codec=true intel-vaapi-driver build
+  ninja -C build
 }
 
 package() {
-  cd intel-vaapi-driver-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm 644 COPYING -t "${pkgdir}"/usr/share/licenses/libva-intel-driver-hybrid
+  DESTDIR="${pkgdir}" ninja -C build install
+  install -Dm 644 intel-vaapi-driver/COPYING -t "${pkgdir}"/usr/share/licenses/libva-intel-driver-hybrid
 }
 
 # vim: ts=2 sw=2 et: