Initial population

git-svn-id: https://svn.o-hand.com/repos/poky@1 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2005-08-31 10:45:47 +00:00
commit 4b46c1f6e8
1032 changed files with 232488 additions and 0 deletions

View File

@@ -0,0 +1,13 @@
--- configure.ac~ 2005-06-03 17:23:36.000000000 +0200
+++ configure.ac 2005-06-03 17:23:36.000000000 +0200
@@ -447,10 +447,6 @@
KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
fi
-if test "$TSLIB" = yes; then
- KDRIVE_LIBS="${KDRIVE_LIBS} -lts"
-fi
-
AC_SUBST([KDRIVE_PURE_LIBS])
AC_SUBST([KDRIVE_PURE_INCS])
AC_SUBST([KDRIVE_LIBS])

View File

@@ -0,0 +1,14 @@
--- 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;

View File

@@ -0,0 +1,19 @@
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 */

View File

@@ -0,0 +1,24 @@
LICENSE = "MIT"
DEPENDS = "xsp tslib-maemo xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
PROVIDES = "virtual/xserver"
PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
SECTION = "x11/base"
DESCRIPTION = "X server from freedesktop.org"
DESCRIPTION_xserver-kdrive-omap = "X server from freedesktop.org with patches from maemo.org, supporting X on OMAP based devices"
PR = "r2"
FILES_${PN} = "${bindir}/Xomap"
SRC_URI = " http://stage.maemo.org/pool/maemo/ossw/source/x/xserver-kdrive/xserver-kdrive_${PV}-5.tar.gz \
file://kmode.patch;patch=1 \
file://fbdev-not-fix.patch;patch=1 \
file://configure-tslib.patch;patch=1;pnum=0"
S = "${WORKDIR}/xserver"
inherit autotools pkgconfig
EXTRA_OECONF = "--enable-composite --disable-xinerama --enable-xomapserver \
--enable-xsp --disable-xlocale --disable-rpath --prefix=/usr \
--disable-xdmcp"

View File

