diff options
| author | Bram Stolk <bram.stolk@canonical.com> | 2022-10-13 14:17:56 -0700 |
|---|---|---|
| committer | Bram Stolk <bram.stolk@canonical.com> | 2022-10-13 14:17:56 -0700 |
| commit | 10bb7ef368018b49f03f5871d0e58ccb4f806f51 (patch) | |
| tree | 83743d082d74df7adbaebf78c67f7d6af38fa642 | |
| parent | 9224248e59149d21e0f31007fa74775bc08da27a (diff) | |
Use meson to build libva. No need to move around libraries.
| -rw-r--r-- | snapcraft.yaml | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/snapcraft.yaml b/snapcraft.yaml index 46ac0d8..0a0693a 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -324,12 +324,12 @@ parts: ln -s /usr/bin/xdg-open xdg-email gmmlib: - source: https://github.com/intel/gmmlib/archive/refs/tags/intel-gmmlib-22.1.3.tar.gz + source: https://github.com/intel/gmmlib/archive/refs/tags/intel-gmmlib-22.2.0.tar.gz plugin: cmake cmake-parameters: - -DCMAKE_BUILD_TYPE=Release - - -DARCH=64 - -DCMAKE_INSTALL_PREFIX=/usr + - -DRUN_TEST_SUITE=OFF override-stage: | set -ex snapcraftctl stage @@ -339,22 +339,25 @@ parts: prime: - usr/**/*.so* + libva: - source: https://github.com/intel/libva/archive/refs/tags/2.14.0.tar.gz - plugin: autotools - autotools-configure-parameters: - - --prefix=/usr - override-build: | - # Move libva files from /usr/lib to /usr/lib/@triplet@ - snapcraftctl build - mkdir -p "$SNAPCRAFT_PART_INSTALL/usr/lib/$SNAPCRAFT_ARCH_TRIPLET" - find "$SNAPCRAFT_PART_INSTALL" -name 'libva*.so*' -exec \ - mv -t "$SNAPCRAFT_PART_INSTALL"/usr/lib/$SNAPCRAFT_ARCH_TRIPLET {} + - prime: - - usr/**/*.so* + source: https://github.com/intel/libva/archive/refs/tags/2.15.0.tar.gz + plugin: meson # Because autotools makes a mess of this. + meson-parameters: + - --prefix /usr + build-packages: + - pkg-config + - libdrm-dev + - xorg-dev + - libxcb-dri3-dev + - libgl1-mesa-dev + - libgl1-mesa-glx + - libwayland-dev + + va-drivers: - source: https://github.com/intel/media-driver/archive/refs/tags/intel-media-22.4.3.tar.gz + source: https://github.com/intel/media-driver/archive/refs/tags/intel-media-22.4.4.tar.gz after: [gmmlib, libva] plugin: cmake cmake-parameters: @@ -373,12 +376,9 @@ parts: - mesa-vulkan-drivers - libxcb-randr0 override-build: | - # Strip iHD driver and move it from /usr/lib to /usr/lib/@triplet@ + # Strip iHD driver. snapcraftctl build - mkdir -p "$SNAPCRAFT_PART_INSTALL/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/dri" - find "$SNAPCRAFT_PART_INSTALL" -name 'iHD_drv_video.so' \ - -exec strip {} \; \ - -exec mv {} "$SNAPCRAFT_PART_INSTALL/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/dri" \; + strip $SNAPCRAFT_PART_INSTALL/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/dri/iHD_drv_video.so prime: - usr/**/iHD_drv_video.so - usr/**/libigfxcmrt.so* |