try fixing i386
This commit is contained in:
parent
55ca61858a
commit
9ff0ed21f5
18
debian/control
vendored
18
debian/control
vendored
@ -1,9 +1,9 @@
|
||||
Source: mesa
|
||||
Section: graphics
|
||||
Priority: optional
|
||||
Maintainer: Ki'Sak <kisak.ppa@gmail.com>
|
||||
XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
|
||||
Uploaders: Ki'Sak <kisak.ppa@gmail.com>
|
||||
Maintainer: First Mate Rummey <fmrummey@gmail.com>
|
||||
XSBC-Original-Maintainer: Ubuntu X-SWAT <ubuntu-x@lists.ubuntu.com>
|
||||
Uploaders: Andreas Boll <aboll@debian.org>
|
||||
Standards-Version: 4.1.4
|
||||
Build-Depends:
|
||||
debhelper-compat (= 12),
|
||||
@ -12,11 +12,11 @@ Build-Depends:
|
||||
meson (>= 0.45),
|
||||
quilt (>= 0.63-8.2~),
|
||||
pkg-config,
|
||||
libdrm-dev (>= 2.4.110),
|
||||
libdrm-dev (>= 2.4.107-4),
|
||||
libx11-dev,
|
||||
libxxf86vm-dev,
|
||||
libexpat1-dev,
|
||||
libsensors4-dev [!hurd-any],
|
||||
libsensors-dev [!hurd-any],
|
||||
libxfixes-dev,
|
||||
libxext-dev,
|
||||
libva-dev (>= 1.6.0) [linux-any kfreebsd-any] <!pkg.mesa.nolibva>,
|
||||
@ -57,7 +57,7 @@ Build-Depends:
|
||||
bindgen [amd64 arm64 armel armhf mips64el mipsel ppc64el s390x],
|
||||
llvm-spirv-15 [amd64 arm64 armel armhf mips64el mipsel ppc64el s390x],
|
||||
libclc-15 [amd64 arm64 armel armhf mips64el mipsel ppc64el s390x],
|
||||
libllvmspirvlib-15-dev [amd64 arm64 armel armhf mips64el mipsel ppc64el s390x],
|
||||
libllvmspirvlib-15-dev,
|
||||
Rules-Requires-Root: no
|
||||
Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
|
||||
Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa
|
||||
@ -289,6 +289,12 @@ Pre-Depends: ${misc:Pre-Depends}
|
||||
Depends:
|
||||
${shlibs:Depends},
|
||||
${misc:Depends}
|
||||
Recommends:
|
||||
libgl1-amber-dri
|
||||
Breaks:
|
||||
libgl1-amber-dri (<< 21.3.9)
|
||||
Replaces:
|
||||
libgl1-amber-dri (<< 21.3.9)
|
||||
Multi-Arch: same
|
||||
Description: free implementation of the OpenGL API -- DRI modules
|
||||
This version of Mesa provides GLX and DRI capabilities: it is capable of
|
||||
|
18
debian/control.in
vendored
18
debian/control.in
vendored
@ -1,9 +1,9 @@
|
||||
Source: mesa
|
||||
Section: graphics
|
||||
Priority: optional
|
||||
Maintainer: Ki'Sak <kisak.ppa@gmail.com>
|
||||
XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
|
||||
Uploaders: Ki'Sak <kisak.ppa@gmail.com>
|
||||
Maintainer: First Mate Rummey <fmrummey@gmail.com>
|
||||
XSBC-Original-Maintainer: Ubuntu X-SWAT <ubuntu-x@lists.ubuntu.com>
|
||||
Uploaders: Andreas Boll <aboll@debian.org>
|
||||
Standards-Version: 4.1.4
|
||||
Build-Depends:
|
||||
debhelper-compat (= 12),
|
||||
@ -12,11 +12,11 @@ Build-Depends:
|
||||
meson (>= 0.45),
|
||||
quilt (>= 0.63-8.2~),
|
||||
pkg-config,
|
||||
libdrm-dev (>= 2.4.110),
|
||||
libdrm-dev (>= 2.4.107-4),
|
||||
libx11-dev,
|
||||
libxxf86vm-dev,
|
||||
libexpat1-dev,
|
||||
libsensors4-dev [!hurd-any],
|
||||
libsensors-dev [!hurd-any],
|
||||
libxfixes-dev,
|
||||
libxext-dev,
|
||||
libva-dev (>= 1.6.0) [linux-any kfreebsd-any] <!pkg.mesa.nolibva>,
|
||||
@ -57,7 +57,7 @@ Build-Depends:
|
||||
bindgen [@RUSTICL_ARCHS@],
|
||||
llvm-spirv-@LLVM_VERSION@ [@RUSTICL_ARCHS@],
|
||||
libclc-@LLVM_VERSION@ [@RUSTICL_ARCHS@],
|
||||
libllvmspirvlib-@LLVM_VERSION@-dev [@RUSTICL_ARCHS@],
|
||||
libllvmspirvlib-@LLVM_VERSION@-dev,
|
||||
Rules-Requires-Root: no
|
||||
Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
|
||||
Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa
|
||||
@ -289,6 +289,12 @@ Pre-Depends: ${misc:Pre-Depends}
|
||||
Depends:
|
||||
${shlibs:Depends},
|
||||
${misc:Depends}
|
||||
Recommends:
|
||||
libgl1-amber-dri
|
||||
Breaks:
|
||||
libgl1-amber-dri (<< 21.3.9)
|
||||
Replaces:
|
||||
libgl1-amber-dri (<< 21.3.9)
|
||||
Multi-Arch: same
|
||||
Description: free implementation of the OpenGL API -- DRI modules
|
||||
This version of Mesa provides GLX and DRI capabilities: it is capable of
|
||||
|
5
debian/mesa-vulkan-drivers.install
vendored
5
debian/mesa-vulkan-drivers.install
vendored
@ -1,9 +1,10 @@
|
||||
usr/bin/mesa-overlay-control.py
|
||||
#dozen usr/bin/spirv2dxil
|
||||
usr/share/drirc.d/00-radv-defaults.conf
|
||||
usr/share/vulkan/explicit_layer.d/*.json
|
||||
usr/share/vulkan/icd.d/*.json
|
||||
usr/share/vulkan/implicit_layer.d/*.json
|
||||
usr/lib/*/libvulkan_*.so
|
||||
usr/lib/*/libVkLayer_*.so
|
||||
#dozen usr/lib/*/libspirv_to_dxil.*
|
||||
# microsoft
|
||||
#usr/bin/spirv2dxil
|
||||
#usr/lib/x86_64-linux-gnu/libspirv_to_dxil.*
|
||||
|
25
debian/rules
vendored
25
debian/rules
vendored
@ -17,6 +17,8 @@ LLVM_VERSION = 15
|
||||
export PATH:=/usr/lib/llvm-$(LLVM_VERSION)/bin/:$(PATH)
|
||||
|
||||
export DEB_BUILD_MAINT_OPTIONS=optimize=-lto
|
||||
# enable LTO everywhere:
|
||||
#confflags += -Db_lto=true
|
||||
|
||||
ifeq (,$(filter $(DEB_HOST_ARCH), armhf ppc64el sh3 sh4))
|
||||
buildflags = \
|
||||
@ -50,6 +52,9 @@ confflags_SSE2 = -Dsse2=true
|
||||
|
||||
LLVM_ARCHS = amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
|
||||
RUSTICL_ARCHS = amd64 arm64 armel armhf mips64el mipsel ppc64el s390x
|
||||
#ifeq ($(DEB_DISTRIBUTION), jammy)
|
||||
# RUSTICL_ARCHS = arm64
|
||||
#else
|
||||
VALGRIND_ARCHS = amd64 arm64 armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x
|
||||
WINE_ARCHS = amd64 arm64 armel armhf i386 powerpc
|
||||
|
||||
@ -69,7 +74,7 @@ else
|
||||
# radv/lavapipe needs LLVM and the Vulkan loader, so only build on the subset of
|
||||
# arches where we have LLVM enabled and where the Vulkan loader is built.
|
||||
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64))
|
||||
VULKAN_DRIVERS += amd swrast
|
||||
VULKAN_DRIVERS += amd swrast virtio nouveau-experimental
|
||||
endif
|
||||
|
||||
# Only enable amd on riscv64, swrast needs CPU JIT support which doesn't work properly yet
|
||||
@ -85,13 +90,13 @@ else
|
||||
|
||||
# Freedreno requires arm in addition
|
||||
ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
|
||||
GALLIUM_DRIVERS += freedreno
|
||||
GALLIUM_DRIVERS += freedreno asahi
|
||||
endif
|
||||
|
||||
# etnaviv, tegra, vc4 and v3d kernel support are only available on armhf and arm64
|
||||
ifneq (,$(filter $(DEB_HOST_ARCH), armhf arm64))
|
||||
GALLIUM_DRIVERS += etnaviv panfrost svga tegra vc4 v3d
|
||||
VULKAN_DRIVERS += broadcom freedreno
|
||||
VULKAN_DRIVERS += broadcom freedreno panfrost
|
||||
endif
|
||||
|
||||
ifneq (,$(filter $(DEB_HOST_ARCH), armhf arm64 riscv64))
|
||||
@ -118,11 +123,9 @@ else
|
||||
endif
|
||||
|
||||
# WSL supports only amd64 and arm64
|
||||
DOZEN_INSTALLED=no
|
||||
ifneq (,$(filter amd64 arm64,$(DEB_HOST_ARCH)))
|
||||
GALLIUM_DRIVERS += d3d12
|
||||
VULKAN_DRIVERS += microsoft-experimental
|
||||
DOZEN_INSTALLED=yes
|
||||
# VULKAN_DRIVERS += microsoft-experimental
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -207,6 +210,7 @@ confflags += \
|
||||
$(confflags_VALGRIND)
|
||||
|
||||
override_dh_clean: regen_control
|
||||
sed -i 's/-.*//' VERSION
|
||||
rm -rf .pc
|
||||
rm -rf build
|
||||
rm -rf configure bin/config.guess bin/config.sub config.h.in
|
||||
@ -218,6 +222,7 @@ override_dh_clean: regen_control
|
||||
dh_clean
|
||||
|
||||
override_dh_auto_configure:
|
||||
dpkg-parsechangelog | awk '/^Version:/ {print $$2}' > VERSION
|
||||
$(buildflags) dh_auto_configure -- \
|
||||
$(confflags)
|
||||
|
||||
@ -243,6 +248,7 @@ override_dh_installchangelogs:
|
||||
override_dh_install:
|
||||
# purge .la files
|
||||
find debian/tmp/ -name '*.la' -exec rm '{}' ';'
|
||||
find debian/tmp/usr/bin -name 'mme_*_sim_hw_test' -exec rm '{}' ';'
|
||||
|
||||
# Get rid of some files which aren't installed. Do not
|
||||
# use -f to ensure we notice disappearing files:
|
||||
@ -280,11 +286,6 @@ override_dh_install:
|
||||
debian/mesa-opencl-icd/usr/lib/${DEB_HOST_MULTIARCH}/
|
||||
endif
|
||||
|
||||
# Conditionally enable install of dozen files
|
||||
if test "$(DOZEN_INSTALLED)" = "yes"; then \
|
||||
sed -i -e "s|#dozen\ ||g" debian/mesa-vulkan-drivers.install; \
|
||||
fi
|
||||
|
||||
dh_install -a
|
||||
|
||||
# Install bug control and script:
|
||||
@ -298,7 +299,7 @@ override_dh_missing:
|
||||
dh_missing --fail-missing
|
||||
|
||||
override_dh_makeshlibs:
|
||||
dh_makeshlibs -a -- -c4
|
||||
dh_makeshlibs -a -- -c0
|
||||
|
||||
%:
|
||||
dh $@ --with quilt \
|
||||
|
0
debian/tests/gles-gbm-build-test
vendored
Executable file → Normal file
0
debian/tests/gles-gbm-build-test
vendored
Executable file → Normal file
Loading…
Reference in New Issue
Block a user