Update patches

9 files changed, 158 insertions, 176 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index 0a7ebd0..91277e2 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -363,11 +363,12 @@ def BuilderList(slaves):
                   'app-sessreg' : [ '0001-Don-t-try-to-use-utmpx-functions-if-WTMPX_FILE-isn-t.patch' ],
                   'app-xdm' :     [ '0001-Workaround-Cygwin-s-failure-to-prototype-initgroups.patch' ],
                   'khronos-opengl-registry' : [ 'Makefile.patch' ],
-                  'xserver-meson' : [ '0001-meson.build-Fix-compilation-in-hw-xwin-when-dependen.patch',
-                                      '0002-Use-spawnl-rather-than-pipe-fork-to-invoke-xkbcomp.patch',
-                                      '0003-Investigate-ignore-weirdness-with-request-length-tes.patch' ],
-                  'mesa-mesa-meson' : [ '0001-meson-Fix-configuring-dri-glx-with-only-gallium-driv.patch',
-                                        '0002-meson-Fix-install-and-linking-of-gallium-swrast-only.patch' ],
+                  'xserver-meson' : [ '0001-meson.build-Fix-hw-xwin-build-when-dependencies-are-.patch',
+                                      '0002-Bodge-GL-include-path.patch',
+                                      '0003-Use-spawnl-rather-than-pipe-fork-to-invoke-xkbcomp.patch',
+                                      '0004-Investigate-ignore-weirdness-with-request-length-tes.patch',
+                                      '0005-meson-look-for-Secure-RPC-authentication-function-in.patch' ],
+                  'mesa-mesa-meson' : [ '0001-meson-Set-with_dri-from-with_gallium-when-DRI-glx-is.patch' ],
 	        }
 
       if name in patches:
