Timo Aaltonen pushed to branch debian-experimental at X Strike Force / lib / 
mesa


Commits:
e7217aec by Timo Aaltonen at 2022-11-08T19:56:29+02:00
control, rules: Enable intel vulkan raytracing support, add python3-ply and 
libclc-15 to build-depends.

- - - - -
c477d24d by Timo Aaltonen at 2022-11-08T19:58:45+02:00
rules: Fix rusticl logic.

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+mesa (22.3.0~rc1-3) UNRELEASED; urgency=medium
+
+  * control, rules: Enable intel vulkan raytracing support, add
+    python3-ply and libclc-15 to build-depends.
+  * rules: Fix rusticl logic.
+
+ -- Timo Aaltonen <[email protected]>  Tue, 08 Nov 2022 16:07:22 +0200
+
 mesa (22.3.0~rc1-2) experimental; urgency=medium
 
   * rules: Update list of archs without rustc.


=====================================
debian/control
=====================================
@@ -37,6 +37,7 @@ Build-Depends:
  libzstd-dev,
  python3,
  python3-mako,
+ python3-ply,
  python3-setuptools,
  flex,
  bison,
@@ -54,6 +55,7 @@ Build-Depends:
  rustc [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x],
  bindgen [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x],
  llvm-spirv-15 [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x],
+ libclc-15 [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x],
  libllvmspirvlib-15-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el 
s390x],
 Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
 Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa


=====================================
debian/rules
=====================================
@@ -47,7 +47,7 @@ confflags_DRI3 = -Ddri3=disabled
 confflags_OSMESA =  -Dosmesa=true
 confflags_SSE2 = -Dsse2=true
 
-NO_RUSTC_ARCHS = alpha arc hppa hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 
m68k powerpc ppc64 riscv64 sh4 sparc64 x32
+RUSTICL_ARCHS = amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x
 
 # hurd doesn't do direct rendering
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
@@ -89,6 +89,7 @@ else
                # svga needs xa state tracker
                confflags_GALLIUM += -Dgallium-xa=enabled
                VULKAN_DRIVERS += intel
+               confflags_GALLIUM += -Dintel-clc=enabled
        endif
 
        # Non-Linux ports lack epoll, so wayland isn't ready yet:
@@ -119,7 +120,7 @@ else
        confflags_GALLIUM += -Dgallium-opencl=icd
 
        # Build rusticl for archs where rustc is available
-       ifneq ($(DEB_HOST_ARCH), $(NO_RUSTC_ARCHS))
+       ifneq (,$(filter $(DEB_HOST_ARCH), $(RUSTICL_ARCHS)))
                confflags_GALLIUM += -Dgallium-rusticl=true
        endif
 
@@ -244,7 +245,7 @@ override_dh_install:
     endif
   endif
 
-  ifneq ($(DEB_HOST_ARCH), $(NO_RUSTC_ARCHS))
+  ifneq (,$(filter $(DEB_HOST_ARCH), $(RUSTICL_ARCHS)))
        install -m755 -d debian/mesa-opencl-icd/etc/OpenCL/vendors
        mv debian/tmp/etc/OpenCL/vendors/rusticl.icd \
           debian/mesa-opencl-icd/etc/OpenCL/vendors



View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/mesa/-/compare/8f20e6112056d9620e57a9ae4cfaad9d23899051...c477d24d3c321faba6577c4ba8fb1f23bb7b7ec5

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/mesa/-/compare/8f20e6112056d9620e57a9ae4cfaad9d23899051...c477d24d3c321faba6577c4ba8fb1f23bb7b7ec5
You're receiving this email because of your account on salsa.debian.org.


Reply via email to