diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-11-21 14:44:44 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-11-21 14:44:44 +0000 |
| commit | 76abab42d7318d89b0594c653868254b2bb6edc7 (patch) | |
| tree | 14420108cd911aef67b9eaa6eebef444ceccf4c3 /packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch | |
| parent | da24bf8f8e6dec5a0af9c0b2c74753bec48e166f (diff) | |
xserver-kdrive : commit missing patches
Diffstat (limited to 'packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch')
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch new file mode 100644 index 0000000000..f4757ce3c9 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch @@ -0,0 +1,76 @@ +diff --git a/configure.ac b/configure.ac +index 76d33f0..2807c50 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1824,6 +1824,7 @@ hw/kdrive/ati/Makefile + hw/kdrive/chips/Makefile + hw/kdrive/ephyr/Makefile + hw/kdrive/epson/Makefile ++hw/kdrive/glamo/Makefile + hw/kdrive/fake/Makefile + hw/kdrive/fbdev/Makefile + hw/kdrive/w100/Makefile +diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am +index 8075a56..b97912d 100644 +--- a/hw/kdrive/Makefile.am ++++ b/hw/kdrive/Makefile.am +@@ -4,7 +4,7 @@ VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ + endif + + if KDRIVEFBDEV +-FBDEV_SUBDIRS = fbdev epson ++FBDEV_SUBDIRS = fbdev epson glamo + endif + + if KDRIVEW100 +@@ -34,4 +34,4 @@ SUBDIRS = \ + fake + + DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ +- smi via fbdev sdl ephyr src linux fake sis300 ++ smi via fbdev sdl ephyr src linux fake sis300 glamo +diff --git a/hw/kdrive/glamo/Makefile.am b/hw/kdrive/glamo/Makefile.am +index e8c48a4..ffb7a30 100644 +--- a/hw/kdrive/glamo/Makefile.am ++++ b/hw/kdrive/glamo/Makefile.am +@@ -41,11 +41,14 @@ GLAMO_LIBS = \ + + Xglamo_LDADD = \ + $(GLAMO_LIBS) \ +- @KDRIVE_LIBS@ ++ @KDRIVE_LIBS@ \ ++ @XSERVER_LIBS@ + + Xglamo_DEPENDENCIES = \ + libglamo.a \ +- @KDRIVE_LOCAL_LIBS@ ++ $(FBDEV_LIBS) \ ++ $(VESA_LIBS) \ ++ $(DRI_LIBS) + + relink: + rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) +diff --git a/hw/kdrive/glamo/glamo_stub.c b/hw/kdrive/glamo/glamo_stub.c +index d772671..df43455 100644 +--- a/hw/kdrive/glamo/glamo_stub.c ++++ b/hw/kdrive/glamo/glamo_stub.c +@@ -49,16 +49,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) + void + InitInput(int argc, char **argv) + { +- KdKeyboardInfo *ki; +- +- KdAddKeyboardDriver(&LinuxKeyboardDriver); +- KdAddPointerDriver(&LinuxMouseDriver); +-#ifdef TSLIB +- KdAddPointerDriver(&TsDriver); ++ KdInitInput (&LinuxEvdevMouseFuncs, &LinuxEvdevKeyboardFuncs); ++#ifdef TOUCHSCREEN ++ KdAddMouseDriver (&TsFuncs); + #endif +- +- ki = KdParseKeyboard("keybd"); +- KdAddKeyboard(ki); + } + + void |