[meta-fsl-arm][PATCH 0/2] Get master working again

[meta-fsl-arm][PATCH 0/2] Get master working again

[Otavio Salvador]

Hello,

Today I spent most of day working in current failures in master.

The patch for sdcard concurrency issue is already merged and should
have fixed the rootfs generation issues people has reported.

Here goes the last two patches. This fixes MX5 and MX6 builds. As you
will notice this includes a backport for Xorg 1.14.4 and this is
necessary due GL linking changes done in Xorg 1.15.0. This backport
will last until Vivante fixes the GL symbols. The mesa patch is much
cleaner now as it reuses the PACKAGECONFIG options added for this kind
of case.

I will merge both on Monday morning so speak soon!

Otavio Salvador (2):
  mesa: Update to follow OE-Core changes
  xserver-xorg: Backport 1.14.4 version

 conf/machine/include/imx-base.inc                  |  3 ++
 recipes-graphics/mesa/mesa_%.bbappend              |  5 +++
 recipes-graphics/mesa/mesa_9.2.2.bbappend          | 40 ----------------------
 .../xorg-xserver/xserver-xorg/aarch64.patch        | 35 +++++++++++++++++++
 .../xorg-xserver/xserver-xorg/crosscompile.patch   | 22 ++++++++++++
 .../fix_open_max_preprocessor_error.patch          | 15 ++++++++
 .../xorg-xserver/xserver-xorg/macro_tweak.patch    | 25 ++++++++++++++
 .../xserver-xorg/mips64-compiler.patch             | 29 ++++++++++++++++
 .../xorg-xserver/xserver-xorg_1.14.4.bb            | 35 +++++++++++++++++++
 9 files changed, 169 insertions(+), 40 deletions(-)
 create mode 100644 recipes-graphics/mesa/mesa_%.bbappend
 delete mode 100644 recipes-graphics/mesa/mesa_9.2.2.bbappend
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb

-- 
1.9.0

[meta-fsl-arm][PATCH 1/2] mesa: Update to follow OE-Core changes

[Otavio Salvador]

This updates the bbappend to the newer version; as mesa now provides
the needed PACKAGECONFIG settings we rely on this instead of using an
annonymous Python code to change it during build time.

The bbappend file now is much easier to read.

Change-Id: Ie7b6027462f458d139d0561e737b254dd8b07653
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/mesa/mesa_%.bbappend     |  5 ++++
 recipes-graphics/mesa/mesa_9.2.2.bbappend | 40 -------------------------------
 2 files changed, 5 insertions(+), 40 deletions(-)
 create mode 100644 recipes-graphics/mesa/mesa_%.bbappend
 delete mode 100644 recipes-graphics/mesa/mesa_9.2.2.bbappend

diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
new file mode 100644
index 0000000..8dca313
--- /dev/null
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -0,0 +1,5 @@
+PACKAGECONFIG_remove_mx5 = "egl gles"
+PROVIDES_remove_mx5 = "virtual/libgles1 virtual/libgles2 virtual/egl"
+
+PACKAGECONFIG_remove_mx6 = "egl gles"
+PROVIDES_remove_mx6 = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
diff --git a/recipes-graphics/mesa/mesa_9.2.2.bbappend b/recipes-graphics/mesa/mesa_9.2.2.bbappend
deleted file mode 100644
index 9975abc..0000000
--- a/recipes-graphics/mesa/mesa_9.2.2.bbappend
+++ /dev/null
@@ -1,40 +0,0 @@
-# FIXME: We may need to disable EGL, GL ES1 and GL ES2
-python __anonymous () {
-    import re
-
-    # SoC families to work on
-    families = ['mx5', 'mx6']
-    cur_soc_families = d.getVar('SOC_FAMILY', True)
-    if cur_soc_families and \
-        any(map(lambda x: x in cur_soc_families.split(':'), families)):
-        # Remove egl gles1 and gles2 configure options
-        extra_oeconf = d.getVar('EXTRA_OECONF', True).split()
-        take_out = ['--enable-egl', '--enable-gles1', '--enable-gles2']
-        put_in = ['--disable-egl', '--disable-gles1', '--disable-gles2']
-        pattern = re.compile("--with-egl-platforms")
-        new_extra_oeconf = []
-        for i in extra_oeconf:
-            if i not in take_out and not pattern.match(i):
-                new_extra_oeconf.append(i)
-        for i in put_in:
-            new_extra_oeconf.append(i)
-
-        d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf))
-
-        # Remove itens from provides
-        provides = d.getVar('PROVIDES', True).split()
-        take_out = ['virtual/libgles1', 'virtual/libgles2', 'virtual/egl']
-        if 'mx6' in cur_soc_families.split(':'):
-            take_out.append('virtual/libgl')
-        new_provides = []
-        for i in provides:
-            if i not in take_out:
-                new_provides.append(i)
-
-        d.setVar('PROVIDES', ' '.join(new_provides))
-}
-
-# FIXME: Dirty hack to allow use of Vivante GPU libGL binary
-do_install_append_mx6 () {
-    rm -f ${D}${libdir}/libGL.*
-}
-- 
1.9.0

