Merge pull request #5799 from heitbaum/mesonc

Fixes to meson: unknown options are now always fatal

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 \

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)

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 \

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 \

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}"