debian/changelog | 9 +++++++++ debian/patches/egl-platform-mir.patch | 2 +- debian/patches/egl-platform-rs.patch | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-)
New commits: commit 320f962ebccfadab22a810ff4f8b0d85e6efa84f Author: Christopher James Halse Rogers <r...@ubuntu.com> Date: Fri Jun 16 18:01:05 2017 +1000 Release to artful diff --git a/debian/changelog b/debian/changelog index eb4acd7..16feab6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +mesa (17.1.2-1ubuntu2) artful; urgency=medium + + * egl-platform-mir.patch + * egl-platform-rs.patch + - Fix configure.ac so that the Mir EGL platforms are actually + built. (LP: #1526658) (LP: #1696797) + + -- Christopher James Halse Rogers <r...@ubuntu.com> Fri, 16 Jun 2017 17:51:50 +1000 + mesa (17.1.2-1ubuntu1) artful; urgency=medium * Merge from Debian. commit 19ba4ed64f115caec20b668212ead25ceb404451 Author: Christopher James Halse Rogers <r...@ubuntu.com> Date: Fri Jun 16 18:00:54 2017 +1000 Fix configure.ac detection for Mir EGL platform patches diff --git a/debian/patches/egl-platform-mir.patch b/debian/patches/egl-platform-mir.patch index d1fbc1b..faa0509 100644 --- a/debian/patches/egl-platform-mir.patch +++ b/debian/patches/egl-platform-mir.patch @@ -15,7 +15,7 @@ AM_CONDITIONAL(HAVE_PLATFORM_DRM, echo "$platforms" | grep -q 'drm') AM_CONDITIONAL(HAVE_PLATFORM_SURFACELESS, echo "$platforms" | grep -q 'surfaceless') AM_CONDITIONAL(HAVE_PLATFORM_ANDROID, echo "$platforms" | grep -q 'android') -+AM_CONDITIONAL(HAVE_PLATFORM_MIR, echo "$egl_platforms" | grep -q 'mir') ++AM_CONDITIONAL(HAVE_PLATFORM_MIR, echo "$platforms" | grep -q 'mir') dnl dnl More DRI setup diff --git a/debian/patches/egl-platform-rs.patch b/debian/patches/egl-platform-rs.patch index 9a1c887..9d8321c 100644 --- a/debian/patches/egl-platform-rs.patch +++ b/debian/patches/egl-platform-rs.patch @@ -30,8 +30,8 @@ @@ -1735,6 +1742,7 @@ AM_CONDITIONAL(HAVE_PLATFORM_DRM, echo " AM_CONDITIONAL(HAVE_PLATFORM_SURFACELESS, echo "$platforms" | grep -q 'surfaceless') AM_CONDITIONAL(HAVE_PLATFORM_ANDROID, echo "$platforms" | grep -q 'android') - AM_CONDITIONAL(HAVE_PLATFORM_MIR, echo "$egl_platforms" | grep -q 'mir') -+AM_CONDITIONAL(HAVE_PLATFORM_RS, echo "$egl_platforms" | grep -q 'rs') + AM_CONDITIONAL(HAVE_PLATFORM_MIR, echo "$platforms" | grep -q 'mir') ++AM_CONDITIONAL(HAVE_PLATFORM_RS, echo "$platforms" | grep -q 'rs') dnl dnl More DRI setup