From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Mon, 10 Jun 2019 18:21:59 +0000 (+0200)
Subject: package/weston: drop unneeded first patch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=947b625bb6b57bcaad1f1f11a984cbdd3328962c;p=buildroot.git

package/weston: drop unneeded first patch

Patch is not needed since
https://gitlab.freedesktop.org/wayland/weston/commit/32838c93a509dbeda717e58279683c63a34a2e07

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---

diff --git a/package/weston/0001-Fix-build-with-kernel-4.4.patch b/package/weston/0001-Fix-build-with-kernel-4.4.patch
new file mode 100644
index 0000000000..89390e0e28
--- /dev/null
+++ b/package/weston/0001-Fix-build-with-kernel-4.4.patch
@@ -0,0 +1,40 @@
+From 137b811ecd566086f7eb42c1e49e7c0cf27fb85e Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Mon, 10 Jun 2019 12:02:03 +0200
+Subject: [PATCH] Fix build with kernel < 4.4
+
+weston includes input-event-codes.h since version 5.0.91 and
+https://github.com/wayland-project/weston/commit/6e229ca26381bc8191fd9af1e439c311da709aff
+
+input-event-codes.h is available only since kernel 4.4 and
+https://github.com/torvalds/linux/commit/f902dd893427eade90f7eaf858e5ff8b150a5a12
+
+To fix this build failure, replace include on linux/input-event-codes.h
+by linux/input.h
+
+Fixes:
+ - http://autobuild.buildroot.org/results/210c2759900f15ea0030d088f6f45cd8bb199b29
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status:
+https://gitlab.freedesktop.org/wayland/weston/merge_requests/184]
+---
+ compositor/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/compositor/main.c b/compositor/main.c
+index 945f99ae..bf4062af 100644
+--- a/compositor/main.c
++++ b/compositor/main.c
+@@ -42,7 +42,7 @@
+ #include <sys/socket.h>
+ #include <libinput.h>
+ #include <libevdev/libevdev.h>
+-#include <linux/input-event-codes.h>
++#include <linux/input.h>
+ #include <sys/time.h>
+ #include <linux/limits.h>
+ 
+-- 
+2.20.1
+
diff --git a/package/weston/0001-os-compatibility-define-CLOCK_BOOTTIME-when-not-avai.patch b/package/weston/0001-os-compatibility-define-CLOCK_BOOTTIME-when-not-avai.patch
deleted file mode 100644
index a7f2a34a88..0000000000
--- a/package/weston/0001-os-compatibility-define-CLOCK_BOOTTIME-when-not-avai.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 66b71951f8ce66f02040f8814e1d89db34c34a87 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sun, 22 Feb 2015 12:36:00 +0100
-Subject: [PATCH] os-compatibility: define CLOCK_BOOTTIME when not available
-
-CLOCK_BOOTTIME is supposed to be provided by the C library headers,
-but uClibc 0.9.33.2 does not provide it. Instead of depending on an
-uClibc patch, let's make Weston define it to the right value when not
-already defined by the C library.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- shared/os-compatibility.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/shared/os-compatibility.h b/shared/os-compatibility.h
-index 172bb7e..e369899 100644
---- a/shared/os-compatibility.h
-+++ b/shared/os-compatibility.h
-@@ -26,6 +26,7 @@
- #include "config.h"
- 
- #include <sys/types.h>
-+#include <time.h>
- 
- #ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
-@@ -37,6 +38,10 @@ backtrace(void **buffer, int size)
- }
- #endif
- 
-+#ifndef CLOCK_BOOTTIME
-+#define CLOCK_BOOTTIME 7
-+#endif
-+
- int
- os_socketpair_cloexec(int domain, int type, int protocol, int *sv);
- 
--- 
-2.1.0
-
diff --git a/package/weston/0002-Fix-build-with-kernel-4.4.patch b/package/weston/0002-Fix-build-with-kernel-4.4.patch
deleted file mode 100644
index 89390e0e28..0000000000
--- a/package/weston/0002-Fix-build-with-kernel-4.4.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 137b811ecd566086f7eb42c1e49e7c0cf27fb85e Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 10 Jun 2019 12:02:03 +0200
-Subject: [PATCH] Fix build with kernel < 4.4
-
-weston includes input-event-codes.h since version 5.0.91 and
-https://github.com/wayland-project/weston/commit/6e229ca26381bc8191fd9af1e439c311da709aff
-
-input-event-codes.h is available only since kernel 4.4 and
-https://github.com/torvalds/linux/commit/f902dd893427eade90f7eaf858e5ff8b150a5a12
-
-To fix this build failure, replace include on linux/input-event-codes.h
-by linux/input.h
-
-Fixes:
- - http://autobuild.buildroot.org/results/210c2759900f15ea0030d088f6f45cd8bb199b29
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status:
-https://gitlab.freedesktop.org/wayland/weston/merge_requests/184]
----
- compositor/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/compositor/main.c b/compositor/main.c
-index 945f99ae..bf4062af 100644
---- a/compositor/main.c
-+++ b/compositor/main.c
-@@ -42,7 +42,7 @@
- #include <sys/socket.h>
- #include <libinput.h>
- #include <libevdev/libevdev.h>
--#include <linux/input-event-codes.h>
-+#include <linux/input.h>
- #include <sys/time.h>
- #include <linux/limits.h>
- 
--- 
-2.20.1
-