+++ /dev/null
-HOMEPAGE = "http://www.x.org"
-SECTION = "x11/base"
-LICENSE = "MIT-X"
-
-PROVIDES = "virtual/xserver"
-
-DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \
-xf86driproto drm glproto randrproto renderproto fixesproto damageproto \
-xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \
-scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \
-xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \
-resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \
-libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
-libxkbui libxxf86misc libxi libdmx libxtst libxres mesa"
-
-REPENDS="rgb"
-
-XORG_PN = "xorg-server"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.gz \
- file://xorg.conf"
-
-S = "${WORKDIR}/${XORG_PN}-${PV}"
-
-inherit autotools pkgconfig
-
-PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils"
-
-FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
-FILES_${PN}-xvfb = "${bindir}/Xvfb"
-FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
-FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/modules ${libdir}/xorg/modules /etc/X11 "
-FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled"
-
-do_stage() {
- autotools_stage_all
-}
-
-do_install_append () {
- install -d ${D}/etc/X11
- install -m0644 ${WORKDIR}/xorg.conf ${D}/etc/X11/
-}
+++ /dev/null
---- 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
+++ /dev/null
-Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
-===================================================================
---- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/os-support/linux/Makefile.am
-+++ xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
-@@ -24,7 +24,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_vid
-
- AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
-
--INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack
-+INCLUDES = $(XORG_INCS) $(LIBDRM_CFLAGS)
-
- # FIXME: These need to be added to the build
- LNX_EXTRA_SOURCES = \
+++ /dev/null
---- 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
+++ /dev/null
---- 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
+++ /dev/null
---- 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)
+++ /dev/null
---- 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
+++ /dev/null
---- temp/xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am 2005-12-01 23:02:44.000000000 -0700
-+++ xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am 2006-04-18 23:16:04.315823560 -0600
-@@ -2,7 +2,7 @@
-
- AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
-
--INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
-+INCLUDES = -I$(top_srcdir)/miext/shadow -I$(top_srcdir)/hw/xfree86/os-support
-
- liblayer_la_SOURCES = \
- layer.h \
+++ /dev/null
---- xserver/include/site.h-orig 2006-11-02 10:37:14.000000000 +0000
-+++ xserver/include/site.h 2006-11-02 10:37:14.000000000 +0000
-@@ -117,8 +117,8 @@
- #define DEFAULT_PTR_DENOMINATOR 1
- #define DEFAULT_PTR_THRESHOLD 4
-
--#define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000))
--#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000))
-+#define DEFAULT_SCREEN_SAVER_TIME 0
-+#define DEFAULT_SCREEN_SAVER_INTERVAL 0
- #define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking
- #define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures
- #ifndef NOLOGOHACK
+++ /dev/null
-
-# xorg configuration
-
-Section "ServerLayout"
- Identifier "Default Layout"
- Screen 0 "Screen0" 0 0
- InputDevice "Mouse0" "CorePointer"
- InputDevice "Keyboard0" "CoreKeyboard"
-EndSection
-
-Section "Files"
-
-# RgbPath is the location of the RGB database. Note, this is the name of the
-# file minus the extension (like ".txt" or ".db"). There is normally
-# no need to change the default.
-# Multiple FontPath entries are allowed (they are concatenated together)
-# By default, Red Hat 6.0 and later now use a font server independent of
-# the X server to render fonts.
-# FontPath "unix/:7100"
- FontPath "/usr/lib/X11/fonts/misc"
-EndSection
-
-Section "Module"
- Load "dbe"
- Load "extmod"
- Load "fbdevhw"
-# Load "glx"
- Load "record"
- Load "freetype"
- Load "type1"
-# to enable Xv, link /dev/videox to video device, eg. ln -s video0 /dev/videox
-# Load "z4l"
-EndSection
-
-Section "InputDevice"
-
-# Specify which keyboard LEDs can be user-controlled (eg, with xset(1))
-# Option "Xleds" "1 2 3"
-# To disable the XKEYBOARD extension, uncomment XkbDisable.
-# Option "XkbDisable"
-# To customise the XKB settings to suit your keyboard, modify the
-# lines below (which are the defaults). For example, for a non-U.S.
-# keyboard, you will probably want to use:
-# Option "XkbModel" "pc102"
-# If you have a US Microsoft Natural keyboard, you can use:
-# Option "XkbModel" "microsoft"
-#
-# Then to change the language, change the Layout setting.
-# For example, a german layout can be obtained with:
-# Option "XkbLayout" "de"
-# or:
-# Option "XkbLayout" "de"
-# Option "XkbVariant" "nodeadkeys"
-#
-# If you'd like to switch the positions of your capslock and
-# control keys, use:
-# Option "XkbOptions" "ctrl:swapcaps"
-# Or if you just want both to be control, use:
-# Option "XkbOptions" "ctrl:nocaps"
-#
- Identifier "Keyboard0"
- Driver "keyboard"
- Option "XkbModel" "pc105"
- Option "XkbLayout" "us"
-EndSection
-
-Section "InputDevice"
- Identifier "Mouse0"
- Driver "mouse"
- Option "Protocol" "PS/2"
-# Option "Protocol" "IMPS/2"
- Option "Device" "/dev/psaux"
-# Option "Device" "/dev/input/mice"
- Option "ZAxisMapping" "4 5"
- Option "Emulate3Buttons" "yes"
-EndSection
-
-Section "Monitor"
- Identifier "Monitor0"
- VendorName "Monitor Vendor"
- ModelName "NEC FP2141SB"
-# DisplaySize 400 300
-# Note: setting HorizSync/VertRefresh will override DDC probe
-# HorizSync 30.0 - 140.0
-# VertRefresh 25.0 - 160.0
- Option "dpms"
-EndSection
-
-Section "Monitor"
- Identifier "Monitor1"
- VendorName "Generic Vendor"
- ModelName "Generic Monitor"
- HorizSync 28-50
- VertRefresh 43-73
- Modeline "800x600-60" 40.0000 800 840 976 1056 600 601 605 628
- Modeline "800x600-72" 50.0000 800 856 976 1040 600 637 643 666
- Modeline "640x480-60" 25.1749 640 656 744 800 480 490 492 525 -HSync -VSync
- Modeline "640x480-72" 31.5000 640 664 704 832 480 489 492 520 -HSync -VSync
- Option "dpms"
-EndSection
-
-
-Section "Device"
- Identifier "Videocard0"
- Driver "s3"
-# Driver "nv"
- VendorName "Videocard vendor"
- BoardName "S3 driver"
- #BoardName "NVidia driver"
-EndSection
-
-Section "Device"
- Identifier "FBDev"
- Driver "fbdev"
- #Option "shadowfb" "off"
- VideoRam 4096
-EndSection
-
-Section "Screen"
- Identifier "Screen0"
- Device "Videocard0"
- Monitor "Monitor0"
-# DefaultDepth 8
- DefaultDepth 16
-# DefaultDepth 24
-
- SubSection "Display"
- Depth 8
- Modes "1024x768" "800x600" "640x480"
- EndSubsection
-
- SubSection "Display"
- Depth 16
- Modes "1024x768" "800x600" "640x480"
- EndSubsection
-
- SubSection "Display"
- Depth 24
- FbBpp 32
- Modes "1024x768" "800x600" "640x480"
- EndSubsection
-
-EndSection
-
-Section "DRI"
- Group 0
- Mode 0666
-EndSection
-
+++ /dev/null
---- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am.orig 2006-06-23 10:20:42.126095128 -0600
-+++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am 2006-06-23 10:20:50.923757680 -0600
-@@ -1,6 +1,6 @@
- xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS/fonts
-
--parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
-+parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
-
- XPFONTS = \
- AvantGarde-Book.pmf \
---- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am.orig 2006-06-23 10:21:02.877940368 -0600
-+++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am 2006-06-23 10:21:11.903568264 -0600
-@@ -1,6 +1,6 @@
- xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS/fonts
-
--parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
-+parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
-
- XPFONTS = \
- AvantGarde-Book.pmf \
---- xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am.orig 2006-06-23 10:21:22.893897480 -0600
-+++ xorg-server-X11R7.0-1.0.1/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am 2006-06-23 10:21:28.412058592 -0600
-@@ -1,6 +1,6 @@
- xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts
-
--parentdir = $(DESTDIR)/@xpconfigdir@/C/print/models/PSdefault/fonts
-+parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
-
- XPFONTS = \
- Courier-Bold.pmf \
