Timo Aaltonen pushed to branch debian-experimental at X Strike Force / lib / mesa
Commits:
-
19e0c09f
by Timo Aaltonen at 2019-12-06T06:32:37Z
-
16236de4
by Timo Aaltonen at 2019-12-06T23:52:38Z
-
90a1d47b
by Timo Aaltonen at 2019-12-07T00:05:17Z
-
5f652bdd
by Timo Aaltonen at 2019-12-07T00:13:20Z
9 changed files:
- debian/changelog
- debian/control
- debian/libegl1-mesa-dev.install
- − debian/libgl1-mesa-dev.install
- − debian/libgles2-mesa-dev.install
- debian/mesa-common-dev.install
- − debian/patches/generate-pc-files-for-gles-and-gles2.diff
- debian/patches/series
- debian/rules
Changes:
| 1 | 1 |
mesa (19.3.0~rc6-1) UNRELEASED; urgency=medium
|
| 2 | 2 |
|
| 3 | 3 |
* New upstream release candidate.
|
| 4 |
- * control, rules: Don't build mesa-vulkan-drivers on mips*.
|
|
| 4 |
+ * control, rules: Don't build radv on non-x86.
|
|
| 5 |
+ * Don't install EGL/GL/GLES headers or pkg-config files, they're
|
|
| 6 |
+ shipped by libglvnd 1.3.0 now. Make old -dev packages transitional,
|
|
| 7 |
+ except libegl1-mesa-dev which still has two mesa specific headers.
|
|
| 8 |
+ * generate-pc-files-for-gles-and-gles2.diff: Dropped, not needed anymore.
|
|
| 9 |
+ * rules: Update clean target.
|
|
| 5 | 10 |
|
| 6 | 11 |
-- Timo Aaltonen <tjaalton@debian.org> Thu, 05 Dec 2019 09:21:11 +0200
|
| 7 | 12 |
|
| ... | ... | @@ -46,7 +46,7 @@ Build-Depends: |
| 46 | 46 |
libclc-dev (>= 0.2.0+git20190827-1~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
|
| 47 | 47 |
wayland-protocols (>= 1.9),
|
| 48 | 48 |
zlib1g-dev,
|
| 49 |
- libglvnd-core-dev,
|
|
| 49 |
+ libglvnd-dev (>= 1.3.0),
|
|
| 50 | 50 |
Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
|
| 51 | 51 |
Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa
|
| 52 | 52 |
Homepage: https://mesa3d.org/
|
| ... | ... | @@ -172,23 +172,7 @@ Package: libegl1-mesa-dev |
| 172 | 172 |
Section: libdevel
|
| 173 | 173 |
Architecture: any
|
| 174 | 174 |
Depends:
|
| 175 |
- mesa-common-dev (= ${binary:Version}),
|
|
| 176 |
- libglvnd-dev,
|
|
| 177 |
- libdrm-dev (>= 2.4.95) [!hurd-any],
|
|
| 178 |
- libx11-dev,
|
|
| 179 |
- libxext-dev,
|
|
| 180 |
- libxxf86vm-dev,
|
|
| 181 |
- libxdamage-dev,
|
|
| 182 |
- libxfixes-dev,
|
|
| 183 |
- libxcb-glx0-dev,
|
|
| 184 |
- libxcb-dri2-0-dev,
|
|
| 185 |
- libxcb-dri3-dev,
|
|
| 186 |
- libxcb-present-dev,
|
|
| 187 |
- libxcb-sync-dev,
|
|
| 188 |
- libxshmfence-dev,
|
|
| 189 |
- libx11-xcb-dev,
|
|
| 190 |
- libwayland-dev (>= 1.15.0) [linux-any],
|
|
| 191 |
- x11proto-dev,
|
|
| 175 |
+ libegl-dev,
|
|
| 192 | 176 |
${misc:Depends},
|
| 193 | 177 |
Multi-Arch: same
|
| 194 | 178 |
Description: free implementation of the EGL API -- development files
|
| ... | ... | @@ -223,24 +207,14 @@ Description: transitional dummy package |
| 223 | 207 |
This is a transitional dummy package, it can be safely removed.
|
| 224 | 208 |
|
| 225 | 209 |
Package: libgles2-mesa-dev
|
| 226 |
-Section: libdevel
|
|
| 210 |
+Section: oldlibs
|
|
| 227 | 211 |
Architecture: any
|
| 228 | 212 |
Depends:
|
| 229 |
- libegl1-mesa-dev,
|
|
| 230 |
- libglvnd-dev,
|
|
| 213 |
+ libgles-dev,
|
|
| 231 | 214 |
${misc:Depends},
|
| 232 | 215 |
Multi-Arch: same
|
| 233 |
-Description: free implementation of the OpenGL|ES 2.x API -- development files
|
|
| 234 |
- OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
|
|
| 235 |
- embedded systems - including consoles, phones, appliances and vehicles.
|
|
| 236 |
- It contains a subset of OpenGL plus a number of extensions for the
|
|
| 237 |
- special needs of embedded systems.
|
|
| 238 |
- .
|
|
| 239 |
- OpenGL|ES 2.x provides an API for programmable hardware including vertex
|
|
| 240 |
- and fragment shaders.
|
|
| 241 |
- .
|
|
| 242 |
- This package provides a development environment for building applications
|
|
| 243 |
- using the OpenGL|ES 2.x APIs.
|
|
| 216 |
+Description: transitional dummy package
|
|
| 217 |
+ This is a transitional dummy package, it can be safely removed.
|
|
| 244 | 218 |
|
| 245 | 219 |
Package: libglapi-mesa
|
| 246 | 220 |
Section: libs
|
| ... | ... | @@ -315,40 +289,14 @@ Description: free implementation of the OpenGL API -- DRI modules |
| 315 | 289 |
libglx-mesa0 package.
|
| 316 | 290 |
|
| 317 | 291 |
Package: libgl1-mesa-dev
|
| 318 |
-Section: libdevel
|
|
| 292 |
+Section: oldlibs
|
|
| 319 | 293 |
Architecture: any
|
| 320 | 294 |
Depends:
|
| 321 |
- mesa-common-dev (= ${binary:Version}),
|
|
| 322 |
- libglvnd-dev,
|
|
| 323 |
- libdrm-dev (>= 2.4.95) [!hurd-any],
|
|
| 324 |
- libx11-dev,
|
|
| 325 |
- libx11-xcb-dev,
|
|
| 326 |
- libxcb-dri3-dev,
|
|
| 327 |
- libxcb-present-dev,
|
|
| 328 |
- libxcb-sync-dev,
|
|
| 329 |
- libxshmfence-dev,
|
|
| 330 |
- libxcb-dri2-0-dev,
|
|
| 331 |
- libxcb-glx0-dev,
|
|
| 332 |
- libxdamage-dev,
|
|
| 333 |
- libxext-dev,
|
|
| 334 |
- libxfixes-dev,
|
|
| 335 |
- libxxf86vm-dev,
|
|
| 336 |
- x11proto-dev,
|
|
| 295 |
+ libgl-dev,
|
|
| 337 | 296 |
${misc:Depends},
|
| 338 |
-Conflicts: libgl-dev
|
|
| 339 |
-Replaces: libgl-dev
|
|
| 340 |
-Provides: libgl-dev
|
|
| 341 | 297 |
Multi-Arch: same
|
| 342 |
-Description: free implementation of the OpenGL API -- GLX development files
|
|
| 343 |
- This version of Mesa provides GLX and DRI capabilities: it is capable of
|
|
| 344 |
- both direct and indirect rendering. For direct rendering, it can use DRI
|
|
| 345 |
- modules from the libgl1-mesa-dri package to accelerate drawing.
|
|
| 346 |
- .
|
|
| 347 |
- This package includes headers and static libraries for compiling
|
|
| 348 |
- programs with Mesa.
|
|
| 349 |
- .
|
|
| 350 |
- For a complete description of Mesa, please look at the libglx-mesa0
|
|
| 351 |
- package.
|
|
| 298 |
+Description: transitional dummy package
|
|
| 299 |
+ This is a transitional dummy package, it can be safely removed.
|
|
| 352 | 300 |
|
| 353 | 301 |
Package: mesa-common-dev
|
| 354 | 302 |
Section: libdevel
|
| ... | ... | @@ -443,7 +391,7 @@ Description: Mesa VDPAU video acceleration drivers |
| 443 | 391 |
|
| 444 | 392 |
Package: mesa-vulkan-drivers
|
| 445 | 393 |
Section: libs
|
| 446 |
-Architecture: amd64 arm64 armel armhf i386 powerpc ppc64 ppc64el s390x sparc64 x32
|
|
| 394 |
+Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64 x32
|
|
| 447 | 395 |
Pre-Depends: ${misc:Pre-Depends}
|
| 448 | 396 |
Depends:
|
| 449 | 397 |
libvulkan1,
|
| 1 |
-usr/include/EGL
|
|
| 2 |
-usr/lib/*/pkgconfig/egl.pc
|
|
| 1 |
+usr/include/EGL/eglmesaext.h
|
|
| 2 |
+usr/include/EGL/eglextchromium.h
|
| 1 |
-usr/lib/*/pkgconfig/gl.pc
|
| 1 |
-usr/include/GLES2
|
|
| 2 |
-usr/include/GLES3
|
|
| 3 |
-usr/lib/*/pkgconfig/glesv2.pc
|
| 1 |
-usr/include/GL/gl.h
|
|
| 2 |
-usr/include/GL/glcorearb.h
|
|
| 3 |
-usr/include/GL/glext.h
|
|
| 4 |
-usr/include/GL/glx.h
|
|
| 5 |
-usr/include/GL/glxext.h
|
|
| 6 | 1 |
usr/include/GL/internal/dri_interface.h
|
| 7 |
-usr/include/KHR/khrplatform.h
|
|
| 8 | 2 |
usr/lib/*/pkgconfig/dri.pc
|
| 1 |
-From aa620fdf8e9364fc64116923c3855ca15d9b5c3e Mon Sep 17 00:00:00 2001
|
|
| 2 |
-From: Dylan Baker <dylan@pnwbakers.com>
|
|
| 3 |
-Date: Thu, 10 Oct 2019 15:18:40 -0700
|
|
| 4 |
-Subject: [PATCH] meson: generate .pc files for gles and gles2 with old glvnd
|
|
| 5 |
- |
|
| 6 |
-Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1921
|
|
| 7 |
----
|
|
| 8 |
- src/mapi/meson.build | 28 ++++++++++++++++++++++++----
|
|
| 9 |
- 1 file changed, 24 insertions(+), 4 deletions(-)
|
|
| 10 |
- |
|
| 11 |
-diff --git a/src/mapi/meson.build b/src/mapi/meson.build
|
|
| 12 |
-index 2c79a04f1df..bf9e982d149 100644
|
|
| 13 |
---- a/src/mapi/meson.build
|
|
| 14 |
-+++ b/src/mapi/meson.build
|
|
| 15 |
-@@ -1,4 +1,4 @@
|
|
| 16 |
--# Copyright © 2017 Intel Corporation
|
|
| 17 |
-+# Copyright © 2017-2019 Intel Corporation
|
|
| 18 |
-
|
|
| 19 |
- # Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
| 20 |
- # of this software and associated documentation files (the "Software"), to deal
|
|
| 21 |
-@@ -35,11 +35,31 @@ if with_shared_glapi
|
|
| 22 |
- else
|
|
| 23 |
- libglapi = []
|
|
| 24 |
- endif
|
|
| 25 |
--if not with_glvnd
|
|
| 26 |
-- if with_gles1
|
|
| 27 |
-+if with_gles1
|
|
| 28 |
-+ if not with_glvnd
|
|
| 29 |
- subdir('es1api')
|
|
| 30 |
-+ elif not glvnd_has_headers_and_pc_files
|
|
| 31 |
-+ pkg.generate(
|
|
| 32 |
-+ name : 'glesv1_cm',
|
|
| 33 |
-+ filebase : 'glesv1_cm',
|
|
| 34 |
-+ description : 'Mesa OpenGL ES 1.1 CM library',
|
|
| 35 |
-+ version : meson.project_version(),
|
|
| 36 |
-+ libraries : '-L${libdir} -lGLESv1_CM',
|
|
| 37 |
-+ libraries_private : gl_priv_libs,
|
|
| 38 |
-+ )
|
|
| 39 |
- endif
|
|
| 40 |
-- if with_gles2
|
|
| 41 |
-+endif
|
|
| 42 |
-+if with_gles2
|
|
| 43 |
-+ if not with_glvnd
|
|
| 44 |
- subdir('es2api')
|
|
| 45 |
-+ elif not glvnd_has_headers_and_pc_files
|
|
| 46 |
-+ pkg.generate(
|
|
| 47 |
-+ name : 'glesv2',
|
|
| 48 |
-+ filebase : 'glesv2',
|
|
| 49 |
-+ description : 'Mesa OpenGL ES 2.0 library',
|
|
| 50 |
-+ version : meson.project_version(),
|
|
| 51 |
-+ libraries : '-L${libdir} -lGLESv2',
|
|
| 52 |
-+ libraries_private : gl_priv_libs,
|
|
| 53 |
-+ )
|
|
| 54 |
- endif
|
|
| 55 |
- endif
|
|
| 56 |
---
|
|
| 57 |
-2.20.1
|
|
| 58 |
- |
| 1 | 1 |
07_gallium-fix-build-failure-on-powerpcspe.diff
|
| 2 |
-generate-pc-files-for-gles-and-gles2.diff
|
| ... | ... | @@ -103,7 +103,7 @@ else |
| 103 | 103 |
|
| 104 | 104 |
# radv needs LLVM and the Vulkan loader, so only build on the subset of
|
| 105 | 105 |
# arches where we have LLVM enabled and where the Vulkan loader is built.
|
| 106 |
- ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 powerpc ppc64 ppc64el s390x sparc64))
|
|
| 106 |
+ ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386))
|
|
| 107 | 107 |
VULKAN_DRIVERS += amd,
|
| 108 | 108 |
endif
|
| 109 | 109 |
|
| ... | ... | @@ -153,6 +153,7 @@ override_dh_clean: |
| 153 | 153 |
rm -rf $$(find -name Makefile.in)
|
| 154 | 154 |
rm -rf bin/install-sh bin/ltmain.sh
|
| 155 | 155 |
for file in debian/*.in; do rm -f $${file%%.in}; done
|
| 156 |
+ rm -rf src/amd/compiler/__pycache__/ src/amd/registers/__pycache__
|
|
| 156 | 157 |
rm -rf src/amd/vulkan/*.pyc src/amd/vulkan/__pycache__/
|
| 157 | 158 |
rm -rf src/compiler/nir/*.pyc src/compiler/nir/__pycache__/
|
| 158 | 159 |
rm -rf src/egl/generate/*.pyc src/egl/generate/__pycache__/
|