diff --git a/patches/mesa-mesa-meson/0001-meson-Fix-configuring-dri-glx-with-only-gallium-driv.patch b/patches/mesa-mesa-meson/0001-meson-Fix-configuring-dri-glx-with-only-gallium-driv.patch
deleted file mode 100644
index a7baa3d..0000000
--- a/patches/mesa-mesa-meson/0001-meson-Fix-configuring-dri-glx-with-only-gallium-driv.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f8e7a25bf879c195f61978b352d0dc8e8c9c387b Mon Sep 17 00:00:00 2001
-From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Thu, 11 Jan 2018 17:41:36 +0000
-Subject: [PATCH 1/2] meson: Fix configuring dri glx with only gallium drivers
-
-'meson -Ddri-drivers= -Dgallium-drivers=swrast -Dglx=dri' fails with 'dri
-based GLX requires at least one DRI driver'
----
- meson.build         | 2 +-
- src/glx/meson.build | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 77e4e894b23..dd8e6145edb 100644
---- a/meson.build
-+++ b/meson.build
-@@ -323,7 +323,7 @@ if with_glx != 'disabled'
-     if with_dri
-       error('xlib conflicts with any dri driver')
-     endif
--  elif with_glx == 'dri' and not with_dri
-+  elif with_glx == 'dri' and not (with_dri or with_gallium)
-     error('dri based GLX requires at least one DRI driver')
-   endif
- endif
-diff --git a/src/glx/meson.build b/src/glx/meson.build
-index cdb388e9837..ead6e6138f7 100644
---- a/src/glx/meson.build
-+++ b/src/glx/meson.build
-@@ -65,7 +65,7 @@ extra_libs_libglx = []
- extra_deps_libgl = []
- extra_ld_args_libgl = []
- 
--if with_dri
-+if with_dri or with_gallium
-   files_libglx += files(
-     'dri_common.c',
-     'dri_common.h',
--- 
-2.15.1
-
diff --git a/patches/mesa-mesa-meson/0001-meson-Set-with_dri-from-with_gallium-when-DRI-glx-is.patch b/patches/mesa-mesa-meson/0001-meson-Set-with_dri-from-with_gallium-when-DRI-glx-is.patch
new file mode 100644
index 0000000..322ef5b
--- /dev/null
+++ b/patches/mesa-mesa-meson/0001-meson-Set-with_dri-from-with_gallium-when-DRI-glx-is.patch
@@ -0,0 +1,39 @@
+From f8e440462604cfa4b400a3323c311b8b34149f07 Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Mon, 15 Jan 2018 19:39:46 +0000
+Subject: [PATCH] meson: Set with_dri from with_gallium when DRI glx is
+ explicitly configured
+
+Set with_dri from with_gallium when DRI GLX is explicitly configured, as
+well as when DRI GLX is chosen automatically.
+---
+ meson.build | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index ae31cdd6571..f3179c38062 100644
+--- a/meson.build
++++ b/meson.build
+@@ -248,7 +248,6 @@ if with_glx == 'auto'
+   elif with_gallium
+     # Even when building just gallium drivers the user probably wants dri
+     with_glx = 'dri'
+-    with_dri = true
+   elif with_platform_x11 and with_any_opengl and not with_any_vk
+     # The automatic behavior should not be to turn on xlib based glx when
+     # building only vulkan drivers
+@@ -257,6 +256,11 @@ if with_glx == 'auto'
+     with_glx = 'disabled'
+   endif
+ endif
++if with_glx == 'dri'
++   if with_gallium
++      with_dri = true
++   endif
++endif
+ 
+ if not (with_dri or with_gallium or with_glx == 'xlib' or with_glx == 'gallium-xlib')
+   with_gles1 = false
+-- 
+2.15.1
+
diff --git a/patches/mesa-mesa-meson/0002-meson-Fix-install-and-linking-of-gallium-swrast-only.patch b/patches/mesa-mesa-meson/0002-meson-Fix-install-and-linking-of-gallium-swrast-only.patch
deleted file mode 100644
index 8bcd260..0000000
--- a/patches/mesa-mesa-meson/0002-meson-Fix-install-and-linking-of-gallium-swrast-only.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 31e4d4b116be0d5b8f82b3fc668e38c57380a2f0 Mon Sep 17 00:00:00 2001
-From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Thu, 11 Jan 2018 19:18:59 +0000
-Subject: [PATCH 2/2] meson: Fix install and linking of gallium swrast only
- driver
-
-When configured 'meson -Ddri-drivers= -Dgallium-drivers=swrast -Dglx=dri'
-link and install a galliumized swrast_dri.so
-
-Also install dri.pc and internal/dri_interface.h
----
- include/meson.build                        | 2 +-
- src/gallium/meson.build                    | 2 +-
- src/gallium/state_trackers/dri/meson.build | 2 +-
- src/gallium/targets/dri/meson.build        | 2 +-
- src/mesa/drivers/dri/meson.build           | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/include/meson.build b/include/meson.build
-index a2e7ce6580e..db3b479a94e 100644
---- a/include/meson.build
-+++ b/include/meson.build
-@@ -68,7 +68,7 @@ if with_egl
-   )
- endif
- 
--if with_dri
-+if with_dri or with_gallium
-   install_headers('GL/internal/dri_interface.h', subdir : 'GL/internal')
- endif
- 
-diff --git a/src/gallium/meson.build b/src/gallium/meson.build
-index 6330c7514af..ba6392467b6 100644
---- a/src/gallium/meson.build
-+++ b/src/gallium/meson.build
-@@ -156,7 +156,7 @@ if with_gallium_opencl
-   subdir('state_trackers/clover')
-   subdir('targets/opencl')
- endif
--if with_dri
-+if with_dri or with_gallium
-   subdir('state_trackers/dri')
-   subdir('targets/dri')
- endif
-diff --git a/src/gallium/state_trackers/dri/meson.build b/src/gallium/state_trackers/dri/meson.build
-index b99314ebf61..6cd70ad6c34 100644
---- a/src/gallium/state_trackers/dri/meson.build
-+++ b/src/gallium/state_trackers/dri/meson.build
-@@ -31,7 +31,7 @@ files_libdri = files(
-   'dri_screen.h',
- )
- 
--if with_dri
-+if with_dri or with_gallium_softpipe
-   files_libdri += files('drisw.c')
- endif
- 
-diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
-index edf8d67fe39..bf53db4a29d 100644
---- a/src/gallium/targets/dri/meson.build
-+++ b/src/gallium/targets/dri/meson.build
-@@ -42,7 +42,7 @@ if with_ld_dynamic_list
-   gallium_dri_link_depends += files('../dri-vdpau.dyn')
- endif
- 
--if with_dri
-+if with_dri or with_gallium_softpipe
-   gallium_dri_link_with += libswdri
- endif
- if with_gallium_drisw_kms
-diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
-index 4ec2f343df2..b033d4c536f 100644
---- a/src/mesa/drivers/dri/meson.build
-+++ b/src/mesa/drivers/dri/meson.build
-@@ -63,7 +63,7 @@ endif
- 
- # This needs to be installed if any dri drivers (including gallium dri drivers)
- # are built.
--if with_dri
-+if with_dri or with_gallium
-   pkg.generate(
-     name : 'dri',
-     filebase : 'dri',
--- 
-2.15.1
-
diff --git a/patches/xserver-meson/0001-meson.build-Fix-hw-xwin-build-when-dependencies-are-.patch b/patches/xserver-meson/0001-meson.build-Fix-hw-xwin-build-when-dependencies-are-.patch
new file mode 100644
index 0000000..8751fcf
--- /dev/null
+++ b/patches/xserver-meson/0001-meson.build-Fix-hw-xwin-build-when-dependencies-are-.patch
@@ -0,0 +1,38 @@
+From c917ca4cfe6849ee075ef05ad7093836caf5529f Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Tue, 9 Jan 2018 23:56:20 +0000
+Subject: [PATCH xserver 1/5] meson.build: Fix hw/xwin build when dependencies
+ are installed in a non-default location
+
+---
+ hw/xwin/glx/meson.build          | 2 +-
+ hw/xwin/winclipboard/meson.build | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/hw/xwin/glx/meson.build b/hw/xwin/glx/meson.build
+index e9969536d..57cce039d 100644
+--- a/hw/xwin/glx/meson.build
++++ b/hw/xwin/glx/meson.build
+@@ -75,7 +75,7 @@ xwin_glx = static_library(
+         top_srcdir_inc,
+         include_directories('../'),
+     ],
+-    dependencies: pixman_dep,
++    dependencies: common_dep,
+     c_args: xwin_glx_c_args,
+ )
+ 
+diff --git a/hw/xwin/winclipboard/meson.build b/hw/xwin/winclipboard/meson.build
+index 1c784c384..dd7b2d20e 100644
+--- a/hw/xwin/winclipboard/meson.build
++++ b/hw/xwin/winclipboard/meson.build
+@@ -27,5 +27,6 @@ executable(
+     srcs_xwinclip,
+     link_with: xwin_clipboard,
+     link_args: ['-lgdi32', '-lpthread'],
++    dependencies: [dependency('x11')],
+     install: true,
+ )
+-- 
+2.15.1
+
diff --git a/patches/xserver-meson/0001-meson.build-Fix-compilation-in-hw-xwin-when-dependen.patch b/patches/xserver-meson/0002-Bodge-GL-include-path.patch
index e0a0c5c..bfb15ce 100644
--- a/patches/xserver-meson/0001-meson.build-Fix-compilation-in-hw-xwin-when-dependen.patch
+++ b/patches/xserver-meson/0002-Bodge-GL-include-path.patch
@@ -1,14 +1,14 @@
-From d3629f6c75c6a94dfb78ddbf546fcfb830ed3224 Mon Sep 17 00:00:00 2001
+From 02dcbe5e9ad954d791a83d7a47a4233038108e86 Mon Sep 17 00:00:00 2001
 From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Tue, 9 Jan 2018 23:56:20 +0000
