debian/changelog

+mesa (18.2.0-2) UNRELEASED; urgency=medium
+
+  * control: Bump build-dep on libxcb-dri3-dev and libxcb-present-dev to
+    1.13. (Closes: #908827)
+  * control: Build-depend on x11proto-dev, modify libegl1-mesa-dev and
+    libgl1-mesa-dev depends.
+  * Migrate to llvm/clang-7.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 17 Sep 2018 15:46:55 +0300
+
 mesa (18.2.0-1) experimental; urgency=medium
 
   * New upstream release.

debian/control

@@ -10,7 +10,6 @@ Build-Depends:
  pkg-config,
  libdrm-dev (>= 2.4.91) [!hurd-any],
  libx11-dev,
- x11proto-gl-dev (>= 1.4.14),
  libxxf86vm-dev,
  libexpat1-dev,
  libsensors4-dev [!hurd-any],
@@ -23,16 +22,14 @@ Build-Depends:
  autoconf,
  automake,
  libtool,
- x11proto-dri2-dev (>= 2.6),
- x11proto-dri3-dev (>= 1.0),
- x11proto-present-dev (>= 1.0),
+ x11proto-dev,
  linux-libc-dev (>= 2.6.31) [linux-any],
  libx11-xcb-dev,
  libxcb-dri2-0-dev (>= 1.8),
  libxcb-glx0-dev (>= 1.8.1),
  libxcb-xfixes0-dev,
- libxcb-dri3-dev,
- libxcb-present-dev,
+ libxcb-dri3-dev (>= 1.13),
+ libxcb-present-dev (>= 1.13),
  libxcb-randr0-dev,
  libxcb-sync-dev,
  libxrandr-dev,
@@ -41,12 +38,12 @@ Build-Depends:
  python-mako,
  flex,
  bison,
- llvm-6.0-dev (>= 1:6.0~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],
+ llvm-7-dev (>= 1:7~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],
  libelf-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],
  libwayland-dev (>= 1.15.0) [linux-any],
  libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
- libclang-6.0-dev (>= 1:6.0~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],
- libclc-dev (>= 0.2.0+git20180312-1~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],
+ libclang-7-dev (>= 1:7~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],
+ libclc-dev (>= 0.2.0+git20180917-1~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],
  wayland-protocols (>= 1.9),
  zlib1g-dev,
  libglvnd-core-dev,
@@ -147,8 +144,6 @@ Architecture: any
 Depends:
  libglvnd-dev,
  libdrm-dev (>= 2.4.91) [!hurd-any],
- x11proto-dri2-dev (>= 2.6),
- x11proto-gl-dev (>= 1.4.14),
  libx11-dev,
  libxext-dev,
  libxxf86vm-dev,
@@ -162,6 +157,7 @@ Depends:
  libxshmfence-dev,
  libx11-xcb-dev,
  libwayland-dev (>= 1.15.0) [linux-any],
+ x11proto-dev,
  ${misc:Depends},
 Multi-Arch: same
 Description: free implementation of the EGL API -- development files
@@ -306,8 +302,7 @@ Depends:
  libxext-dev,
  libxfixes-dev,
  libxxf86vm-dev,
- x11proto-dri2-dev (>= 2.6),
- x11proto-gl-dev (>= 1.4.14),
+ x11proto-dev,
  ${misc:Depends},
 Conflicts: libgl-dev
 Replaces: libgl-dev

debian/rules

@@ -99,7 +99,7 @@ else
 	GALLIUM_DRIVERS += radeonsi
 	confflags_GALLIUM += --enable-llvm
 	confflags_GALLIUM += --enable-opencl --enable-opencl-icd
-	confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-6.0
+	confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-7
 	GALLIUM_DRIVERS += swrast
   else
 	DRI_DRIVERS += swrast