Re: [meta-fsl-arm][PATCH 1/2] mesa: Update to follow OE-Core changes

[John Weber]

On 2/21/14, 3:54 PM, Otavio Salvador wrote:
> This updates the bbappend to the newer version; as mesa now provides
> the needed PACKAGECONFIG settings we rely on this instead of using an
> annonymous Python code to change it during build time.
>
> The bbappend file now is much easier to read.

Thanks Otavio - I'm really glad you were able to free up some time to work on 
this.  As master changes, it's clear that it takes a lot of work to keep up with it.

I applied both patches and ran into a snag.  I'm deleting the tmp and 
rebuilding, but here is what I'm seeing:

WARNING: libgl-mesa-9.2.5 was registered as shlib provider for libGL.so.1, 
changing it to libgl-mx6-3.10.9-1.0.0-hfp because it was built later

That is followed by a pretty unspecific error during the do_rootfs task.  
Looking into the task log, this is the error that seems to indicate the source 
of failure:

error: file /usr/lib/libGL.so.1.2.0 conflicts between attempted installs of 
libgl-mx6-3.10.9+1.0.0+hfp-r0.cortexa9hf_vfp_neon_mx6 and 
libgl-mesa-9.2.5-r0.cortexa9hf_vfp_neon_mx6




>
> Change-Id: Ie7b6027462f458d139d0561e737b254dd8b07653
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>   recipes-graphics/mesa/mesa_%.bbappend     |  5 ++++
>   recipes-graphics/mesa/mesa_9.2.2.bbappend | 40 -------------------------------
>   2 files changed, 5 insertions(+), 40 deletions(-)
>   create mode 100644 recipes-graphics/mesa/mesa_%.bbappend
>   delete mode 100644 recipes-graphics/mesa/mesa_9.2.2.bbappend
>
> diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
> new file mode 100644
> index 0000000..8dca313
> --- /dev/null
> +++ b/recipes-graphics/mesa/mesa_%.bbappend
> @@ -0,0 +1,5 @@
> +PACKAGECONFIG_remove_mx5 = "egl gles"
> +PROVIDES_remove_mx5 = "virtual/libgles1 virtual/libgles2 virtual/egl"
> +
> +PACKAGECONFIG_remove_mx6 = "egl gles"
> +PROVIDES_remove_mx6 = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
> diff --git a/recipes-graphics/mesa/mesa_9.2.2.bbappend b/recipes-graphics/mesa/mesa_9.2.2.bbappend
> deleted file mode 100644
> index 9975abc..0000000
> --- a/recipes-graphics/mesa/mesa_9.2.2.bbappend
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -# FIXME: We may need to disable EGL, GL ES1 and GL ES2
> -python __anonymous () {
> -    import re
> -
> -    # SoC families to work on
> -    families = ['mx5', 'mx6']
> -    cur_soc_families = d.getVar('SOC_FAMILY', True)
> -    if cur_soc_families and \
> -        any(map(lambda x: x in cur_soc_families.split(':'), families)):
> -        # Remove egl gles1 and gles2 configure options
> -        extra_oeconf = d.getVar('EXTRA_OECONF', True).split()
> -        take_out = ['--enable-egl', '--enable-gles1', '--enable-gles2']
> -        put_in = ['--disable-egl', '--disable-gles1', '--disable-gles2']
> -        pattern = re.compile("--with-egl-platforms")
> -        new_extra_oeconf = []
> -        for i in extra_oeconf:
> -            if i not in take_out and not pattern.match(i):
> -                new_extra_oeconf.append(i)
> -        for i in put_in:
> -            new_extra_oeconf.append(i)
> -
> -        d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf))
> -
> -        # Remove itens from provides
> -        provides = d.getVar('PROVIDES', True).split()
> -        take_out = ['virtual/libgles1', 'virtual/libgles2', 'virtual/egl']
> -        if 'mx6' in cur_soc_families.split(':'):
> -            take_out.append('virtual/libgl')
> -        new_provides = []
> -        for i in provides:
> -            if i not in take_out:
> -                new_provides.append(i)
> -
> -        d.setVar('PROVIDES', ' '.join(new_provides))
> -}
> -
> -# FIXME: Dirty hack to allow use of Vivante GPU libGL binary
> -do_install_append_mx6 () {
> -    rm -f ${D}${libdir}/libGL.*
> -}

