From 3a96920e324ddfa60bab5adff0d6935dffd62c63 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Mon, 25 Oct 2021 12:52:09 +1100
Subject: [PATCH 1/5] glib: Drop internal libpcre copy from meson build

---
 packages/devel/glib/package.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk
index 9cd79e9dd9..77933c5e07 100644
--- a/packages/devel/glib/package.mk
+++ b/packages/devel/glib/package.mk
@@ -14,13 +14,11 @@ PKG_LONGDESC="A library which includes support routines for C such as lists, tre
 PKG_TOOLCHAIN="meson"
 
 PKG_MESON_OPTS_HOST="-Ddefault_library=static \
-                     -Dinternal_pcre=true \
                      -Dinstalled_tests=false \
                      -Dlibmount=disabled \
                      -Dtests=false"
 
 PKG_MESON_OPTS_TARGET="-Ddefault_library=shared \
-                       -Dinternal_pcre=false \
                        -Dinstalled_tests=false \
                        -Dselinux=disabled \
                        -Dfam=false \

From 9e1ebe5dcd91316946085d22a809354a9995a74c Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Mon, 25 Oct 2021 16:31:48 +1100
Subject: [PATCH 2/5] harfbuzz: Drop fontconfig from meson build

---
 packages/graphics/harfbuzz/package.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/graphics/harfbuzz/package.mk b/packages/graphics/harfbuzz/package.mk
index 31a1f1d804..66a3072570 100644
--- a/packages/graphics/harfbuzz/package.mk
+++ b/packages/graphics/harfbuzz/package.mk
@@ -15,7 +15,6 @@ PKG_TOOLCHAIN="meson"
 PKG_MESON_OPTS_TARGET="-Dbenchmark=disabled \
                        -Dcairo=enabled \
                        -Ddocs=disabled \
-                       -Dfontconfig=enabled \
                        -Dfreetype=enabled \
                        -Dglib=enabled \
                        -Dgobject=disabled \

From 9c6cf9e858fb07ccc2a02bb19e8041b53a3dad86 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Mon, 25 Oct 2021 16:35:29 +1100
Subject: [PATCH 3/5] harfbuzz-icu: Drop fontconfig from meson build

---
 .../addons/addon-depends/chrome-depends/harfbuzz-icu/package.mk  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/addons/addon-depends/chrome-depends/harfbuzz-icu/package.mk b/packages/addons/addon-depends/chrome-depends/harfbuzz-icu/package.mk
index a5ef9da8af..716edb7226 100644
--- a/packages/addons/addon-depends/chrome-depends/harfbuzz-icu/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/harfbuzz-icu/package.mk
@@ -15,7 +15,6 @@ PKG_BUILD_FLAGS="-sysroot"
 PKG_MESON_OPTS_TARGET="-Dbenchmark=disabled \
                        -Dcairo=enabled \
                        -Ddocs=disabled \
-                       -Dfontconfig=enabled \
                        -Dfreetype=enabled \
                        -Dglib=enabled \
                        -Dgobject=disabled \

From 2ec775fef9d76993c69d4966927dc2f94f138e9c Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Mon, 25 Oct 2021 16:58:08 +1100
Subject: [PATCH 4/5] xorg-intel-gpu-tools: correct meson build options

---
 .../debug/xorg-intel-gpu-tools/package.mk     | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/packages/debug/xorg-intel-gpu-tools/package.mk b/packages/debug/xorg-intel-gpu-tools/package.mk
index c25eb6ed9b..bafd429fa6 100644
--- a/packages/debug/xorg-intel-gpu-tools/package.mk
+++ b/packages/debug/xorg-intel-gpu-tools/package.mk
@@ -11,16 +11,15 @@ PKG_URL="https://www.x.org/releases/individual/app/igt-gpu-tools-${PKG_VERSION}.
 PKG_LONGDESC="Test suite and tools for DRM/KMS drivers"
 PKG_TOOLCHAIN="meson"
 
-PKG_MESON_OPTS_TARGET="-Dbuild_overlay=false \
-                       -Dbuild_man=false \
-                       -Dwith_valgrind=false \
-                       -Dbuild_audio=false \
-                       -Dbuild_chamelium=false \
-                       -Dbuild_docs=false \
-                       -Dbuild_tests=true
-                       -Dwith_libdrm=auto \
-                       -Dwith_libunwind=false \
-                       -Dbuild_runner=false"
+PKG_MESON_OPTS_TARGET="-Dchamelium=disabled \
+                       -Ddocs=disabled \
+                       -Dlibdrm_drivers=auto \
+                       -Dlibunwind=disabled \
+                       -Dman=disabled \
+                       -Doverlay=disabled \
+                       -Drunner=disabled \
+                       -Dtests=enabled \
+                       -Dvalgrind=disabled"
 
 pre_configure_target() {
   # xorg-intel-gpu-tools does not build with NDEBUG (requires assert for tests)

From 885beccf4b58f506c54bf102f0b23db120d10871 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Mon, 25 Oct 2021 19:04:04 +1100
Subject: [PATCH 5/5] intel-vaapi-driver: fix meson options typographical error

---
 packages/multimedia/intel-vaapi-driver/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/multimedia/intel-vaapi-driver/package.mk b/packages/multimedia/intel-vaapi-driver/package.mk
index 4b4c0ff6cf..7e36710ebc 100644
--- a/packages/multimedia/intel-vaapi-driver/package.mk
+++ b/packages/multimedia/intel-vaapi-driver/package.mk
@@ -21,7 +21,7 @@ else
   DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_wayland=no"
 fi
 
-PKG_MESON_OPTS_TARGET="-Denable_hybrid_code=false \
+PKG_MESON_OPTS_TARGET="-Denable_hybrid_codec=false \
                        -Denable_tests=false \
                        ${DISPLAYSERVER_LIBVA}"