-Subject: [PATCH xserver] meson.build: Fix compilation in hw/xwin when
- dependencies are installed in a non-default location
+Date: Wed, 17 Jan 2018 14:09:46 +0000
+Subject: [PATCH xserver 2/5] Bodge GL include path
 
+What we really want to do here is get just the cflags from the gl
+dependency, but meson doesn't have a means to do that, yet...
 ---
- hw/xwin/glx/glthunk.c            |  1 +
- hw/xwin/glx/meson.build          | 13 ++++++++++++-
- hw/xwin/winclipboard/meson.build |  1 +
- 3 files changed, 14 insertions(+), 1 deletion(-)
+ hw/xwin/glx/glthunk.c   |  1 +
+ hw/xwin/glx/meson.build | 11 +++++++++++
+ 2 files changed, 12 insertions(+)
 
 diff --git a/hw/xwin/glx/glthunk.c b/hw/xwin/glx/glthunk.c
 index 3d2702ddb..c03c1b7d6 100644
@@ -23,18 +23,9 @@ index 3d2702ddb..c03c1b7d6 100644
  #include <GL/gl.h>
  #undef GL_ARB_imaging
 diff --git a/hw/xwin/glx/meson.build b/hw/xwin/glx/meson.build
-index e9969536d..05bba3adc 100644
+index 57cce039d..bc02aed52 100644
 --- a/hw/xwin/glx/meson.build
 +++ b/hw/xwin/glx/meson.build
