recipes upgrade: xserver, sqlite3, xf86-video-intel

index da730e6..7afa8c9 100644
@@ -145,6 +145,6 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.7.0"
 PREFERRED_VERSION_xf86-input-keyboard ?= "1.6.0"
 PREFERRED_VERSION_xf86-input-synaptics ?= "1.4.0"
-PREFERRED_VERSION_xf86-video-intel ?= "2.14.0"
+PREFERRED_VERSION_xf86-video-intel ?= "2.15.0"
 
 

similarity index 83%
rename from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.14.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-intel_2.15.0.bb
index 099cf9d..6c9db59 100644
@@ -9,7 +9,7 @@ Infrastructure (DRI)."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
 
-PR = "r1"
+PR = "r0"
 
 EXTRA_OECONF += "--disable-xvmc"
 

@@ -21,5 +21,5 @@ DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
-SRC_URI[md5sum] = "05f187582aeabda57fcd6f2782cfbf8e"
-SRC_URI[sha256sum] = "e18c37a579a960516e69de5c6f74750ca02208c0e41cf763ae5630c84db507df"
+SRC_URI[md5sum] = "ba56ae395a9769ada1fef2014468bee9"
+SRC_URI[sha256sum] = "c377e1e9ab8b846d7e039acc9105479d5dce6a03f1ddccccf01c8474259c1720"

index 92c4930..d8ef8dc 100644
@@ -6,11 +6,6 @@ DEPENDS = "readline ncurses tcl-native"
 DEPENDS_virtclass-native = "tcl-native"
 LICENSE = "PD"
 
-SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \
-	   file://libtool.patch"
-
-S = "${WORKDIR}/sqlite-${PV}"
-
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-tcl --enable-shared --enable-threadsafe"

deleted file mode 100644
index ccf9993..0000000
@@ -1,25 +0,0 @@
-Index: sqlite-3.2.1/Makefile.in
-===================================================================
---- sqlite-3.2.1.orig/Makefile.in	2005-03-23 17:09:39.000000000 +0100
-+++ sqlite-3.2.1/Makefile.in	2005-04-25 23:11:20.000000000 +0200
-@@ -15,7 +15,10 @@
- # The toplevel directory of the source tree.  This is the directory
- # that contains this "Makefile.in" and the "configure.in" script.
- #
--TOP = @srcdir@
-+TOP = $(srcdir)
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = .
- 
- # C Compiler and options for use in building executables that
- # will run on the platform that is doing the build.
-@@ -96,7 +99,7 @@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
- INSTALL = @INSTALL@
--LIBTOOL = ./libtool
-+LIBTOOL = @LIBTOOL@
- ALLOWRELEASE = @ALLOWRELEASE@
- 
- # libtool compile/link/install

deleted file mode 100644
index 212d9e2..0000000
@@ -1,10 +0,0 @@
-require sqlite3.inc
-
-LIC_FILES_CHKSUM = "file://sqlite3.c;endline=19;md5=c1b8048b783961c3ba387c43fd955dc6"
-
-SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz"
-S = "${WORKDIR}/sqlite-autoconf-3070500"
-PR = "r0"
-
-SRC_URI[md5sum] = "a9604a82613ade2e7f4c303f233e477f"                                                 
-SRC_URI[sha256sum] = "cb5b86926ec9f65882b2dddd244f2d620337d911ec73411863f77e48cf6a2f94"              

new file mode 100644
index 0000000..34d1653
@@ -0,0 +1,10 @@
+require sqlite3.inc
+
+LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0"
+
+SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3070602.tar.gz"
+S = "${WORKDIR}/sqlite-autoconf-3070602"
+PR = "r0"
+
+SRC_URI[md5sum] = "f16c08617968b4087b3d591fd575f59f"
+SRC_URI[sha256sum] = "53aa66f30d8ff87230d4173b7979814432b8084da77fba05992223f76593fc81"

index 7afa8c9..add4d29 100644
@@ -128,7 +128,7 @@ PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
 PREFERRED_VERSION_xrandr ?= "1.3.4"
 PREFERRED_VERSION_xrdb ?= "1.0.5"
 PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2"
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
+PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.10.1"
 PREFERRED_VERSION_xset ?= "1.2.1"
 PREFERRED_VERSION_xtrans ?= "1.2.6"
 PREFERRED_VERSION_xtrans-native ?= "1.2.6"

