[arch-commits] Commit in mesa/trunk (9 files)
Date: Thursday, May 17, 2018 @ 07:43:57
Author: heftig
Revision: 324434
18.0.3-4
Added:
mesa/trunk/0001-glvnd-fix-gl.pc.patch
(from rev 324433, mesa/trunk/0001-glvnd-fix-gl-dot-pc.patch)
mesa/trunk/0002-meson-Add-library-versions-to-swr-drivers.patch
(from rev 324433,
mesa/trunk/0004-meson-Add-library-versions-to-swr-drivers.patch)
mesa/trunk/0003-meson-Version-libMesaOpenCL-like-autotools-does.patch
(from rev 324433,
mesa/trunk/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch)
mesa/trunk/0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch
Modified:
mesa/trunk/PKGBUILD
Deleted:
mesa/trunk/0001-glvnd-fix-gl-dot-pc.patch
mesa/trunk/0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch
mesa/trunk/0004-meson-Add-library-versions-to-swr-drivers.patch
mesa/trunk/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch
+
0001-glvnd-fix-gl-dot-pc.patch
| 12 -
0001-glvnd-fix-gl.pc.patch
| 26 +++
0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch
| 14 -
0002-meson-Add-library-versions-to-swr-drivers.patch
| 71 +
0003-meson-Version-libMesaOpenCL-like-autotools-does.patch
| 43 +
0004-loader_dri3-Variant-2-Wait-for-pending-swaps-to-comp.patch
| 73 ++
0004-meson-Add-library-versions-to-swr-drivers.patch
| 71 -
0005-meson-Version-libMesaOpenCL-like-autotools-does.patch
| 43 -
PKGBUILD
| 31 ++--
9 files changed, 229 insertions(+), 155 deletions(-)
Deleted: 0001-glvnd-fix-gl-dot-pc.patch
===
--- 0001-glvnd-fix-gl-dot-pc.patch 2018-05-17 07:35:18 UTC (rev 324433)
+++ 0001-glvnd-fix-gl-dot-pc.patch 2018-05-17 07:43:57 UTC (rev 324434)
@@ -1,12 +0,0 @@
-diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in
mesa-12.0.3/src/mesa/gl.pc.in.jx 2016-01-18 02:39:26.0 -0500
-+++ mesa-12.0.3/src/mesa/gl.pc.in 2016-10-25 13:06:44.013159358 -0400
-@@ -7,7 +7,7 @@ Name: gl
- Description: Mesa OpenGL library
- Requires.private: @GL_PC_REQ_PRIV@
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -l@GL_LIB@
-+Libs: -L${libdir} -lGL
- Libs.private: @GL_PC_LIB_PRIV@
- Cflags: -I${includedir} @GL_PC_CFLAGS@
- glx_tls: @GLX_TLS@
Copied: mesa/trunk/0001-glvnd-fix-gl.pc.patch (from rev 324433,
mesa/trunk/0001-glvnd-fix-gl-dot-pc.patch)
===
--- 0001-glvnd-fix-gl.pc.patch (rev 0)
+++ 0001-glvnd-fix-gl.pc.patch 2018-05-17 07:43:57 UTC (rev 324434)
@@ -0,0 +1,26 @@
+From a9554de2a6028540fa12a7ebdab4daf2b46010fa Mon Sep 17 00:00:00 2001
+Message-Id:
+From: Unknown <>
+Date: Tue, 15 May 2018 20:10:53 +0200
+Subject: [PATCH 1/4] glvnd: fix gl.pc
+
+---
+ src/mesa/gl.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in
+index 181724b97b..8c7b7da8d7 100644
+--- a/src/mesa/gl.pc.in
b/src/mesa/gl.pc.in
+@@ -7,7 +7,7 @@ Name: gl
+ Description: Mesa OpenGL library
+ Requires.private: @GL_PC_REQ_PRIV@
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -l@GL_LIB@
++Libs: -L${libdir} -lGL
+ Libs.private: @GL_PC_LIB_PRIV@
+ Cflags: -I${includedir} @GL_PC_CFLAGS@
+ glx_tls: @GLX_TLS@
+--
+2.17.0
+
Deleted:
0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch
===
---
0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch
2018-05-17 07:35:18 UTC (rev 324433)
+++
0002-loader_dri3-Wait-for-pending-swaps-to-complete-before-drawable_fini.patch
2018-05-17 07:43:57 UTC (rev 324434)
@@ -1,14 +0,0 @@
-diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
-index 6bb11c4..7bd79af 100644
a/src/loader/loader_dri3_helper.c
-+++ b/src/loader/loader_dri3_helper.c
-@@ -234,6 +234,9 @@ loader_dri3_drawable_fini(struct loader_dri3_drawable
*draw)
- {
-int i;
-
-+ if (draw->special_event)
-+ loader_dri3_swapbuffer_barrier(draw);
-+
-draw->ext->core->destroyDrawable(draw->dri_drawable);
-
-for (i = 0; i < ARRAY_SIZE(draw->buffers); i++) {
Copied: mesa/trunk/0002-meson-Add-library-versions-to-swr-drivers.patch (from
rev 324433, mesa/trunk/0004-meson-Add-library-versions-to-swr-drivers.patch)
===
--- 0002-meson-Add-library-versions-to-swr-drivers.patch
(rev 0)
+++ 0002-meson-Add-library-versions-to-swr-drivers.pa
[arch-commits] Commit in mesa/trunk (9 files)
Date: Saturday, April 14, 2018 @ 17:26:29
Author: heftig
Revision: 321804
Use upstreamed patches
Added:
mesa/trunk/0001-meson-fix-megadriver-symlinking.patch
(from rev 321803, mesa/trunk/fix-install.diff)
mesa/trunk/0002-meson-Set-.so-version-for-xa-like-autotools-does.patch
(from rev 321801, mesa/trunk/fix-versions.diff)
mesa/trunk/0003-meson-Define-NDEBUG-for-non-debug-builds.patch
(from rev 321803, mesa/trunk/ndebug.diff)
mesa/trunk/0004-meson-Add-library-versions-to-swr-drivers.patch
(from rev 321803, mesa/trunk/fix-versions.diff)
mesa/trunk/0005-meson-Version-libMesaOpenCL-like-autotools-does.patch
(from rev 321801, mesa/trunk/fix-versions.diff)
Modified:
mesa/trunk/PKGBUILD
Deleted:
mesa/trunk/fix-install.diff
mesa/trunk/fix-versions.diff
mesa/trunk/ndebug.diff
-+
0001-meson-fix-megadriver-symlinking.patch | 34
0002-meson-Set-.so-version-for-xa-like-autotools-does.patch | 59 +++
0003-meson-Define-NDEBUG-for-non-debug-builds.patch | 34
0004-meson-Add-library-versions-to-swr-drivers.patch| 71 +
0005-meson-Version-libMesaOpenCL-like-autotools-does.patch | 43 +
PKGBUILD| 33 ++--
fix-install.diff| 29 ---
fix-versions.diff | 74 --
ndebug.diff | 13 -
9 files changed, 257 insertions(+), 133 deletions(-)
Copied: mesa/trunk/0001-meson-fix-megadriver-symlinking.patch (from rev 321803,
mesa/trunk/fix-install.diff)
===
--- 0001-meson-fix-megadriver-symlinking.patch (rev 0)
+++ 0001-meson-fix-megadriver-symlinking.patch 2018-04-14 17:26:29 UTC (rev
321804)
@@ -0,0 +1,34 @@
+From ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd Mon Sep 17 00:00:00 2001
+Message-Id:
+From: Dylan Baker
+Date: Wed, 4 Apr 2018 10:23:02 -0700
+Subject: [PATCH 1/5] meson: fix megadriver symlinking
+
+Which should be relative instead of absolute.
+
+Fixes: f7f1b30f81e842db6057591470ce3cb6d4fb2795
+ ("meson: extend install_megadrivers script to handle symmlinking")
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105567
+Signed-off-by: Dylan Baker
+Reviewed-and-Tested-by: Eric Engestrom
+Reviewed-by: Emil Velikov
+---
+ bin/install_megadrivers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/install_megadrivers.py b/bin/install_megadrivers.py
+index 86bfa35918..7931a544bd 100755
+--- a/bin/install_megadrivers.py
b/bin/install_megadrivers.py
+@@ -58,7 +58,7 @@ def main():
+ while ext != '.so':
+ if os.path.exists(name):
+ os.unlink(name)
+-os.symlink(driver, name)
++os.symlink(each, name)
+ name, ext = os.path.splitext(name)
+ finally:
+ os.chdir(ret)
+--
+2.16.2
+
Copied: mesa/trunk/0002-meson-Set-.so-version-for-xa-like-autotools-does.patch
(from rev 321801, mesa/trunk/fix-versions.diff)
===
--- 0002-meson-Set-.so-version-for-xa-like-autotools-does.patch
(rev 0)
+++ 0002-meson-Set-.so-version-for-xa-like-autotools-does.patch 2018-04-14
17:26:29 UTC (rev 321804)
@@ -0,0 +1,59 @@
+From bc13bd64008dc32586a0b4d41189b74a2ab27265 Mon Sep 17 00:00:00 2001
+Message-Id:
+In-Reply-To:
+References:
+From: Dylan Baker
+Date: Wed, 4 Apr 2018 10:53:16 -0700
+Subject: [PATCH 2/5] meson: Set .so version for xa like autotools does
+
+Fixes: 0ba909f0f111824223bc38563d1a6bc73e69c2cc
+ ("meson: build gallium xa state tracker")
+Signed-off-by: Dylan Baker
+Reviewed-by: Eric Engestrom
+Reviewed-by: Emil Velikov
+---
+ src/gallium/targets/xa/meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/gallium/targets/xa/meson.build
b/src/gallium/targets/xa/meson.build
+index ea6e1296da..733ef54ff8 100644
+--- a/src/gallium/targets/xa/meson.build
b/src/gallium/targets/xa/meson.build
+@@ -30,31 +30,33 @@ if with_ld_version_script
+ xa_link_depends += files('xa.sym')
+ endif
+
++_xa_version = '.'.join(xa_version)
+
+ libxatracker = shared_library(
+ 'xatracker',
+ 'target.c',
+ c_args : c_vis_args,
+ cpp_args : cpp_vis_args,
+ link_args : [xa_link_args, ld_args_gc_sections],
+ include_directories : [
+ inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
+ ],
+ link_whole : [libxa_st],
+ link_with : [
+ libgalliumvl_stub, libgallium, libmesa_util, libpipe_loader_static,
+ libws_null, libwsw, libswdri, libswkmsdri,
+ ],
+ link_depends : xa_link_depends,
+ dependencies : [
+ dep_thread, driver_nouveau, driver_i915, driver_svga, driver_freedr
