mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-01 15:37:44 +00:00
package/x11r7/xdriver_xf86-video-*: mass addition of patches for ABI 23 support (xserver_xorg-server 1.19+)
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
c585980193
commit
f08ab40b60
33
package/x11r7/xdriver_xf86-video-glint/0002-abi23.patch
Normal file
33
package/x11r7/xdriver_xf86-video-glint/0002-abi23.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
From 2eb4d03d2280deec4d6f1b06aaa16477a641af9a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Tue, 19 Jul 2016 10:03:56 -0400
|
||||||
|
Subject: Adapt Block/WakeupHandler signature for ABI 23
|
||||||
|
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
---
|
||||||
|
Downloaded from:
|
||||||
|
https://cgit.freedesktop.org/xorg/driver/xf86-video-glint/commit/?id=2eb4d03d2280deec4d6f1b06aaa16477a641af9a
|
||||||
|
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||||
|
|
||||||
|
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
|
||||||
|
|
33
package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch
Normal file
33
package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
From df094bfffe4ef097bfd9a569f2d2e35649c1a3c7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Tue, 19 Jul 2016 10:03:56 -0400
|
||||||
|
Subject: Adapt Block/WakeupHandler signature for ABI 23
|
||||||
|
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
---
|
||||||
|
Downloaded from
|
||||||
|
https://cgit.freedesktop.org/xorg/driver/xf86-video-mga/commit/?id=df094bfffe4ef097bfd9a569f2d2e35649c1a3c7
|
||||||
|
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||||
|
|
||||||
|
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
|
||||||
|
|
39
package/x11r7/xdriver_xf86-video-nv/0002-abi23.patch
Normal file
39
package/x11r7/xdriver_xf86-video-nv/0002-abi23.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
From 42e260a7ab630fdfa4664f467dad25e7178ff809 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Tue, 19 Jul 2016 10:03:56 -0400
|
||||||
|
Subject: Adapt Block/WakeupHandler signature for ABI 23
|
||||||
|
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
---
|
||||||
|
Downloaded from
|
||||||
|
https://cgit.freedesktop.org/xorg/driver/xf86-video-nv/commit/?id=42e260a7ab630fdfa4664f467dad25e7178ff809
|
||||||
|
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||||
|
|
||||||
|
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
|
||||||
|
|
33
package/x11r7/xdriver_xf86-video-r128/0002-abi23.patch
Normal file
33
package/x11r7/xdriver_xf86-video-r128/0002-abi23.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
From 5ab23b3a8ef18ab9ff96ac8be174380d36e185e5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Tue, 19 Jul 2016 10:03:56 -0400
|
||||||
|
Subject: Adapt Block/WakeupHandler signature for ABI 23
|
||||||
|
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
---
|
||||||
|
Downloaded from
|
||||||
|
https://cgit.freedesktop.org/xorg/driver/xf86-video-r128/commit/?id=5ab23b3a8ef18ab9ff96ac8be174380d36e185e5
|
||||||
|
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||||
|
|
||||||
|
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
|
||||||
|
|
39
package/x11r7/xdriver_xf86-video-savage/0002-abi23.patch
Normal file
39
package/x11r7/xdriver_xf86-video-savage/0002-abi23.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
From de3e1803314820968502156703d5bfe3fab24972 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Tue, 19 Jul 2016 10:03:56 -0400
|
||||||
|
Subject: Adapt Block/WakeupHandler signature for ABI 23
|
||||||
|
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
---
|
||||||
|
Downloaded from
|
||||||
|
https://cgit.freedesktop.org/xorg/driver/xf86-video-savage/commit/?id=de3e1803314820968502156703d5bfe3fab24972
|
||||||
|
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||||
|
|
||||||
|
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
|
||||||
|
|
@ -0,0 +1,33 @@
|
|||||||
|
From e67f3949648c20e16ac756ae28ea4a2b4a1d0f4c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Tue, 19 Jul 2016 10:03:56 -0400
|
||||||
|
Subject: Adapt Block/WakeupHandler signature for ABI 23
|
||||||
|
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
---
|
||||||
|
Downloaded from
|
||||||
|
https://cgit.freedesktop.org/xorg/driver/xf86-video-siliconmotion/patch/?id=e67f3949648c20e16ac756ae28ea4a2b4a1d0f4c
|
||||||
|
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||||
|
|
||||||
|
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
|
||||||
|
|
39
package/x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch
Normal file
39
package/x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
From b99390efcb55d7d4a68e8c595119c1af4426fc0b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Tue, 19 Jul 2016 10:03:56 -0400
|
||||||
|
Subject: Adapt Block/WakeupHandler signature for ABI 23
|
||||||
|
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
---
|
||||||
|
Downloaded from
|
||||||
|
https://cgit.freedesktop.org/xorg/driver/xf86-video-tdfx/patch/?id=b99390efcb55d7d4a68e8c595119c1af4426fc0b
|
||||||
|
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||||
|
|
||||||
|
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
|
||||||
|
|
33
package/x11r7/xdriver_xf86-video-trident/0001-abi23.patch
Normal file
33
package/x11r7/xdriver_xf86-video-trident/0001-abi23.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
From b5f4d35327863a14224d2a63885cd8b3b83a1815 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Jackson <ajax@redhat.com>
|
||||||
|
Date: Tue, 19 Jul 2016 10:03:56 -0400
|
||||||
|
Subject: Adapt Block/WakeupHandler signature for ABI 23
|
||||||
|
|
||||||
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||||
|
---
|
||||||
|
Downloaded from
|
||||||
|
https://cgit.freedesktop.org/xorg/driver/xf86-video-trident/patch/?id=b5f4d35327863a14224d2a63885cd8b3b83a1815
|
||||||
|
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||||
|
|
||||||
|
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
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user