index cd408c7..2b75427 100644
@@ -6,6 +6,8 @@ xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
 are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
 can be safely replace by this patch.
 
+Upstream-Status: Pending
+
 Signed-off-by: Yu Ke <[email protected]>
 
 diff --git a/xorg-server.m4 b/xorg-server.m4

deleted file mode 100644
index 6b34032..0000000
@@ -1,12 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac	2009-01-15 20:35:31.000000000 +0000
-+++ git/configure.ac	2009-01-15 20:35:38.000000000 +0000
-@@ -62,7 +62,6 @@
- AC_LIBTOOL_WIN32_DLL
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--DOLT
- AC_PROG_MAKE_SET
- PKG_PROG_PKG_CONFIG
- AC_PROG_LEX

new file mode 100644
index 0000000..ea57140
@@ -0,0 +1,20 @@
+require xserver-xf86-dri-lite.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
+
+PROTO_DEPS += "xf86driproto dri2proto"
+
+DEPENDS += "font-util"
+
+PE = "1"
+PR = "r0"
+
+SRC_URI += "file://crosscompile.patch"
+
+# Misc build failure for master HEAD
+SRC_URI += "file://fix_open_max_preprocessor_error.patch"
+
+SRC_URI[md5sum] = "75f117c74f2ecaf9dd167f6a66ac98de"
+SRC_URI[sha256sum] = "143c7c3d7d4428352e1153dffa34fd64af391f72d30b2a03e911e54e36f00b5d"
+
+EXTRA_OECONF += "--enable-dri --enable-dri2"

deleted file mode 100644
index faa4f64..0000000
@@ -1,22 +0,0 @@
-require xserver-xf86-dri-lite.inc
-
-
-PROTO_DEPS += "xf86driproto dri2proto"
-
-DEPENDS += "font-util"
-
-PE = "1"
-PR = "r0"
-
-SRC_URI += "file://nodolt.patch \
-            file://crosscompile.patch"
-#           file://libdri-xinerama-symbol.patch;patch=1
-#           file://xserver-boottime.patch;patch=1
-
-# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch"
-
-SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201"
-SRC_URI[sha256sum] = "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d"
-
-EXTRA_OECONF += "--enable-dri --enable-dri2"

index b121bba..6b1b40f 100644
@@ -7,6 +7,8 @@ Organization: Intel
 xkbcomp outputs will be cached in files with hashed keymap as
 names. This saves boot time for around 1s on commodity netbooks.
 
+Upstream-Status: Pending
+
 Signed-off-by: Yan Li <[email protected]>
 ---
  configure.ac        |    6 +-

index 8b82de2..2f98bb8 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 diff --git a/configure.ac b/configure.ac
 index b3b752c..600500b 100644
 --- a/configure.ac

deleted file mode 100644
index 092a712..0000000
@@ -1,13 +0,0 @@
-Index: xorg-server-1.6.0/hw/xfree86/common/Makefile.am
-===================================================================
---- xorg-server-1.6.0.orig/hw/xfree86/common/Makefile.am	2010-02-01 14:04:53.247789918 +0000
-+++ xorg-server-1.6.0/hw/xfree86/common/Makefile.am	2010-02-01 14:05:27.787817002 +0000
-@@ -46,7 +46,7 @@
- sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
-               xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
-               xf86cmap.h xf86fbman.h xf86str.h xf86RAC.h xf86Xinput.h xisb.h \
--              $(XVSDKINCS) xorgVersion.h \
-+              xorgVersion.h \
-               xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h
- 
- DISTCLEANFILES = xf86Build.h

deleted file mode 100644
index a62a767..0000000
@@ -1,13 +0,0 @@
-Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
-===================================================================
---- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am	2007-08-23 21:04:53.000000000 +0200
-+++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am	2008-03-13 18:27:23.000000000 +0100
-@@ -41,7 +41,7 @@
- 
- AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
- 
--INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
-+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
- 
- # FIXME: These need to be added to the build
- LNX_EXTRA_SRCS = \

