debian/changelog | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 467c777827583709277b027171df1d91a08dc27a
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Wed Nov 23 17:30:12 2016 +0200
release to zesty
diff --git a/debian/changelog b/debian/changelog
index 471e67d..cd9f261 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mesa (13.0.1-1ubuntu1) UNRELEASED; urgency=medium
+mesa (13.0.1-1ubuntu1) zesty; urgency=medium
* Merge from Debian experimental.
* dri3-fix-totem-with-libva.diff: Dropped, upstream.
* egl-platform-mir.patch: Refreshed.
- -- Timo Aaltonen <tjaal...@debian.org> Mon, 07 Nov 2016 10:57:41 +0200
+ -- Timo Aaltonen <tjaal...@debian.org> Wed, 23 Nov 2016 16:36:34 +0200
mesa (13.0.1-1) experimental; urgency=medium
commit b0430341c3629409820600b298f526baa3ec2b9f
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Wed Nov 23 14:16:03 2016 +0200
release to zesty
diff --git a/debian/changelog b/debian/changelog
index 62d62bc..2c2b991 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mesa (12.0.4-2ubuntu1) UNRELEASED; urgency=medium
+mesa (12.0.4-2ubuntu1) zesty; urgency=medium
* Merge from Debian
- New upstream bugfix release. (LP: #1641017)
* dri3-fix-totem-with-libva.diff: Dropped, upstream.
- -- Timo Aaltonen <tjaal...@debian.org> Wed, 23 Nov 2016 11:40:25 +0200
+ -- Timo Aaltonen <tjaal...@debian.org> Wed, 23 Nov 2016 14:04:45 +0200
mesa (12.0.4-2) unstable; urgency=medium
commit 3a7a81f87420cceab148f1751974f59b8bbad3dc
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Wed Nov 23 13:58:43 2016 +0200
update changelog
diff --git a/debian/changelog b/debian/changelog
index 4ab4474..62d62bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (12.0.4-2ubuntu1) UNRELEASED; urgency=medium
+
+ * Merge from Debian
+ - New upstream bugfix release. (LP: #1641017)
+ * dri3-fix-totem-with-libva.diff: Dropped, upstream.
+
+ -- Timo Aaltonen <tjaal...@debian.org> Wed, 23 Nov 2016 11:40:25 +0200
+
mesa (12.0.4-2) unstable; urgency=medium
* Limit new glx symbols to !hurd-any. Should fix FTBFS on hurd.
diff --git a/debian/patches/dri3-fix-totem-with-libva.diff
b/debian/patches/dri3-fix-totem-with-libva.diff
deleted file mode 100644
index 1da3c26..0000000
--- a/debian/patches/dri3-fix-totem-with-libva.diff
+++ /dev/null
@@ -1,128 +0,0 @@
-From 5113845fae9b95dba0da59229a2e9947cef4196f Mon Sep 17 00:00:00 2001
-From: Martin Peres <martin.pe...@linux.intel.com>
-Date: Tue, 4 Oct 2016 13:08:43 +0300
-Subject: [PATCH] [WIP] dri3: import prime buffers in the currently-bound
- screen
-
-This tries to mirrors the codepath taken by DRI2 in IntelSetTexBuffer2()
-and fixes many applications when using DRI3:
- - Totem with libva on hw-accelerated decoding
- - obs-studio, using Window Capture (Xcomposite) as a Source
- - gstreamer with VAAPI
-
-v2:
- - introduce get_dri_screen() in the dri3 loader's vtable (krh)
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71759
----
- src/egl/drivers/dri2/platform_x11_dri3.c | 12 ++++++++++++
- src/glx/dri3_glx.c | 11 +++++++++++
- src/loader/loader_dri3_helper.c | 12 +++++++++++-
- src/loader/loader_dri3_helper.h | 1 +
- src/mesa/drivers/dri/i965/intel_screen.c | 1 +
- 5 files changed, 36 insertions(+), 1 deletion(-)
-
---- a/src/egl/drivers/dri2/platform_x11_dri3.c
-+++ b/src/egl/drivers/dri2/platform_x11_dri3.c
-@@ -103,6 +103,17 @@ egl_dri3_get_dri_context(struct loader_d
- return dri2_ctx->dri_context;
- }
-
-+static __DRIscreen *
-+egl_dri3_get_dri_screen(struct loader_dri3_drawable *draw)
-+{
-+ _EGLContext *ctx = _eglGetCurrentContext();
-+ struct dri2_egl_context *dri2_ctx;
-+ if (!ctx)
-+ return NULL;
-+ dri2_ctx = dri2_egl_context(ctx);
-+ return dri2_egl_display(dri2_ctx->base.Resource.Display)->dri_screen;
-+}
-+
- static void
- egl_dri3_flush_drawable(struct loader_dri3_drawable *draw, unsigned flags)
- {
-@@ -119,6 +130,7 @@ static struct loader_dri3_vtable egl_dri
- .set_drawable_size = egl_dri3_set_drawable_size,
- .in_current_context = egl_dri3_in_current_context,
- .get_dri_context = egl_dri3_get_dri_context,
-+ .get_dri_screen = egl_dri3_get_dri_screen,
- .flush_drawable = egl_dri3_flush_drawable,
- .show_fps = NULL,
- };
---- a/src/glx/dri3_glx.c
-+++ b/src/glx/dri3_glx.c
-@@ -132,6 +132,16 @@ glx_dri3_get_dri_context(struct loader_d
- return (gc != &dummyContext) ? dri3Ctx->driContext : NULL;
- }
-
-+static __DRIscreen *
-+glx_dri3_get_dri_screen(struct loader_dri3_drawable *draw)
-+{
-+ struct glx_context *gc = __glXGetCurrentContext();
-+ struct dri3_context *pcp = (struct dri3_context *)
__glXGetCurrentContext();
-+ struct dri3_screen *psc = (struct dri3_screen *) pcp->base.psc;
-+
-+ return (gc != &dummyContext && psc) ? psc->driScreen : NULL;
-+}
-+
- static void
- glx_dri3_flush_drawable(struct loader_dri3_drawable *draw, unsigned flags)
- {
-@@ -169,6 +179,7 @@ static struct loader_dri3_vtable glx_dri
- .set_drawable_size = glx_dri3_set_drawable_size,
- .in_current_context = glx_dri3_in_current_context,
- .get_dri_context = glx_dri3_get_dri_context,
-+ .get_dri_screen = glx_dri3_get_dri_screen,
- .flush_drawable = glx_dri3_flush_drawable,
- .show_fps = glx_dri3_show_fps,
- };
---- a/src/loader/loader_dri3_helper.c
-+++ b/src/loader/loader_dri3_helper.c
-@@ -1116,6 +1116,7 @@ dri3_get_pixmap_buffer(__DRIdrawable *dr
- xcb_sync_fence_t sync_fence;
- struct xshmfence *shm_fence;
- int fence_fd;
-+ __DRIscreen *cur_screen;
-
- if (buffer)
- return buffer;
-@@ -1146,8 +1147,17 @@ dri3_get_pixmap_buffer(__DRIdrawable *dr
- if (!bp_reply)
- goto no_image;
-
-+ /* Get the current-bound screen or revert to using the drawable's screen if
-+ * no contexts are currently bound. The latter case is at least necessary
for
-+ * obs-studio, when using Window Capture (Xcomposite) as a Source.
-+ */
-+ cur_screen = draw->vtable->get_dri_screen(draw);
-+ if (!cur_screen) {
-+ cur_screen = draw->dri_screen;
-+ }
-+
- buffer->image = loader_dri3_create_image(draw->conn, bp_reply, format,
-- draw->dri_screen,
draw->ext->image,
-+ cur_screen, draw->ext->image,
- buffer);
- if (!buffer->image)
- goto no_image;
---- a/src/loader/loader_dri3_helper.h
-+++ b/src/loader/loader_dri3_helper.h
-@@ -103,6 +103,7 @@ struct loader_dri3_vtable {
- void (*set_drawable_size)(struct loader_dri3_drawable *, int, int);
- bool (*in_current_context)(struct loader_dri3_drawable *);
- __DRIcontext *(*get_dri_context)(struct loader_dri3_drawable *);
-+ __DRIscreen *(*get_dri_screen)(struct loader_dri3_drawable *);
- void (*flush_drawable)(struct loader_dri3_drawable *, unsigned);
- void (*show_fps)(struct loader_dri3_drawable *, uint64_t);
- };
---- a/src/mesa/drivers/dri/i965/intel_screen.c
-+++ b/src/mesa/drivers/dri/i965/intel_screen.c
-@@ -702,6 +702,7 @@ intel_create_image_from_fds(__DRIscreen
- {
- struct intel_screen *intelScreen = screen->driverPrivate;
- struct intel_image_format *f;
-+ dri_bufmgr *bufmgr;
- __DRIimage *image;
- int i, index;
-
diff --git a/debian/patches/series b/debian/patches/series
index 7fd00c0..bdcbe7c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@
# Ubuntu patches.
egl-platform-mir.patch
i915-dont-default-to-2.1.patch
-dri3-fix-totem-with-libva.diff