Re: [meta-fsl-arm][PATCH 1/2] mesa: Update to follow OE-Core changes

[Otavio Salvador]

Hello John,

On Sat, Feb 22, 2014 at 1:13 PM, John Weber <rjohnweber@gmail.com> wrote:
> On 2/21/14, 3:54 PM, Otavio Salvador wrote:
>>
>> This updates the bbappend to the newer version; as mesa now provides
>> the needed PACKAGECONFIG settings we rely on this instead of using an
>> annonymous Python code to change it during build time.
>>
>> The bbappend file now is much easier to read.
>
>
> Thanks Otavio - I'm really glad you were able to free up some time to work
> on this.  As master changes, it's clear that it takes a lot of work to keep
> up with it.
>
> I applied both patches and ran into a snag.  I'm deleting the tmp and
> rebuilding, but here is what I'm seeing:
>
> WARNING: libgl-mesa-9.2.5 was registered as shlib provider for libGL.so.1,
> changing it to libgl-mx6-3.10.9-1.0.0-hfp because it was built later
>
> That is followed by a pretty unspecific error during the do_rootfs task.
> Looking into the task log, this is the error that seems to indicate the
> source of failure:
>
> error: file /usr/lib/libGL.so.1.2.0 conflicts between attempted installs of
> libgl-mx6-3.10.9+1.0.0+hfp-r0.cortexa9hf_vfp_neon_mx6 and
> libgl-mesa-9.2.5-r0.cortexa9hf_vfp_neon_mx6

I must have missed this as I didn't spot this issue while testing.
Please add following block of code below the bbappend and confirm it
works for you.

# FIXME: Dirty hack to allow use of Vivante GPU libGL binary
do_install_append_mx6 () {
    rm -f ${D}${libdir}/libGL.*
}

Thanks for reporting this issue.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-fsl-arm][PATCH 1/2] mesa: Update to follow OE-Core changes

[John Weber]

Hi Otavio,

On 2/22/14, 11:46 AM, Otavio Salvador wrote:
> Hello John,
>
> On Sat, Feb 22, 2014 at 1:13 PM, John Weber <rjohnweber@gmail.com> wrote:
>> On 2/21/14, 3:54 PM, Otavio Salvador wrote:
>>> This updates the bbappend to the newer version; as mesa now provides
>>> the needed PACKAGECONFIG settings we rely on this instead of using an
>>> annonymous Python code to change it during build time.
>>>
>>> The bbappend file now is much easier to read.
>>
>> Thanks Otavio - I'm really glad you were able to free up some time to work
>> on this.  As master changes, it's clear that it takes a lot of work to keep
>> up with it.
>>
>> I applied both patches and ran into a snag.  I'm deleting the tmp and
>> rebuilding, but here is what I'm seeing:
>>
>> WARNING: libgl-mesa-9.2.5 was registered as shlib provider for libGL.so.1,
>> changing it to libgl-mx6-3.10.9-1.0.0-hfp because it was built later
>>
>> That is followed by a pretty unspecific error during the do_rootfs task.
>> Looking into the task log, this is the error that seems to indicate the
>> source of failure:
>>
>> error: file /usr/lib/libGL.so.1.2.0 conflicts between attempted installs of
>> libgl-mx6-3.10.9+1.0.0+hfp-r0.cortexa9hf_vfp_neon_mx6 and
>> libgl-mesa-9.2.5-r0.cortexa9hf_vfp_neon_mx6
> I must have missed this as I didn't spot this issue while testing.
> Please add following block of code below the bbappend and confirm it
> works for you.
>
> # FIXME: Dirty hack to allow use of Vivante GPU libGL binary
> do_install_append_mx6 () {
>      rm -f ${D}${libdir}/libGL.*
> }
>
> Thanks for reporting this issue.
>
Thanks for helping to solve it.  This fixed the issue with generating the 
rootfs.  Thanks!

Re: [meta-fsl-arm][PATCH 1/2] mesa: Update to follow OE-Core changes

[Otavio Salvador]

Hello John,

