diff options
Diffstat (limited to 'meta')
18 files changed, 0 insertions, 2147 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch deleted file mode 100644 index 87595d0a5a..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Inappropriate [cross compiling] - -Signed-off-by: Yu Ke <ke.yu@intel.com> - -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 -- ]) - 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}" ]) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch deleted file mode 100644 index c22b1c06e2..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Yu Ke <ke.yu@intel.com> - ---- 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 - */ diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch deleted file mode 100644 index 98d5176b40..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch +++ /dev/null @@ -1,16 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Yu Ke <ke.yu@intel.com> - ---- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig 2006-06-08 14:49:12.158684250 +0200 -+++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c 2006-06-08 14:49:52.493205000 +0200 -@@ -52,8 +52,8 @@ - /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */ - - #define NEED_REPLIES - #ifdef HAVE_DIX_CONFIG_H --#include <dix-config.h> -+#include <kdrive-config.h> - #endif - - #include <X11/X.h> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch deleted file mode 100644 index efac5ef67a..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch +++ /dev/null @@ -1,152 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Yu Ke <ke.yu@intel.com> - ---- - Xext/Makefile.am | 6 ++++++ - configure.ac | 11 +++++++++-- - include/kdrive-config.h.in | 3 +++ - mi/miinitext.c | 6 ++++++ - 4 files changed, 24 insertions(+), 2 deletions(-) - -Index: xorg-server-1.7.99.2/mi/miinitext.c -=================================================================== ---- xorg-server-1.7.99.2.orig/mi/miinitext.c 2010-02-10 18:54:11.959086237 +0000 -+++ xorg-server-1.7.99.2/mi/miinitext.c 2010-02-10 18:54:12.429078513 +0000 -@@ -264,6 +264,9 @@ - #ifdef DMXEXT - extern void DMXExtensionInit(INITARGS); - #endif -+#ifdef XCALIBRATE -+extern void XCalibrateExtensionInit(INITARGS); -+#endif - #ifdef XFIXES - extern void XFixesExtensionInit(INITARGS); - #endif -@@ -493,6 +496,9 @@ - GlxPushProvider(&__glXDRISWRastProvider); - if (!noGlxExtension) GlxExtensionInit(); - #endif -+#ifdef XCALIBRATE -+ XCalibrateExtensionInit (); -+#endif - } - - #else /* XFree86LOADER */ -Index: xorg-server-1.7.99.2/configure.ac -=================================================================== ---- xorg-server-1.7.99.2.orig/configure.ac 2010-02-10 18:54:11.959086237 +0000 -+++ xorg-server-1.7.99.2/configure.ac 2010-02-11 11:49:50.710736962 +0000 -@@ -1985,7 +1985,7 @@ - fi - - -- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"]) -+ PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"]) - if test "x$HAVE_TSLIB" = xno; then - AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"]) - fi -@@ -2039,7 +2039,7 @@ - KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB" - KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS" - KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB" -- KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS" -+ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $TSLIB_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS" - - AC_SUBST([XEPHYR_LIBS]) - AC_SUBST([XEPHYR_INCS]) -Index: xorg-server-1.7.99.2/include/kdrive-config.h.in -=================================================================== ---- xorg-server-1.7.99.2.orig/include/kdrive-config.h.in 2010-02-10 18:54:11.959086237 +0000 -+++ xorg-server-1.7.99.2/include/kdrive-config.h.in 2010-02-10 18:54:12.429078513 +0000 -@@ -28,4 +28,7 @@ - /* Have execinfo.h for backtrace(). */ - #undef HAVE_EXECINFO_H - -+/* Enable XCalibrate extension */ -+#undef XCALIBRATE -+ - #endif /* _KDRIVE_CONFIG_H_ */ -Index: xorg-server-1.7.99.2/hw/kdrive/linux/tslib.c -=================================================================== ---- xorg-server-1.7.99.2.orig/hw/kdrive/linux/tslib.c 2010-02-10 18:58:12.669078495 +0000 -+++ xorg-server-1.7.99.2/hw/kdrive/linux/tslib.c 2010-02-10 19:04:56.927828767 +0000 -@@ -50,12 +50,15 @@ - int fd; - int lastx, lasty; - struct tsdev *tsDev; -- void (*raw_event_hook)(int x, int y, int pressure, void *closure); -- void *raw_event_closure; - int phys_screen; - }; - - -+/* For XCalibrate extension */ -+void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure); -+void *tslib_raw_event_closure; -+ -+ - static void - TsRead (int fd, void *closure) - { -@@ -65,10 +68,10 @@ - long x = 0, y = 0; - unsigned long flags; - -- if (private->raw_event_hook) { -+ if (tslib_raw_event_hook) { - while (ts_read_raw(private->tsDev, &event, 1) == 1) -- private->raw_event_hook (event.x, event.y, event.pressure, -- private->raw_event_closure); -+ tslib_raw_event_hook (event.x, event.y, event.pressure, -+ tslib_raw_event_closure); - return; - } - -@@ -111,8 +114,8 @@ - { - struct TslibPrivate *private = pi->driverPrivate; - -- private->raw_event_hook = NULL; -- private->raw_event_closure = NULL; -+ tslib_raw_event_hook = NULL; -+ tslib_raw_event_closure = NULL; - if (!pi->path) { - pi->path = strdup("/dev/input/touchscreen0"); - ErrorF("[tslib/TslibEnable] no device path given, trying %s\n", pi->path); -Index: xorg-server-1.7.99.2/Xext/xcalibrate.c -=================================================================== ---- xorg-server-1.7.99.2.orig/Xext/xcalibrate.c 2010-02-10 18:59:24.097829840 +0000 -+++ xorg-server-1.7.99.2/Xext/xcalibrate.c 2010-02-11 11:51:00.930735731 +0000 -@@ -115,6 +115,7 @@ - - memset (&rep, 0, sizeof (rep)); - rep.type = X_Reply; -+ rep.length = 0; - rep.sequenceNumber = client->sequence; - - if (stuff->on) -@@ -158,6 +159,7 @@ - - swaps (&rep.sequenceNumber, n); - swaps (&rep.status, n); -+ swapl (&rep.length, n); - } - WriteToClient(client, sizeof (rep), (char *) &rep); - return (client->noClientException); -@@ -186,6 +188,7 @@ - - memset (&rep, 0, sizeof (rep)); - rep.type = X_Reply; -+ rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.x = stuff->x; - rep.y = stuff->y; -@@ -198,6 +201,7 @@ - - swaps (&rep.x, n); - swaps (&rep.y, n); -+ swapl (&rep.length, n); - } - WriteToClient(client, sizeof (rep), (char *) &rep); - return (client->noClientException); diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/error-address-work-around.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/error-address-work-around.patch deleted file mode 100644 index 98a946aad6..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/error-address-work-around.patch +++ /dev/null @@ -1,364 +0,0 @@ -Upstream-Status: Inappropriate - -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/dix/window.c xorg-server-1.7.99.2/dix/window.c ---- xorg-server-1.7.99.2.ORIG/dix/window.c 2012-01-04 13:12:40.417640130 -0700 -+++ xorg-server-1.7.99.2/dix/window.c 2012-01-04 12:13:20.678605493 -0700 -@@ -559,10 +559,10 @@ - box.y1 = 0; - box.x2 = pScreen->width; - box.y2 = pScreen->height; -- REGION_INIT(pScreen, &pWin->clipList, &box, 1); -- REGION_INIT(pScreen, &pWin->winSize, &box, 1); -- REGION_INIT(pScreen, &pWin->borderSize, &box, 1); -- REGION_INIT(pScreen, &pWin->borderClip, &box, 1); -+ REGION_INIT2(pScreen, &pWin->clipList, &box, 1); -+ REGION_INIT2(pScreen, &pWin->winSize, &box, 1); -+ REGION_INIT2(pScreen, &pWin->borderSize, &box, 1); -+ REGION_INIT2(pScreen, &pWin->borderClip, &box, 1); - - pWin->drawable.class = InputOutput; - pWin->optional->visual = pScreen->rootVisual; -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/exa/exa_accel.c xorg-server-1.7.99.2/exa/exa_accel.c ---- xorg-server-1.7.99.2.ORIG/exa/exa_accel.c 2009-12-11 11:20:48.000000000 -0700 -+++ xorg-server-1.7.99.2/exa/exa_accel.c 2012-01-04 12:58:11.218616328 -0700 -@@ -1275,7 +1275,7 @@ - Box.x2 = Box.x1 + w; - Box.y2 = Box.y1 + h; - -- REGION_INIT(pScreen, &Reg, &Box, 1); -+ REGION_INIT2(pScreen, &Reg, &Box, 1); - - pixmaps[0].as_dst = FALSE; - pixmaps[0].as_src = TRUE; -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/exa/exa.c xorg-server-1.7.99.2/exa/exa.c ---- xorg-server-1.7.99.2.ORIG/exa/exa.c 2009-12-11 11:20:48.000000000 -0700 -+++ xorg-server-1.7.99.2/exa/exa.c 2012-01-04 12:56:30.592593427 -0700 -@@ -161,7 +161,7 @@ - if (box.x1 >= box.x2 || box.y1 >= box.y2) - return; - -- REGION_INIT(pScreen, ®ion, &box, 1); -+ REGION_INIT2(pScreen, ®ion, &box, 1); - DamageRegionAppend(&pPix->drawable, ®ion); - DamageRegionProcessPending(&pPix->drawable); - REGION_UNINIT(pScreen, ®ion); -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/exa/exa_classic.c xorg-server-1.7.99.2/exa/exa_classic.c ---- xorg-server-1.7.99.2.ORIG/exa/exa_classic.c 2009-11-28 13:44:58.000000000 -0700 -+++ xorg-server-1.7.99.2/exa/exa_classic.c 2012-01-04 12:54:50.586576675 -0700 -@@ -131,8 +131,8 @@ - box.y1 = 0; - box.x2 = w; - box.y2 = h; -- REGION_INIT(pScreen, &pExaPixmap->validSys, &box, 0); -- REGION_INIT(pScreen, &pExaPixmap->validFB, &box, 0); -+ REGION_INIT2(pScreen, &pExaPixmap->validSys, &box, 0); -+ REGION_INIT2(pScreen, &pExaPixmap->validFB, &box, 0); - - exaSetAccelBlock(pExaScr, pExaPixmap, - w, h, bpp); -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/exa/exa_migration_classic.c xorg-server-1.7.99.2/exa/exa_migration_classic.c ---- xorg-server-1.7.99.2.ORIG/exa/exa_migration_classic.c 2009-11-28 13:44:58.000000000 -0700 -+++ xorg-server-1.7.99.2/exa/exa_migration_classic.c 2012-01-04 12:54:43.077500333 -0700 -@@ -177,7 +177,7 @@ - box.x2 = max(pValidExt->x2, pDamageExt->x2); - box.y2 = max(pValidExt->y2, pDamageExt->y2); - -- REGION_INIT(pScreen, &closure, &box, 0); -+ REGION_INIT2(pScreen, &closure, &box, 0); - REGION_INTERSECT(pScreen, &CopyReg, &CopyReg, &closure); - } else - REGION_INTERSECT(pScreen, &CopyReg, &CopyReg, pending_damage); -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/exa/exa_render.c xorg-server-1.7.99.2/exa/exa_render.c ---- xorg-server-1.7.99.2.ORIG/exa/exa_render.c 2009-11-28 13:44:58.000000000 -0700 -+++ xorg-server-1.7.99.2/exa/exa_render.c 2012-01-04 12:59:18.234297490 -0700 -@@ -576,7 +576,7 @@ - * (see use of DamagePendingRegion in exaCopyDirty) - */ - -- REGION_INIT(pScreen, ®ion, &box, 1); -+ REGION_INIT2(pScreen, ®ion, &box, 1); - - DamageRegionAppend(pDst->pDrawable, ®ion); - -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/exa/exa_unaccel.c xorg-server-1.7.99.2/exa/exa_unaccel.c ---- xorg-server-1.7.99.2.ORIG/exa/exa_unaccel.c 2009-12-11 11:20:48.000000000 -0700 -+++ xorg-server-1.7.99.2/exa/exa_unaccel.c 2012-01-04 12:59:25.915375559 -0700 -@@ -344,7 +344,7 @@ - Box.x2 = Box.x1 + w; - Box.y2 = Box.y1 + h; - -- REGION_INIT(pScreen, &Reg, &Box, 1); -+ REGION_INIT2(pScreen, &Reg, &Box, 1); - - pExaScr->prepare_access_reg(pPix, EXA_PREPARE_SRC, &Reg); - } else -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/fb/fboverlay.c xorg-server-1.7.99.2/fb/fboverlay.c ---- xorg-server-1.7.99.2.ORIG/fb/fboverlay.c 2009-11-04 09:25:50.000000000 -0700 -+++ xorg-server-1.7.99.2/fb/fboverlay.c 2012-01-04 12:24:43.855400893 -0700 -@@ -147,7 +147,7 @@ - pbits)) - return FALSE; - pScrPriv->layer[i].u.run.pixmap = pPixmap; -- REGION_INIT(pScreen, &pScrPriv->layer[i].u.run.region, &box, 0); -+ REGION_INIT2(pScreen, &pScrPriv->layer[i].u.run.region, &box, 0); - } - pScreen->devPrivate = pScrPriv->layer[0].u.run.pixmap; - return TRUE; -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/hw/kdrive/src/kdrive.c xorg-server-1.7.99.2/hw/kdrive/src/kdrive.c ---- xorg-server-1.7.99.2.ORIG/hw/kdrive/src/kdrive.c 2012-01-04 13:12:40.418640141 -0700 -+++ xorg-server-1.7.99.2/hw/kdrive/src/kdrive.c 2012-01-04 13:05:08.771897914 -0700 -@@ -144,8 +144,8 @@ - box.y2 = pScreen->height; - pWin->drawable.width = pScreen->width; - pWin->drawable.height = pScreen->height; -- REGION_INIT (pScreen, &pWin->winSize, &box, 1); -- REGION_INIT (pScreen, &pWin->borderSize, &box, 1); -+ REGION_INIT2 (pScreen, &pWin->winSize, &box, 1); -+ REGION_INIT2 (pScreen, &pWin->borderSize, &box, 1); - REGION_RESET(pScreen, &pWin->borderClip, &box); - REGION_BREAK (pWin->drawable.pScreen, &pWin->clipList); - } -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/hw/kdrive/src/kxv.c xorg-server-1.7.99.2/hw/kdrive/src/kxv.c ---- xorg-server-1.7.99.2.ORIG/hw/kdrive/src/kxv.c 2008-11-14 14:27:05.000000000 -0700 -+++ xorg-server-1.7.99.2/hw/kdrive/src/kxv.c 2012-01-04 13:07:32.625411023 -0700 -@@ -674,7 +674,7 @@ - WinBox.y2 = WinBox.y1 + portPriv->drw_h; - - /* clip to the window composite clip */ -- REGION_INIT(portPriv->pDraw->pScreen, &WinRegion, &WinBox, 1); -+ REGION_INIT2(portPriv->pDraw->pScreen, &WinRegion, &WinBox, 1); - REGION_INIT(portPriv->pDraw->pScreen, &ClipRegion, NullBox, 1); - REGION_INTERSECT(portPriv->pDraw->pScreen, &ClipRegion, &WinRegion, portPriv->pCompositeClip); - -@@ -738,7 +738,7 @@ - WinBox.y2 = WinBox.y1 + portPriv->drw_h; - - /* clip to the window composite clip */ -- REGION_INIT(pScreen, &WinRegion, &WinBox, 1); -+ REGION_INIT2(pScreen, &WinRegion, &WinBox, 1); - REGION_INIT(pScreen, &ClipRegion, NullBox, 1); - REGION_INTERSECT(Screen, &ClipRegion, &WinRegion, portPriv->pCompositeClip); - -@@ -752,7 +752,7 @@ - VPBox.x2 = screen->width; - VPBox.y2 = screen->height; - -- REGION_INIT(pScreen, &VPReg, &VPBox, 1); -+ REGION_INIT2(pScreen, &VPReg, &VPBox, 1); - REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg); - REGION_UNINIT(pScreen, &VPReg); - } -@@ -827,7 +827,7 @@ - WinBox.y2 = WinBox.y1 + portPriv->drw_h; - - /* clip to the window composite clip */ -- REGION_INIT(pScreen, &WinRegion, &WinBox, 1); -+ REGION_INIT2(pScreen, &WinRegion, &WinBox, 1); - REGION_INIT(pScreen, &ClipRegion, NullBox, 1); - REGION_INTERSECT(Screen, &ClipRegion, &WinRegion, portPriv->pCompositeClip); - -@@ -841,7 +841,7 @@ - VPBox.x2 = screen->width; - VPBox.y2 = screen->height; - -- REGION_INIT(pScreen, &VPReg, &VPBox, 1); -+ REGION_INIT2(pScreen, &VPReg, &VPBox, 1); - REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg); - REGION_UNINIT(pScreen, &VPReg); - } -@@ -1337,7 +1337,7 @@ - WinBox.x2 = WinBox.x1 + drw_w; - WinBox.y2 = WinBox.y1 + drw_h; - -- REGION_INIT(pScreen, &WinRegion, &WinBox, 1); -+ REGION_INIT2(pScreen, &WinRegion, &WinBox, 1); - REGION_INIT(pScreen, &ClipRegion, NullBox, 1); - REGION_INTERSECT(pScreen, &ClipRegion, &WinRegion, pGC->pCompositeClip); - -@@ -1350,7 +1350,7 @@ - VPBox.x2 = screen->width; - VPBox.y2 = screen->height; - -- REGION_INIT(pScreen, &VPReg, &VPBox, 1); -+ REGION_INIT2(pScreen, &VPReg, &VPBox, 1); - REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg); - REGION_UNINIT(pScreen, &VPReg); - } -@@ -1490,7 +1490,7 @@ - WinBox.x2 = WinBox.x1 + drw_w; - WinBox.y2 = WinBox.y1 + drw_h; - -- REGION_INIT(pScreen, &WinRegion, &WinBox, 1); -+ REGION_INIT2(pScreen, &WinRegion, &WinBox, 1); - REGION_INIT(pScreen, &ClipRegion, NullBox, 1); - REGION_INTERSECT(pScreen, &ClipRegion, &WinRegion, pGC->pCompositeClip); - -@@ -1637,7 +1637,7 @@ - WinBox.x2 = WinBox.x1 + drw_w; - WinBox.y2 = WinBox.y1 + drw_h; - -- REGION_INIT(pScreen, &WinRegion, &WinBox, 1); -+ REGION_INIT2(pScreen, &WinRegion, &WinBox, 1); - REGION_INIT(pScreen, &ClipRegion, NullBox, 1); - REGION_INTERSECT(pScreen, &ClipRegion, &WinRegion, pGC->pCompositeClip); - -@@ -1650,7 +1650,7 @@ - VPBox.x2 = pScreen->width; - VPBox.y2 = pScreen->height; - -- REGION_INIT(pScreen, &VPReg, &VPBox, 1); -+ REGION_INIT2(pScreen, &VPReg, &VPBox, 1); - REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg); - REGION_UNINIT(pScreen, &VPReg); - } -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/include/regionstr.h xorg-server-1.7.99.2/include/regionstr.h ---- xorg-server-1.7.99.2.ORIG/include/regionstr.h 2009-11-04 09:25:50.000000000 -0700 -+++ xorg-server-1.7.99.2/include/regionstr.h 2012-01-04 12:13:06.174461574 -0700 -@@ -152,6 +152,12 @@ - } \ - } - -+#define REGION_INIT2(_pScreen, _pReg, _rect, _size) \ -+{ \ -+ (_pReg)->extents = *(_rect); \ -+ (_pReg)->data = (RegDataPtr)NULL; \ -+ } -+ - - #define REGION_UNINIT(_pScreen, _pReg) \ - { \ -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/mi/micopy.c xorg-server-1.7.99.2/mi/micopy.c ---- xorg-server-1.7.99.2.ORIG/mi/micopy.c 2009-11-04 09:25:50.000000000 -0700 -+++ xorg-server-1.7.99.2/mi/micopy.c 2012-01-04 12:44:17.003144611 -0700 -@@ -315,7 +315,7 @@ - box.y1 = box_y1; - box.x2 = box_x2; - box.y2 = box_y2; -- REGION_INIT(pGC->pScreen, &rgnDst, &box, 1); -+ REGION_INIT2(pGC->pScreen, &rgnDst, &box, 1); - } - - /* Clip against complex source if needed */ -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/mi/miexpose.c xorg-server-1.7.99.2/mi/miexpose.c ---- xorg-server-1.7.99.2.ORIG/mi/miexpose.c 2009-11-04 09:25:50.000000000 -0700 -+++ xorg-server-1.7.99.2/mi/miexpose.c 2012-01-04 12:46:29.400478668 -0700 -@@ -206,7 +206,7 @@ - box.x2 = pSrcDrawable->width; - box.y2 = pSrcDrawable->height; - prgnSrcClip = &rgnSrcRec; -- REGION_INIT(pscr, prgnSrcClip, &box, 1); -+ REGION_INIT2(pscr, prgnSrcClip, &box, 1); - pSrcWin = NULL; - } - -@@ -239,11 +239,11 @@ - box.x2 = pDstDrawable->width; - box.y2 = pDstDrawable->height; - prgnDstClip = &rgnDstRec; -- REGION_INIT(pscr, prgnDstClip, &box, 1); -+ REGION_INIT2(pscr, prgnDstClip, &box, 1); - } - - /* drawable-relative source region */ -- REGION_INIT(pscr, &rgnExposed, &srcBox, 1); -+ REGION_INIT2(pscr, &rgnExposed, &srcBox, 1); - - /* now get the hidden parts of the source box*/ - REGION_SUBTRACT(pscr, &rgnExposed, &rgnExposed, prgnSrcClip); -@@ -491,7 +491,7 @@ - box = *REGION_EXTENTS( pWin->drawable.pScreen, exposures); - if (exposures == prgn) { - exposures = &expRec; -- REGION_INIT( pWin->drawable.pScreen, exposures, &box, 1); -+ REGION_INIT2( pWin->drawable.pScreen, exposures, &box, 1); - REGION_RESET( pWin->drawable.pScreen, prgn, &box); - } else { - REGION_RESET( pWin->drawable.pScreen, exposures, &box); -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/mi/mioverlay.c xorg-server-1.7.99.2/mi/mioverlay.c ---- xorg-server-1.7.99.2.ORIG/mi/mioverlay.c 2009-11-04 09:25:50.000000000 -0700 -+++ xorg-server-1.7.99.2/mi/mioverlay.c 2012-01-04 12:47:50.114300224 -0700 -@@ -209,8 +209,8 @@ - fullBox.y1 = 0; - fullBox.x2 = pScreen->width; - fullBox.y2 = pScreen->height; -- REGION_INIT(pScreen, &(pTree->borderClip), &fullBox, 1); -- REGION_INIT(pScreen, &(pTree->clipList), &fullBox, 1); -+ REGION_INIT2(pScreen, &(pTree->borderClip), &fullBox, 1); -+ REGION_INIT2(pScreen, &(pTree->clipList), &fullBox, 1); - } - } else xfree(pTree); - } -@@ -1027,7 +1027,7 @@ - box = *REGION_EXTENTS(pScreen, exposures); - if (exposures == prgn) { - exposures = &expRec; -- REGION_INIT(pScreen, exposures, &box, 1); -+ REGION_INIT2(pScreen, exposures, &box, 1); - REGION_RESET(pScreen, prgn, &box); - } else { - REGION_RESET(pScreen, exposures, &box); -@@ -1672,7 +1672,7 @@ - box.x1 = x1; box.x2 = x2; - box.y1 = y1; box.y2 = y2; - -- REGION_INIT(pScreen, ®, &box, 1); -+ REGION_INIT2(pScreen, ®, &box, 1); - - REGION_INTERSECT(pScreen, ®, ®, clipList); - if (generateExposures) -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/mi/miwindow.c xorg-server-1.7.99.2/mi/miwindow.c ---- xorg-server-1.7.99.2.ORIG/mi/miwindow.c 2009-11-04 09:25:50.000000000 -0700 -+++ xorg-server-1.7.99.2/mi/miwindow.c 2012-01-04 12:48:38.055787835 -0700 -@@ -111,7 +111,7 @@ - box.y2 = y2; - - pScreen = pWin->drawable.pScreen; -- REGION_INIT(pScreen, ®, &box, 1); -+ REGION_INIT2(pScreen, ®, &box, 1); - - REGION_INTERSECT(pScreen, ®, ®, &pWin->clipList); - if (generateExposures) -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/miext/damage/damage.c xorg-server-1.7.99.2/miext/damage/damage.c ---- xorg-server-1.7.99.2.ORIG/miext/damage/damage.c 2009-11-04 09:25:50.000000000 -0700 -+++ xorg-server-1.7.99.2/miext/damage/damage.c 2012-01-04 12:51:04.883281430 -0700 -@@ -324,7 +324,7 @@ - box.y1 = draw_y; - box.x2 = draw_x + pDamage->pDrawable->width; - box.y2 = draw_y + pDamage->pDrawable->height; -- REGION_INIT(pScreen, &pixClip, &box, 1); -+ REGION_INIT2(pScreen, &pixClip, &box, 1); - REGION_INTERSECT (pScreen, pDamageRegion, pRegion, &pixClip); - REGION_UNINIT(pScreen, &pixClip); - } -@@ -2085,7 +2085,7 @@ - box.y1 = pDrawable->y; - box.x2 = pDrawable->x + pDrawable->width; - box.y2 = pDrawable->y + pDrawable->height; -- REGION_INIT (pDrawable->pScreen, &pixmapClip, &box, 1); -+ REGION_INIT2 (pDrawable->pScreen, &pixmapClip, &box, 1); - pClip = &pixmapClip; - } - REGION_TRANSLATE (pDrawable->pScreen, &pDamage->damage, pDrawable->x, pDrawable->y); -diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/Xext/xace.c xorg-server-1.7.99.2/Xext/xace.c ---- xorg-server-1.7.99.2.ORIG/Xext/xace.c 2009-11-04 09:25:50.000000000 -0700 -+++ xorg-server-1.7.99.2/Xext/xace.c 2012-01-04 12:49:36.850385965 -0700 -@@ -255,7 +255,7 @@ - imageBox.y1 = y; - imageBox.x2 = x + w; - imageBox.y2 = y + h; -- REGION_INIT(pScreen, &imageRegion, &imageBox, 1); -+ REGION_INIT2(pScreen, &imageRegion, &imageBox, 1); - REGION_NULL(pScreen, &censorRegion); - - /* censorRegion = imageRegion - visibleRegion */ ---- xorg-server-1.7.99.2.ORIG/mi/mibank.c 2009-11-04 09:25:50.000000000 -0700 -+++ xorg-server-1.7.99.2/mi/mibank.c 2012-01-04 12:37:42.251184747 -0700 -@@ -772,7 +772,7 @@ - } - else - { -- REGION_INIT(pScreen, &rgnDst, &fastBox, 1); -+ REGION_INIT2(pScreen, &rgnDst, &fastBox, 1); - REGION_INTERSECT(pScreen, &rgnDst, &rgnDst, prgnSrcClip); - pBox = REGION_RECTS(&rgnDst); - nBox = REGION_NUM_RECTS(&rgnDst); diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch deleted file mode 100644 index 896c0332b1..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch +++ /dev/null @@ -1,87 +0,0 @@ -Add some extra video modes and change the default to VGA. - -Upstream-Status: Pending - -Signed-off-by: Yu Ke <ke.yu@intel.com> - ---- - hw/kdrive/src/kmode.c | 41 +++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 39 insertions(+), 2 deletions(-) - -Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c 2008-01-11 14:20:47.000000000 +0000 -+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2008-01-11 14:21:18.000000000 +0000 -@@ -32,6 +32,31 @@ const KdMonitorTiming kdMonitorTimings[ - /* H V Hz KHz */ - /* FP BP BLANK POLARITY */ - -+ /* Treo 650 */ -+ -+ { 320, 320, 64, 16256, -+ 17, 12, 32, KdSyncNegative, -+ 1, 11, 14, KdSyncNegative, -+ }, -+ -+ { 320, 320, 64, 0, -+ 0, 0, 0, KdSyncNegative, -+ 0, 0, 0, KdSyncNegative, -+ }, -+ -+ /* LifeDrive/T3/TX modes */ -+ -+ { 320, 480, 64, 16256, -+ 17, 12, 32, KdSyncNegative, -+ 1, 11, 14, KdSyncNegative, -+ }, -+ -+ { 480, 320, 64, 0, -+ 0, 0, 0, KdSyncNegative, -+ 0, 0, 0, KdSyncNegative, -+ }, -+ -+ - /* IPAQ modeline: - * - * Modeline "320x240" 5.7222 320 337 340 352 240 241 244 254" -@@ -41,6 +66,11 @@ const KdMonitorTiming kdMonitorTimings[ - 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 */ -@@ -76,10 +106,19 @@ const KdMonitorTiming kdMonitorTimings[ - 16, 120, 176, KdSyncNegative, /* 37.861 */ - 1, 20, 24, KdSyncNegative, /* 72.809 */ - }, -+ /* DEFAULT */ -+#define MONITOR_TIMING_DEFAULT 13 - { 640, 480, 60, 25175, /* VESA */ - 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 */ -@@ -90,8 +129,6 @@ const KdMonitorTiming kdMonitorTimings[ - 16, 160, 256, KdSyncPositive, /* 46.875 */ - 1, 21, 25, KdSyncPositive, /* 75.000 */ - }, -- /* DEFAULT */ --#define MONITOR_TIMING_DEFAULT 9 - { 800, 600, 72, 50000, /* VESA */ - 56, 64, 240, KdSyncPositive, /* 48.077 */ - 37, 23, 66, KdSyncPositive, /* 72.188 */ diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch deleted file mode 100644 index 06761c9141..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch +++ /dev/null @@ -1,65 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Yu Ke <ke.yu@intel.com> - -Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c -=================================================================== ---- xorg-server-1.3.0.0.orig/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:12.000000000 +0100 -+++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:46.000000000 +0100 -@@ -498,6 +498,7 @@ - KdScreenInfo *screen = pScreenPriv->screen; - FbdevScrPriv *scrpriv = screen->driver; - Bool wasEnabled = pScreenPriv->enabled; -+ FbdevPriv *priv = screen->card->driver; - FbdevScrPriv oldscr; - int oldwidth; - int oldheight; -@@ -525,11 +526,46 @@ - oldheight = screen->height; - oldmmwidth = pScreen->mmWidth; - oldmmheight = pScreen->mmHeight; -- -+ - /* - * Set new configuration - */ -- -+ -+ if (newwidth != oldwidth || newheight != oldheight) -+ { -+ struct fb_var_screeninfo var; -+ int k; -+ -+ k = ioctl (priv->fd, FBIOGET_VSCREENINFO, &var); -+ -+ if (k < 0) -+ { -+ ErrorF("Error with framebuffer ioctl FBIOGET_VSCREENINFO: %s", strerror (errno)); -+ return FALSE; -+ } -+ -+ var.xres = newwidth; -+ var.yres = newheight; -+ var.activate = FB_ACTIVATE_NOW; -+ -+ k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var); -+ -+ if (k >= 0) -+ { -+ if ((k=ioctl(priv->fd, FBIOGET_FSCREENINFO, &priv->fix)) < 0) -+ { -+ perror("Error with framebuffer ioctl FIOGET_FSCREENINFO"); -+ close (priv->fd); -+ return FALSE; -+ } -+ if ((k=ioctl(priv->fd, FBIOGET_VSCREENINFO, &priv->var)) < 0) { -+ perror("Error framebuffer ioctl FIOGET_VSCREENINFO"); -+ close (priv->fd); -+ return FALSE; -+ } -+ } -+ } -+ - scrpriv->randr = KdAddRotation (screen->randr, randr); - - KdOffscreenSwapOut (screen->pScreen); diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fix-bogus-stack-variables.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/f |