-@@ -75,7 +75,7 @@ xwin_glx = static_library(
-         top_srcdir_inc,
-         include_directories('../'),
-     ],
--    dependencies: pixman_dep,
-+    dependencies: common_dep,
-     c_args: xwin_glx_c_args,
- )
- 
 @@ -84,10 +84,21 @@ srcs_wgl_thunk = [
      gl_thunks,
  ]
@@ -47,7 +38,7 @@ index e9969536d..05bba3adc 100644
 +# know will give the same include path.
 +# See https://github.com/mesonbuild/meson/issues/2905
 +
-+gl_inc = include_directories(dependency('dri', method:'pkg-config').get_pkgconfig_variable('includedir'))
++gl_inc = include_directories(join_paths(get_option('prefix'), 'include'))
 +
  WGLthunk = shared_library(
      'nativeGLthunk',
@@ -57,17 +48,6 @@ index e9969536d..05bba3adc 100644
          inc,
          top_srcdir_inc,
      ],
-diff --git a/hw/xwin/winclipboard/meson.build b/hw/xwin/winclipboard/meson.build
-index 1c784c384..dd7b2d20e 100644
---- a/hw/xwin/winclipboard/meson.build
-+++ b/hw/xwin/winclipboard/meson.build
-@@ -27,5 +27,6 @@ executable(
-     srcs_xwinclip,
-     link_with: xwin_clipboard,
-     link_args: ['-lgdi32', '-lpthread'],
-+    dependencies: [dependency('x11')],
-     install: true,
- )
 -- 
 2.15.1
 
diff --git a/patches/xserver-meson/0002-Use-spawnl-rather-than-pipe-fork-to-invoke-xkbcomp.patch b/patches/xserver-meson/0003-Use-spawnl-rather-than-pipe-fork-to-invoke-xkbcomp.patch
index d4afebf..5504e35 100644
--- a/patches/xserver-meson/0002-Use-spawnl-rather-than-pipe-fork-to-invoke-xkbcomp.patch
+++ b/patches/xserver-meson/0003-Use-spawnl-rather-than-pipe-fork-to-invoke-xkbcomp.patch
@@ -1,8 +1,8 @@
-From 591c0c87b40180afe5c01b78b74a7545fe6867ce Mon Sep 17 00:00:00 2001
+From 24a220b308eb8891b12b5ebde1f2d2de08d09081 Mon Sep 17 00:00:00 2001
 From: Jon Turney <jon.turney@dronecode.org.uk>
 Date: Mon, 5 Mar 2012 22:16:33 +0000
-Subject: [PATCH xserver] Use spawnl() rather than pipe() & fork() to invoke
- xkbcomp
+Subject: [PATCH xserver 3/5] Use spawnl() rather than pipe() & fork() to
+ invoke xkbcomp
 
 Implement System() specially on Cygwin not to use fork() and exec(), but
 spawnl()
diff --git a/patches/xserver-meson/0003-Investigate-ignore-weirdness-with-request-length-tes.patch b/patches/xserver-meson/0004-Investigate-ignore-weirdness-with-request-length-tes.patch
index a32b6f6..cd8f1f3 100644
--- a/patches/xserver-meson/0003-Investigate-ignore-weirdness-with-request-length-tes.patch
+++ b/patches/xserver-meson/0004-Investigate-ignore-weirdness-with-request-length-tes.patch
@@ -1,13 +1,13 @@
-From a110b5372e85d0a48126a7cf294c91b82a741251 Mon Sep 17 00:00:00 2001
+From 6b4e7a82a6c947b2f8def6d2ac6fb467e4cef792 Mon Sep 17 00:00:00 2001
 From: Jon Turney <jon.turney@dronecode.org.uk>
 Date: Fri, 12 Jan 2018 14:01:39 +0000
