[arch-commits] Commit in xorg-server/repos (8 files)

2021-11-06 Thread Laurent Carlier via arch-commits 
Date: Saturday, November 6, 2021 @ 10:08:59
  Author: lcarlier
Revision: 427396

archrelease: copy trunk to staging-x86_64

Added:
  xorg-server/repos/staging-x86_64/
  xorg-server/repos/staging-x86_64/0001-v2-FS-58644.patch
(from rev 427395, xorg-server/trunk/0001-v2-FS-58644.patch)
  xorg-server/repos/staging-x86_64/0002-fix-libshadow-2.patch
(from rev 427395, xorg-server/trunk/0002-fix-libshadow-2.patch)
  xorg-server/repos/staging-x86_64/PKGBUILD
(from rev 427395, xorg-server/trunk/PKGBUILD)
  xorg-server/repos/staging-x86_64/xorg-server.install
(from rev 427395, xorg-server/trunk/xorg-server.install)
  xorg-server/repos/staging-x86_64/xserver-autobind-hotplug.patch
(from rev 427395, xorg-server/trunk/xserver-autobind-hotplug.patch)
  xorg-server/repos/staging-x86_64/xvfb-run
(from rev 427395, xorg-server/trunk/xvfb-run)
  xorg-server/repos/staging-x86_64/xvfb-run.1
(from rev 427395, xorg-server/trunk/xvfb-run.1)

+
 0001-v2-FS-58644.patch |   57 +++
 0002-fix-libshadow-2.patch |   30 +++
 PKGBUILD   |  169 ++
 xorg-server.install|   18 ++
 xserver-autobind-hotplug.patch |  293 +++
 xvfb-run   |  200 ++
 xvfb-run.1 |  282 +
 7 files changed, 1049 insertions(+)

Copied: xorg-server/repos/staging-x86_64/0001-v2-FS-58644.patch (from rev 
427395, xorg-server/trunk/0001-v2-FS-58644.patch)
===
--- staging-x86_64/0001-v2-FS-58644.patch   (rev 0)
+++ staging-x86_64/0001-v2-FS-58644.patch   2021-11-06 10:08:59 UTC (rev 
427396)
@@ -0,0 +1,57 @@
+From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
+From: fafryd 
+Date: Sun, 20 May 2018 14:30:43 +0200
+Subject: [PATCH] v2 FS#58644
+
+---
+ hw/xfree86/common/meson.build | 13 +
+ hw/xfree86/meson.build| 12 +++-
+ 2 files changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
+index 514999ff6..0eff6e488 100644
+--- a/hw/xfree86/common/meson.build
 b/hw/xfree86/common/meson.build