deleted file mode 100644
index eed491b..0000000
@@ -1,21 +0,0 @@
-We need to insert the sysroot path into compiler commandlines for this
-kind of variable use, otherwise we're looking into /usr/include/.
-
-RP - 26/11/09
-
-Index: git/xorg-server.m4
-===================================================================
---- git.orig/xorg-server.m4	2009-11-10 12:04:34.000000000 +0000
-+++ git/xorg-server.m4	2009-11-27 00:05:02.000000000 +0000
-@@ -28,9 +28,10 @@
- # 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],[
- 	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

index 94852f0..b2c8d58 100644
@@ -3,6 +3,8 @@ kind of variable use, otherwise we're looking into /usr/include/.
 
 RP - 26/11/09
 
+Upstream-Status: Pending
+
 Index: git/xorg-server.m4
 ===================================================================
 --- git.orig/xorg-server.m4	2010-02-05 10:00:55.000000000 +0000

index 565832e..9c33072 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [embedded specific]
+
 Index: git/os/osdep.h
 ===================================================================
 --- git.orig/os/osdep.h	2008-10-07 18:38:21.000000000 +0100

50 lines not on this page · raw message

deleted file mode 100755
index 3d2fa16..0000000
@@ -1,12 +0,0 @@
-diff -urN xorg-server-1.5.99.1/hw/xfree86/dri2/dri2.c xorg-server-1.5.99.1.new/hw/xfree86/dri2/dri2.c
---- xorg-server-1.5.99.1/hw/xfree86/dri2/dri2.c	2008-09-01 03:26:37.000000000 +0800
-+++ xorg-server-1.5.99.1.new/hw/xfree86/dri2/dri2.c	2008-09-18 00:28:16.000000000 +0800
-@@ -39,7 +39,7 @@
- #include "scrnintstr.h"
- #include "windowstr.h"
- #include "dri2.h"
--#include <GL/internal/dri_sarea.h>
-+//#include <GL/internal/dri_sarea.h>
- 
- #include "xf86.h"
- 

deleted file mode 100755
index 7ff3658..0000000
@@ -1,23 +0,0 @@
-commit 67b9b3a77a8b86eef03af36a0f4be3a07411efee
-Author: Eric Anholt <[email protected]>
-Date:   Thu Sep 11 16:18:17 2008 -0700
-
-    Enable DRI2 build.
-
-diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
-index eff2c31..98d7ec8 100644
---- a/hw/xfree86/Makefile.am
-+++ b/hw/xfree86/Makefile.am
-@@ -4,9 +4,9 @@ if DRI
- DRI_SUBDIR = dri
- endif
- 
--#if DRI2
--#DRI2_SUBDIR = dri2
--#endif
-+if DRI2
-+DRI2_SUBDIR = dri2
-+endif
- 
- if XF86UTILS
- XF86UTILS_SUBDIR = utils

156 lines not on this page · raw message

179 lines not on this page · raw message

