This commit is contained in:
parent
0e70d3892e
commit
14b6e871ff
2
.github/release-nest-v3
vendored
2
.github/release-nest-v3
vendored
@ -1 +1 @@
|
||||
8
|
||||
9
|
20
debian/control
vendored
20
debian/control
vendored
@ -1,13 +1,11 @@
|
||||
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: Debian X Strike Force <debian-x@lists.debian.org>
|
||||
Uploaders: Andreas Boll <aboll@debian.org>
|
||||
Standards-Version: 4.1.4
|
||||
Build-Depends:
|
||||
debhelper-compat (= 13),
|
||||
glslang-dev,
|
||||
directx-headers-dev (>= 1.613.0) [linux-amd64 linux-arm64],
|
||||
flatbuffers-compiler [linux-arm64],
|
||||
glslang-tools [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
|
||||
@ -60,14 +58,14 @@ Build-Depends:
|
||||
zlib1g-dev,
|
||||
libglvnd-core-dev (>= 1.3.2),
|
||||
valgrind [amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x],
|
||||
rustc (>= 1.73) [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
|
||||
rustfmt [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
|
||||
bindgen (>= 0.66.1~) [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
|
||||
cbindgen [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
|
||||
llvm-spirv-18 [amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
|
||||
rustc (>= 1.73) [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
|
||||
rustfmt [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
|
||||
bindgen (>= 0.66.1~) [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
|
||||
cbindgen [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
|
||||
llvm-spirv-18 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
|
||||
libllvmspirvlib-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
|
||||
librust-paste-dev [amd64 arm64 armhf ppc64 riscv64 x32],
|
||||
librust-syn-dev [amd64 arm64 armhf ppc64 riscv64 x32],
|
||||
librust-paste-dev [amd64 arm64 armhf i386 ppc64 riscv64 x32],
|
||||
librust-syn-dev (>= 2.0.68) [amd64 arm64 armhf i386 ppc64 riscv64 x32],
|
||||
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
|
||||
|
8
debian/control.in
vendored
8
debian/control.in
vendored
@ -1,15 +1,13 @@
|
||||
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: Debian X Strike Force <debian-x@lists.debian.org>
|
||||
Uploaders: Andreas Boll <aboll@debian.org>
|
||||
Standards-Version: 4.1.4
|
||||
Build-Depends:
|
||||
debhelper-compat (= 13),
|
||||
directx-headers-dev (>= 1.613.0) [linux-amd64 linux-arm64],
|
||||
flatbuffers-compiler [linux-arm64],
|
||||
glslang-dev [@LLVM_ARCHS@],
|
||||
glslang-tools [@LLVM_ARCHS@],
|
||||
meson (>= 1.4.0),
|
||||
quilt (>= 0.63-8.2~),
|
||||
@ -67,7 +65,7 @@ Build-Depends:
|
||||
llvm-spirv-@LLVM_VERSION@ [@RUSTICL_ARCHS@],
|
||||
libllvmspirvlib-@LLVM_VERSION@-dev [@LLVM_ARCHS@],
|
||||
librust-paste-dev [@NVK_ARCHS@],
|
||||
librust-syn-dev [@NVK_ARCHS@],
|
||||
librust-syn-dev (>= 2.0.68) [@NVK_ARCHS@],
|
||||
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
|
||||
|
2
debian/mesa-vulkan-drivers.install
vendored
2
debian/mesa-vulkan-drivers.install
vendored
@ -1,9 +1,7 @@
|
||||
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.*
|
||||
|
20
debian/rules
vendored
20
debian/rules
vendored
@ -17,7 +17,6 @@ LLVM_VERSION = 18
|
||||
export PATH:=/usr/lib/llvm-$(LLVM_VERSION)/bin/:$(PATH)
|
||||
|
||||
export DEB_BUILD_MAINT_OPTIONS=optimize=-lto
|
||||
export MESON_PACKAGE_CACHE_DIR=/usr/share/cargo/registry/
|
||||
|
||||
DEB_CFLAGS_MAINT_APPEND := -Wall
|
||||
DEB_CXXFLAGS_MAINT_APPEND := -Wall
|
||||
@ -44,7 +43,7 @@ buildflags = $(shell \
|
||||
dpkg-buildflags --export=configure)
|
||||
|
||||
EGL_PLATFORMS = x11
|
||||
GALLIUM_DRIVERS =
|
||||
GALLIUM_DRIVERS = softpipe
|
||||
VULKAN_DRIVERS =
|
||||
VULKAN_LAYERS =
|
||||
|
||||
@ -54,14 +53,13 @@ confflags_SSE2 = -Dsse2=true
|
||||
confflags_TEFLON = -Dteflon=false
|
||||
|
||||
LLVM_ARCHS = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
|
||||
RUSTICL_ARCHS = amd64 arm64 armel armhf loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32
|
||||
NVK_ARCHS = amd64 arm64 armhf ppc64 riscv64 x32
|
||||
RUSTICL_ARCHS = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32
|
||||
NVK_ARCHS = amd64 arm64 armhf i386 ppc64 riscv64 x32
|
||||
VALGRIND_ARCHS = amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x
|
||||
WINE_ARCHS = amd64 arm64 armel armhf i386
|
||||
|
||||
# hurd doesn't do direct rendering
|
||||
ifeq ($(DEB_HOST_ARCH_OS), hurd)
|
||||
GALLIUM_DRIVERS += softpipe
|
||||
confflags_DIRECT_RENDERING = -Dglx-direct=false
|
||||
confflags_GBM = -Dgbm=disabled
|
||||
else
|
||||
@ -110,11 +108,8 @@ else
|
||||
endif
|
||||
|
||||
# WSL supports only amd64 and arm64
|
||||
DOZEN_INSTALLED=no
|
||||
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64))
|
||||
GALLIUM_DRIVERS += d3d12
|
||||
VULKAN_DRIVERS += microsoft-experimental
|
||||
DOZEN_INSTALLED=yes
|
||||
endif
|
||||
|
||||
# LLVM is required for building r300g, radeonsi and llvmpipe drivers.
|
||||
@ -139,6 +134,7 @@ else
|
||||
endif
|
||||
|
||||
ifneq (,$(filter $(DEB_HOST_ARCH), $(NVK_ARCHS)))
|
||||
export MESON_PACKAGE_CACHE_DIR=/usr/share/cargo/registry/
|
||||
VULKAN_DRIVERS += nouveau
|
||||
endif
|
||||
|
||||
@ -147,7 +143,6 @@ else
|
||||
confflags_GALLIUM += -Dgallium-nine=true
|
||||
endif
|
||||
else
|
||||
GALLIUM_DRIVERS += softpipe
|
||||
confflags_GALLIUM += -Dllvm=disabled
|
||||
endif
|
||||
|
||||
@ -214,6 +209,7 @@ rewrite_wrap_files:
|
||||
touch subprojects/rewrite
|
||||
|
||||
override_dh_clean: regen_control
|
||||
dpkg-parsechangelog | awk '/^Version:/ {print $$2}' | sed 's/-.*//;s/~/-/' > VERSION
|
||||
rm -rf .pc
|
||||
rm -rf build
|
||||
rm -rf configure bin/config.guess bin/config.sub config.h.in
|
||||
@ -231,6 +227,7 @@ override_dh_clean: regen_control
|
||||
dh_clean
|
||||
|
||||
override_dh_auto_configure: rewrite_wrap_files
|
||||
dpkg-parsechangelog | awk '/^Version:/ {print $$2}' > VERSION
|
||||
$(buildflags) dh_auto_configure -- \
|
||||
$(confflags)
|
||||
|
||||
@ -297,11 +294,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:
|
||||
|
25
debian/source/local-options
vendored
Normal file
25
debian/source/local-options
vendored
Normal file
@ -0,0 +1,25 @@
|
||||
# ignore symlinks from git, use source files from the tarball
|
||||
extend-diff-ignore = src/mesa/drivers/dri/r200/.*radeon_.*
|
||||
|
||||
## The following files aren't shipped in the upstream tarball
|
||||
|
||||
# Android Makefiles
|
||||
extend-diff-ignore = Android.*mk|CleanSpec\.mk
|
||||
|
||||
# coding-style and other config files
|
||||
extend-diff-ignore = \.clang-format|\.dir-locals\.el|\.editorconfig|\.mailmap|\.travis\.yml|appveyor\.yml
|
||||
|
||||
# misc. files and scripts used by Mesa developers but not required for the build
|
||||
extend-diff-ignore = include/drm-uapi/README|src/compiler/glsl/int64\.glsl|src/compiler/nir/README|src/gallium/drivers/vc4/kernel/README|src/util/sha1/README|REVIEWERS|scripts/get_reviewer\.pl|bin/\.cherry-ignore|bin/bugzilla_mesa\.sh|bin/get-extra-pick-list\.sh|bin/get-fixes-pick-list\.sh|bin/get-pick-list\.sh|bin/get-typod-pick-list\.sh|bin/perf-annotate-jit|bin/shortlog_mesa\.sh|src/intel/blorp/TODO|src/mesa/drivers/dri/gen-symbol-redefs\.py|src/mesa/drivers/dri/r200/Doxyfile
|
||||
|
||||
# radeonsi GLSL lit tests (for developers only)
|
||||
extend-diff-ignore = src/gallium/drivers/radeonsi/glsl_tests/
|
||||
|
||||
# dead code
|
||||
extend-diff-ignore = src/gallium/auxiliary/gallivm/f.cpp
|
||||
|
||||
# empty Makefile.sources
|
||||
extend-diff-ignore = src/gallium/drivers/pl111/Makefile.sources
|
||||
|
||||
# CI
|
||||
extend-diff-ignore = .gitlab-ci|.gitlab-ci.yml
|
4
debian/upstream/metadata
vendored
Normal file
4
debian/upstream/metadata
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
Bug-Database: https://gitlab.freedesktop.org/mesa/mesa/-/issues
|
||||
Bug-Submit: https://gitlab.freedesktop.org/mesa/mesa/-/issues/new
|
||||
Repository: https://gitlab.freedesktop.org/mesa/mesa.git
|
||||
Repository-Browse: https://gitlab.freedesktop.org/mesa/mesa
|
1
debian/watch
vendored
1
debian/watch
vendored
@ -1,4 +1,3 @@
|
||||
#git=git://anongit.freedesktop.org/mesa/mesa
|
||||
version=3
|
||||
opts="uversionmangle=s/-rc/~rc/,dversionmangle=s/\+repack//,pgpsigurlmangle=s/$/.sig/,pasv" \
|
||||
https://mesa.freedesktop.org/archive/mesa-(.*)\.tar\.xz
|
||||
|
10
pika-build-config/amd64-v3.sh
Executable file → Normal file
10
pika-build-config/amd64-v3.sh
Executable file → Normal file
@ -1,10 +1,10 @@
|
||||
#! /bin/bash
|
||||
export PIKA_BUILD_ARCH="amd64-v3"
|
||||
export DEBIAN_FRONTEND="noninteractive"
|
||||
export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
|
||||
export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
|
||||
export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
|
||||
export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
|
||||
export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
|
||||
export DEB_BUILD_MAINT_OPTIONS="-march=x86-64-v3 -O3"
|
||||
export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3"
|
||||
export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3"
|
||||
export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3"
|
||||
export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3"
|
||||
export DEB_BUILD_OPTIONS="nocheck notest terse"
|
||||
export DPKG_GENSYMBOLS_CHECK_LEVEL=0
|
||||
|
@ -1,10 +0,0 @@
|
||||
#! /bin/bash
|
||||
export PIKA_BUILD_ARCH="amd64-v3"
|
||||
export DEBIAN_FRONTEND="noninteractive"
|
||||
export DEB_BUILD_MAINT_OPTIONS="-march=x86-64-v3 -O3"
|
||||
export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3"
|
||||
export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3"
|
||||
export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3"
|
||||
export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3"
|
||||
export DEB_BUILD_OPTIONS="nocheck notest terse"
|
||||
export DPKG_GENSYMBOLS_CHECK_LEVEL=0
|
10
pika-build-config/amd64-v3.sh.bak1
Executable file
10
pika-build-config/amd64-v3.sh.bak1
Executable file
@ -0,0 +1,10 @@
|
||||
#! /bin/bash
|
||||
export PIKA_BUILD_ARCH="amd64-v3"
|
||||
export DEBIAN_FRONTEND="noninteractive"
|
||||
export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
|
||||
export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
|
||||
export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
|
||||
export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
|
||||
export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
|
||||
export DEB_BUILD_OPTIONS="nocheck notest terse"
|
||||
export DPKG_GENSYMBOLS_CHECK_LEVEL=0
|
Loading…
Reference in New Issue
Block a user