debian: Undo unneeded comma-stripping from meson config flags.
BUG=chromium:972237
TEST=Builds
Change-Id: I6753eab08ea974ce4a45c246b75432c44bb2f9ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/mesa/+/1686536
Tested-by: David Riley <davidriley@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
diff --git a/debian/changelog b/debian/changelog
index 46ce1f5..36c856c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (19.2.0~cros1-2) UNRELEASED; urgency=medium
+
+ * Undo all comma striping from meson config flags.
+
+ -- David Riley <davidriley@google.com> Tue, 02 Jul 2019 15:58:12 -0700
+
mesa (19.2.0~cros1-1) experimental; urgency=medium
* Fix meson invocation to strip trailing comma from platform list.
diff --git a/debian/rules b/debian/rules
index 2fae8bb..7f59df4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,13 +125,13 @@
confflags_EGL = -Dplatforms="$(EGL_PLATFORMS)"
confflags_GLES = -Dgles1=false -Dgles2=true
-confflags_GALLIUM += -Dgallium-drivers="$(GALLIUM_DRIVERS:,=)"
+confflags_GALLIUM += -Dgallium-drivers="$(GALLIUM_DRIVERS)"
confflags += \
- -Ddri-drivers="$(DRI_DRIVERS:,=)" \
+ -Ddri-drivers="$(DRI_DRIVERS)" \
-Ddri-drivers-path=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
-Ddri-search-path='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
- -Dvulkan-drivers="$(VULKAN_DRIVERS:,=)" \
+ -Dvulkan-drivers="$(VULKAN_DRIVERS)" \
-Dglvnd=true \
-Dshared-glapi=true \
-Dgallium-xvmc=false \