debian/changelog

-mesa (19.2.0~rc2-1) UNRELEASED; urgency=medium
+mesa (19.2.0~rc2-2) UNRELEASED; urgency=medium
+
+  * control,rules: Restore libva-dev build-dep and nolibva build
+    profile.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 10 Sep 2019 14:50:21 +0300
+
+mesa (19.2.0~rc2-1) experimental; urgency=medium
 
   * New upstream release candidate.
   * Migrate to llvm/clang-9. (Closes: #935768)
@@ -7,8 +14,9 @@ mesa (19.2.0~rc2-1) UNRELEASED; urgency=medium
   * control, rules: Drop libva-dev from build-depends, don't use
     dh_libva and drop pkg.mesa.nolibva build profile, libva2 transition
     is done.
+  * control: Bump llvm/clang build-dep.
 
- -- Timo Aaltonen <tjaalton@debian.org>  Tue, 27 Aug 2019 10:51:47 +0300
+ -- Timo Aaltonen <tjaalton@debian.org>  Mon, 09 Sep 2019 14:36:14 +0300
 
 mesa (19.2.0~rc1-1) experimental; urgency=medium
 

debian/control

@@ -18,6 +18,7 @@ Build-Depends:
  libxfixes-dev,
  libxdamage-dev,
  libxext-dev,
+ libva-dev (>= 1.6.0) [linux-any kfreebsd-any] <!pkg.mesa.nolibva>,
  libvdpau-dev (>= 1.1.1) [linux-any kfreebsd-any],
  libvulkan-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64 x32],
  x11proto-dev,
@@ -37,11 +38,11 @@ Build-Depends:
  python3-setuptools,
  flex,
  bison,
- llvm-9-dev (>= 1:9~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+ llvm-9-dev (>= 1:9~+rc3-1~exp3) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
  libelf-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
  libwayland-dev (>= 1.15.0) [linux-any],
  libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
- libclang-9-dev (>= 1:9~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
+ libclang-9-dev (>= 1:9~+rc3-1~exp3) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
  libclc-dev (>= 0.2.0+git20190827-1~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
  wayland-protocols (>= 1.9),
  zlib1g-dev,
@@ -401,6 +402,7 @@ Description: Mesa Off-screen rendering extension -- development files
 Package: mesa-va-drivers
 Section: libs
 Architecture: linux-any kfreebsd-any
+Build-Profiles: <!pkg.mesa.nolibva>
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},

debian/rules

@@ -111,9 +111,12 @@ else
 	confflags_DIRECT_RENDERING = -Dglx-direct=true
 	confflags_GBM = -Dgbm=true
 	confflags_GALLIUM += -Dgallium-extra-hud=true
-	confflags_GALLIUM += -Dgallium-va=true
 	confflags_GALLIUM += -Dgallium-vdpau=true
 	confflags_GALLIUM += -Dlmsensors=true
+
+  ifeq (,$(filter pkg.mesa.nolibva,$(DEB_BUILD_PROFILES)))
+        confflags_GALLIUM += -Dgallium-va=true
+  endif
 endif
 
 # Disable assembly usage on x32 otherwise Mesa defaults to x86_64 assembly
@@ -212,10 +215,12 @@ override_dh_install:
 	mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/libvdpau*.so* \
 	   debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
 
+    ifeq (,$(filter pkg.mesa.nolibva,$(DEB_BUILD_PROFILES)))
 	# Copy the hardlinked va drivers correctly.
 	install -m755 -d debian/mesa-va-drivers/usr/lib/${DEB_HOST_MULTIARCH}/dri/
 	mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_drv_video.so \
 	   debian/mesa-va-drivers/usr/lib/${DEB_HOST_MULTIARCH}/dri/
+    endif
   endif
 
 	dh_install -a