From 9c96f455c1dd986f692a58358e298a7970b3252d Mon Sep 17 00:00:00 2001 From: Owen Rafferty Date: Sat, 18 Nov 2023 14:51:12 -0600 Subject: [PATCH] *: use 'meson setup' closes #165 --- extra/adwaita-icon-theme/build | 2 +- extra/cairo/build | 2 +- extra/freetype-harfbuzz/build | 12 ++++++------ extra/gdk-pixbuf/build | 10 +++++----- extra/glib/build | 8 ++++---- extra/intel-vaapi-driver/build | 6 +++--- extra/libva-utils/build | 10 +++++----- extra/libva/build | 10 +++++----- extra/mesa/build | 12 ++++++------ extra/mpv/build | 6 +++--- extra/pango/build | 6 +++--- wayland/fcft/build | 6 +++--- wayland/foot-pgo/build | 6 +++--- wayland/foot/build | 8 ++++---- wayland/grim/build | 6 +++--- wayland/libdrm/build | 6 +++--- wayland/libinput/build | 12 ++++++------ wayland/libseat/build | 6 +++--- wayland/libxkbcommon/build | 8 ++++---- wayland/slurp/build | 8 ++++---- wayland/sway/build | 6 +++--- wayland/tllist/build | 6 +++--- wayland/wayland-protocols/build | 8 ++++---- wayland/wayland/build | 6 +++--- wayland/wbg/build | 8 ++++---- wayland/wlroots/build | 6 +++--- wayland/wlsunset/build | 8 ++++---- 27 files changed, 99 insertions(+), 99 deletions(-) diff --git a/extra/adwaita-icon-theme/build b/extra/adwaita-icon-theme/build index 4dd26dc9..b5164b4f 100755 --- a/extra/adwaita-icon-theme/build +++ b/extra/adwaita-icon-theme/build @@ -4,7 +4,7 @@ export DESTDIR="$1" meson setup \ -Dprefix=/usr \ - . output + output ninja -C output ninja -C output install diff --git a/extra/cairo/build b/extra/cairo/build index fbf1918c..d6e17b7d 100755 --- a/extra/cairo/build +++ b/extra/cairo/build @@ -9,7 +9,7 @@ meson setup \ -Dxlib=disabled \ -Dxlib-xcb=disabled \ -Dtests=disabled \ - . output + output ninja -C output ninja -C output install diff --git a/extra/freetype-harfbuzz/build b/extra/freetype-harfbuzz/build index 7ba9beb2..9d445c95 100755 --- a/extra/freetype-harfbuzz/build +++ b/extra/freetype-harfbuzz/build @@ -5,13 +5,13 @@ export DESTDIR="$1" build_freetype() ( cd freetype - meson \ - --prefix=/usr \ + meson setup \ + -Dprefix=/usr \ -Ddefault_library=both \ -Dbzip2=disabled \ -Dzlib=disabled \ "$@" \ - . output + output ninja -C output ninja -C output install @@ -20,8 +20,8 @@ build_freetype() ( build_harfbuzz() ( cd harfbuzz - meson \ - --prefix=/usr \ + meson setup \ + -Dprefix=/usr \ -Ddefault_library=both \ -Dglib=disabled \ -Dfreetype=enabled \ @@ -30,7 +30,7 @@ build_harfbuzz() ( -Dicu=disabled \ -Dbenchmark=disabled \ -Dtests=disabled \ - . output + output ninja -C output ninja -C output install diff --git a/extra/gdk-pixbuf/build b/extra/gdk-pixbuf/build index ba35fba9..96e22777 100755 --- a/extra/gdk-pixbuf/build +++ b/extra/gdk-pixbuf/build @@ -2,10 +2,10 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ +meson setup \ + -Dprefix=/usr \ + -Dsysconfdir=/etc \ + -Dmandir=/usr/share/man \ -Ddebug=false \ -Djpeg=enabled \ -Dpng=enabled \ @@ -17,7 +17,7 @@ meson \ -Dinstalled_tests=false \ -Dbuiltin_loaders=all \ -Dwrap_mode=nofallback \ - . output + output ninja -C output ninja -C output install diff --git a/extra/glib/build b/extra/glib/build index d9589909..dc5481b7 100755 --- a/extra/glib/build +++ b/extra/glib/build @@ -4,9 +4,9 @@ export DESTDIR="$1" : > fuzzing/meson.build -meson \ - --prefix=/usr \ - --libexecdir=/usr/lib \ +meson setup \ + -Dprefix=/usr \ + -Dlibexecdir=/usr/lib \ -Dlibmount=disabled \ -Dinstalled_tests=false \ -Ddefault_library=both \ @@ -14,7 +14,7 @@ meson \ -Dtests=false \ -Dlibelf=disabled \ -Dnls=disabled \ - . build + build ninja -C build ninja -C build install diff --git a/extra/intel-vaapi-driver/build b/extra/intel-vaapi-driver/build index 64ee0e20..b5164b4f 100755 --- a/extra/intel-vaapi-driver/build +++ b/extra/intel-vaapi-driver/build @@ -2,9 +2,9 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ - . output +meson setup \ + -Dprefix=/usr \ + output ninja -C output ninja -C output install diff --git a/extra/libva-utils/build b/extra/libva-utils/build index fd5a0757..e5f35d69 100755 --- a/extra/libva-utils/build +++ b/extra/libva-utils/build @@ -2,11 +2,11 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - . output +meson setup \ + -Dprefix=/usr \ + -Dsysconfdir=/etc \ + -Dmandir=/usr/share/man \ + output ninja -C output ninja -C output install diff --git a/extra/libva/build b/extra/libva/build index 61b326d5..b60540eb 100755 --- a/extra/libva/build +++ b/extra/libva/build @@ -2,14 +2,14 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ +meson setup \ + -Dprefix=/usr \ + -Dsysconfdir=/etc \ + -Dmandir=/usr/share/man \ -Dwith_wayland=yes \ -Dwith_x11=no \ -Dwith_glx=no \ - . output + output ninja -C output ninja -C output install diff --git a/extra/mesa/build b/extra/mesa/build index bf0d8c2c..c0ed1e8e 100755 --- a/extra/mesa/build +++ b/extra/mesa/build @@ -13,11 +13,11 @@ mv -f _ meson.build pkg-config --exists libglvnd || glvnd_enabled=false meson setup \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --buildtype=release \ + -Dprefix=/usr \ + -Dsysconfdir=/etc \ + -Dmandir=/usr/share/man \ + -Dlocalstatedir=/var \ + -Dbuildtype=release \ -Dglx-read-only-text=true \ -Dplatforms=wayland \ -Dglx=disabled \ @@ -27,7 +27,7 @@ meson setup \ -Dglvnd="${glvnd_enabled:-true}" \ -Dvideo-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc \ -Dvulkan-drivers='' \ - . output + output ninja -C output ninja -C output install diff --git a/extra/mpv/build b/extra/mpv/build index 5e18cd9d..513844a0 100755 --- a/extra/mpv/build +++ b/extra/mpv/build @@ -2,13 +2,13 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ +meson setup \ + -Dprefix=/usr \ -Dalsa=enabled \ -Dlibmpv=true \ -Dwayland=enabled \ -Dx11=disabled \ - . output + output ninja -C output ninja -C output install diff --git a/extra/pango/build b/extra/pango/build index 91f7d490..9461c128 100755 --- a/extra/pango/build +++ b/extra/pango/build @@ -12,12 +12,12 @@ rm -rf subprojects : > examples/meson.build : > docs/meson.build -meson \ - --prefix=/usr \ +meson setup \ + -Dprefix=/usr \ -Dgtk_doc=false \ -Dxft=disabled \ -Dintrospection=disabled \ - . build + build ninja -C build ninja -C build install diff --git a/wayland/fcft/build b/wayland/fcft/build index 4e99b4bb..1f7b90d8 100755 --- a/wayland/fcft/build +++ b/wayland/fcft/build @@ -2,10 +2,10 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ +meson setup \ + -Dprefix=/usr \ -Dsvg-backend=none \ - . output + output ninja -C output ninja -C output install diff --git a/wayland/foot-pgo/build b/wayland/foot-pgo/build index 3aa196fb..41fde413 100755 --- a/wayland/foot-pgo/build +++ b/wayland/foot-pgo/build @@ -22,9 +22,9 @@ esac mkdir -p bld/release cd bld/release -meson \ - --prefix=/usr \ - --buildtype=release \ +meson setup \ + -Dprefix=/usr \ + -Dbuildtype=release \ -Dime=false \ ../.. diff --git a/wayland/foot/build b/wayland/foot/build index fb27672c..f5c8db9a 100755 --- a/wayland/foot/build +++ b/wayland/foot/build @@ -2,11 +2,11 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ - --buildtype=release \ +meson setup \ + -Dprefix=/usr \ + -Dbuildtype=release \ -Dime=false \ - . output + output ninja -C output ninja -C output install diff --git a/wayland/grim/build b/wayland/grim/build index 612ca870..74634979 100755 --- a/wayland/grim/build +++ b/wayland/grim/build @@ -2,10 +2,10 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ +meson setup \ + -Dprefix=/usr \ -Djpeg=disabled \ - . build + build ninja -C build ninja -C build install diff --git a/wayland/libdrm/build b/wayland/libdrm/build index 9d335007..e343d3e7 100755 --- a/wayland/libdrm/build +++ b/wayland/libdrm/build @@ -2,11 +2,11 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ +meson setup \ + -Dprefix=/usr \ -Dvalgrind=disabled \ -Dintel=enabled \ - . build + build ninja -C build ninja -C build install diff --git a/wayland/libinput/build b/wayland/libinput/build index 1e9eee4f..f4cb0719 100755 --- a/wayland/libinput/build +++ b/wayland/libinput/build @@ -8,17 +8,17 @@ export CFLAGS="$CFLAGS -fPIC" # the below CFLAGS. export CFLAGS="-Wno-unused-command-line-argument $CFLAGS" -meson \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --libexecdir=/usr/lib \ +meson setup \ + -Dprefix=/usr \ + -Dsysconfdir=/etc \ + -Dmandir=/usr/share/man \ + -Dlibexecdir=/usr/lib \ -Ddefault_library=both \ -Ddebug-gui=false \ -Ddocumentation=false \ -Dtests=false \ -Dlibwacom=false \ - . output + output ninja -C output ninja -C output install diff --git a/wayland/libseat/build b/wayland/libseat/build index 88a67e83..b531fd47 100755 --- a/wayland/libseat/build +++ b/wayland/libseat/build @@ -5,10 +5,10 @@ export CFLAGS="-Wno-error $CFLAGS" export DESTDIR="$1" -meson \ - --prefix=/usr \ +meson setup \ + -Dprefix=/usr \ -Ddefault_library=both \ - . build + build ninja -C build ninja -C build install diff --git a/wayland/libxkbcommon/build b/wayland/libxkbcommon/build index 7079a15d..fa9f2a9f 100755 --- a/wayland/libxkbcommon/build +++ b/wayland/libxkbcommon/build @@ -2,15 +2,15 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ - --libexecdir=/usr/lib \ +meson setup \ + -Dprefix=/usr \ + -Dlibexecdir=/usr/lib \ -Ddefault_library=both \ -Denable-docs=false \ -Denable-wayland=true \ -Denable-x11=false \ -Denable-xkbregistry=false \ - . output + output ninja -C output ninja -C output install diff --git a/wayland/slurp/build b/wayland/slurp/build index 7649f1b1..919448f8 100755 --- a/wayland/slurp/build +++ b/wayland/slurp/build @@ -2,10 +2,10 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ - --buildtype=release \ - . output +meson setup \ + -Dprefix=/usr \ + -Dbuildtype=release \ + output ninja -C output ninja -C output install diff --git a/wayland/sway/build b/wayland/sway/build index 42188807..6563e128 100755 --- a/wayland/sway/build +++ b/wayland/sway/build @@ -10,14 +10,14 @@ mv -f _ sway/desktop/render.c export DESTDIR="$1" -meson \ - --prefix=/usr \ +meson setup \ + -Dprefix=/usr \ -Ddefault-wallpaper=false \ -Dzsh-completions=false \ -Dbash-completions=false \ -Dfish-completions=false \ -Dxwayland=disabled \ - . build + build ninja -C build ninja -C build install diff --git a/wayland/tllist/build b/wayland/tllist/build index 8030b49a..c45ba3cf 100755 --- a/wayland/tllist/build +++ b/wayland/tllist/build @@ -2,9 +2,9 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ - . output +meson setup \ + -Dprefix=/usr \ + output ninja -C output ninja -C output install diff --git a/wayland/wayland-protocols/build b/wayland/wayland-protocols/build index 7ca9d78a..a22755a5 100755 --- a/wayland/wayland-protocols/build +++ b/wayland/wayland-protocols/build @@ -2,11 +2,11 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ - --buildtype=release \ +meson setup \ + -Dprefix=/usr \ + -Dbuildtype=release \ -Dtests=false \ - . output + output ninja -C output ninja -C output install diff --git a/wayland/wayland/build b/wayland/wayland/build index e36717c9..fb78af1f 100755 --- a/wayland/wayland/build +++ b/wayland/wayland/build @@ -2,13 +2,13 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ +meson setup \ + -Dprefix=/usr \ -Ddefault_library=both \ -Dtests=false \ -Ddocumentation=false \ -Ddtd_validation=false \ - . build + build ninja -C build ninja -C build install diff --git a/wayland/wbg/build b/wayland/wbg/build index c1e46315..7e649205 100755 --- a/wayland/wbg/build +++ b/wayland/wbg/build @@ -2,12 +2,12 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ - --buildtype=release \ +meson setup \ + -Dprefix=/usr \ + -Dbuildtype=release \ -Djpeg=enabled \ -Dpng=enabled \ - . output + output ninja -C output ninja -C output install diff --git a/wayland/wlroots/build b/wayland/wlroots/build index c3b257c9..931bc4b1 100755 --- a/wayland/wlroots/build +++ b/wayland/wlroots/build @@ -2,13 +2,13 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ +meson setup \ + -Dprefix=/usr \ -Ddefault_library=both \ -Dexamples=false \ -Dxcb-errors=disabled \ -Drenderers=gles2 \ - . build + build ninja -C build ninja -C build install diff --git a/wayland/wlsunset/build b/wayland/wlsunset/build index 7649f1b1..919448f8 100755 --- a/wayland/wlsunset/build +++ b/wayland/wlsunset/build @@ -2,10 +2,10 @@ export DESTDIR="$1" -meson \ - --prefix=/usr \ - --buildtype=release \ - . output +meson setup \ + -Dprefix=/usr \ + -Dbuildtype=release \ + output ninja -C output ninja -C output install