On Sat, Feb 22, 2014 at 4:32 PM, John Weber <rjohnweber@gmail.com> wrote:
> On 2/22/14, 11:46 AM, Otavio Salvador wrote:
>>
>> Hello John,
>>
>> On Sat, Feb 22, 2014 at 1:13 PM, John Weber <rjohnweber@gmail.com> wrote:
>>>
>>> On 2/21/14, 3:54 PM, Otavio Salvador wrote:
>>>>
>>>> This updates the bbappend to the newer version; as mesa now provides
>>>> the needed PACKAGECONFIG settings we rely on this instead of using an
>>>> annonymous Python code to change it during build time.
>>>>
>>>> The bbappend file now is much easier to read.
>>>
>>>
>>> Thanks Otavio - I'm really glad you were able to free up some time to
>>> work
>>> on this.  As master changes, it's clear that it takes a lot of work to
>>> keep
>>> up with it.
>>>
>>> I applied both patches and ran into a snag.  I'm deleting the tmp and
>>> rebuilding, but here is what I'm seeing:
>>>
>>> WARNING: libgl-mesa-9.2.5 was registered as shlib provider for
>>> libGL.so.1,
>>> changing it to libgl-mx6-3.10.9-1.0.0-hfp because it was built later
>>>
>>> That is followed by a pretty unspecific error during the do_rootfs task.
>>> Looking into the task log, this is the error that seems to indicate the
>>> source of failure:
>>>
>>> error: file /usr/lib/libGL.so.1.2.0 conflicts between attempted installs
>>> of
>>> libgl-mx6-3.10.9+1.0.0+hfp-r0.cortexa9hf_vfp_neon_mx6 and
>>> libgl-mesa-9.2.5-r0.cortexa9hf_vfp_neon_mx6
>>
>> I must have missed this as I didn't spot this issue while testing.
>> Please add following block of code below the bbappend and confirm it
>> works for you.
>>
>> # FIXME: Dirty hack to allow use of Vivante GPU libGL binary
>> do_install_append_mx6 () {
>>      rm -f ${D}${libdir}/libGL.*
>> }
>>
>> Thanks for reporting this issue.
>>
> Thanks for helping to solve it.  This fixed the issue with generating the
> rootfs.  Thanks!

I sent a v2.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

[meta-fsl-arm][PATCH 2/2] xserver-xorg: Backport 1.14.4 version

[Otavio Salvador]

Currently Vivante does not provides a valid GL API so Xorg fails to
link against it, we cannot workaround it easily in newer Xorg version
so instead of maintaining a pile of patches for it we are backporting
1.14.4 version as an interim solution.

Change-Id: Ie8c8c002f7c3904abb383f2a1ee6f3dc6ad09e20
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/include/imx-base.inc                  |  3 ++
 .../xorg-xserver/xserver-xorg/aarch64.patch        | 35 ++++++++++++++++++++++
 .../xorg-xserver/xserver-xorg/crosscompile.patch   | 22 ++++++++++++++
 .../fix_open_max_preprocessor_error.patch          | 15 ++++++++++
 .../xorg-xserver/xserver-xorg/macro_tweak.patch    | 25 ++++++++++++++++
 .../xserver-xorg/mips64-compiler.patch             | 29 ++++++++++++++++++
 .../xorg-xserver/xserver-xorg_1.14.4.bb            | 35 ++++++++++++++++++++++
 7 files changed, 164 insertions(+)
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 3199238..08d2950 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -27,6 +27,9 @@ XSERVER = "xserver-xorg \
            xf86-input-evdev \
            ${XSERVER_DRIVER}"
 
