mesa: fix mesa-*-dri 32bit pkg generation

This commit is contained in:
Stefano Ragni 2019-12-27 23:26:58 +01:00 committed by Juan RP
parent b222abda18
commit 8b28789ad2

View file

@ -1,7 +1,7 @@
# Template file for 'mesa' # Template file for 'mesa'
pkgname=mesa pkgname=mesa
version=19.3.1 version=19.3.1
revision=2 revision=3
wrksrc="mesa-${version}" wrksrc="mesa-${version}"
build_style=meson build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
@ -199,6 +199,7 @@ mesa-opencl_package() {
mesa-dri_package() { mesa-dri_package() {
short_desc="Mesa DRI drivers" short_desc="Mesa DRI drivers"
depends="mesa-${version}_${revision}" depends="mesa-${version}_${revision}"
shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit
nostrip_files="armada-drm_dri.so etnaviv_dri.so exynos_dri.so nostrip_files="armada-drm_dri.so etnaviv_dri.so exynos_dri.so
hx8357d_dri.so i915_dri.so i965_dri.so ili9225_dri.so ili9341_dri.so hx8357d_dri.so i915_dri.so i965_dri.so ili9225_dri.so ili9341_dri.so
imx-drm_dri.so kgsl_dri.so kms_swrast_dri.so lima_dri.so meson_dri.so imx-drm_dri.so kgsl_dri.so kms_swrast_dri.so lima_dri.so meson_dri.so
@ -218,6 +219,7 @@ mesa-dri_package() {
mesa-vaapi_package() { mesa-vaapi_package() {
short_desc="Mesa VA-API drivers" short_desc="Mesa VA-API drivers"
shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit
nostrip_files="nouveau_drv_video.so r600_drv_video.so radeonsi_drv_video.so" nostrip_files="nouveau_drv_video.so r600_drv_video.so radeonsi_drv_video.so"
pkg_install() { pkg_install() {
vmove "usr/lib/dri/*_drv_video.so" vmove "usr/lib/dri/*_drv_video.so"
@ -228,7 +230,6 @@ mesa-vdpau_package() {
short_desc="Mesa VDPAU drivers" short_desc="Mesa VDPAU drivers"
nostrip_files="libvdpau_r300.so.1.0.0 libvdpau_r600.so.1.0.0 nostrip_files="libvdpau_r300.so.1.0.0 libvdpau_r600.so.1.0.0
libvdpau_radeonsi.so.1.0.0 libvdpau_nouveau.so.1.0.0" libvdpau_radeonsi.so.1.0.0 libvdpau_nouveau.so.1.0.0"
noshlibprovides=yes # manually set them in case they are needed
pkg_install() { pkg_install() {
vmove "usr/lib/vdpau/libvdpau_*" vmove "usr/lib/vdpau/libvdpau_*"
} }
@ -237,7 +238,6 @@ mesa-vdpau_package() {
mesa-XvMC_package() { mesa-XvMC_package() {
short_desc="Mesa XvMC drivers" short_desc="Mesa XvMC drivers"
nostrip_files="libXvMCnouveau.so.1.0.0 libXvMCr600.so.1.0.0" nostrip_files="libXvMCnouveau.so.1.0.0 libXvMCr600.so.1.0.0"
noshlibprovides=yes # manually set them in case they are needed
pkg_install() { pkg_install() {
vmove "usr/lib/libXvMC*" vmove "usr/lib/libXvMC*"
} }
@ -271,72 +271,84 @@ mesa-vulkan-overlay-layer_package() {
mesa-ati-dri_package() { mesa-ati-dri_package() {
build_style=meta build_style=meta
lib32mode=full
short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)" short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
depends="mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC mesa-vulkan-radeon" depends="mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC mesa-vulkan-radeon"
} }
mesa-etnaviv-dri_package() { mesa-etnaviv-dri_package() {
build_style=meta build_style=meta
lib32mode=full
short_desc="Mesa DRI drivers for Vivante GPUs (transitional dummy package)" short_desc="Mesa DRI drivers for Vivante GPUs (transitional dummy package)"
depends="mesa-dri" depends="mesa-dri"
} }
mesa-freedreno-dri_package() { mesa-freedreno-dri_package() {
build_style=meta build_style=meta
lib32mode=full
short_desc="Mesa DRI drivers for Adreno GPUs (transitional dummy package)" short_desc="Mesa DRI drivers for Adreno GPUs (transitional dummy package)"
depends="mesa-dri" depends="mesa-dri"
} }
mesa-intel-dri_package() { mesa-intel-dri_package() {
build_style=meta build_style=meta
lib32mode=full
short_desc="Mesa DRI drivers for Intel GPUs (transitional dummy package)" short_desc="Mesa DRI drivers for Intel GPUs (transitional dummy package)"
depends="mesa-dri mesa-vulkan-intel" depends="mesa-dri mesa-vulkan-intel"
} }
mesa-kmsro-dri_package() { mesa-kmsro-dri_package() {
build_style=meta build_style=meta
lib32mode=full
short_desc="KMS Render-only Mesa DRI drivers (transitional dummy package)" short_desc="KMS Render-only Mesa DRI drivers (transitional dummy package)"
depends="mesa-dri" depends="mesa-dri"
} }
mesa-lima-dri_package() { mesa-lima-dri_package() {
build_style=meta build_style=meta
lib32mode=full
short_desc="Mesa DRI drivers for Mali GPUs (Utgard) (transitional dummy package)" short_desc="Mesa DRI drivers for Mali GPUs (Utgard) (transitional dummy package)"
depends="mesa-dri" depends="mesa-dri"
} }
mesa-nouveau-dri_package() { mesa-nouveau-dri_package() {
build_style=meta build_style=meta
lib32mode=full
short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)" short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
depends="mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC" depends="mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC"
} }
mesa-panfrost-dri_package() { mesa-panfrost-dri_package() {
build_style=meta build_style=meta
lib32mode=full
short_desc="Mesa DRI drivers for Mali GPUs (Midgard/Bifrost) (dummy package)" short_desc="Mesa DRI drivers for Mali GPUs (Midgard/Bifrost) (dummy package)"
depends="mesa-dri" depends="mesa-dri"
} }
mesa-tegra-dri_package() { mesa-tegra-dri_package() {
build_style=meta build_style=meta
lib32mode=full
short_desc="Mesa DRI drivers for Tegra GPU (transitional dummy package)" short_desc="Mesa DRI drivers for Tegra GPU (transitional dummy package)"
depends="mesa-dri" depends="mesa-dri"
} }
mesa-v3d-dri_package() { mesa-v3d-dri_package() {
build_style=meta build_style=meta
lib32mode=full
short_desc="Mesa DRI drivers for Videocore VI GPU (transitional dummy package)" short_desc="Mesa DRI drivers for Videocore VI GPU (transitional dummy package)"
depends="mesa-dri" depends="mesa-dri"
} }
mesa-vmwgfx-dri_package() { mesa-vmwgfx-dri_package() {
build_style=meta build_style=meta
lib32mode=full
short_desc="Mesa DRI drivers for VMware (transitional dummy package)" short_desc="Mesa DRI drivers for VMware (transitional dummy package)"
depends="mesa-dri" depends="mesa-dri"
} }
mesa-vc4-dri_package() { mesa-vc4-dri_package() {
build_style=meta build_style=meta
lib32mode=full
short_desc="Mesa DRI drivers for Videocore IV GPU (transitional dummy package)" short_desc="Mesa DRI drivers for Videocore IV GPU (transitional dummy package)"
depends="mesa-dri" depends="mesa-dri"
} }