package/x11r7/xdriver_xf86-input-joystick: bump version to 1.6.3

PATCH New Bernd Kuhls 2 participants 15 messages Nov 27, 2016

lore

Share & tools

lore

Bernd Kuhls

author

2016-11-27 11:06 UTC #0 lore raw

PATCH 1/13 package/x11r7/xdriver_xf86-input-joystick: bump version to 1.6.3

Signed-off-by Bernd Kuhls <[email protected]>

---
 .../xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash      | 4 ++--
 .../x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash +2 -2

index 5fac77e..feec2d3 100644
@@ -1,2 +1,2 @@
-# From http://lists.x.org/archives/xorg-announce/2013-January/002136.html
-sha1	61658b8d829fdaed6064c7c26232c3884d359187	xf86-input-joystick-1.6.2.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2016-November/002742.html
+sha256 9e7669ecf0f23b8e5dc39d5397cf28296f692aa4c0e4255f5e02816612c18eab  xf86-input-joystick-1.6.3.tar.bz2

package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +1 -1

index 76f2577..5bc2a5c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.6.2
+XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.6.3
 XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_JOYSTICK_LICENSE = MIT

Signature · 1 line

2.10.2

Bernd Kuhls

author

2016-11-27 11:06 UTC #1 lore raw

PATCH 2/13 package/x11r7/xdriver_xf86-input-keyboard: bump version to 1.9.0

Signed-off-by Bernd Kuhls <[email protected]>

---
 .../xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash      | 4 ++--
 .../x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash +2 -2

index 11fcc60..eccfa74 100644
@@ -1,2 +1,2 @@
-# From http://lists.x.org/archives/xorg-announce/2015-April/002559.html
-sha256	1ac8ff39bf9da7d2fc7fd6c24515726e8138340c0518ab8c606e008cf93ca211	xf86-input-keyboard-1.8.1.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2016-November/002739.html
+sha256 f7c900f21752683402992b288d5a2826de7a6c0c0abac2aadd7e8a409e170388  xf86-input-keyboard-1.9.0.tar.bz2

package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk +1 -1

index eb2d582..01a6859 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.8.1
+XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.9.0
 XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_KEYBOARD_LICENSE = MIT

Signature · 1 line

2.10.2

Bernd Kuhls

author

2016-11-27 11:06 UTC #2 lore raw

PATCH 3/13 package/x11r7/xdriver_xf86-input-mouse: bump version to 1.9.2

In reply to Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash | 4 ++--
 package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash +2 -2

index 5a62d13..caba427 100644
@@ -1,2 +1,2 @@
-# From http://lists.x.org/archives/xorg-announce/2014-August/002471.html
-sha256	3485d375779c08406f0789feedde15933dc703158a086ddac638598f479fc5ce	xf86-input-mouse-1.9.1.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2016-November/002740.html
+sha256 f425d5b05c6ab412a27e0a1106bb83f9e2662b307210abbe48270892387f4b2f  xf86-input-mouse-1.9.2.tar.bz2

package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk +1 -1

index e1bd81a..5bcbeb7 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.1
+XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.2
 XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT

Signature · 1 line

2.10.2

Bernd Kuhls

author

2016-11-27 11:06 UTC #3 lore raw

PATCH 4/13 package/x11r7/xdriver_xf86-input-synaptics: bump version to 1.9.0

In reply to Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 .../xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash    | 4 ++--
 .../xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash +2 -2

index 3cb0758..2c31600 100644
@@ -1,2 +1,2 @@
-# From http://lists.x.org/archives/xorg-announce/2015-November/002652.html
-sha256	d39f100c74f3673778b53f17bab7690161925e25dd998a15dd8cc69b52e83f01	xf86-input-synaptics-1.8.3.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2016-November/002744.html
+sha256 afba3289d7a40217a19d90db98ce181772f9ca6d77e1898727b0afcf02073b5a  xf86-input-synaptics-1.9.0.tar.bz2

package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk +1 -1

index d6164d0..6bd9cc4 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.8.3
+XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.9.0
 XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xf86-input-synaptics-$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE = MIT

Signature · 1 line

2.10.2

Bernd Kuhls

author

2016-11-27 11:06 UTC #4 lore raw

PATCH 5/13 package/x11r7/xdriver_xf86-video-amdgpu: bump version to 1.2.0

