[arch-commits] Commit in lib32-mesa/repos/multilib-x86_64 (10 files)
Laurent Carlier
lcarlier at archlinux.org
Sun Oct 23 08:28:08 UTC 2016
Date: Sunday, October 23, 2016 @ 08:28:07
Author: lcarlier
Revision: 193029
archrelease: copy trunk to multilib-x86_64
Added:
lib32-mesa/repos/multilib-x86_64/0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
(from rev 193028, lib32-mesa/trunk/0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch)
lib32-mesa/repos/multilib-x86_64/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
(from rev 193028, lib32-mesa/trunk/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch)
lib32-mesa/repos/multilib-x86_64/LICENSE
(from rev 193028, lib32-mesa/trunk/LICENSE)
lib32-mesa/repos/multilib-x86_64/PKGBUILD
(from rev 193028, lib32-mesa/trunk/PKGBUILD)
lib32-mesa/repos/multilib-x86_64/remove-libpthread-stubs.patch
(from rev 193028, lib32-mesa/trunk/remove-libpthread-stubs.patch)
Deleted:
lib32-mesa/repos/multilib-x86_64/0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
lib32-mesa/repos/multilib-x86_64/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
lib32-mesa/repos/multilib-x86_64/LICENSE
lib32-mesa/repos/multilib-x86_64/PKGBUILD
lib32-mesa/repos/multilib-x86_64/remove-libpthread-stubs.patch
-----------------------------------------------------------------+
0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch | 182 ++---
0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch | 118 +--
LICENSE | 164 ++---
PKGBUILD | 325 +++++-----
remove-libpthread-stubs.patch | 28
5 files changed, 410 insertions(+), 407 deletions(-)
Deleted: 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
===================================================================
--- 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch 2016-10-23 08:28:01 UTC (rev 193028)
+++ 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch 2016-10-23 08:28:07 UTC (rev 193029)
@@ -1,91 +0,0 @@
-From 0247e5ee3edd546b8598082d5b45d110f61853d0 Mon Sep 17 00:00:00 2001
-From: Martin Peres <martin.peres at linux.intel.com>
-Date: Thu, 6 Oct 2016 17:07:22 +0300
-Subject: [PATCH 1/2] loader/dri3: add get_dri_screen() to the vtable
-
-This allows querying the current active screen from the
-loader's common code.
-
-Cc: mesa-stable at lists.freedesktop.org
-Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
-Signed-off-by: Martin Peres <martin.peres at linux.intel.com>
----
- src/egl/drivers/dri2/platform_x11_dri3.c | 12 ++++++++++++
- src/glx/dri3_glx.c | 11 +++++++++++
- src/loader/loader_dri3_helper.h | 1 +
- 3 files changed, 24 insertions(+)
-
-diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c
-index 31649fe..d93f5bc 100644
---- 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_dri3_drawable *draw)
- 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_dri3_vtable = {
- .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,
- };
-diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
-index 90d7bba..51b6b1c 100644
---- a/src/glx/dri3_glx.c
-+++ b/src/glx/dri3_glx.c
-@@ -132,6 +132,16 @@ glx_dri3_get_dri_context(struct loader_dri3_drawable *draw)
- 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 *) gc;
-+ 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_dri3_vtable = {
- .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,
- };
-diff --git a/src/loader/loader_dri3_helper.h b/src/loader/loader_dri3_helper.h
-index 5b8fd1d..658e190 100644
---- 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);
- };
---
-2.10.0
-
Copied: lib32-mesa/repos/multilib-x86_64/0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch (from rev 193028, lib32-mesa/trunk/0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch)
===================================================================
--- 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch (rev 0)
+++ 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch 2016-10-23 08:28:07 UTC (rev 193029)
@@ -0,0 +1,91 @@
+From 0247e5ee3edd546b8598082d5b45d110f61853d0 Mon Sep 17 00:00:00 2001
+From: Martin Peres <martin.peres at linux.intel.com>
+Date: Thu, 6 Oct 2016 17:07:22 +0300
+Subject: [PATCH 1/2] loader/dri3: add get_dri_screen() to the vtable
+
+This allows querying the current active screen from the
+loader's common code.
+
+Cc: mesa-stable at lists.freedesktop.org
+Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
+Signed-off-by: Martin Peres <martin.peres at linux.intel.com>
+---
+ src/egl/drivers/dri2/platform_x11_dri3.c | 12 ++++++++++++
+ src/glx/dri3_glx.c | 11 +++++++++++
+ src/loader/loader_dri3_helper.h | 1 +
+ 3 files changed, 24 insertions(+)
+
+diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c
+index 31649fe..d93f5bc 100644
+--- 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_dri3_drawable *draw)
+ 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_dri3_vtable = {
+ .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,
+ };
+diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
+index 90d7bba..51b6b1c 100644
+--- a/src/glx/dri3_glx.c
++++ b/src/glx/dri3_glx.c
+@@ -132,6 +132,16 @@ glx_dri3_get_dri_context(struct loader_dri3_drawable *draw)
+ 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 *) gc;
++ 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_dri3_vtable = {
+ .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,
+ };
+diff --git a/src/loader/loader_dri3_helper.h b/src/loader/loader_dri3_helper.h
+index 5b8fd1d..658e190 100644
+--- 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);
+ };
+--
+2.10.0
+
Deleted: 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
===================================================================
--- 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch 2016-10-23 08:28:01 UTC (rev 193028)
+++ 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch 2016-10-23 08:28:07 UTC (rev 193029)
@@ -1,59 +0,0 @@
-From a599b1c2037ac8aca6c92350c8a7b3e42c81deaa Mon Sep 17 00:00:00 2001
-From: Martin Peres <martin.peres at linux.intel.com>
-Date: Thu, 6 Oct 2016 17:10:35 +0300
-Subject: [PATCH 2/2] loader/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)
-
-Tested-by: Timo Aaltonen <tjaalton at ubuntu.com>
-Tested-by: Ionut Biru <biru.ionut at gmail.com>
-Cc: mesa-stable at lists.freedesktop.org
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71759
-Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
-Signed-off-by: Martin Peres <martin.peres at linux.intel.com>
----
- src/loader/loader_dri3_helper.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
-index 3ce0352..8179297 100644
---- a/src/loader/loader_dri3_helper.c
-+++ b/src/loader/loader_dri3_helper.c
-@@ -1117,6 +1117,7 @@ dri3_get_pixmap_buffer(__DRIdrawable *driDrawable, unsigned int format,
- xcb_sync_fence_t sync_fence;
- struct xshmfence *shm_fence;
- int fence_fd;
-+ __DRIscreen *cur_screen;
-
- if (buffer)
- return buffer;
-@@ -1147,8 +1148,17 @@ dri3_get_pixmap_buffer(__DRIdrawable *driDrawable, unsigned int format,
- if (!bp_reply)
- goto no_image;
-
-+ /* Get the currently-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;
---
-2.10.0
-
Copied: lib32-mesa/repos/multilib-x86_64/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch (from rev 193028, lib32-mesa/trunk/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch)
===================================================================
--- 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch (rev 0)
+++ 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch 2016-10-23 08:28:07 UTC (rev 193029)
@@ -0,0 +1,59 @@
+From a599b1c2037ac8aca6c92350c8a7b3e42c81deaa Mon Sep 17 00:00:00 2001
+From: Martin Peres <martin.peres at linux.intel.com>
+Date: Thu, 6 Oct 2016 17:10:35 +0300
+Subject: [PATCH 2/2] loader/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)
+
+Tested-by: Timo Aaltonen <tjaalton at ubuntu.com>
+Tested-by: Ionut Biru <biru.ionut at gmail.com>
+Cc: mesa-stable at lists.freedesktop.org
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71759
+Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
+Signed-off-by: Martin Peres <martin.peres at linux.intel.com>
+---
+ src/loader/loader_dri3_helper.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
+index 3ce0352..8179297 100644
+--- a/src/loader/loader_dri3_helper.c
++++ b/src/loader/loader_dri3_helper.c
+@@ -1117,6 +1117,7 @@ dri3_get_pixmap_buffer(__DRIdrawable *driDrawable, unsigned int format,
+ xcb_sync_fence_t sync_fence;
+ struct xshmfence *shm_fence;
+ int fence_fd;
++ __DRIscreen *cur_screen;
+
+ if (buffer)
+ return buffer;
+@@ -1147,8 +1148,17 @@ dri3_get_pixmap_buffer(__DRIdrawable *driDrawable, unsigned int format,
+ if (!bp_reply)
+ goto no_image;
+
++ /* Get the currently-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;
+--
+2.10.0
+
Deleted: LICENSE
===================================================================
--- LICENSE 2016-10-23 08:28:01 UTC (rev 193028)
+++ LICENSE 2016-10-23 08:28:07 UTC (rev 193029)
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components. Different copyrights
-and licenses apply to different components. For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors. See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component Location Primary Author License
-----------------------------------------------------------------------------
-Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
-
-Device drivers src/mesa/drivers/* See drivers See drivers
-
-Ext headers include/GL/glext.h SGI SGI Free B
- include/GL/glxext.h
-
-GLUT src/glut/ Mark Kilgard Mark's copyright
-
-Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
-
-SGI GLU library src/glu/sgi/ SGI SGI Free B
-
-demo programs progs/demos/ various see source files
-
-X demos progs/xdemos/ Brian Paul see source files
-
-SGI demos progs/samples/ SGI SGI copyright
-
-RedBook demos progs/redbook/ SGI SGI copyright
Copied: lib32-mesa/repos/multilib-x86_64/LICENSE (from rev 193028, lib32-mesa/trunk/LICENSE)
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2016-10-23 08:28:07 UTC (rev 193029)
@@ -0,0 +1,82 @@
+Disclaimer
+
+Mesa is a 3-D graphics library with an API which is very similar to
+that of OpenGL*
+To the extent that Mesa utilizes the OpenGL command syntax or state
+machine, it is being used with authorization from Silicon Graphics,
+Inc.(SGI). However, the author does not possess an OpenGL license
+from SGI, and makes no claim that Mesa is in any way a compatible
+replacement for OpenGL or associated with SGI. Those who want a
+licensed implementation of OpenGL should contact a licensed
+vendor.
+
+Please do not refer to the library as MesaGL (for legal
+reasons). It's just Mesa or The Mesa 3-D graphics
+library
+
+* OpenGL is a trademark of Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+The Mesa distribution consists of several components. Different copyrights
+and licenses apply to different components. For example, GLUT is copyrighted
+by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
+device drivers are copyrighted by their authors. See below for a list of
+Mesa's main components and the license for each.
+
+The core Mesa library is licensed according to the terms of the MIT license.
+This allows integration with the XFree86, Xorg and DRI projects.
+
+The default Mesa license is as follows:
+
+Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Attention, Contributors
+
+When contributing to the Mesa project you must agree to the licensing terms
+of the component to which you're contributing.
+The following section lists the primary components of the Mesa distribution
+and their respective licenses.
+
+
+Mesa Component Licenses
+
+Component Location Primary Author License
+----------------------------------------------------------------------------
+Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
+
+Device drivers src/mesa/drivers/* See drivers See drivers
+
+Ext headers include/GL/glext.h SGI SGI Free B
+ include/GL/glxext.h
+
+GLUT src/glut/ Mark Kilgard Mark's copyright
+
+Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
+
+SGI GLU library src/glu/sgi/ SGI SGI Free B
+
+demo programs progs/demos/ various see source files
+
+X demos progs/xdemos/ Brian Paul see source files
+
+SGI demos progs/samples/ SGI SGI copyright
+
+RedBook demos progs/redbook/ SGI SGI copyright
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-10-23 08:28:01 UTC (rev 193028)
+++ PKGBUILD 2016-10-23 08:28:07 UTC (rev 193029)
@@ -1,161 +0,0 @@
-# $Id$
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=lib32-mesa
-pkgname=('lib32-vulkan-intel' 'lib32-mesa-vdpau' 'lib32-mesa' 'lib32-mesa-libgl')
-pkgver=12.0.3
-pkgrel=3
-arch=('x86_64')
-makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
- 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-llvm' 'lib32-systemd'
- 'lib32-libvdpau' 'lib32-wayland' 'lib32-libgcrypt')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz{,.sig}
- LICENSE
- remove-libpthread-stubs.patch
- 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
- 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch)
-sha256sums=('1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1'
- 'SKIP'
- '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
- 'd82c329e89754266eb1538df29b94d33692a66e3b6882b2cee78f4d5aab4a39c'
- '52eb98eb6c9c644383d9743692aea302d84c4f89cfaa7a276b9276befc2d9780'
- '96ad07e241d16802b14b14ca3d6965fa7f4f4b8c678d62ba375291910dce3b4a')
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov at gmail.com>
-
-prepare() {
- cd ${srcdir}/?esa-*
-
- # Now mesa checks for libpthread-stubs - so remove the check
- patch -Np1 -i ../remove-libpthread-stubs.patch
-
- # fix FS#50240 - https://bugs.freedesktop.org/show_bug.cgi?id=71759
- # merged upstream
- patch -Np1 -i ../0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
- patch -Np1 -i ../0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
-
- autoreconf -fiv
-}
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- export LLVM_CONFIG="/usr/bin/llvm-config32"
-
- cd ${srcdir}/?esa-*
-
- ./configure \
- --build=i686-pc-linux-gnu --host=i686-pc-linux-gnu \
- --libdir=/usr/lib32 \
- --prefix=/usr \
- --sysconfdir=/etc \
- --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
- --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,virgl \
- --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
- --with-egl-platforms=x11,drm,wayland \
- --with-vulkan-drivers=intel \
- --with-sha1=libgcrypt \
- --disable-xvmc \
- --enable-gallium-llvm \
- --enable-llvm-shared-libs \
- --enable-shared-glapi \
- --enable-glx-tls \
- --enable-egl \
- --enable-glx \
- --enable-gles1 \
- --enable-gles2 \
- --enable-gbm \
- --enable-dri \
- --enable-osmesa \
- --enable-texture-float \
- --enable-nine \
- --enable-vdpau
-
- make
-
- mkdir $srcdir/fakeinstall
- make DESTDIR=${srcdir}/fakeinstall install
-}
-
-package_lib32-vulkan-intel() {
- pkgdesc="Intel's Vulkan mesa driver (32-bit)"
- depends=('vulkan-intel' 'lib32-vulkan-icd-loader' 'lib32-libgcrypt' 'lib32-wayland' 'lib32-libxcb')
-
- install -m755 -d ${pkgdir}/usr/lib32
- mv -v ${srcdir}/fakeinstall/usr/lib32/libvulkan_intel.so ${pkgdir}/usr/lib32/
-
- install -m755 -d "${pkgdir}/usr/share/licenses/lib32-vulkan-intel"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-vulkan-intel/"
-}
-
-package_lib32-mesa-vdpau() {
- pkgdesc="Mesa VDPAU drivers (32-bit)"
- depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-elfutils')
-
- install -m755 -d ${pkgdir}/usr/lib32
- mv -v ${srcdir}/fakeinstall/usr/lib32/vdpau ${pkgdir}/usr/lib32
-
- install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau/"
-}
-
-package_lib32-mesa() {
- pkgdesc="an open-source implementation of the OpenGL specification (32-bit)"
- depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-systemd'
- 'lib32-elfutils' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-libtxc_dxtn' 'lib32-expat' 'mesa')
- optdepends=('opengl-man-pages: for the OpenGL API man pages'
- 'lib32-mesa-vdpau: for accelerated video playback')
- provides=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
- conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
- replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
-
- install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
- # ati-dri, nouveay-dri, intel-dri, swrast
- mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/* ${pkgdir}/usr/lib32/xorg/modules/dri
-
- install -m755 -d ${pkgdir}/usr/lib32
- mv -v ${srcdir}/fakeinstall/usr/lib32/d3d ${pkgdir}/usr/lib32
- mv -v ${srcdir}/fakeinstall/usr/lib32/*.so* ${pkgdir}/usr/lib32/
-
- mv -v ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/
-
- install -m755 -d ${pkgdir}/usr/lib32/mesa
- # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
- mv -v ${pkgdir}/usr/lib32/libGL.so* ${pkgdir}/usr/lib32/mesa/
- mv -v ${pkgdir}/usr/lib32/libEGL.so* ${pkgdir}/usr/lib32/mesa/
- mv -v ${pkgdir}/usr/lib32/libGLES*.so* ${pkgdir}/usr/lib32/mesa/
-
- install -m755 -d "${pkgdir}/usr/share/licenses"
- ln -s mesa "$pkgdir/usr/share/licenses/lib32-mesa"
-}
-
-package_lib32-mesa-libgl() {
- pkgdesc="Mesa 3-D graphics library (32-bit)"
- depends=('lib32-mesa')
- provides=('lib32-libgl' 'lib32-libegl' 'lib32-libgles')
- conflicts=('lib32-libgl' 'lib32-libegl' 'lib32-libgles')
-
- install -m755 -d ${pkgdir}/usr/lib32
-
- ln -s /usr/lib32/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1.2.0
- ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1
- ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so
-
- ln -s /usr/lib32/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1.0.0
- ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1
- ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so
-
- ln -s /usr/lib32/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1.1.0
- ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1
- ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so
-
- ln -s /usr/lib32/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2.0.0
- ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2
- ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so
-
- install -m755 -d "${pkgdir}/usr/share/licenses"
- ln -s lib32-mesa "${pkgdir}/usr/share/licenses/lib32-mesa-libgl"
-}
Copied: lib32-mesa/repos/multilib-x86_64/PKGBUILD (from rev 193028, lib32-mesa/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-10-23 08:28:07 UTC (rev 193029)
@@ -0,0 +1,164 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=lib32-mesa
+pkgname=('lib32-vulkan-intel' 'lib32-mesa-vdpau' 'lib32-mesa' 'lib32-mesa-libgl')
+pkgver=12.0.3
+pkgrel=4
+arch=('x86_64')
+makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
+ 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-libelf' 'lib32-llvm' 'lib32-systemd'
+ 'lib32-libvdpau' 'lib32-wayland' 'lib32-libgcrypt')
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz{,.sig}
+ LICENSE
+ remove-libpthread-stubs.patch
+ 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
+ 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch)
+sha256sums=('1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1'
+ 'SKIP'
+ '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
+ 'd82c329e89754266eb1538df29b94d33692a66e3b6882b2cee78f4d5aab4a39c'
+ '52eb98eb6c9c644383d9743692aea302d84c4f89cfaa7a276b9276befc2d9780'
+ '96ad07e241d16802b14b14ca3d6965fa7f4f4b8c678d62ba375291910dce3b4a')
+validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov at gmail.com>
+
+prepare() {
+ cd ${srcdir}/?esa-*
+
+ # Now mesa checks for libpthread-stubs - so remove the check
+ patch -Np1 -i ../remove-libpthread-stubs.patch
+
+ # fix FS#50240 - https://bugs.freedesktop.org/show_bug.cgi?id=71759
+ # merged upstream
+ patch -Np1 -i ../0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
+ patch -Np1 -i ../0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
+
+ autoreconf -fiv
+}
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+ export LLVM_CONFIG="/usr/bin/llvm-config32"
+
+ cd ${srcdir}/?esa-*
+
+ ./configure \
+ --build=i686-pc-linux-gnu --host=i686-pc-linux-gnu \
+ --libdir=/usr/lib32 \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
+ --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,virgl \
+ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
+ --with-egl-platforms=x11,drm,wayland \
+ --with-vulkan-drivers=intel \
+ --with-sha1=libgcrypt \
+ --disable-xvmc \
+ --enable-gallium-llvm \
+ --enable-llvm-shared-libs \
+ --enable-shared-glapi \
+ --enable-glx-tls \
+ --enable-egl \
+ --enable-glx \
+ --enable-gles1 \
+ --enable-gles2 \
+ --enable-gbm \
+ --enable-dri \
+ --enable-osmesa \
+ --enable-texture-float \
+ --enable-nine \
+ --enable-vdpau
+
+ make
+
+ mkdir $srcdir/fakeinstall
+ make DESTDIR=${srcdir}/fakeinstall install
+}
+
+package_lib32-vulkan-intel() {
+ pkgdesc="Intel's Vulkan mesa driver (32-bit)"
+ depends=('vulkan-intel' 'lib32-vulkan-icd-loader' 'lib32-libgcrypt' 'lib32-wayland' 'lib32-libxcb'
+ 'lib32-gcc-libs' 'lib32-libxshmfence')
+
+ install -m755 -d ${pkgdir}/usr/lib32
+ mv -v ${srcdir}/fakeinstall/usr/lib32/libvulkan_intel.so ${pkgdir}/usr/lib32/
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-vulkan-intel"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-vulkan-intel/"
+}
+
+package_lib32-mesa-vdpau() {
+ pkgdesc="Mesa VDPAU drivers (32-bit)"
+ depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-libelf' 'lib32-libgcrypt'
+ 'lib32-libxshmfence')
+
+ install -m755 -d ${pkgdir}/usr/lib32
+ mv -v ${srcdir}/fakeinstall/usr/lib32/vdpau ${pkgdir}/usr/lib32
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau/"
+}
+
+package_lib32-mesa() {
+ pkgdesc="an open-source implementation of the OpenGL specification (32-bit)"
+ depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-systemd'
+ 'lib32-libelf' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-libtxc_dxtn' 'mesa')
+ optdepends=('opengl-man-pages: for the OpenGL API man pages'
+ 'lib32-mesa-vdpau: for accelerated video playback')
+ provides=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
+ conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
+ replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
+
+ install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
+ # ati-dri, nouveay-dri, intel-dri, swrast
+ mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/* ${pkgdir}/usr/lib32/xorg/modules/dri
+
+ install -m755 -d ${pkgdir}/usr/lib32
+ mv -v ${srcdir}/fakeinstall/usr/lib32/d3d ${pkgdir}/usr/lib32
+ mv -v ${srcdir}/fakeinstall/usr/lib32/*.so* ${pkgdir}/usr/lib32/
+
+ mv -v ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/
+
+ install -m755 -d ${pkgdir}/usr/lib32/mesa
+ # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
+ mv -v ${pkgdir}/usr/lib32/libGL.so* ${pkgdir}/usr/lib32/mesa/
+ mv -v ${pkgdir}/usr/lib32/libEGL.so* ${pkgdir}/usr/lib32/mesa/
+ mv -v ${pkgdir}/usr/lib32/libGLES*.so* ${pkgdir}/usr/lib32/mesa/
+
+ install -m755 -d "${pkgdir}/usr/share/licenses"
+ ln -s mesa "$pkgdir/usr/share/licenses/lib32-mesa"
+}
+
+package_lib32-mesa-libgl() {
+ pkgdesc="Mesa 3-D graphics library (32-bit)"
+ depends=('lib32-mesa')
+ provides=('lib32-libgl' 'lib32-libegl' 'lib32-libgles')
+ conflicts=('lib32-libgl' 'lib32-libegl' 'lib32-libgles')
+
+ install -m755 -d ${pkgdir}/usr/lib32
+
+ ln -s /usr/lib32/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1.2.0
+ ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1
+ ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so
+
+ ln -s /usr/lib32/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1.0.0
+ ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1
+ ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so
+
+ ln -s /usr/lib32/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1.1.0
+ ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1
+ ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so
+
+ ln -s /usr/lib32/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2.0.0
+ ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2
+ ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so
+
+ install -m755 -d "${pkgdir}/usr/share/licenses"
+ ln -s lib32-mesa "${pkgdir}/usr/share/licenses/lib32-mesa-libgl"
+}
Deleted: remove-libpthread-stubs.patch
===================================================================
--- remove-libpthread-stubs.patch 2016-10-23 08:28:01 UTC (rev 193028)
+++ remove-libpthread-stubs.patch 2016-10-23 08:28:07 UTC (rev 193029)
@@ -1,14 +0,0 @@
-diff -ur mesa-orig/configure.ac mesa-origb/configure.ac
---- mesa-orig/configure.ac 2016-05-25 15:37:44.191643017 +0200
-+++ mesa-origb/configure.ac 2016-05-25 15:42:20.861654709 +0200
-@@ -813,10 +813,6 @@
- dnl pkgconfig files.
- test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
-
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- dnl SELinux awareness.
- AC_ARG_ENABLE([selinux],
- [AS_HELP_STRING([--enable-selinux],
Copied: lib32-mesa/repos/multilib-x86_64/remove-libpthread-stubs.patch (from rev 193028, lib32-mesa/trunk/remove-libpthread-stubs.patch)
===================================================================
--- remove-libpthread-stubs.patch (rev 0)
+++ remove-libpthread-stubs.patch 2016-10-23 08:28:07 UTC (rev 193029)
@@ -0,0 +1,14 @@
+diff -ur mesa-orig/configure.ac mesa-origb/configure.ac
+--- mesa-orig/configure.ac 2016-05-25 15:37:44.191643017 +0200
++++ mesa-origb/configure.ac 2016-05-25 15:42:20.861654709 +0200
+@@ -813,10 +813,6 @@
+ dnl pkgconfig files.
+ test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
+
+-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
+-AC_SUBST(PTHREADSTUBS_CFLAGS)
+-AC_SUBST(PTHREADSTUBS_LIBS)
+-
+ dnl SELinux awareness.
+ AC_ARG_ENABLE([selinux],
+ [AS_HELP_STRING([--enable-selinux],
More information about the arch-commits
mailing list