@@ -8,6 +8,7 @@ grade: stable
88base : core24
99platforms :
1010 amd64 :
11+ arm64 :
1112compression : lzo
1213
1314slots :
@@ -32,6 +33,13 @@ package-repositories:
3233 architectures : [amd64, i386]
3334 key-id : F6ECB3762474EDA9D21B7022871920D1991BC93C
3435 key-server : keyserver.ubuntu.com
36+ - type : apt
37+ url : http://ports.ubuntu.com/ubuntu-ports/
38+ suites : [noble, noble-updates]
39+ components : [main, universe]
40+ architectures : [arm64]
41+ key-id : F6ECB3762474EDA9D21B7022871920D1991BC93C
42+ key-server : keyserver.ubuntu.com
3543 - type : apt
3644 # FIXME: We need to enable both 32-bit and 64-bit architectures
3745 # for this PPA, but Snapcraft doesn't let us do that with the
@@ -41,7 +49,7 @@ package-repositories:
4149 url : http://ppa.launchpad.net/kisak/kisak-mesa/ubuntu
4250 suites : [noble]
4351 components : [main]
44- architectures : [amd64, i386]
52+ architectures : [amd64, i386, arm64 ]
4553 key-id : EB8B81E14DA65431D7504EA8F63F0F2B90935439
4654 key-server : keyserver.ubuntu.com
4755
@@ -51,32 +59,51 @@ parts:
5159 build-packages :
5260 - execstack
5361 stage-packages :
54- - libdrm2:i386
55- - libdrm2:amd64
56- - libglx-mesa0:i386
57- - libglx-mesa0:amd64
58- - libgl1:i386
59- - libgl1:amd64
60- - libgl1-mesa-dri:i386
61- - libgl1-mesa-dri:amd64
62- - libvkd3d1:amd64
63- - mesa-va-drivers:amd64
64- - mesa-va-drivers:i386
65- - mesa-vdpau-drivers:amd64
66- - mesa-vdpau-drivers:i386
67- - mesa-vulkan-drivers:amd64
68- - mesa-vulkan-drivers:i386
69- - va-driver-all:amd64
70- - va-driver-all:i386
71- - va-driver:i386
72- - libvdpau-va-gl1:amd64
73- - libdrm-common
74- - vulkan-tools # For testing/debugging
75- - mesa-utils # For testing/debugging
76- # Only needed in the kisak branches, oibaf picks these up from the PPA
77- - libxml2:i386
78- - libxml2:amd64
79- - libstdc++6
62+ - on amd64 :
63+ - libdrm2:i386
64+ - libdrm2:amd64
65+ - libglx-mesa0:i386
66+ - libglx-mesa0:amd64
67+ - libgl1:i386
68+ - libgl1:amd64
69+ - libgl1-mesa-dri:i386
70+ - libgl1-mesa-dri:amd64
71+ - libvkd3d1:amd64
72+ - mesa-va-drivers:amd64
73+ - mesa-va-drivers:i386
74+ - mesa-vdpau-drivers:amd64
75+ - mesa-vdpau-drivers:i386
76+ - mesa-vulkan-drivers:amd64
77+ - mesa-vulkan-drivers:i386
78+ - va-driver-all:amd64
79+ - va-driver-all:i386
80+ - va-driver:i386
81+ - libvdpau-va-gl1:amd64
82+ - libdrm-common
83+ - vulkan-tools # For testing/debugging
84+ - mesa-utils # For testing/debugging
85+ # Only needed in the kisak branches, oibaf picks these up from the PPA
86+ - libxml2:i386
87+ - libxml2:amd64
88+ - libstdc++6
89+ - on arm64 :
90+ - libdrm2
91+ - libglx-mesa0
92+ - libgl1
93+ - libgl1-mesa-dri
94+ - libvkd3d1
95+ - mesa-va-drivers
96+ - mesa-vdpau-drivers
97+ - mesa-vulkan-drivers
98+ - va-driver-all
99+ - libvdpau-va-gl1
100+ - va-driver
101+ - libdrm-common
102+ - vulkan-tools # For testing/debugging
103+ - mesa-utils # For testing/debugging
104+ # Only needed in the kisak branches, oibaf picks these up from the PPA
105+ - libxml2
106+ - libstdc++6
80107 stage :
81108 - -usr/share/doc
82109 - -usr/share/man
@@ -94,10 +121,11 @@ parts:
94121 craftctl default
95122 # Set the snap version from the mesa package version
96123 craftctl set version=$(dpkg-parsechangelog -l $CRAFT_PART_INSTALL/usr/share/doc/mesa-va-drivers/changelog*gz -S Version | cut -c -32)
97- # Clear execstack
98- for f in usr/lib/*/libvkd3d-shader.so.* usr/lib/*/libvkd3d.so.*; do
99- if [ -f $f ]; then
100- execstack -c $f
101- fi
102- done
103-
124+ if [[ "$CRAFT_ARCH_BUILD_FOR" == "amd64" ]]; then
125+ # Clear execstack
126+ for f in usr/lib/*/libvkd3d-shader.so.* usr/lib/*/libvkd3d.so.*; do
127+ if [ -f $f ]; then
128+ execstack -c $f
129+ fi
130+ done
131+ fi
0 commit comments