From 8c5b566b02649110d9aabecd1a92fb903cbd6a27 Mon Sep 17 00:00:00 2001 From: Carl Zhang Date: Thu, 1 Feb 2024 03:34:22 -0500 Subject: [PATCH] use meson setup instead of meson options 1. use obsolute folder as prefix 2. use checkout@v4 3. use meson setup Signed-off-by: Carl Zhang --- .github/workflows/freebsd.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index 57196b5..493970d 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -15,12 +15,12 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout libva - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: intel/libva path: libva - name: checkout libva-utils - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: libva-utils - name: test @@ -30,14 +30,11 @@ jobs: pkg install -y meson pkgconf libdrm libXext libXfixes wayland pkg install -y -x '^mesa($|-libs)' run: | - set PREFIX="$PWD/_install" - set LIBDIR="$PREFIX/lib" - setenv PKG_CONFIG_PATH $LIBDIR/pkgconfig:$PREFIX/libdata/pkgconfig cd libva - meson --prefix=$PREFIX --libdir=$LIBDIR _build + meson setup _build --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu meson compile -C _build meson install -C _build cd ../libva-utils - meson --prefix=$PREFIX --libdir=$LIBDIR _build + meson setup _build --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu meson compile -C _build meson install -C _build