Merge oe-devel@oe-devel.bkbits.net:openembedded

into hyperion.kergoth.com:/home/kergoth/code/openembedded

2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.

BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA

8 files changed, 0 insertions, 125 deletions

diff --git a/xserver/xserver-kdrive/fbdev-not-fix.patch b/xserver/xserver-kdrive/fbdev-not-fix.patch
deleted file mode 100644
index f87e7cc2cd..0000000000
--- a/xserver/xserver-kdrive/fbdev-not-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- xserver/hw/kdrive/fbdev/fbdev.c~	2004-09-15 00:08:10.000000000 +0100
-+++ xserver/hw/kdrive/fbdev/fbdev.c	2004-11-13 17:47:02.000000000 +0000
-@@ -198,6 +198,11 @@
- 	return FALSE;
-     }
- 
-+    /* Re-get the "fixed" parameters since they might have changed */
-+    k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
-+    if (k < 0)
-+        perror ("FBIOGET_FSCREENINFO");
-+
-     /* Now get the new screeninfo */
-     ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
-     depth = priv->var.bits_per_pixel;
diff --git a/xserver/xserver-kdrive/kmode.patch b/xserver/xserver-kdrive/kmode.patch
deleted file mode 100644
index 22ad51c5ad..0000000000
--- a/xserver/xserver-kdrive/kmode.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: hw/kdrive/src/kmode.c
-===================================================================
-RCS file: /cvs/xserver/xserver/hw/kdrive/src/kmode.c,v
-retrieving revision 1.13
-diff -u -r1.13 kmode.c
---- xserver/hw/kdrive/src/kmode.c	26 Jul 2004 17:14:26 -0000	1.13
-+++ xserver/hw/kdrive/src/kmode.c	28 Aug 2004 14:04:19 -0000
-@@ -41,6 +41,11 @@
- 	            1,      11,     14,     KdSyncNegative,
-     },
-     
-+    {   240,	320,	64,	    0,
-+	            0,	    0,	    0,     KdSyncNegative,
-+	            0,      0,      0,     KdSyncNegative,
-+    },
-+
-     /* Other VESA modes */
-     {	640,	350,	85,	31500,			    /* VESA */
- 		    32,	    96,	    192,    KdSyncPositive, /* 26.413 */
diff --git a/xserver/xserver-kdrive/xserver-kdrive-poodle.patch b/xserver/xserver-kdrive/xserver-kdrive-poodle.patch
deleted file mode 100644
index ce80a7e389..0000000000
--- a/xserver/xserver-kdrive/xserver-kdrive-poodle.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- xserver/hw/kdrive/fbdev/fbdev.c~xserver-kdrive-poodle.patch
-+++ xserver/hw/kdrive/fbdev/fbdev.c
-@@ -190,6 +190,7 @@
-     var.nonstd = 0;
-     var.grayscale = 0;
- 
-+    /* commented out for poodle 
-     k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var);
- 
-     if (k < 0)
-@@ -198,10 +199,11 @@
- 	return FALSE;
-     }
- 
--    /* Re-get the "fixed" parameters since they might have changed */
-+    // Re-get the "fixed" parameters since they might have changed
-     k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
-     if (k < 0)
-         perror ("FBIOGET_FSCREENINFO");
-+    */
- 
-     /* Now get the new screeninfo */
-     ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
-@@ -659,13 +661,14 @@
-     priv->var.activate = FB_ACTIVATE_NOW|FB_CHANGE_CMAP_VBL;
-     
-     /* display it on the LCD */
-+    /* commented out for poodle
-     k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &priv->var);
-     if (k < 0)
-     {
- 	perror ("FBIOPUT_VSCREENINFO");
- 	return FALSE;
-     }
--    
-+    */
-     if (priv->fix.visual == FB_VISUAL_DIRECTCOLOR)
-     {
- 	struct fb_cmap	cmap;
diff --git a/xserver/xserver-kdrive_cvs.bb b/xserver/xserver-kdrive_cvs.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/xserver/xserver-kdrive_cvs.bb
+++ /dev/null
diff --git a/xserver/xserver-xorg/dri.patch b/xserver/xserver-xorg/dri.patch
deleted file mode 100644
index 37d0407fe4..0000000000
--- a/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/xserver/xserver-xorg/imake-staging.patch b/xserver/xserver-xorg/imake-staging.patch
deleted file mode 100644
index bf2e350830..0000000000
--- a/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
diff --git a/xserver/xserver-xorg_6.8.bb b/xserver/xserver-xorg_6.8.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/xserver/xserver-xorg_6.8.bb
+++ /dev/null
diff --git a/xserver/xserver-xorg_cvs.bb b/xserver/xserver-xorg_cvs.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/xserver/xserver-xorg_cvs.bb
+++ /dev/null