From 3c9a267312d83bb97095c7bd0403d3b4ffe6d997 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Sun, 26 Jan 2020 09:53:59 -0800
Subject: [PATCH 1/3] libva: use meson

---
 packages/multimedia/libva/package.mk | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/multimedia/libva/package.mk b/packages/multimedia/libva/package.mk
index 926de10e88..274cb57d12 100644
--- a/packages/multimedia/libva/package.mk
+++ b/packages/multimedia/libva/package.mk
@@ -10,20 +10,20 @@ PKG_LICENSE="GPL"
 PKG_SITE="https://01.org/linuxmedia"
 PKG_URL="https://github.com/intel/libva/archive/$PKG_VERSION.tar.gz"
 PKG_LONGDESC="Libva is an implementation for VA-API (VIdeo Acceleration API)."
-PKG_TOOLCHAIN="autotools"
+PKG_TOOLCHAIN="meson"
 
 if [ "$DISPLAYSERVER" = "x11" ]; then
   PKG_DEPENDS_TARGET="toolchain libX11 libXext libXfixes libdrm"
-  DISPLAYSERVER_LIBVA="--enable-x11 --disable-glx --disable-wayland"
+  DISPLAYSERVER_LIBVA="-Dwith_x11=yes -Dwith_glx=no -Dwith_wayland=no"
 elif [ "$DISPLAYSERVER" = "weston" ]; then
-  DISPLAYSERVER_LIBVA="--disable-x11 --disable-glx --enable-wayland"
+  DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_glx=no -Dwith_wayland=yes"
   PKG_DEPENDS_TARGET="toolchain libdrm wayland"
 else
   PKG_DEPENDS_TARGET="toolchain libdrm"
-  DISPLAYSERVER_LIBVA="--disable-x11 --disable-glx --disable-wayland"
+  DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_glx=no -Dwith_wayland=no"
 fi
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
-                           --disable-docs \
-                           --enable-drm \
-                           $DISPLAYSERVER_LIBVA"
+PKG_MESON_OPTS_TARGET="-Ddisable_drm=false \
+                       -Denable_docs=false \
+                       -Denable_va_messaging=true \
+                       $DISPLAYSERVER_LIBVA"

From ad6e23187e04b7e9e661c6155c7ce70332d39b4f Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Sun, 26 Jan 2020 09:58:14 -0800
Subject: [PATCH 2/3] intel-vaapi-driver: use meson

---
 packages/multimedia/intel-vaapi-driver/package.mk | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/multimedia/intel-vaapi-driver/package.mk b/packages/multimedia/intel-vaapi-driver/package.mk
index fc8dffa897..3001c633a4 100644
--- a/packages/multimedia/intel-vaapi-driver/package.mk
+++ b/packages/multimedia/intel-vaapi-driver/package.mk
@@ -11,15 +11,17 @@ PKG_SITE="https://01.org/linuxmedia"
 PKG_URL="https://github.com/intel/intel-vaapi-driver/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libva libdrm"
 PKG_LONGDESC="intel-vaapi-driver: VA-API user mode driver for Intel GEN Graphics family"
-PKG_TOOLCHAIN="autotools"
+PKG_TOOLCHAIN="meson"
 
 if [ "$DISPLAYSERVER" = "x11" ]; then
-  DISPLAYSERVER_LIBVA="--enable-x11 --disable-wayland"
+  DISPLAYSERVER_LIBVA="-Dwith_x11=yes -Dwith_wayland=no"
 elif [ "$DISPLAYSERVER" = "weston" ]; then
-  DISPLAYSERVER_LIBVA="--disable-x11 --enable-wayland"
+  DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_wayland=yes"
 else
-  DISPLAYSERVER_LIBVA="--disable-x11 --disable-wayland"
+  DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_wayland=no"
 fi
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
-                           $DISPLAYSERVER_LIBVA"
+PKG_MESON_OPTS_TARGET="-Denable_hybrid_code=false \
+                       -Denable_tests=false \
+                       $DISPLAYSERVER_LIBVA"
+

From 43d2b8cd3bbd112d18fa30d85cfe92f84390687f Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Sun, 26 Jan 2020 10:01:18 -0800
Subject: [PATCH 3/3] libva-utils: use meson

---
 packages/debug/libva-utils/package.mk | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/debug/libva-utils/package.mk b/packages/debug/libva-utils/package.mk
index fc41d6049e..2c417616e3 100644
--- a/packages/debug/libva-utils/package.mk
+++ b/packages/debug/libva-utils/package.mk
@@ -8,18 +8,18 @@ PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/01org/libva-utils"
 PKG_URL="https://github.com/intel/libva-utils/archive/$PKG_VERSION.tar.gz"
 PKG_LONGDESC="Libva-utils is a collection of tests for VA-API (VIdeo Acceleration API)"
-PKG_TOOLCHAIN="autotools"
+PKG_TOOLCHAIN="meson"
 
 if [ "$DISPLAYSERVER" = "x11" ]; then
   PKG_DEPENDS_TARGET="toolchain libva libdrm libX11"
-  DISPLAYSERVER_LIBVA="--enable-x11"
+  DISPLAYSERVER_LIBVA="-Dx11=true"
 else
   PKG_DEPENDS_TARGET="toolchain libva libdrm"
-  DISPLAYSERVER_LIBVA="--disable-x11"
+  DISPLAYSERVER_LIBVA="-Dx11=false"
 fi
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
-                           --enable-drm \
-                           $DISPLAYSERVER_LIBVA \
-                           --disable-wayland \
-                           --disable-tests"
+PKG_MESON_OPTS_TARGET="-Ddrm=true \
+                       $DISPLAYSERVER_LIBVA \
+                       -Dwayland=false \
+                       -Dtests=false"
+