From e3878b44c40bb08225c7677b2b272b380aba4ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 23 Jan 2025 16:40:10 +0100 Subject: [PATCH] snap: Use upstream libpciaccess The version in ubuntu is a bit older than upstream, plus it seems to have link issues (as it's the one compiled by autotools), so let's try using the latest upstream version instead --- snap/snapcraft.yaml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 48c5fb7..2724757 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -112,6 +112,23 @@ apps: LIBVIRT_DEFAULT_URI: 'qemu+unix:///session' parts: + libpciaccess: + source: https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git + source-depth: 1 + source-tag: libpciaccess-0.18.1 + plugin: meson + build-packages: + - zlib1g-dev + - xutils-dev + meson-parameters: + - --prefix=/usr + - --buildtype=release + - -Dzlib=enabled + - -Dpci-ids=/usr/share/misc + prime: + - -usr/include + - -usr/lib/*/pkgconfig + libvirt: source: https://gitlab.com/libvirt/libvirt.git source-depth: 1 @@ -123,6 +140,8 @@ parts: # version-format: # lower-than: 10.5.0 plugin: meson + after: + - libpciaccess build-packages: - libxml2-dev - libncurses5-dev @@ -136,7 +155,6 @@ parts: - libdevmapper-dev - uuid-dev - libudev-dev - - libpciaccess-dev - libcurl4-gnutls-dev - libpolkit-gobject-1-dev - libcap-ng-dev