[oe-commits] org.oe.dev xserver-kdrive git: adjust for new calibrate stuff, package Xsdl, enable build of epson server

[koen commit]

xserver-kdrive git: adjust for new calibrate stuff, package Xsdl, enable build of epson server

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 9f5352e4df25228e76f9b50379d4725b307e23e5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9f5352e4df25228e76f9b50379d4725b307e23e5
Files:
1
packages/xorg-xserver/xserver-kdrive/enable-epson.patch
packages/xorg-xserver/xserver-kdrive_git.bb
Diffs:

#
# mt diff -r1c574776ca8b7967835b47517d85afe20e47e645 -r9f5352e4df25228e76f9b50379d4725b307e23e5
#
# 
# 
# add_file "packages/xorg-xserver/xserver-kdrive/enable-epson.patch"
#  content [5d1a5713d80483aec06eb6bcb9d31e42df9c8519]
# 
# patch "packages/xorg-xserver/xserver-kdrive_git.bb"
#  from [0e40a5d22eab803618bd477ce207f9e0951f7177]
#    to [03350063e5025d055b267de2a3815ad9245ae59d]
# 
============================================================
--- packages/xorg-xserver/xserver-kdrive/enable-epson.patch	5d1a5713d80483aec06eb6bcb9d31e42df9c8519
+++ packages/xorg-xserver/xserver-kdrive/enable-epson.patch	5d1a5713d80483aec06eb6bcb9d31e42df9c8519
@@ -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
============================================================
--- packages/xorg-xserver/xserver-kdrive_git.bb	0e40a5d22eab803618bd477ce207f9e0951f7177
+++ packages/xorg-xserver/xserver-kdrive_git.bb	03350063e5025d055b267de2a3815ad9245ae59d
@@ -1,29 +1,35 @@ LICENSE = "MIT"
 PV = "1.1.0+git${SRCDATE}"
 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
 	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 --ena
 		--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"
+
+