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


Commits:
86561ba7 by Timo Aaltonen at 2021-05-06T16:03:48+03:00
Build with llvm-12.

- - - - -
c1e60d16 by Timo Aaltonen at 2021-05-06T16:04:14+03:00
path_max.diff: Refreshed.

- - - - -
1bb28ce7 by Timo Aaltonen at 2021-05-06T16:04:33+03:00
rules: vulkan_intel.h is gone.

- - - - -
141bc009 by Timo Aaltonen at 2021-05-06T16:05:28+03:00
release to experimental

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/path_max.diff
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,11 @@
-mesa (21.1.0-1) UNRELEASED; urgency=medium
+mesa (21.1.0-1) experimental; urgency=medium
 
   * New upstream release.
+  * Build with llvm-12.
+  * path_max.diff: Refreshed.
+  * rules: vulkan_intel.h is gone.
 
- -- Timo Aaltonen <[email protected]>  Thu, 06 May 2021 09:29:33 +0300
+ -- Timo Aaltonen <[email protected]>  Thu, 06 May 2021 16:05:12 +0300
 
 mesa (21.0.3-1) experimental; urgency=medium
 


=====================================
debian/control
=====================================
@@ -44,10 +44,10 @@ Build-Depends:
  libelf-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 
mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
  libwayland-dev (>= 1.15.0) [linux-any],
  libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
- llvm-11-dev (>= 1:11.0.0~) [amd64 arm64 armel armhf i386 mips64el mipsel 
powerpc ppc64 ppc64el riscv64 s390x sparc64],
- libclang-11-dev (>= 1:11.0.0~) [amd64 arm64 armel armhf i386 mips64el mipsel 
powerpc ppc64 ppc64el riscv64 s390x sparc64],
- libclang-cpp11-dev (>= 1:11.0.0~) [amd64 arm64 armel armhf i386 mips64el 
mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
- libclc-dev (>= 0.2.0+git20190827-7~) [amd64 arm64 armel armhf i386 mips64el 
mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
+ llvm-12-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 
ppc64el riscv64 s390x sparc64],
+ libclang-12-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 
ppc64el riscv64 s390x sparc64],
+ libclang-cpp12-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc 
ppc64 ppc64el riscv64 s390x sparc64],
+ libclc-12-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 
ppc64el riscv64 s390x sparc64],
  wayland-protocols (>= 1.9),
  zlib1g-dev,
  libglvnd-dev (>= 1.3.2),
@@ -416,8 +416,7 @@ Section: libs
 Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 
ppc64el s390x sparc64
 Pre-Depends: ${misc:Pre-Depends}
 Depends:
- libclc-r600 (>= 0.2.0+git20180312-1~),
- libclc-amdgcn (>= 0.2.0+git20180312-1~),
+ libclc-12,
  ocl-icd-libopencl1 | libopencl1,
  ${shlibs:Depends},
  ${misc:Depends},


=====================================
debian/patches/path_max.diff
=====================================
@@ -1,6 +1,6 @@
---- a/src/compiler/glsl/tests/cache_test.c
-+++ b/src/compiler/glsl/tests/cache_test.c
-@@ -132,8 +132,8 @@ check_directories_created(const char *ca
+--- a/src/util/tests/cache/cache_test.c
++++ b/src/util/tests/cache/cache_test.c
+@@ -141,8 +141,8 @@ check_directories_created(const char *ca
  {
     bool sub_dirs_created = false;
  
@@ -11,7 +11,7 @@
        char *full_path = NULL;
        if (asprintf(&full_path, "%s%s", buf, ++cache_dir) != -1 ) {
           struct stat sb;
-@@ -142,6 +142,7 @@ check_directories_created(const char *ca
+@@ -151,6 +151,7 @@ check_directories_created(const char *ca
  
           free(full_path);
        }
@@ -34,7 +34,7 @@
  static void
 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader.c
 +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
-@@ -42,6 +42,10 @@
+@@ -43,6 +43,10 @@
  #define PATH_MAX _MAX_PATH
  #endif
  


=====================================
debian/rules
=====================================
@@ -13,7 +13,7 @@ DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture 
-qDEB_HOST_ARCH_OS)
 DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 # for finding the correct llvm-config when meson doesn't know about it yet
-export PATH:=/usr/lib/llvm-11/bin/:$(PATH)
+export PATH:=/usr/lib/llvm-12/bin/:$(PATH)
 
 ifeq (,$(filter $(DEB_HOST_ARCH), armhf sh3 sh4))
 buildflags = \
@@ -224,7 +224,6 @@ override_dh_install:
   # Remove vulkan headers only where they get installed in tmp
   # We ship those headers via src:vulkan / libvulkan-dev
   ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 x32))
-       rm debian/tmp/usr/include/vulkan/vulkan_intel.h
        rmdir debian/tmp/usr/include/vulkan
   endif
 



View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/mesa/-/compare/607b6f002d4603ef30af74216778a99384add81e...141bc00985a67ab92b7f3e5a62a2daa6aecf033f

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/mesa/-/compare/607b6f002d4603ef30af74216778a99384add81e...141bc00985a67ab92b7f3e5a62a2daa6aecf033f
You're receiving this email because of your account on salsa.debian.org.


Reply via email to