+# Use an older Xorg version until Vivante provides a valid GL API
+PREFERRED_VERSION_xserver-xorg_mx6 = "2:1.14.4"
+
 # Ship kernel modules
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch b/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch
new file mode 100644
index 0000000..045e24a
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch
@@ -0,0 +1,35 @@
+Subject: Add AArch64 support to xserver-xorg
+Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
+
+lnx_video.c parts are not existing in 1.14 branch.
+
+Xserver was checked in AArch64 fastmodel (commercial one with graphics support).
+
+http://patchwork.freedesktop.org/patch/12785/
+
+Upstream-Status: Pending
+
+---
+ include/servermd.h                      |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+--- xorg-server-1.13.1.orig/include/servermd.h
++++ xorg-server-1.13.1/include/servermd.h
+@@ -243,10 +243,17 @@ SOFTWARE.
+ #define BITMAP_BIT_ORDER       LSBFirst
+ #define GLYPHPADBYTES		4
+ /* ???? */
+ #endif                          /* AMD64 */
+ 
++#if defined(__aarch64__) || defined(aarch64) || defined(__aarch64)
++#define IMAGE_BYTE_ORDER	MSBFirst
++#define BITMAP_BIT_ORDER       MSBFirst
++#define GLYPHPADBYTES		4
++/* ???? */
++#endif                          /* AArch64 */
++
+ #if	defined(SVR4) && (defined(__i386__) || defined(__i386) ) ||	\
+ 	defined(__alpha__) || defined(__alpha) || \
+ 	defined(__i386__) || \
+ 	defined(__s390x__) || defined(__s390__)
+ 
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch b/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
new file mode 100644
index 0000000..2f98bb8
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
@@ -0,0 +1,22 @@
+Upstream-Status: Inappropriate [configuration]
+
+diff --git a/configure.ac b/configure.ac
+index b3b752c..600500b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
+ dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
+ dnl compiling, assume default font path uses standard FONTROOTDIR directories.
+ DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
+-if test "$cross_compiling" != yes; then
+-	AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
+-		[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
+-		[case $host_os in
++		case $host_os in
+ 			darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
+-		esac])
+-fi
++		esac
+ AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
+ 				[ FONTPATH="$withval" ],
+ 				[ FONTPATH="${DEFAULT_FONT_PATH}" ])
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch b/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
new file mode 100644
index 0000000..2f62972
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
@@ -0,0 +1,15 @@
+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
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
new file mode 100644
index 0000000..ec0eea6
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
@@ -0,0 +1,25 @@
+This is the revised version of files/macro_tweak.patch for
+xorg-server 1.8.99.904 and newer.
+
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <ke.yu@intel.com>
+
+diff --git a/xorg-server.m4 b/xorg-server.m4
+index bdecf62..040fdb8 100644
+--- a/xorg-server.m4
++++ b/xorg-server.m4
+@@ -28,10 +28,12 @@ dnl
+ # Checks for the $1 define in xorg-server.h (from the sdk).  If it
+ # is defined, then add $1 to $REQUIRED_MODULES.
+ 
++m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
++
+ AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+ 	AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+ 	SAVE_CFLAGS="$CFLAGS"
+-	CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
++	CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`"
+ 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "xorg-server.h"
+ #if !defined $1
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch b/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch
new file mode 100644
index 0000000..168368e
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch
@@ -0,0 +1,29 @@
+on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well
+so we end up with incompatible conversion errors
+
+This patch choses the right values for mips64
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+Index: xorg-server-1.13.0/hw/xfree86/common/compiler.h
+===================================================================
+--- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h	2012-06-14 23:04:29.000000000 +0300
++++ xorg-server-1.13.0/hw/xfree86/common/compiler.h	2012-11-08 10:06:50.865831783 +0200
+@@ -101,6 +101,7 @@
+ #if defined(NO_INLINE) || defined(DO_PROTOTYPES)
+ #if !defined(__arm__)
+ #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
++      && !defined(__mips64) \
+       && !(defined(__alpha__) && defined(linux)) \
+       && !(defined(__ia64__) && defined(linux)) \
+ 
+@@ -721,7 +722,7 @@
+ }
+ 
+ #elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
+-#ifdef __arm32__
++#if defined (__arm32__) || defined (__mips64)
+ #define PORT_SIZE long
+ #else
+ #define PORT_SIZE short
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb b/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb
new file mode 100644
index 0000000..c6e23be
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.14.4.bb
@@ -0,0 +1,35 @@
+require recipes-graphics/xorg-xserver/xserver-xorg.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc098b9774ed096943f6c37b5beeef13"
+
+# Misc build failure for master HEAD
+SRC_URI += "file://crosscompile.patch \
+            file://fix_open_max_preprocessor_error.patch \
+            file://mips64-compiler.patch \
+            file://aarch64.patch \
+           "
+
+SRC_URI[md5sum] = "9d68a30258c67faa3c036a4a85e8bf97"
+SRC_URI[sha256sum] = "608ccfaafb845f6e559884a30f946d365209172416710d687b190e9e1ff65dc3"
+
+# These extensions are now integrated into the server, so declare the migration
+# path for in-place upgrades.
+
+RREPLACES_${PN} =  "${PN}-extension-dri \
+                    ${PN}-extension-dri2 \
+                    ${PN}-extension-record \
+                    ${PN}-extension-extmod \
+                    ${PN}-extension-dbe \
+                   "
+RPROVIDES_${PN} =  "${PN}-extension-dri \
+                    ${PN}-extension-dri2 \
+                    ${PN}-extension-record \
+                    ${PN}-extension-extmod \
+                    ${PN}-extension-dbe \
+                   "
+RCONFLICTS_${PN} = "${PN}-extension-dri \
+                    ${PN}-extension-dri2 \
+                    ${PN}-extension-record \
+                    ${PN}-extension-extmod \
+                    ${PN}-extension-dbe \
+                   "
-- 
1.9.0