Point upgrades (X, mesa, freetype)

similarity index 92%
rename from meta/recipes-graphics/freetype/freetype_2.5.5.bb
rename to meta/recipes-graphics/freetype/freetype_2.6.bb
index dd4c3b0..70599c6 100644
@@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56
 SECTION = "libs"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2"
-SRC_URI[md5sum] = "2a7a314927011d5030903179cf183be0"
-SRC_URI[sha256sum] = "387bcc4b780b12484aa2ec9f7db1a55d8286eb5639f45fbc0fbba7a4e5a1afb9"
+SRC_URI[md5sum] = "5682890cb0267f6671dd3de6eabd3e69"
+SRC_URI[sha256sum] = "8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e"
 
 BINCONFIG = "${bindir}/freetype-config"
 

similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_10.5.6.bb
rename to meta/recipes-graphics/mesa/mesa-gl_10.5.8.bb

similarity index 77%
rename from meta/recipes-graphics/mesa/mesa_10.5.6.bb
rename to meta/recipes-graphics/mesa/mesa_10.5.8.bb
index 70cc8aa..7cfef0c 100644
@@ -2,8 +2,8 @@ require ${BPN}.inc
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "7a845c50fc8aaae4c9373e795c1f491d"
-SRC_URI[sha256sum] = "66017853bde5f7a6647db3eede30512a091a3491daa1708e0ad8027c328ba595"
+SRC_URI[md5sum] = "5332a3576c5e3a0c3947ee6668dd4157"
+SRC_URI[sha256sum] = "2866b855c5299a4aed066338c77ff6467c389b2c30ada7647be8758663da2b54"
 
 #because we cannot rely on the fact that all apps will use pkgconfig,
 #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER

