[Buildroot] [PATCH 1/2] package/libdrm: bump version to 2.4.69

[Buildroot] [PATCH 1/2] package/libdrm: bump version to 2.4.69

[Bernd Kuhls]

Removed patch 0002, applied upstream:
https://cgit.freedesktop.org/mesa/drm/commit/xf86drm.c?id=4031dc17bb728850c9b079c8d5f9cc0a379b9d46

Renumbered patch 0003.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 ...mic-require-CAS-support-in-libatomic_ops.patch} |  0
 ...nclude-limits.h-to-fix-build-error-on-Sol.patch | 31 ----------------------
 package/libdrm/libdrm.hash                         |  4 +--
 package/libdrm/libdrm.mk                           |  2 +-
 4 files changed, 3 insertions(+), 34 deletions(-)
 rename package/libdrm/{0003-xf86atomic-require-CAS-support-in-libatomic_ops.patch => 0002-xf86atomic-require-CAS-support-in-libatomic_ops.patch} (100%)
 delete mode 100644 package/libdrm/0002-xf86drm.c-Include-limits.h-to-fix-build-error-on-Sol.patch

diff --git a/package/libdrm/0003-xf86atomic-require-CAS-support-in-libatomic_ops.patch b/package/libdrm/0002-xf86atomic-require-CAS-support-in-libatomic_ops.patch
similarity index 100%
rename from package/libdrm/0003-xf86atomic-require-CAS-support-in-libatomic_ops.patch
rename to package/libdrm/0002-xf86atomic-require-CAS-support-in-libatomic_ops.patch
diff --git a/package/libdrm/0002-xf86drm.c-Include-limits.h-to-fix-build-error-on-Sol.patch b/package/libdrm/0002-xf86drm.c-Include-limits.h-to-fix-build-error-on-Sol.patch
deleted file mode 100644
index 03b4524..0000000
--- a/package/libdrm/0002-xf86drm.c-Include-limits.h-to-fix-build-error-on-Sol.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3fed80daf1dcb0b5d20e623d27228726c735e138 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sun, 27 Sep 2015 19:09:47 +0200
-Subject: [PATCH 1/1] xf86drm.c: Include limits.h to fix build error on Solaris
- and with musl
-
-musl's strict implementation requires #include <limits.h> for PATH_MAX.
-
-Patch suggested by evgeny for Solaris:
-https://bugs.freedesktop.org/show_bug.cgi?id=92082
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- xf86drm.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/xf86drm.c b/xf86drm.c
-index a9f5c29..ec985eb 100644
---- a/xf86drm.c
-+++ b/xf86drm.c
-@@ -53,6 +53,7 @@
- #include <sys/ioctl.h>
- #include <sys/time.h>
- #include <stdarg.h>
-+#include <limits.h>
- #ifdef HAVE_SYS_MKDEV_H
- # include <sys/mkdev.h> /* defines major(), minor(), and makedev() on Solaris */
- #endif
--- 
-2.5.3
-
diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash
index 8bd3d95..3cfa34e 100644
--- a/package/libdrm/libdrm.hash
+++ b/package/libdrm/libdrm.hash
@@ -1,2 +1,2 @@
-# From https://lists.freedesktop.org/archives/dri-devel/2016-April/106211.html
-sha256	5b4bd9a5922929bc716411cb74061fbf31b06ba36feb89bc1358a91a8d0ca9df	libdrm-2.4.68.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2016-July/002700.html
+sha256	09510cbc75adba7e84fd3ec86586fd352a787fd534a63377de9e19ff85280b33	libdrm-2.4.69.tar.bz2
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index e6c7ecd..e62f813 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBDRM_VERSION = 2.4.68
+LIBDRM_VERSION = 2.4.69
 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
 LIBDRM_SITE = http://dri.freedesktop.org/libdrm
 LIBDRM_LICENSE = MIT
-- 
2.8.1

[Buildroot] [PATCH 2/2] package/x11r7/xserver_xorg-server: bump version to 1.18.4

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/x11r7/xserver_xorg-server/Config.in                | 4 ++--
 package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index af1bac9..df3801c 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -74,7 +74,7 @@ choice
 	bool "X Window System server version"
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
-	bool "1.18.3"
+	bool "1.18.4"
 	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
 	select BR2_PACKAGE_XPROTO_PRESENTPROTO
 
@@ -91,7 +91,7 @@ endchoice
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
 	string
-	default "1.18.3" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
+	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
 
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
index abd1589..ab7ba7e 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
@@ -3,5 +3,5 @@ sha1   7a95765e56b124758fcd7b609589e65b8870880b                                x
 sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f        xorg-server-1.14.7.tar.bz2
 # From https://lists.x.org/archives/xorg-announce/2015-October/002650.html
 sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457        xorg-server-1.17.4.tar.bz2
-# From https://lists.freedesktop.org/archives/xorg-announce/2016-April/002683.html
-sha256	ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd	xorg-server-1.18.3.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2016-July/002699.html
+sha256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8        xorg-server-1.18.4.tar.bz2
-- 
2.8.1

[Buildroot] [PATCH 1/2] package/libdrm: bump version to 2.4.69

[Thomas Petazzoni]

Hello,

On Thu, 21 Jul 2016 21:07:19 +0200, Bernd Kuhls wrote:
> Removed patch 0002, applied upstream:
> https://cgit.freedesktop.org/mesa/drm/commit/xf86drm.c?id=4031dc17bb728850c9b079c8d5f9cc0a379b9d46
> 
> Renumbered patch 0003.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  ...mic-require-CAS-support-in-libatomic_ops.patch} |  0
>  ...nclude-limits.h-to-fix-build-error-on-Sol.patch | 31 ----------------------
>  package/libdrm/libdrm.hash                         |  4 +--
>  package/libdrm/libdrm.mk                           |  2 +-
>  4 files changed, 3 insertions(+), 34 deletions(-)
>  rename package/libdrm/{0003-xf86atomic-require-CAS-support-in-libatomic_ops.patch => 0002-xf86atomic-require-CAS-support-in-libatomic_ops.patch} (100%)
>  delete mode 100644 package/libdrm/0002-xf86drm.c-Include-limits.h-to-fix-build-error-on-Sol.patch

Both patches applied. Thanks!

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