@@ -0,0 +1,47 @@
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- xserver/hw/kdrive/linux/linux.c~devfs
+++ xserver/hw/kdrive/linux/linux.c
@@ -82,10 +82,10 @@
vtno = kdVirtualTerminal;
else
{
- if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0)
+ if ((fd = open("/dev/vc/0",O_WRONLY,0)) < 0)
{
FatalError(
- "LinuxInit: Cannot open /dev/tty0 (%s)\n",
+ "LinuxInit: Cannot open /dev/tty/0 (%s)\n",
strerror(errno));
}
if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) ||
@@ -96,7 +96,7 @@
}
close(fd);
- sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */
+ sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/tty1-64 */
if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0)
{
@@ -113,7 +113,7 @@
*
* Why is this needed?
*/
- LinuxCheckChown ("/dev/tty0");
+ LinuxCheckChown ("/dev/vc/0");
/*
* Linux doesn't switch to an active vt after the last close of a vt,
* so we do this ourselves by remembering which is active now.
@@ -453,7 +453,7 @@
activeVT = -1;
}
close(LinuxConsoleFd); /* make the vt-manager happy */
- fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0);
+ fd = open ("/dev/vc/0", O_RDWR|O_NDELAY, 0);
if (fd >= 0)
{
memset (&vts, '\0', sizeof (vts)); /* valgrind */

View File

@@ -0,0 +1,20 @@
--- xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 +0000
+++ xserver/hw/kdrive/linux/linux.c 2005-04-23 15:57:05.001094192 +0000
@@ -342,7 +342,7 @@
/*
* Open the APM driver
*/
- LinuxApmFd = open ("/dev/apm_bios", 2);
+ /*LinuxApmFd = open ("/dev/apm_bios", 2);
if (LinuxApmFd < 0 && errno == ENOENT)
LinuxApmFd = open ("/dev/misc/apm_bios", 2);
if (LinuxApmFd >= 0)
@@ -352,7 +352,7 @@
RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
AddEnabledDevice (LinuxApmFd);
}
-
+ */
/*
* now get the VT
*/

View File

@@ -0,0 +1,11 @@
--- xserver.orig/hw/kdrive/epson/epson13806stub.c 2004-10-20 10:20:51.000000000 +0200
+++ xserver/hw/kdrive/epson/epson13806stub.c 2005-03-17 14:38:22.000000000 +0100
@@ -55,7 +55,7 @@
{
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
#ifdef TOUCHSCREEN
- KdInitTouchScreen (&TsFuncs);
+ KdAddMouseDriver (&TsFuncs);
#endif
}

View File

@@ -0,0 +1,14 @@
--- 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;

View File

@@ -0,0 +1,28 @@
--- /tmp/kmode.c 2005-06-27 14:46:19.716843288 +0200
+++ xserver/hw/kdrive/src/kmode.c 2005-06-27 14:46:30.070269328 +0200
@@ -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 */
@@ -80,6 +85,13 @@
16, 48, 160, KdSyncNegative, /* 31.469 */
10, 33, 45, KdSyncNegative, /* 59.940 */
},
+
+
+ { 480, 640, 60, 0, /* VESA */
+ 0, 0, 0, KdSyncNegative, /* 31.469 */
+ 0, 0, 0, KdSyncNegative, /* 59.940 */
+ },
+
/* 800x600 modes */
{ 800, 600, 85, 56250, /* VESA */

View File

@@ -0,0 +1,21 @@
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- xserver/hw/kdrive/Makefile.am~onlyfb
+++ xserver/hw/kdrive/Makefile.am
@@ -17,12 +17,4 @@
SUBDIRS = \
src \
linux \
- $(XSDL_SUBDIRS) \
- $(FBDEV_SUBDIRS) \
- $(VESA_SUBDIRS) \
- $(XEPHYR_SUBDIRS) \
- ati \
- fake \
- ephyr \
- i810 \
- epson
+ $(FBDEV_SUBDIRS)

View File

@@ -0,0 +1,44 @@
#
# 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;

View File

@@ -0,0 +1,55 @@
PV = "0.0cvs${FIXEDCVSDATE}"
FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
DEFAULT_PREFERENCE = "1"
LICENSE = "MIT"
DEPENDS = "tslib xproto xdmcp xextensions-1.0.1 xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
SECTION = "x11/base"
DESCRIPTION = "X server from freedesktop.org"
DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices"
DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices"
DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices"
DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices"
DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices"
DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
DESCRIPTION_xserver-kdrive-fake = "Fake X server"
DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
PR = "r2"
FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
FILES_xserver-kdrive-ati = "${bindir}/Xati"
FILES_xserver-kdrive-vesa = "${bindir}/Xvesa"
FILES_xserver-kdrive-via = "${bindir}/Xvia"
FILES_xserver-kdrive-mga = "${bindir}/Xmga"
FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64"
FILES_xserver-kdrive-fake = "${bindir}/Xfake"
FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
FILES_xserver-kdrive-epson = "${bindir}/Xepson"
FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \
file://kmode.patch;patch=1 \
file://fbdev-not-fix.patch;patch=1"
SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \
file://devfs.patch;patch=1 \
file://disable-apm.patch;patch=1"
SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
SRC_URI_append_c7x0 = " file://disable-apm.patch;patch=1"
SRC_URI_append_ipaq-pxa270 = " file://disable-apm.patch;patch=1"
PACKAGE_ARCH_poodle = "poodle"
PACKAGE_ARCH_c7x0 = "c7x0"
PACKAGE_ARCH_ipaq-pxa270 = "ipaq-pxa270"
S = "${WORKDIR}/xserver"
inherit autotools pkgconfig
EXTRA_OECONF = "--enable-composite --disable-xinerama"

View File

@@ -0,0 +1,47 @@
PV = "0.0cvs${FIXEDCVSDATE}"
FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
LICENSE = "MIT"
DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
SECTION = "x11/base"
DESCRIPTION = "X server from freedesktop.org"
DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices"
DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices"
DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices"
DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices"
DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices"
DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
DESCRIPTION_xserver-kdrive-fake = "Fake X server"
DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
PR = "r10"
FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
FILES_xserver-kdrive-ati = "${bindir}/Xati"
FILES_xserver-kdrive-vesa = "${bindir}/Xvesa"
FILES_xserver-kdrive-via = "${bindir}/Xvia"
FILES_xserver-kdrive-mga = "${bindir}/Xmga"
FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64"
FILES_xserver-kdrive-fake = "${bindir}/Xfake"
FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
FILES_xserver-kdrive-epson = "${bindir}/Xepson"
FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \
file://kmode.patch;patch=1 \
file://fbdev-not-fix.patch;patch=1"
SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
PACKAGE_ARCH_poodle = "poodle"
S = "${WORKDIR}/xserver"
inherit autotools pkgconfig
EXTRA_OECONF = "--enable-composite --disable-xinerama"

View File

@@ -0,0 +1,47 @@
PV = "0.0cvs${CVSDATE}"
DEFAULT_PREFERENCE = "-2"
LICENSE = "MIT"
DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
SECTION = "x11/base"
DESCRIPTION = "X server from freedesktop.org"
DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices"
DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices"
DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices"
DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices"
DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices"
DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
DESCRIPTION_xserver-kdrive-fake = "Fake X server"
DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
PR = "r10"
FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
FILES_xserver-kdrive-ati = "${bindir}/Xati"
FILES_xserver-kdrive-vesa = "${bindir}/Xvesa"
FILES_xserver-kdrive-via = "${bindir}/Xvia"
FILES_xserver-kdrive-mga = "${bindir}/Xmga"
FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64"
FILES_xserver-kdrive-fake = "${bindir}/Xfake"
FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
FILES_xserver-kdrive-epson = "${bindir}/Xepson"
FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver \
file://kmode.patch;patch=1 \
file://fbdev-not-fix.patch;patch=1"
SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
PACKAGE_ARCH_poodle = "poodle"
S = "${WORKDIR}/xserver"
inherit autotools pkgconfig
EXTRA_OECONF = "--enable-composite --disable-xinerama"

View File

@@ -0,0 +1,10 @@
--- 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

View File

@@ -0,0 +1,11 @@
--- 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

View File

@@ -0,0 +1,22 @@
--- 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

View File

@@ -0,0 +1,11 @@
--- 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)