In reply to Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 .../x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash    | 4 ++--
 package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash +2 -2

index 816f075..32ff164 100644
@@ -1,2 +1,2 @@
-# From https://lists.x.org/archives/xorg-announce/2016-September/002708.html
-sha256 6ee87fed6d70d12353ca7ac02f8321a30d770626bf56f62f0e27970a33690779  xf86-video-amdgpu-1.1.2.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2016-November/002741.html
+sha256 275b1aac5f127f55ba3d7480a1df89eace1d02650e24e46908067fc875e76c8f  xf86-video-amdgpu-1.2.0.tar.bz2

package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +1 -1

index 4e12e12..d858e14 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 1.1.2
+XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 1.2.0
 XDRIVER_XF86_VIDEO_AMDGPU_SOURCE = xf86-video-amdgpu-$(XDRIVER_XF86_VIDEO_AMDGPU_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_AMDGPU_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_AMDGPU_LICENSE = MIT

Signature · 1 line

2.10.2

Bernd Kuhls

author

2016-11-27 11:06 UTC #5 lore raw

PATCH 6/13 package/x11r7/xdriver_xf86-video-ati: bump version to 7.8.0

In reply to Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash | 4 ++--
 package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash +2 -2

index 469e057..fe5ae0e 100644
@@ -1,2 +1,2 @@
-# From https://lists.x.org/archives/xorg-announce/2016-September/002707.html
-sha256 00a58588db62ee309095c5c5920bbd248d965e8627f88affe68a73b18865078d  xf86-video-ati-7.7.1.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2016-November/002738.html
+sha256 401f5de772928f3dc4ce43a885adb0a47a2f61aa4a9e45d2ab3d184136a9d6fa  xf86-video-ati-7.8.0.tar.bz2

package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +1 -1

index 02a457b..ea70167 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_ATI_VERSION = 7.7.1
+XDRIVER_XF86_VIDEO_ATI_VERSION = 7.8.0
 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT

Signature · 1 line

2.10.2

Bernd Kuhls

author

2016-11-27 11:06 UTC #6 lore raw

PATCH 7/13 package/x11r7/xdriver_xf86-video-openchrome: bump version to 0.5.0

In reply to Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 .../xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash  | 4 ++--
 .../xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash +2 -2

index b3aef58..2d29fae 100644
@@ -1,2 +1,2 @@
-# Locally computed
-sha256	73e7966d01d0d644d3b9204e8bfc106cb99069c58e981626e7352f2693e3e927	xf86-video-openchrome-0.4.0.tar.bz2
+# From https://lists.freedesktop.org/archives/openchrome-devel/2016-July/002890.html
+sha1 9c7ad349de6dd350252ccda8da56fa1e2a6afa32  xf86-video-openchrome-0.5.0.tar.bz2

package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk +1 -1

index 83c12b2..9ab032b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.4.0
+XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.5.0
 XDRIVER_XF86_VIDEO_OPENCHROME_SOURCE = xf86-video-openchrome-$(XDRIVER_XF86_VIDEO_OPENCHROME_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_OPENCHROME_SITE = http://xorg.freedesktop.org/archive/individual/driver
 XDRIVER_XF86_VIDEO_OPENCHROME_LICENSE = MIT

Signature · 1 line

2.10.2

Bernd Kuhls

author

2016-11-27 11:06 UTC #7 lore raw

PATCH 8/13 package/x11r7/xdriver_xf86-video-vmware: bump version to 13.2.1

In reply to Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 .../x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash    | 4 ++--
 package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash +2 -2

index 10d31d0..8d948a7 100644
@@ -1,2 +1,2 @@
-# From http://lists.x.org/archives/xorg-announce/2015-January/002521.html
-sha256	3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939e4a0cc	xf86-video-vmware-13.1.0.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2016-November/002743.html
+sha256 e2f7f7101fba7f53b268e7a25908babbf155b3984fb5268b3d244eb6c11bf62b  xf86-video-vmware-13.2.1.tar.bz2

package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk +1 -1

index ea4dd48..ef262f8 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_VMWARE_VERSION = 13.1.0
+XDRIVER_XF86_VIDEO_VMWARE_VERSION = 13.2.1
 XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VMWARE_LICENSE = MIT

Signature · 1 line

2.10.2

Bernd Kuhls

author

2016-11-27 11:06 UTC #8 lore raw

PATCH 9/13 package/x11r7/xdriver_xf86-video-*: mass addition of patches for ABI 23 support (xserver_xorg-server 1.19+)

In reply to Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 .../xdriver_xf86-video-glint/0002-abi23.patch      | 33 ++++++++++++++++++
 .../x11r7/xdriver_xf86-video-mga/0002-abi23.patch  | 33 ++++++++++++++++++
 .../x11r7/xdriver_xf86-video-nv/0002-abi23.patch   | 39 ++++++++++++++++++++++
 .../x11r7/xdriver_xf86-video-r128/0002-abi23.patch | 33 ++++++++++++++++++
 .../xdriver_xf86-video-savage/0002-abi23.patch     | 39 ++++++++++++++++++++++
 .../0001-abi23.patch                               | 33 ++++++++++++++++++
 .../x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch | 39 ++++++++++++++++++++++
 .../xdriver_xf86-video-trident/0001-abi23.patch    | 33 ++++++++++++++++++
 8 files changed, 282 insertions(+)
 create mode 100644 package/x11r7/xdriver_xf86-video-glint/0002-abi23.patch
 create mode 100644 package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch
 create mode 100644 package/x11r7/xdriver_xf86-video-nv/0002-abi23.patch
 create mode 100644 package/x11r7/xdriver_xf86-video-r128/0002-abi23.patch
 create mode 100644 package/x11r7/xdriver_xf86-video-savage/0002-abi23.patch
 create mode 100644 package/x11r7/xdriver_xf86-video-siliconmotion/0001-abi23.patch
 create mode 100644 package/x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch
 create mode 100644 package/x11r7/xdriver_xf86-video-trident/0001-abi23.patch

package/x11r7/xdriver_xf86-video-glint/0002-abi23.patch new file +33 -0

new file mode 100644
index 0000000..1d8f7f2
@@ -0,0 +1,33 @@
+From 2eb4d03d2280deec4d6f1b06aaa16477a641af9a Mon Sep 17 00:00:00 2001
+From: Adam Jackson <[email protected]>
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson <[email protected]>
+---
+Downloaded from:
+https://cgit.freedesktop.org/xorg/driver/xf86-video-glint/commit/?id=2eb4d03d2280deec4d6f1b06aaa16477a641af9a
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 6bc946f..89976e4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -75,8 +75,13 @@
+ 
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+ 
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+-- 
+cgit v0.10.2
+

package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch new file +33 -0

new file mode 100644
index 0000000..b2b6917
@@ -0,0 +1,33 @@
+From df094bfffe4ef097bfd9a569f2d2e35649c1a3c7 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <[email protected]>
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson <[email protected]>
+---
+Downloaded from
+https://cgit.freedesktop.org/xorg/driver/xf86-video-mga/commit/?id=df094bfffe4ef097bfd9a569f2d2e35649c1a3c7
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 6bc946f..89976e4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -75,8 +75,13 @@
+ 
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+ 
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+-- 
+cgit v0.10.2
+

package/x11r7/xdriver_xf86-video-nv/0002-abi23.patch new file +39 -0

new file mode 100644
index 0000000..7b7bb34
@@ -0,0 +1,39 @@
+From 42e260a7ab630fdfa4664f467dad25e7178ff809 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <[email protected]>
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson <[email protected]>
+---
+Downloaded from
+https://cgit.freedesktop.org/xorg/driver/xf86-video-nv/commit/?id=42e260a7ab630fdfa4664f467dad25e7178ff809
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 0a87cf5..62d9481 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -78,11 +78,19 @@
+ 
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+ 
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++
++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
++#define WAKEUPHANDLER_ARGS arg, result
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+ 
+ #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
+ #define WAKEUPHANDLER_ARGS arg, result, read_mask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+-- 
+cgit v0.10.2
+

package/x11r7/xdriver_xf86-video-r128/0002-abi23.patch new file +33 -0

new file mode 100644
index 0000000..e79ffdf
@@ -0,0 +1,33 @@
+From 5ab23b3a8ef18ab9ff96ac8be174380d36e185e5 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <[email protected]>
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson <[email protected]>
+---
+Downloaded from
+https://cgit.freedesktop.org/xorg/driver/xf86-video-r128/commit/?id=5ab23b3a8ef18ab9ff96ac8be174380d36e185e5
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 6bc946f..89976e4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -75,8 +75,13 @@
+ 
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+ 
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+-- 
+cgit v0.10.2
+

package/x11r7/xdriver_xf86-video-savage/0002-abi23.patch new file +39 -0

new file mode 100644
index 0000000..2487585
@@ -0,0 +1,39 @@
+From de3e1803314820968502156703d5bfe3fab24972 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <[email protected]>
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson <[email protected]>
+---
+Downloaded from
+https://cgit.freedesktop.org/xorg/driver/xf86-video-savage/commit/?id=de3e1803314820968502156703d5bfe3fab24972
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 98ba435..44daea4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -78,11 +78,19 @@
+ 
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+ 
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++
++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
++#define WAKEUPHANDLER_ARGS arg, result
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+ 
+ #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
+ #define WAKEUPHANDLER_ARGS arg, result, read_mask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+-- 
+cgit v0.10.2
+

package/x11r7/xdriver_xf86-video-siliconmotion/0001-abi23.patch new file +33 -0

new file mode 100644
index 0000000..2cd6e63
@@ -0,0 +1,33 @@
+From e67f3949648c20e16ac756ae28ea4a2b4a1d0f4c Mon Sep 17 00:00:00 2001
+From: Adam Jackson <[email protected]>
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson <[email protected]>
+---
+Downloaded from
+https://cgit.freedesktop.org/xorg/driver/xf86-video-siliconmotion/patch/?id=e67f3949648c20e16ac756ae28ea4a2b4a1d0f4c
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 6bc946f..89976e4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -75,8 +75,13 @@
+ 
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+ 
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+-- 
+cgit v0.10.2
+

package/x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch new file +39 -0

new file mode 100644
index 0000000..7e5d650
@@ -0,0 +1,39 @@
+From b99390efcb55d7d4a68e8c595119c1af4426fc0b Mon Sep 17 00:00:00 2001
+From: Adam Jackson <[email protected]>
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson <[email protected]>
+---
+Downloaded from
+https://cgit.freedesktop.org/xorg/driver/xf86-video-tdfx/patch/?id=b99390efcb55d7d4a68e8c595119c1af4426fc0b
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 98ba435..44daea4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -78,11 +78,19 @@
+ 
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+ 
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++
++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
++#define WAKEUPHANDLER_ARGS arg, result
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+ 
+ #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
+ #define WAKEUPHANDLER_ARGS arg, result, read_mask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+-- 
+cgit v0.10.2
+

package/x11r7/xdriver_xf86-video-trident/0001-abi23.patch new file +33 -0

new file mode 100644
index 0000000..d9aecd5
@@ -0,0 +1,33 @@
+From b5f4d35327863a14224d2a63885cd8b3b83a1815 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <[email protected]>
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson <[email protected]>
+---
+Downloaded from
+https://cgit.freedesktop.org/xorg/driver/xf86-video-trident/patch/?id=b5f4d35327863a14224d2a63885cd8b3b83a1815
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 6bc946f..89976e4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -75,8 +75,13 @@
+ 
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+ 
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+-- 
+cgit v0.10.2
+

Signature · 1 line

2.10.2

Bernd Kuhls

author

2016-11-27 11:06 UTC #9 lore raw

PATCH 10/13 package/x11r7/xdriver_xf86-video-qxl: Add patches for newer xserver_xorg-server releases

In reply to Bernd Kuhls

0002-xserverfix.patch added xlib_libXfont as new dependency.

Signed-off-by Bernd Kuhls <[email protected]>

---
 .../0001-systemincludes.patch                      | 39 +++++++++++++++++
 .../xdriver_xf86-video-qxl/0002-xserverfix.patch   | 51 ++++++++++++++++++++++
 package/x11r7/xdriver_xf86-video-qxl/Config.in     |  1 +
 .../xdriver_xf86-video-qxl.mk                      |  3 ++
 4 files changed, 94 insertions(+)
 create mode 100644 package/x11r7/xdriver_xf86-video-qxl/0001-systemincludes.patch
 create mode 100644 package/x11r7/xdriver_xf86-video-qxl/0002-xserverfix.patch

package/x11r7/xdriver_xf86-video-qxl/0001-systemincludes.patch new file +39 -0

new file mode 100644
index 0000000..0c681f2
@@ -0,0 +1,39 @@
+From 83e00bb5f9b74c0d7059c189d747ec3c24c7798a Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <[email protected]>
+Date: Tue, 4 Aug 2015 17:36:12 +0200
+Subject: Use <> for system-includes
+
+These headers come from /usr/include/xorg/ so it's clearer if they are
+included using <>. While at it, I've reordered them alphabetically.
+---
+Downloaded from
+https://cgit.freedesktop.org/xorg/driver/xf86-video-qxl/commit/?id=83e00bb5f9b74c0d7059c189d747ec3c24c7798a
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff --git a/src/uxa/uxa-damage.c b/src/uxa/uxa-damage.c
+index 3e4c075..6201712 100644
+--- a/src/uxa/uxa-damage.c
++++ b/src/uxa/uxa-damage.c
+@@ -27,12 +27,13 @@
+ #include <stdlib.h>
+ #include "uxa-priv.h"
+ 
++#include    <dixfontstr.h>
++#include    <gcstruct.h>
++#include    <picturestr.h>
++#include    <scrnintstr.h>
++#include    <windowstr.h>
+ #include    <X11/X.h>
+-#include    "scrnintstr.h"
+-#include    "windowstr.h"
+-#include    "dixfontstr.h"
+-#include    "gcstruct.h"
+-#include    "picturestr.h"
++
+ #include    "uxa-damage.h"
+ 
+ typedef struct _damageGCPriv {
+-- 
+cgit v0.10.2
+

package/x11r7/xdriver_xf86-video-qxl/0002-xserverfix.patch new file +51 -0

51 lines not on this page · raw message

package/x11r7/xdriver_xf86-video-qxl/Config.in +1 -0

index 5f05f68..04bde0f 100644
@@ -4,6 +4,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_QXL
 	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_UDEV # for KMS
 	select BR2_PACKAGE_LIBPCIACCESS
 	select BR2_PACKAGE_SPICE_PROTOCOL
+	select BR2_PACKAGE_XLIB_LIBXFONT
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help

package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk +3 -0

index ddc4191..30cd7a2 100644
@@ -7,6 +7,8 @@
 XDRIVER_XF86_VIDEO_QXL_VERSION = 0.1.4
 XDRIVER_XF86_VIDEO_QXL_SOURCE = xf86-video-qxl-$(XDRIVER_XF86_VIDEO_QXL_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_QXL_SITE = http://xorg.freedesktop.org/releases/individual/driver
+# 0002-xserverfix.patch
+XDRIVER_XF86_VIDEO_QXL_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_QXL_LICENSE = MIT
 XDRIVER_XF86_VIDEO_QXL_LICENSE_FILES = COPYING

@@ -16,6 +18,7 @@ XDRIVER_XF86_VIDEO_QXL_CONF_OPTS = \
 XDRIVER_XF86_VIDEO_QXL_DEPENDENCIES = \
 	libpciaccess \
 	spice-protocol \
+	xlib_libXfont \
 	xproto_fontsproto \
 	xproto_xproto \
 	xserver_xorg-server

Signature · 1 line

2.10.2

Bernd Kuhls

author

2016-11-27 11:06 UTC #10 lore raw

PATCH 11/13 package/x11r7/xdriver_xf86-video-sis: Add patch for ABI 23 support (xserver_xorg-server 1.19+)

In reply to Bernd Kuhls

Re-numbered patches as well.

Signed-off-by Bernd Kuhls <[email protected]>

---
 .../x11r7/xdriver_xf86-video-sis/0002-abi23.patch  | 33 ++++++++++++++++++++++
 .../{0007-xi.patch => 0003-xi.patch}               |  0
 2 files changed, 33 insertions(+)
 create mode 100644 package/x11r7/xdriver_xf86-video-sis/0002-abi23.patch
 rename package/x11r7/xdriver_xf86-video-sis/{0007-xi.patch => 0003-xi.patch} (100%)

package/x11r7/xdriver_xf86-video-sis/0002-abi23.patch new file +33 -0

new file mode 100644
index 0000000..109f745
@@ -0,0 +1,33 @@
+From 96fee560cd8bf7bf27048ce5fe67b7af6838c8d0 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <[email protected]>
+Date: Tue, 19 Jul 2016 10:03:56 -0400
+Subject: Adapt Block/WakeupHandler signature for ABI 23
+
+Signed-off-by: Adam Jackson <[email protected]>
+---
+Downloaded from
+https://cgit.freedesktop.org/xorg/driver/xf86-video-sis/commit/?id=96fee560cd8bf7bf27048ce5fe67b7af6838c8d0
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+diff --git a/src/compat-api.h b/src/compat-api.h
+index 6bc946f..89976e4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -75,8 +75,13 @@
+ 
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+ 
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+ #define CLOSE_SCREEN_ARGS pScreen
+-- 
+cgit v0.10.2
+

package/x11r7/xdriver_xf86-video-sis/0003-xi.patch renamed from package/x11r7/xdriver_xf86-video-sis/0007-xi.patch +0 -0

similarity index 100%
rename from package/x11r7/xdriver_xf86-video-sis/0007-xi.patch
rename to package/x11r7/xdriver_xf86-video-sis/0003-xi.patch

Signature · 1 line

2.10.2

Bernd Kuhls

author

2016-11-27 11:06 UTC #11 lore raw

PATCH 12/13 package/x11r7/xlib_libXfont2: new package

In reply to Bernd Kuhls

Needed for xserver_xorg-server 1.19+
https://cgit.freedesktop.org/xorg/xserver/commit/?id=05a793f5b3c40747d5a92a076def7f4fb673c7e7

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/x11r7/Config.in                          |  1 +
 package/x11r7/xlib_libXfont2/Config.in           | 10 +++++++
 package/x11r7/xlib_libXfont2/xlib_libXfont2.hash |  2 ++
 package/x11r7/xlib_libXfont2/xlib_libXfont2.mk   | 35 ++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 package/x11r7/xlib_libXfont2/Config.in
 create mode 100644 package/x11r7/xlib_libXfont2/xlib_libXfont2.hash
 create mode 100644 package/x11r7/xlib_libXfont2/xlib_libXfont2.mk

package/x11r7/Config.in +1 -0

index 40aa80c..c40a643 100644
@@ -35,6 +35,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xlib_libXext/Config.in
 		source package/x11r7/xlib_libXfixes/Config.in
 		source package/x11r7/xlib_libXfont/Config.in
+		source package/x11r7/xlib_libXfont2/Config.in
 		source package/x11r7/xlib_libXft/Config.in
 		source package/x11r7/xlib_libXi/Config.in
 		source package/x11r7/xlib_libXinerama/Config.in

package/x11r7/xlib_libXfont2/Config.in new file +10 -0

new file mode 100644
index 0000000..6cba465
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXFONT2
+	bool "libXfont2"
+	select BR2_PACKAGE_FREETYPE
+	select BR2_PACKAGE_XLIB_LIBFONTENC
+	select BR2_PACKAGE_XLIB_XTRANS
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	select BR2_PACKAGE_XFONT_ENCODINGS
+	help
+	  X.Org Xfont library

package/x11r7/xlib_libXfont2/xlib_libXfont2.hash new file +2 -0

new file mode 100644
index 0000000..81a3c9f
@@ -0,0 +1,2 @@
+# From https://lists.x.org/archives/xorg-announce/2015-December/002663.html
+sha256 e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e  libXfont2-2.0.1.tar.bz2

package/x11r7/xlib_libXfont2/xlib_libXfont2.mk new file +35 -0

new file mode 100644
index 0000000..233ec40
@@ -0,0 +1,35 @@
+################################################################################
+#
+# xlib_libXfont2
+#
+################################################################################
+
+XLIB_LIBXFONT2_VERSION = 2.0.1
+XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.bz2
+XLIB_LIBXFONT2_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXFONT2_AUTORECONF = YES
+XLIB_LIBXFONT2_LICENSE = MIT
+XLIB_LIBXFONT2_LICENSE_FILES = COPYING
+XLIB_LIBXFONT2_INSTALL_STAGING = YES
+
+XLIB_LIBXFONT2_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontsproto xproto_xproto xfont_encodings
+
+HOST_XLIB_LIBXFONT2_DEPENDENCIES = \
+	host-freetype host-xlib_libfontenc host-xlib_xtrans \
+	host-xproto_fontsproto host-xproto_xproto host-xfont_encodings
+
+XLIB_LIBXFONT2_CONF_OPTS = --disable-devel-docs
+HOST_XLIB_LIBXFONT2_CONF_OPTS = --disable-devel-docs
+
+ifeq ($(BR2_microblaze),y)
+# The microblaze toolchains don't define the __ELF__ preprocessor
+# symbol even though they do use the elf format. LibXfont checks for
+# this symbol to know if weak symbols are supported, and otherwise
+# falls back to emulation code using dlopen - Causing linker issues
+# for stuff using libXfont.
+# Work around it by defining the symbol here as well.
+XLIB_LIBXFONT2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D__ELF__"
+endif
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))

Signature · 1 line

2.10.2

Thomas Petazzoni

2016-11-27 21:44 UTC #12 lore raw

PATCH 12/13 package/x11r7/xlib_libXfont2: new package

Hello,

Quoted 6 lines · Bernd Kuhls

package/x11r7/xlib_libXfont2/xlib_libXfont2.mk new file +0 -0
new file mode 100644
index 0000000..233ec40

package/x11r7/xlib_libXfont2/xlib_libXfont2.mk line 10

Quoted 10 lines

package/x11r7/xlib_libXfont2/xlib_libXfont2.mk new file +10 -0

@@ -0,0 +1,35 @@
+################################################################################
+#
+# xlib_libXfont2
+#
+################################################################################
+
+XLIB_LIBXFONT2_VERSION = 2.0.1
+XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.bz2
+XLIB_LIBXFONT2_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXFONT2_AUTORECONF = YES

Why is autoreconf needed? The tarball has the configure script generated, and there are no patches for this package. If there's a good reason, it should be specified by a comment above this line.

package/x11r7/xlib_libXfont2/xlib_libXfont2.mk line 15

Quoted 5 lines

package/x11r7/xlib_libXfont2/xlib_libXfont2.mk new file +5 -0

+XLIB_LIBXFONT2_LICENSE = MIT
+XLIB_LIBXFONT2_LICENSE_FILES = COPYING
+XLIB_LIBXFONT2_INSTALL_STAGING = YES
+
+XLIB_LIBXFONT2_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontsproto xproto_xproto xfont_encodings

Breaking this line that is a bit too long would be good.

Quoted 6 lines

package/x11r7/xlib_libXfont2/xlib_libXfont2.mk new file +6 -0

+HOST_XLIB_LIBXFONT2_DEPENDENCIES = \
+	host-freetype host-xlib_libfontenc host-xlib_xtrans \
+	host-xproto_fontsproto host-xproto_xproto host-xfont_encodings
+
+XLIB_LIBXFONT2_CONF_OPTS = --disable-devel-docs
+HOST_XLIB_LIBXFONT2_CONF_OPTS = --disable-devel-docs

package/x11r7/xlib_libXfont2/xlib_libXfont2.mk line 32

Quoted 10 lines

package/x11r7/xlib_libXfont2/xlib_libXfont2.mk new file +10 -0

+
+ifeq ($(BR2_microblaze),y)
+# The microblaze toolchains don't define the __ELF__ preprocessor
+# symbol even though they do use the elf format. LibXfont checks for
+# this symbol to know if weak symbols are supported, and otherwise
+# falls back to emulation code using dlopen - Causing linker issues
+# for stuff using libXfont.
+# Work around it by defining the symbol here as well.
+XLIB_LIBXFONT2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D__ELF__"
+endif

Are you sure this is needed? The src/stubs/stubs.h code in libXfont doesn't exist in libXfont2.

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Bernd Kuhls

author

2016-11-27 11:06 UTC #13 lore raw

PATCH 13/13 package/x11r7/xserver_xorg-server: add new version 1.19.0

In reply to Bernd Kuhls

This release bumped video ABI to version 23
https://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/common/xf86Module.h?id=8d3f0e964e399dcfa8eb5e85d405217fdc5dbcd4
https://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/common/xf86Module.h?id=c07b796b47ae7f5a616d5e8e02ab0f84dc438a93
https://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/common/xf86Module.h?id=4af00242ef1e39499b932d12423fdf449296090a

and depends on xlib_libXfont2
https://cgit.freedesktop.org/xorg/xserver/commit/?id=05a793f5b3c40747d5a92a076def7f4fb673c7e7

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/x11r7/xserver_xorg-server/Config.in               | 15 ++++++++++++++-
 .../x11r7/xserver_xorg-server/xserver_xorg-server.hash    |  2 ++
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk  |  8 ++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

package/x11r7/xserver_xorg-server/Config.in +14 -1

index df3801c..fa3b14e 100644
@@ -17,7 +17,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XLIB_LIBXDMCP
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XLIB_LIBXFIXES
-	select BR2_PACKAGE_XLIB_LIBXFONT
 	select BR2_PACKAGE_XLIB_LIBXFT
 	select BR2_PACKAGE_XLIB_LIBXI
 	select BR2_PACKAGE_XLIB_LIBXINERAMA

@@ -64,33 +63,47 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
 	bool
 
+config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
+	bool
+
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI
 	int
 	default 14 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
 	default 19 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
 	default 20 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
+	default 23 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
 
 choice
 	bool "X Window System server version"
 
+config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
+	bool "1.19.0"
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
+	select BR2_PACKAGE_XLIB_LIBXFONT2
+	select BR2_PACKAGE_XPROTO_PRESENTPROTO
+
 config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
 	bool "1.18.4"
 	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
+	select BR2_PACKAGE_XLIB_LIBXFONT
 	select BR2_PACKAGE_XPROTO_PRESENTPROTO
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
 	bool "1.17.4"
 	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
+	select BR2_PACKAGE_XLIB_LIBXFONT
 	select BR2_PACKAGE_XPROTO_PRESENTPROTO
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
 	bool "1.14.7"
 	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
+	select BR2_PACKAGE_XLIB_LIBXFONT
 
 endchoice
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
 	string
+	default "1.19.0" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
 	default "1.18.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
 	default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
 	default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14

package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +2 -0

index ab7ba7e..e6c46f1 100644
@@ -5,3 +5,5 @@ sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f        x
 sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457        xorg-server-1.17.4.tar.bz2
 # From https://lists.x.org/archives/xorg-announce/2016-July/002699.html
 sha256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8        xorg-server-1.18.4.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2016-November/002737.html
+sha256 149a708b50befc2d5a40b98d45ddd2ebe0beec018e6d0c663c43bad6210e4da3        xorg-server-1.19.0.tar.bz2

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +8 -0

index 51c3efc..0ed215f 100644
@@ -194,6 +194,14 @@ else
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-record
 endif
 
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y)
+XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont2
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT),y)
+XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont
+endif
+
 ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y)
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-xvmc
 endif

