summaryrefslogtreecommitdiff
path: root/packages/xorg-xserver
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-08-30 08:14:51 +0000
committerKoen Kooi <koen@openembedded.org>2006-08-30 08:14:51 +0000
commit86f8687c1632cb0f1b6da84589e8bc211f4b40ab (patch)
treec6deed4e0b7a87a7397c5413d9f25f2c0f416021 /packages/xorg-xserver
parent342881986b13d73ee6489acf4e23afbf691deb3c (diff)
xserver-kdrive git: adjust for new calibrate stuff, package Xsdl, enable build of epson server
Diffstat (limited to 'packages/xorg-xserver')
-rw-r--r--packages/xorg-xserver/xserver-kdrive/enable-epson.patch11
-rw-r--r--packages/xorg-xserver/xserver-kdrive_git.bb15
2 files changed, 23 insertions, 3 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive/enable-epson.patch b/packages/xorg-xserver/xserver-kdrive/enable-epson.patch
new file mode 100644
index 0000000000..63b13a4511
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive/enable-epson.patch
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.am 2006-08-30 09:51:21.000000000 +0200
++++ git/hw/kdrive/Makefile.am 2006-08-30 09:51:44.425780000 +0200
+@@ -4,7 +4,7 @@
+ endif
+
+ if KDRIVEFBDEV
+-FBDEV_SUBDIRS = fbdev
++FBDEV_SUBDIRS = fbdev epson
+ endif
+
+ if XSDLSERVER
diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
index bf6fd92d61..9c967db254 100644
--- a/packages/xorg-xserver/xserver-kdrive_git.bb
+++ b/packages/xorg-xserver/xserver-kdrive_git.bb
@@ -4,26 +4,32 @@ DEFAULT_PREFERENCE = "-2"
PR = "r3"
LICENSE = "MIT"
-DEPENDS = "tslib libxkbfile xf86dgaproto xf86vidmodeproto xf86miscproto xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+DEPENDS = "tslib virtual/libsdl libxkbfile xf86dgaproto xf86vidmodeproto xf86miscproto xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
-PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
SECTION = "x11/base"
DESCRIPTION = "X server from freedesktop.org"
DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
DESCRIPTION_xserver-kdrive-fake = "Fake X server"
DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
+DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
+DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, SDL version"
FILES_${PN} += "${libdir}/xserver/SecurityPolicy"
FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
FILES_xserver-kdrive-fake = "${bindir}/Xfake"
FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
+FILES_xserver-kdrive-epson = "${bindir}/Xepson"
+FILES_xserver-kdrive-sdl = "${bindir}/Xsdl"
RDEPENDS_xserver-kdrive-fbdev = "${PN}"
RDEPENDS_xserver-kdrive-fake = "${PN}"
RDEPENDS_xserver-kdrive-xephyr = "${PN}"
+RDEPENDS_xserver-kdrive-epson = "${PN}"
+RDEPENDS_xserver-kdrive-sdl = "${PN}"
SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
file://kmode.patch;patch=1 \
@@ -34,6 +40,7 @@ SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
file://fbdev-not-fix.patch;patch=1 \
file://enable-builtin-fonts.patch;patch=1 \
file://optional-xkb.patch;patch=1 \
+ file://enable-epson.patch;patch=1 \
# file://disable-xf86-dga-xorgcfg.patch;patch=1 \
"
@@ -53,5 +60,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \
--disable-xevie --disable-xprint --disable-xtrap \
--disable-dmx \
--with-default-font-path=built-ins \
- --enable-tslib \
+ --enable-tslib --enable-xcalibrate \
ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+
+