ci/install-{gst, gtk}: update meson command usage

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1176>
This commit is contained in:
Jordan Petridis 2022-12-16 10:19:28 +02:00 committed by Sebastian Dröge
parent 2bcc1884cb
commit 3fb604e653
3 changed files with 7 additions and 7 deletions

View file

@ -22,7 +22,7 @@ PLUGINS="-D gst-plugins-base:ogg=enabled \
-D gst-plugins-bad:opus=enabled \ -D gst-plugins-bad:opus=enabled \
-D gst-plugins-ugly:x264=enabled" -D gst-plugins-ugly:x264=enabled"
meson build \ meson setup build \
-D prefix=/usr/local \ -D prefix=/usr/local \
-D gpl=enabled \ -D gpl=enabled \
-D ugly=enabled \ -D ugly=enabled \
@ -33,8 +33,8 @@ meson build \
-D python=disabled \ -D python=disabled \
-D vaapi=disabled \ -D vaapi=disabled \
$PLUGINS $PLUGINS
ninja -C build meson compile -C build
ninja -C build install meson install -C build
cd .. cd ..
rm -rf gstreamer/ rm -rf gstreamer/

View file

@ -7,11 +7,11 @@ BRANCH=4.8.2
git clone https://gitlab.gnome.org/GNOME/gtk.git --branch $BRANCH --depth=1 git clone https://gitlab.gnome.org/GNOME/gtk.git --branch $BRANCH --depth=1
cd gtk cd gtk
meson build \ meson setup build \
-D prefix=/usr/local \ -D prefix=/usr/local \
-Dbuild-tests=false \ -Dbuild-tests=false \
-Dwayland-protocols:tests=false -Dwayland-protocols:tests=false
ninja -C build meson compile -C build
ninja -C build install meson install -C build
cd .. cd ..
rm -rf gtk/ rm -rf gtk/

View file

@ -48,7 +48,7 @@ $env:MESON_ARGS = "--prefix=C:\gst-install\ " +
"-Dgst-plugins-good:lame=disabled " "-Dgst-plugins-good:lame=disabled "
Write-Output "Building gst" Write-Output "Building gst"
cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson _build $env:MESON_ARGS && meson compile -C _build && ninja -C _build install" cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson setup _build $env:MESON_ARGS && meson compile -C _build && meson install -C _build"
if (!$?) { if (!$?) {
Write-Host "Failed to build and install gst" Write-Host "Failed to build and install gst"