deleted file mode 100644
index 28b3218..0000000
@@ -1,50 +0,0 @@
-From 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <[email protected]>
-Date: Sat, 7 Feb 2015 18:13:21 +0100
-Subject: [PATCH] int10: Fix error check for pci_device_map_legacy
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-pci_device_map_legacy returns 0 on success.
-
-Upstream-status: backport 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56
-
-Signed-off-by: Jürg Billeter <[email protected]>
-Reviewed-by: Adam Jackson <[email protected]>
-Signed-off-by: Peter Hutterer <[email protected]>
-Signed-off-by: Bruce Ashfield <[email protected]>
----
- hw/xfree86/int10/generic.c                | 2 +-
- hw/xfree86/os-support/linux/int10/linux.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
-index 012d194..8d5c4da 100644
---- a/hw/xfree86/int10/generic.c
-+++ b/hw/xfree86/int10/generic.c
-@@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsigned char *buf, int len)
- {
-     void *map;
- 
--    if (!pci_device_map_legacy(dev, 0, len, 0, &map))
-+    if (pci_device_map_legacy(dev, 0, len, 0, &map))
-         return FALSE;
- 
-     memcpy(buf, map, len);
-diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c
-index 79b9a88..6ca118f 100644
---- a/hw/xfree86/os-support/linux/int10/linux.c
-+++ b/hw/xfree86/os-support/linux/int10/linux.c
-@@ -75,7 +75,7 @@ readLegacy(struct pci_device *dev, unsigned char *buf, int base, int len)
- {
-     void *map;
- 
--    if (!pci_device_map_legacy(dev, base, len, 0, &map))
-+    if (pci_device_map_legacy(dev, base, len, 0, &map))
-         return FALSE;
- 
-     memcpy(buf, map, len);
--- 
-2.1.4
-

48 lines not on this page · raw message

deleted file mode 100644
index 2f62972..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-Index: git/os/osdep.h
-===================================================================
---- git.orig/os/osdep.h	2008-10-07 18:38:21.000000000 +0100
-+++ git/os/osdep.h	2008-10-07 18:39:36.000000000 +0100
-@@ -92,7 +92,7 @@
-  * like sysconf(_SC_OPEN_MAX) is not supported.
-  */
- 
--#if OPEN_MAX <= 256
-+#if 0
- #define MAXSOCKS (OPEN_MAX - 1)
- #else
- #define MAXSOCKS 256

deleted file mode 100644
index 7c61530..0000000
@@ -1,31 +0,0 @@
-This patch comes from:
-http://lists.x.org/archives/xorg-devel/2013-October/037996.html
-
-Upstream-Status: Backport
-
-Signed-off-by: Baogen shang <[email protected]>
-diff -Naur xorg-server-1.14.0-orig/exa/exa_render.c xorg-server-1.14.0/exa/exa_render.c
---- xorg-server-1.14.0-orig/exa/exa_render.c	2014-02-27 14:32:38.000000000 +0800
-+++ xorg-server-1.14.0/exa/exa_render.c	2014-02-27 15:46:59.000000000 +0800
-@@ -1141,7 +1141,8 @@
- 
-         exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
-         for (; ntrap; ntrap--, traps++)
--            (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1);
-+            if (xTrapezoidValid(traps))
-+                (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1);
-         exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
- 
-         xRel = bounds.x1 + xSrc - xDst;
-diff -Naur xorg-server-1.14.0-orig/render/picture.h xorg-server-1.14.0/render/picture.h
---- xorg-server-1.14.0-orig/render/picture.h	2014-02-27 14:32:26.000000000 +0800
-+++ xorg-server-1.14.0/render/picture.h	2014-02-27 15:48:13.000000000 +0800
-@@ -211,7 +211,7 @@
- /* whether 't' is a well defined not obviously empty trapezoid */
- #define xTrapezoidValid(t)  ((t)->left.p1.y != (t)->left.p2.y && \
- 			     (t)->right.p1.y != (t)->right.p2.y && \
--			     (int) ((t)->bottom - (t)->top) > 0)
-+			     ((t)->bottom > (t)->top))
- 
- /*
-  * Standard NTSC luminance conversions:

deleted file mode 100644
index e6dba04..0000000
@@ -1,38 +0,0 @@
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton <[email protected]>
-
-Since _XSERVTransClose frees the connection pointer passed to it,
-remove that pointer from the array, so we don't try to double free it
-if we come back into CloseWellKnownConnections again.
-
-Should fix https://bugzilla.yoctoproject.org/show_bug.cgi?id=6665 in which
-the shutdown section of the main() loop called CloseWellKnownConnections()
-and then moved on to ddxGiveUp(), which failed to release the VT and thus
-called AbortServer(), which called CloseWellKnownConnections() again.
-
-Signed-off-by: Alan Coopersmith <[email protected]>
-Reviewed-by: Adam Jackson <[email protected]>
----
- os/connection.c |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/os/connection.c b/os/connection.c
-index ddfe50a..7ff44e1 100644
---- a/os/connection.c
-+++ b/os/connection.c
-@@ -513,8 +513,13 @@ CloseWellKnownConnections(void)
- {
-     int i;
-
--    for (i = 0; i < ListenTransCount; i++)
--        _XSERVTransClose(ListenTransConns[i]);
-+    for (i = 0; i < ListenTransCount; i++) {
-+        if (ListenTransConns[i] != NULL) {
-+            _XSERVTransClose(ListenTransConns[i]);
-+            ListenTransConns[i] = NULL;
-+        }
-+    }
-+    ListenTransCount = 0;
- }
-
- static void

similarity index 62%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.1.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
index edca51e..3039d30 100644
@@ -1,16 +1,9 @@
 require xserver-xorg.inc
 
-# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch \
-            file://xorg-CVE-2013-6424.patch \
-            file://xtrans.patch \
-            file://0001-use-__GLIBC__-guard-for-glibc-specific-code.patch \
-	    file://0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch \
-	    file://0001-int10-Fix-error-check-for-pci_device_map_legacy.patch \
+SRC_URI += "file://0001-use-__GLIBC__-guard-for-glibc-specific-code.patch \
            "
-
-SRC_URI[md5sum] = "5986510d59e394a50126a8e2833e79d3"
-SRC_URI[sha256sum] = "2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab"
+SRC_URI[md5sum] = "397e405566651150490ff493e463f1ad"
+SRC_URI[sha256sum] = "f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993"
 
 # These extensions are now integrated into the server, so declare the migration
 # path for in-place upgrades.

similarity index 80%
rename from meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.4.bb
index 4052f70..fa251b5 100644
@@ -17,5 +17,5 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
 RRECOMMENDS_${PN} += "xserver-xorg-module-libint10"
 
-SRC_URI[md5sum] = "3690a5356ed121b1a7dfb59a6dcf4bf9"
-SRC_URI[sha256sum] = "ce8b75e5a40e9dae76f2ac9e2880f7f73a848653ca2eed5880f52dc2c0d3aef8"
+SRC_URI[md5sum] = "a893c37c589f7a31cea929a5d896a0e2"
+SRC_URI[sha256sum] = "7bddf4d879dd6f67088ecb203a31e12334aab980174bd0909930a21f32e251c1"