+@@ -1,3 +1,16 @@
++if get_option('suid_wrapper')
++x_sh = configure_file(
++input: '../Xorg.sh.in',
++output: 'Xorg',
++configuration: conf_data,
++)
++install_data(
++   x_sh,
++   install_mode: 'rwxr-xr-x',
++   install_dir: join_paths(get_option('prefix'), get_option('bindir')),
++)
++endif
++
+ srcs_xorg_common = [
+ 'xf86fbBus.c',
+ 'xf86noBus.c',
+diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
+index cacf56d4c..d1295d404 100644
+--- a/hw/xfree86/meson.build
 b/hw/xfree86/meson.build
+@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
+ install_dir: get_option('libexecdir'),
+ # install_mode: ['r-sr-xr-x', 0, 0],
+ )
+-configure_file(
+-input: 'Xorg.sh.in',
+-output: 'Xorg',
+-configuration: conf_data,
+-install_dir: join_paths(get_option('prefix'), get_option('bindir')),
++ meson.add_install_script(
++'sh', '-c',
++'chmod u+s @0@@1@/@2@'.format(
++'${DESTDIR}',
++join_paths(get_option('prefix'), get_option('libexecdir')),
++'Xorg.wrap'
++)
+ )
+ endif
+ 
+-- 
+2.17.0
+

Copied: xorg-server/repos/staging-x86_64/0002-fix-libshadow-2.patch (from rev 
427395, xorg-server/trunk/0002-fix-libshadow-2.patch)
===
--- staging-x86_64/0002-fix-libshadow-2.patch   (rev 0)
+++ staging-x86_64/0002-fix-libshadow-2.patch   2021-11-06 10:08:59 UTC (rev 
427396)
@@ -0,0 +1,30 @@
+From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
+From: Adam Jackson 
+Date: Tue, 30 Apr 2019 18:01:27 -0400
+Subject: [PATCH] meson: Fix libshadow.so linkage
+
+Don't link against fb, it's the driver's responsibility to load that
+first. Underlinking like this is unpleasant but this matches what
+autotools does.
+
+Fixes: xorg/xserver#540
+---
+ hw/xfree86/dixmods/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
+index 835d23215..0562b630f 100644
+--- a/hw/xfree86/dixmods/meson.build
 b/hw/xfree86/dixmods/meson.build
+@@ -34,7 +34,7 @@ shared_module(
+ c_args: xorg_c_args,
+ dependencies: common_dep,
+ link_whole: libxserver_miext_shadow,
+-link_with: [fb, e],
++link_with: e,
+ 
+ install: true,
+ install_dir: module_dir,
+-- 
+2.22.0
+

Copied: xorg-server/repos/staging-x86_64/PKGBUILD (from rev 427395, 
xorg-server/trunk/PKGBUILD)
===
---

[arch-commits] Commit in xorg-server/repos (8 files)

2021-10-31 Thread Andreas Radke via arch-commits 
Date: Sunday, October 31, 2021 @ 06:25:06
  Author: andyrtr
Revision: 426849

archrelease: copy trunk to testing-x86_64

Added:
  xorg-server/repos/testing-x86_64/
  xorg-server/repos/testing-x86_64/0001-v2-FS-58644.patch
(from rev 426848, xorg-server/trunk/0001-v2-FS-58644.patch)
  xorg-server/repos/testing-x86_64/0002-fix-libshadow-2.patch
(from rev 426848, xorg-server/trunk/0002-fix-libshadow-2.patch)
  xorg-server/repos/testing-x86_64/PKGBUILD
(from rev 426848, xorg-server/trunk/PKGBUILD)
  xorg-server/repos/testing-x86_64/xorg-server.install
(from rev 426848, xorg-server/trunk/xorg-server.install)
  xorg-server/repos/testing-x86_64/xserver-autobind-hotplug.patch
(from rev 426848, xorg-server/trunk/xserver-autobind-hotplug.patch)
  xorg-server/repos/testing-x86_64/xvfb-run
(from rev 426848, xorg-server/trunk/xvfb-run)
  xorg-server/repos/testing-x86_64/xvfb-run.1
(from rev 426848, xorg-server/trunk/xvfb-run.1)

+
 0001-v2-FS-58644.patch |   57 +++
 0002-fix-libshadow-2.patch |   30 +++
 PKGBUILD   |  194 +
 xorg-server.install|   18 ++
 xserver-autobind-hotplug.patch |  293 +++
 xvfb-run   |  200 ++
 xvfb-run.1 |  282 +
 7 files changed, 1074 insertions(+)

Copied: xorg-server/repos/testing-x86_64/0001-v2-FS-58644.patch (from rev 
426848, xorg-server/trunk/0001-v2-FS-58644.patch)
===
--- testing-x86_64/0001-v2-FS-58644.patch   (rev 0)
+++ testing-x86_64/0001-v2-FS-58644.patch   2021-10-31 06:25:06 UTC (rev 
426849)
@@ -0,0 +1,57 @@
+From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
+From: fafryd 
+Date: Sun, 20 May 2018 14:30:43 +0200
+Subject: [PATCH] v2 FS#58644
+
+---
+ hw/xfree86/common/meson.build | 13 +
+ hw/xfree86/meson.build| 12 +++-
+ 2 files changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
+index 514999ff6..0eff6e488 100644
+--- a/hw/xfree86/common/meson.build
 b/hw/xfree86/common/meson.build
+@@ -1,3 +1,16 @@
++if get_option('suid_wrapper')
++x_sh = configure_file(
++input: '../Xorg.sh.in',
++output: 'Xorg',
++configuration: conf_data,
++)
++install_data(
++   x_sh,
++   install_mode: 'rwxr-xr-x',
++   install_dir: join_paths(get_option('prefix'), get_option('bindir')),
++)
++endif
++
+ srcs_xorg_common = [
+ 'xf86fbBus.c',
+ 'xf86noBus.c',
+diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
+index cacf56d4c..d1295d404 100644
+--- a/hw/xfree86/meson.build
 b/hw/xfree86/meson.build
+@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
+ install_dir: get_option('libexecdir'),
+ # install_mode: ['r-sr-xr-x', 0, 0],
+ )
+-configure_file(
+-input: 'Xorg.sh.in',
+-output: 'Xorg',
+-configuration: conf_data,
+-install_dir: join_paths(get_option('prefix'), get_option('bindir')),
++ meson.add_install_script(
++'sh', '-c',
++'chmod u+s @0@@1@/@2@'.format(
++'${DESTDIR}',
++join_paths(get_option('prefix'), get_option('libexecdir')),
++'Xorg.wrap'
++)
+ )
+ endif
+ 
+-- 
+2.17.0
+

Copied: xorg-server/repos/testing-x86_64/0002-fix-libshadow-2.patch (from rev 
426848, xorg-server/trunk/0002-fix-libshadow-2.patch)
===
--- testing-x86_64/0002-fix-libshadow-2.patch   (rev 0)
+++ testing-x86_64/0002-fix-libshadow-2.patch   2021-10-31 06:25:06 UTC (rev 
426849)
@@ -0,0 +1,30 @@
+From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
+From: Adam Jackson 
+Date: Tue, 30 Apr 2019 18:01:27 -0400
+Subject: [PATCH] meson: Fix libshadow.so linkage
+
+Don't link against fb, it's the driver's responsibility to load that
+first. Underlinking like this is unpleasant but this matches what
+autotools does.
+
+Fixes: xorg/xserver#540
+---
+ hw/xfree86/dixmods/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
+index 835d23215..0562b630f 100644
+--- a/hw/xfree86/dixmods/meson.build
 b/hw/xfree86/dixmods/meson.build
+@@ -34,7 +34,7 @@ shared_module(
+ c_args: xorg_c_args,
+ dependencies: common_dep,
+ link_whole: libxserver_miext_shadow,
+-link_with: [fb, e],
++link_with: e,
+ 
+ install: true,
+ install_dir: module_dir,
+-- 
+2.22.0
+

Copied: xorg-server/repos/testing-x86_64/PKGBUILD (from rev 426848, 
xorg-server/trunk/PKGBUILD)
===
---

[arch-commits] Commit in xorg-server/repos (8 files)

2021-07-08 Thread Andreas Radke via arch-commits 
Date: Thursday, July 8, 2021 @ 20:03:15
  Author: andyrtr
Revision: 419312

archrelease: copy trunk to testing-x86_64

Added:
  xorg-server/repos/testing-x86_64/
  xorg-server/repos/testing-x86_64/0001-v2-FS-58644.patch
(from rev 419311, xorg-server/trunk/0001-v2-FS-58644.patch)
  xorg-server/repos/testing-x86_64/0002-fix-libshadow-2.patch
(from rev 419311, xorg-server/trunk/0002-fix-libshadow-2.patch)
  xorg-server/repos/testing-x86_64/PKGBUILD
(from rev 419311, xorg-server/trunk/PKGBUILD)
  xorg-server/repos/testing-x86_64/xorg-server.install
(from rev 419311, xorg-server/trunk/xorg-server.install)
  xorg-server/repos/testing-x86_64/xserver-autobind-hotplug.patch
(from rev 419311, xorg-server/trunk/xserver-autobind-hotplug.patch)
  xorg-server/repos/testing-x86_64/xvfb-run
(from rev 419311, xorg-server/trunk/xvfb-run)
  xorg-server/repos/testing-x86_64/xvfb-run.1
(from rev 419311, xorg-server/trunk/xvfb-run.1)

+
 0001-v2-FS-58644.patch |   57 +++
 0002-fix-libshadow-2.patch |   30 +++
 PKGBUILD   |  191 +
 xorg-server.install|   18 ++
 xserver-autobind-hotplug.patch |  293 +++
 xvfb-run   |  200 ++
 xvfb-run.1 |  282 +
 7 files changed, 1071 insertions(+)

Copied: xorg-server/repos/testing-x86_64/0001-v2-FS-58644.patch (from rev 
419311, xorg-server/trunk/0001-v2-FS-58644.patch)
===
--- testing-x86_64/0001-v2-FS-58644.patch   (rev 0)
+++ testing-x86_64/0001-v2-FS-58644.patch   2021-07-08 20:03:15 UTC (rev 
419312)
@@ -0,0 +1,57 @@
+From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
+From: fafryd 
+Date: Sun, 20 May 2018 14:30:43 +0200
+Subject: [PATCH] v2 FS#58644
+
+---
+ hw/xfree86/common/meson.build | 13 +
+ hw/xfree86/meson.build| 12 +++-
+ 2 files changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
+index 514999ff6..0eff6e488 100644
+--- a/hw/xfree86/common/meson.build
 b/hw/xfree86/common/meson.build
+@@ -1,3 +1,16 @@
++if get_option('suid_wrapper')
++x_sh = configure_file(
++input: '../Xorg.sh.in',
++output: 'Xorg',
++configuration: conf_data,
++)
++install_data(
++   x_sh,
++   install_mode: 'rwxr-xr-x',
++   install_dir: join_paths(get_option('prefix'), get_option('bindir')),
++)
++endif
++
+ srcs_xorg_common = [
+ 'xf86fbBus.c',
+ 'xf86noBus.c',
+diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
+index cacf56d4c..d1295d404 100644
+--- a/hw/xfree86/meson.build
 b/hw/xfree86/meson.build
+@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
+ install_dir: get_option('libexecdir'),
+ # install_mode: ['r-sr-xr-x', 0, 0],
+ )
+-configure_file(
+-input: 'Xorg.sh.in',
+-output: 'Xorg',
+-configuration: conf_data,
+-install_dir: join_paths(get_option('prefix'), get_option('bindir')),
++ meson.add_install_script(
++'sh', '-c',
++'chmod u+s @0@@1@/@2@'.format(
++'${DESTDIR}',
++join_paths(get_option('prefix'), get_option('libexecdir')),
++'Xorg.wrap'
++)
+ )
+ endif
+ 
+-- 
+2.17.0
+

Copied: xorg-server/repos/testing-x86_64/0002-fix-libshadow-2.patch (from rev 
419311, xorg-server/trunk/0002-fix-libshadow-2.patch)
===
--- testing-x86_64/0002-fix-libshadow-2.patch   (rev 0)
+++ testing-x86_64/0002-fix-libshadow-2.patch   2021-07-08 20:03:15 UTC (rev 
419312)
@@ -0,0 +1,30 @@
+From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
+From: Adam Jackson 
+Date: Tue, 30 Apr 2019 18:01:27 -0400
+Subject: [PATCH] meson: Fix libshadow.so linkage
+
+Don't link against fb, it's the driver's responsibility to load that
+first. Underlinking like this is unpleasant but this matches what
+autotools does.
+
+Fixes: xorg/xserver#540
+---
+ hw/xfree86/dixmods/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
+index 835d23215..0562b630f 100644
+--- a/hw/xfree86/dixmods/meson.build
 b/hw/xfree86/dixmods/meson.build
+@@ -34,7 +34,7 @@ shared_module(
+ c_args: xorg_c_args,
+ dependencies: common_dep,
+ link_whole: libxserver_miext_shadow,
+-link_with: [fb, e],
++link_with: e,
+ 
+ install: true,
+ install_dir: module_dir,
+-- 
+2.22.0
+

Copied: xorg-server/repos/testing-x86_64/PKGBUILD (from rev 419311, 
xorg-server/trunk/PKGBUILD)
===
---

[arch-commits] Commit in xorg-server/repos (8 files)

2021-04-13 Thread Laurent Carlier via arch-commits 
Date: Tuesday, April 13, 2021 @ 15:17:26
  Author: lcarlier
Revision: 412402

archrelease: copy trunk to testing-x86_64

Added:
  xorg-server/repos/testing-x86_64/
  xorg-server/repos/testing-x86_64/0001-v2-FS-58644.patch
(from rev 412401, xorg-server/trunk/0001-v2-FS-58644.patch)
  xorg-server/repos/testing-x86_64/0002-fix-libshadow-2.patch
(from rev 412401, xorg-server/trunk/0002-fix-libshadow-2.patch)
  xorg-server/repos/testing-x86_64/PKGBUILD
(from rev 412401, xorg-server/trunk/PKGBUILD)
  xorg-server/repos/testing-x86_64/xorg-server.install
(from rev 412401, xorg-server/trunk/xorg-server.install)
  xorg-server/repos/testing-x86_64/xserver-autobind-hotplug.patch
(from rev 412401, xorg-server/trunk/xserver-autobind-hotplug.patch)
  xorg-server/repos/testing-x86_64/xvfb-run
(from rev 412401, xorg-server/trunk/xvfb-run)
  xorg-server/repos/testing-x86_64/xvfb-run.1
(from rev 412401, xorg-server/trunk/xvfb-run.1)

+
 0001-v2-FS-58644.patch |   57 +++
 0002-fix-libshadow-2.patch |   30 +++
 PKGBUILD   |  192 +
 xorg-server.install|   18 ++
 xserver-autobind-hotplug.patch |  293 +++
 xvfb-run   |  200 ++
 xvfb-run.1 |  282 +
 7 files changed, 1072 insertions(+)

Copied: xorg-server/repos/testing-x86_64/0001-v2-FS-58644.patch (from rev 
412401, xorg-server/trunk/0001-v2-FS-58644.patch)
===
--- testing-x86_64/0001-v2-FS-58644.patch   (rev 0)
+++ testing-x86_64/0001-v2-FS-58644.patch   2021-04-13 15:17:26 UTC (rev 
412402)
@@ -0,0 +1,57 @@
+From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
+From: fafryd 
+Date: Sun, 20 May 2018 14:30:43 +0200
+Subject: [PATCH] v2 FS#58644
+
+---
+ hw/xfree86/common/meson.build | 13 +
+ hw/xfree86/meson.build| 12 +++-
+ 2 files changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
+index 514999ff6..0eff6e488 100644
+--- a/hw/xfree86/common/meson.build
 b/hw/xfree86/common/meson.build
+@@ -1,3 +1,16 @@
++if get_option('suid_wrapper')
++x_sh = configure_file(
++input: '../Xorg.sh.in',
++output: 'Xorg',
++configuration: conf_data,
++)
++install_data(
++   x_sh,
++   install_mode: 'rwxr-xr-x',
++   install_dir: join_paths(get_option('prefix'), get_option('bindir')),
++)
++endif
++
+ srcs_xorg_common = [
+ 'xf86fbBus.c',
+ 'xf86noBus.c',
+diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
+index cacf56d4c..d1295d404 100644
+--- a/hw/xfree86/meson.build
 b/hw/xfree86/meson.build
+@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
+ install_dir: get_option('libexecdir'),
+ # install_mode: ['r-sr-xr-x', 0, 0],
+ )
+-configure_file(
+-input: 'Xorg.sh.in',
+-output: 'Xorg',
+-configuration: conf_data,
+-install_dir: join_paths(get_option('prefix'), get_option('bindir')),
++ meson.add_install_script(
++'sh', '-c',
++'chmod u+s @0@@1@/@2@'.format(
++'${DESTDIR}',
++join_paths(get_option('prefix'), get_option('libexecdir')),
++'Xorg.wrap'
++)
+ )
+ endif
+ 
+-- 
+2.17.0
+

Copied: xorg-server/repos/testing-x86_64/0002-fix-libshadow-2.patch (from rev 
412401, xorg-server/trunk/0002-fix-libshadow-2.patch)
===
--- testing-x86_64/0002-fix-libshadow-2.patch   (rev 0)
+++ testing-x86_64/0002-fix-libshadow-2.patch   2021-04-13 15:17:26 UTC (rev 
412402)
@@ -0,0 +1,30 @@
+From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
+From: Adam Jackson 
+Date: Tue, 30 Apr 2019 18:01:27 -0400
+Subject: [PATCH] meson: Fix libshadow.so linkage
+
+Don't link against fb, it's the driver's responsibility to load that
+first. Underlinking like this is unpleasant but this matches what
+autotools does.
+
+Fixes: xorg/xserver#540
+---
+ hw/xfree86/dixmods/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
+index 835d23215..0562b630f 100644
+--- a/hw/xfree86/dixmods/meson.build
 b/hw/xfree86/dixmods/meson.build
+@@ -34,7 +34,7 @@ shared_module(
+ c_args: xorg_c_args,
+ dependencies: common_dep,
+ link_whole: libxserver_miext_shadow,
+-link_with: [fb, e],
++link_with: e,
+ 
+ install: true,
+ install_dir: module_dir,
+-- 
+2.22.0
+

Copied: xorg-server/repos/testing-x86_64/PKGBUILD (from rev 412401, 
xorg-server/trunk/PKGBUILD)
===
---