Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@607 311d38ba-8fff-0310-9ca6-ca027cbcb966

5 files changed, 0 insertions, 92 deletions

diff --git a/meta/packages/xserver/xserver-xorg/dri.patch b/meta/packages/xserver/xserver-xorg/dri.patch
deleted file mode 100644
index 37d0407fe4..0000000000
--- a/meta/packages/xserver/xserver-xorg/dri.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xc/extras/drm/shared/drm.h.old      2004-09-14 21:42:45.000000000 +0100
-+++ xc/extras/drm/shared/drm.h  2004-09-14 21:42:47.000000000 +0100
-@@ -38,7 +38,6 @@
- #define _DRM_H_
- 
- #if defined(__linux__)
--#include <linux/config.h>
- #include <asm/ioctl.h>         /* For _IO* macros */
- #define DRM_IOCTL_NR(n)                _IOC_NR(n)
- #define DRM_IOC_VOID           _IOC_NONE
diff --git a/meta/packages/xserver/xserver-xorg/fontfile.patch b/meta/packages/xserver/xserver-xorg/fontfile.patch
deleted file mode 100644
index ed39bf45d0..0000000000
--- a/meta/packages/xserver/xserver-xorg/fontfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xc/lib/font/fontfile/Imakefile.old  2005-06-03 20:09:53.000000000 +0100
-+++ xc/lib/font/fontfile/Imakefile      2005-06-03 20:09:57.000000000 +0100
-@@ -14,7 +14,7 @@
- #endif
- 
-    INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include \
--             -I$(INCLUDESRC)
-+             -I$(INCLUDESRC) $(CC_STAGING)
-     HEADERS = 
- #ifdef FontFormatDefines
- FORMAT_DEFS = FontFormatDefines
diff --git a/meta/packages/xserver/xserver-xorg/freetype.patch b/meta/packages/xserver/xserver-xorg/freetype.patch
deleted file mode 100644
index 0ba3dd5627..0000000000
--- a/meta/packages/xserver/xserver-xorg/freetype.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- xc/lib/font/FreeType/Imakefile.old  2005-06-03 20:18:51.000000000 +0100
-+++ xc/lib/font/FreeType/Imakefile      2005-06-03 20:18:52.000000000 +0100
-@@ -20,7 +20,7 @@
- 
- INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \
-            -I$(SERVERSRC)/include $(EXTRAINCLUDES) \
--           -I$(INCLUDESRC)
-+           -I$(INCLUDESRC) $(CC_STAGING)
- 
- SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c
- OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o
---- xc/config/cf/X11.tmpl.old   2005-06-03 20:40:24.000000000 +0100
-+++ xc/config/cf/X11.tmpl       2005-06-03 20:40:40.000000000 +0100
-@@ -3371,7 +3371,7 @@
- 
- #if BuildFreetype2Library || HasFreetype2
- #if Freetype2IncDirStandard
--FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
-+FREETYPE2INCLUDES = `pkg-config --cflags freetype2`
- #else
- FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
- #endif
diff --git a/meta/packages/xserver/xserver-xorg/imake-installed.patch b/meta/packages/xserver/xserver-xorg/imake-installed.patch
deleted file mode 100644
index 57821075ef..0000000000
--- a/meta/packages/xserver/xserver-xorg/imake-installed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xc/config/cf/Imake.tmpl.old 2005-05-05 21:04:45.000000000 +0100
-+++ xc/config/cf/Imake.tmpl     2005-05-05 21:04:49.000000000 +0100
-@@ -2058,7 +2058,7 @@
-  * INCLUDES contains client-specific includes set in Imakefile
-  * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
-  */
--      ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
-+      ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
-        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
-            CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
-         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
diff --git a/meta/packages/xserver/xserver-xorg/imake-staging.patch b/meta/packages/xserver/xserver-xorg/imake-staging.patch
deleted file mode 100644
index bf2e350830..0000000000
--- a/meta/packages/xserver/xserver-xorg/imake-staging.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- xc/config/cf/Imake.tmpl.orig        2004-07-28 04:24:29.000000000 +0100
-+++ xc/config/cf/Imake.tmpl     2004-09-14 21:03:06.000000000 +0100
-@@ -2038,11 +2038,11 @@
-  */
-       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
-        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
--           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
-         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
-          LDPRELIB = LdPreLib $(INSTALLED_LIBS)
-         LDPOSTLIB = LdPostLib
--        LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS)  $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-+        LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS)  $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING)
-      CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
- 
-            LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
---- xc/config/cf/Library.tmpl~  2004-05-24 20:06:57.000000000 +0100
-+++ xc/config/cf/Library.tmpl   2004-09-14 21:10:29.000000000 +0100
-@@ -114,7 +114,7 @@
- STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
- CDEBUGFLAGS = LibraryCDebugFlags
- CLIBDEBUGFLAGS = LibraryDebugOpt
--     CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
-+     CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
- # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
-    PICFLAGS = LargePositionIndependentCFlags
- # endif
---- xc/config/cf/X11.tmpl~      2004-09-03 17:18:18.000000000 +0100
-+++ xc/config/cf/X11.tmpl       2004-09-14 21:30:30.000000000 +0100
-@@ -3359,7 +3359,7 @@
- FREETYPE2LIBDIR = Freetype2LibDir
- FREETYPE2INCDIR = Freetype2IncDir
- #if Freetype2LibDirStandard
--FREETYPE2LIB = -lfreetype
-+FREETYPE2LIB = $(LD_STAGING) -lfreetype
- #else
- FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype
- #endif