deleted file mode 100644
index efc85a4..0000000
@@ -1,38 +0,0 @@
-diff --git a/os/log.c b/os/log.c
-index 0860847..2c46f1a 100644
---- a/os/log.c
-+++ b/os/log.c
-@@ -255,6 +255,33 @@ LogVWrite(int verb, const char *f, va_list args)
-     static char tmpBuffer[1024];
-     int len = 0;
- 
-+    struct timeval time;
-+    time_t tv_sec;
-+    suseconds_t tv_usec;
-+    static Bool first = TRUE;
-+    static time_t start_tv_sec;
-+    static suseconds_t start_usec;
-+    int diff_sec, diff_usec;
-+
-+    gettimeofday(&time, NULL);
-+    tv_sec = time.tv_sec;
-+    tv_usec = time.tv_usec;
-+    if (first == TRUE) {
-+        start_tv_sec = tv_sec;
-+        start_usec = tv_usec;
-+        first = FALSE;
-+    }
-+    diff_sec = (int)difftime(tv_sec, start_tv_sec);
-+    diff_usec = (tv_usec - start_usec);
-+    if (diff_usec < 0) {
-+        diff_sec--;
-+        diff_usec += 1000000;
-+    }
-+    sprintf(tmpBuffer, "[%d sec: %06d usec]", diff_sec , diff_usec);
-+    len = strlen(tmpBuffer);
-+    if (logFile)
-+          fwrite(tmpBuffer, len, 1, logFile);
-+
-     /*
-      * Since a va_list can only be processed once, write the string to a
-      * buffer, and then write the buffer out to the appropriate output

105 lines not on this page · raw message

index 850db49..adefcdb 100644
@@ -1,9 +1,11 @@
 require xserver-xf86-dri-lite.inc
 
-SRCREV = "251d0d8090322b2c9dc0c8b7bef001f338d19433"
+LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
+
+SRCREV = "6689e8add183835274a70ee013e5d3bc8023681f"
 PE = "1"
 PR = "r0"
-PV = "1.7.99+git${SRCPV}"
+PV = "1.10+git${SRCPV}"
 
 PROTO_DEPS += "xf86driproto dri2proto"
 

@@ -11,21 +13,12 @@ DEPENDS += "font-util"
 
 RDEPENDS_${PN} += "xkeyboard-config"
 
-#           file://cache-xkbcomp-output-for-fast-start-up.patch;patch=1
-#           file://xserver-1.5.0-bg-none-root.patch;patch=1
-#           file://xserver-no-root-2.patch;patch=1
-#           file://xserver-boottime.patch;patch=1
-#           file://xserver-DRI2Swapbuffer.patch;patch=1
-
-
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=master \
-           file://nodolt.patch;patch=1 \
-           file://crosscompile.patch;patch=1 \
-           file://fix_macros1.patch;patch=1"
-#           file://libdri-xinerama-symbol.patch;patch=1
+           file://crosscompile.patch; \
+           file://fix_macros1.patch;"
 
 # Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"
+SRC_URI += "file://fix_open_max_preprocessor_error.patch;"
 
 EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga"
 

index 2341e40..2f98bb8 100644
@@ -1,19 +1,22 @@
-Index: xorg-server-1.7.99.2/configure.ac
-===================================================================
---- xorg-server-1.7.99.2.orig/configure.ac	2010-01-29 16:38:49.000000000 +0000
-+++ xorg-server-1.7.99.2/configure.ac	2010-01-29 16:42:39.000000000 +0000
-@@ -503,14 +503,10 @@
- 
- dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
- dnl otherwise uses standard subdirectories of FONTROOTDIR
--AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
--	[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
--	[
- 		DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
- 		case $host_os in
- 			darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
- 		esac
--	])
+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}" ])

deleted file mode 100644
index a62a767..0000000
@@ -1,13 +0,0 @@
-Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
-===================================================================
---- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am	2007-08-23 21:04:53.000000000 +0200
-+++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am	2008-03-13 18:27:23.000000000 +0100
-@@ -41,7 +41,7 @@
- 
- AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
- 
--INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
-+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
- 
- # FIXME: These need to be added to the build
- LNX_EXTRA_SRCS = \

50 lines not on this page · raw message

new file mode 100644
index 0000000..2b75427
@@ -0,0 +1,30 @@
+This is the revised version of files/macro_tweak.patch for
+xorg-server 1.8.99.904.
+
+the files/macro_tweak.patch can not removed now since it is used by
+xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
+are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
+can be safely replace by this patch.
+
+Upstream-Status: Pending
+
+Signed-off-by: Yu Ke <[email protected]>
+
+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

deleted file mode 100644
index 6b34032..0000000
@@ -1,12 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac	2009-01-15 20:35:31.000000000 +0000
-+++ git/configure.ac	2009-01-15 20:35:38.000000000 +0000
-@@ -62,7 +62,6 @@
- AC_LIBTOOL_WIN32_DLL
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--DOLT
- AC_PROG_MAKE_SET
- PKG_PROG_PKG_CONFIG
- AC_PROG_LEX

256 lines not on this page · raw message

new file mode 100644
index 0000000..f9b3a64
@@ -0,0 +1,12 @@
+require xserver-xf86-lite.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
+
+PR = "r0"
+
+DEPENDS += "font-util"
+
+SRC_URI += "file://crosscompile.patch"
+
+# Misc build failure for master HEAD
+SRC_URI += "file://fix_open_max_preprocessor_error.patch;"

deleted file mode 100644
index 5ef2301..0000000
@@ -1,12 +0,0 @@
-require xserver-xf86-lite.inc
-
-PR = "r1"
-
-DEPENDS += "font-util"
-
-SRC_URI += "file://nodolt.patch;patch=1 \
-            file://crosscompile.patch;patch=1"
-
-# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1 \
-            file://revert_make_sys_c_use_unaligned_access_functions.patch;patch=1"