View File

@@ -0,0 +1,38 @@
--- 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

View File

@@ -0,0 +1,65 @@
SECTION = "x11/base"
RPROVIDES = "virtual/xserver"
PROVIDES = "virtual/xserver"
LICENSE = "Xorg"
PR = "r2"
DEPENDS = "fontconfig freetype libxi xmu flex-native zlib"
SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \
file://imake-staging.patch;patch=1 \
file://imake-installed.patch;patch=1 \
file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \
file://dri.patch;patch=1"
PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
S = "${WORKDIR}/xc"
FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*"
FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
FILES_xserver-xorg-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} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
FILES_${PN}-doc += "${libdir}/X11/doc"
do_configure() {
cat <<EOF > config/cf/host.def
#define BuildServersOnly YES
#define ProjectRoot ${prefix}
#define XnestServer NO
#define XdmxServer NO
#define CcCmd gcc
#define LdCmd ld
#define HasFreetype2 YES
#define HasFontconfig YES
#define BuildDevelDRIDrivers YES
#define BuildXF86DRI YES
EOF
echo "" > config/cf/date.def
rm -f include/extensions/panoramiX.h
make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake
make CC="${BUILD_CC}" xmakefile
make Makefiles
make clean
}
do_compile() {
#make depend
make includes
make -C config/util CC="${BUILD_CC}"
for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E"
}
do_install() {
make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
}
do_stage() {
install -d ${STAGING_INCDIR}/xserver-xorg
for i in i810 via; do
pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
done
install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
}

View File

@@ -0,0 +1,65 @@
SECTION = "x11/base"
RPROVIDES = "virtual/xserver"
PROVIDES = "virtual/xserver"
LICENSE = "Xorg"
PR = "r0"
DEPENDS = "fontconfig freetype libxi xmu flex-native zlib"
SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;method=pserver;tag=XORG-6_8_99_11 \
file://imake-staging.patch;patch=1 \
file://imake-installed.patch;patch=1 \
file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \
file://dri.patch;patch=1"
PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
S = "${WORKDIR}/xc"
FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*"
FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
FILES_xserver-xorg-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} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
FILES_${PN}-doc += "${libdir}/X11/doc"
do_configure() {
cat <<EOF > config/cf/host.def
#define BuildServersOnly YES
#define ProjectRoot ${prefix}
#define XnestServer NO
#define XdmxServer NO
#define CcCmd gcc
#define LdCmd ld
#define HasFreetype2 YES
#define HasFontconfig YES
#define BuildDevelDRIDrivers YES
#define BuildXF86DRI YES
EOF
echo "" > config/cf/date.def
rm -f include/extensions/panoramiX.h
make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake
make CC="${BUILD_CC}" xmakefile
make Makefiles
make clean
}
do_compile() {
#make depend
make includes
make -C config/util CC="${BUILD_CC}"
for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E"
}
do_install() {
make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
}
do_stage() {
install -d ${STAGING_INCDIR}/xserver-xorg
for i in i810 via; do
pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
done
install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
}

View File

@@ -0,0 +1,61 @@
SECTION = "x11/base"
LICENSE = "Xorg"
RPROVIDES = "virtual/xserver"
PROVIDES = "virtual/xserver"
PR = "r3"
PV = "6.8.1+cvs${CVSDATE}"
DEPENDS = "fontconfig freetype libxi xmu flex-2.5.4-native"
SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;method=pserver \
file://imake-staging.patch;patch=1 \
file://dri.patch;patch=1"
PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
S = "${WORKDIR}/xc"
FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print"
FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
FILES_xserver-xorg-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} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
FILES_${PN}-doc += "${libdir}/X11/doc"
do_configure() {
echo "#define BuildServersOnly YES" > config/cf/host.def
echo "#define ProjectRoot /usr" >> config/cf/host.def
echo "#define XnestServer NO" >> config/cf/host.def
echo "#define XdmxServer NO" >> config/cf/host.def
echo "#define CcCmd ${CC}" >> config/cf/host.def
echo "#define LdCmd ${LD}" >> config/cf/host.def
echo "#define HasFreetype2 YES" >> config/cf/host.def
echo "#define HasFontconfig YES" >> config/cf/host.def
echo "#define BuildDevelDRIDrivers YES" >>config/cf/host.def
echo "" > config/cf/date.def
rm -f include/extensions/panoramiX.h
}
do_compile() {
make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake
make CC="${BUILD_CC}" xmakefile
make Makefiles
make clean
#make depend
make includes
make -C config/util CC="${BUILD_CC}"
for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS=""
}
do_install() {
make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
}
do_stage() {
install -d ${STAGING_INCDIR}/xserver-xorg
for i in i810 via; do
pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
done
install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
}