Signature · 1 line

2.10.2

Thomas Petazzoni

2016-11-27 21:48 UTC #14 lore raw

PATCH 13/13 package/x11r7/xserver_xorg-server: add new version 1.19.0

Hello,

Thanks again for taking care of the X.org stack. Much appreciated!

package/x11r7/xserver_xorg-server/Config.in config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 · line 89

Quoted 11 lines · Bernd Kuhls

package/x11r7/xserver_xorg-server/Config.in +7 -0

+config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
+	bool "1.19.0"
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
+	select BR2_PACKAGE_XLIB_LIBXFONT2
+	select BR2_PACKAGE_XPROTO_PRESENTPROTO
+
 config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
 	bool "1.18.4"
 	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
+	select BR2_PACKAGE_XLIB_LIBXFONT
 	select BR2_PACKAGE_XPROTO_PRESENTPROTO

Why are you keeping version 1.18 ? I think we should remove it.

We keep 1.17 because it's the only one that can work with the AMD Catalyst driver, and we keep 1.14 because it's the only one that can work with the NVidia Tegra driver. But 1.18 is not used by any binary-only driver packaged in Buildroot, so I think we should no longer support it as soon as we add support for 1.19.

Quoted 5 lines

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +0 -0
index 51c3efc..0ed215f 100644

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk else · line 203

Quoted 10 lines

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +7 -0

@@ -194,6 +194,14 @@ else
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-record
 endif
 
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y)
+XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont2
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT),y)
+XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont
+endif

You forgot to remove the xlib_libXfont dependency from the main XSERVER_XORG_SERVER_DEPENDENCIES definition. So in fact, even on 1.19 where you don't select xlib_libXfont at the Config.in level, it will be built.

Also, regarding this xlib_libXfont thing, do you know if the other packages that use it will be updated? We currently have:

xapp_bdftopcf
xapp_xfs
xdriver_xf86-video-qxl

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com