-Subject: [PATCH xserver] Investigate/ignore weirdness with request-length test
- on x86
+Subject: [PATCH xserver 4/5] Investigate/ignore weirdness with request-length
+ test on x86
 
 ---
  test/bigreq/request-length.c |  4 ++++
- test/simple-xinit.c          | 11 +++++++++++
- 2 files changed, 15 insertions(+)
+ test/simple-xinit.c          | 14 +++++++++++++-
+ 2 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/test/bigreq/request-length.c b/test/bigreq/request-length.c
 index 8174813ae..90083a877 100644
@@ -24,32 +24,42 @@ index 8174813ae..90083a877 100644
      return 2;
  }
 diff --git a/test/simple-xinit.c b/test/simple-xinit.c
-index 26ff12bf7..6ba9aa477 100644
+index 26ff12bf7..5b34a1631 100644
 --- a/test/simple-xinit.c
 +++ b/test/simple-xinit.c
-@@ -64,6 +64,10 @@ usage(int argc, char **argv)
+@@ -64,7 +64,12 @@ usage(int argc, char **argv)
  static int
  start_server(char *const *server_args)
  {
+-    int server_pid = fork();
++    int server_pid;
 +    char *const *arg;
 +    for (arg = server_args; *arg; arg++)
 +        fprintf(stderr, "server arg: %s\n", *arg);
 +
-     int server_pid = fork();
++    server_pid = fork();
  
      if (server_pid == -1) {
-@@ -119,6 +123,10 @@ start_client(char *const *client_args, int display)
+         fprintf(stderr, "Fork failed: %s\n", strerror(errno));
+@@ -106,6 +111,7 @@ start_client(char *const *client_args, int display)
+     char *display_string;
+     int ret;
+     int client_pid;
++    char *const *arg;
+ 
+     ret = asprintf(&display_string, ":%d", display);
+     if (ret < 0) {
+@@ -119,6 +125,9 @@ start_client(char *const *client_args, int display)
          exit(1);
      }
  
-+    char *const *arg;
 +    for (arg = client_args; *arg; arg++)
 +        fprintf(stderr, "client arg: %s\n", *arg);
 +
      client_pid = fork();
      if (client_pid == -1) {
          fprintf(stderr, "Fork failed: %s\n", strerror(errno));
-@@ -225,8 +233,11 @@ main(int argc, char **argv)
+@@ -225,8 +234,11 @@ main(int argc, char **argv)
      parse_args(argc, argv, &client_args, &server_args, displayfd_pipe[1]);
      server_pid = start_server(server_args);
      display = get_display(displayfd_pipe[0]);
diff --git a/patches/xserver-meson/0005-meson-look-for-Secure-RPC-authentication-function-in.patch b/patches/xserver-meson/0005-meson-look-for-Secure-RPC-authentication-function-in.patch
new file mode 100644
index 0000000..e502195
--- /dev/null
+++ b/patches/xserver-meson/0005-meson-look-for-Secure-RPC-authentication-function-in.patch
@@ -0,0 +1,41 @@
+From 9d0e5c41dbb2d98bde5cd53b29b92ee80807f59f Mon Sep 17 00:00:00 2001
+From: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Wed, 17 Jan 2018 13:43:47 +0000
+Subject: [PATCH xserver 5/5] meson: look for Secure RPC authentication
+ function in tirpc
+
+If Secure RPC authentication isn't found in libc, look for it in tirpc.
+
+This does something different to XTRANS_SECURE_RPC_FLAGS, which doesn't find
+what it was looking for in this case, anyhow...
+---
+ os/meson.build | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/os/meson.build b/os/meson.build
+index 54124d32a..e2ab68346 100644
+--- a/os/meson.build
++++ b/os/meson.build
+@@ -54,7 +54,11 @@ if get_option('xdmcp')
+     srcs_os += 'xdmcp.c'
+ endif
+ 
++rpc_dep = []
+ if get_option('secure-rpc')
++    if not (cc.has_function('_authenticate') or cc.has_function('__authenticate'))
++        rpc_dep = dependency('libtirpc')
++    endif
+     srcs_os += 'rpcauth.c'
+ endif
+ 
+@@ -73,6 +77,7 @@ libxserver_os = static_library('libxserver_os',
+         common_dep,
+         dl_dep,
+         sha1_dep,
++        rpc_dep,
+         dependency('xau')
+     ],
+     link_with: libxlibc,
+-- 
+2.15.1
+