Merge branch 'master' of git+ssh://openadk.org/git/openadk

3 files changed, 77 insertions, 6 deletions

diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index f953d434f..063fa92e7 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -22,14 +22,17 @@ PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
 PKG_SUBPKGS:=		XORG_SERVER XORG_SERVER_DEV
+PKGSD_XORG_SERVER_DEV:=	Xorg server development files
+PKGSC_XORG_SERVER_DEV:=	x11/devel
 
 PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA
 PKG_ARCH_DEPENDS:=	!cris
 
-PKG_FLAVOURS_XORG_SERVER:=	WITH_DRI
+PKG_FLAVOURS_XORG_SERVER:=	WITH_DRI WITH_KDRIVE
 PKGFS_WITH_DRI:=		mesalib
 PKGFD_WITH_DRI:=		enable DRI/DRI2 support
 PKGFB_WITH_DRI:=		xf86driproto glproto dri2proto MesaLib
+PKGFD_WITH_KDRIVE:=		Build Kdrive Xfbdev server
 
 PKG_CHOICES_XORG_SERVER:=	WITH_GCRYPT WITH_CRYPTO
 PKGCD_WITH_GCRYPT:=		use libgcrypt for SHA1
@@ -42,7 +45,7 @@ PKGCB_WITH_CRYPTO:=		openssl
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,XORG_SERVER_DEV,${PKG_NAME}-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XORG_SERVER_DEV,${PKG_NAME}-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XORG_SERVER_DEV},${PKGSC_XORG_SERVER_DEV}))
 
 ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y)
 CONFIGURE_ARGS+=	 --with-sha1=libgcrypt
@@ -67,7 +70,6 @@ CONFIGURE_ARGS+=	--enable-dga \
 			--disable-xf86bigfont \
 			--disable-xf86vidmode \
 			--disable-xfake \
-			--disable-xfbdev \
 			--disable-xinerama \
 			--disable-xnest \
 			--disable-xselinux \
@@ -78,6 +80,12 @@ CONFIGURE_ARGS+=	--enable-dga \
 			--with-os-vendor=OpenADK \
 			--with-vendor-web="http://openadk.org"
 
+ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_KDRIVE},y)
+CONFIGURE_ARGS+=	--enable-kdrive --enable-xfbdev --enable-kdrive-kbd --enable-kdrive-mouse --enable-kdrive-evdev
+else
+CONFIGURE_ARGS+=	--disable-kdrive --disable-xfbdev
+endif
+
 ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
 CONFIGURE_ARGS+=	--enable-dri --enable-dri2 --enable-glx
 else
@@ -107,6 +115,10 @@ ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
 	${CP} ./files/xorg.conf.lemote-yeelong \
 		$(IDIR_XORG_SERVER)/etc/X11/xorg.conf
 endif
+ifeq (${ADK_TARGET_SYSTEM_SHARP_ZAURUS},y)
+	${CP} ./files/xorg.conf.sharp-zaurus \
+		$(IDIR_XORG_SERVER)/etc/X11/xorg.conf
+endif
 ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
 	${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*dri*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
diff --git a/package/xorg-server/files/xorg-server.postinst b/package/xorg-server/files/xorg-server.postinst
index e26e54f3f..09f00dd35 100644
--- a/package/xorg-server/files/xorg-server.postinst
+++ b/package/xorg-server/files/xorg-server.postinst
@@ -1,5 +1,2 @@
 #!/bin/sh
 if [ -z $IPKG_INSTROOT ];then chmod u+s /usr/bin/Xorg;fi
-. $IPKG_INSTROOT/etc/functions.sh
-gid=$(get_next_gid)
-add_group video $gid
diff --git a/package/xorg-server/files/xorg.conf.sharp-zaurus b/package/xorg-server/files/xorg.conf.sharp-zaurus
new file mode 100644
index 000000000..9f3022a22
--- /dev/null
+++ b/package/xorg-server/files/xorg.conf.sharp-zaurus
@@ -0,0 +1,62 @@
+Section "Device"
+        Identifier      "Generic Video Card"
+        Driver          "fbdev"
+        Option          "UseFBDev"              "true"
+        Option          "Rotate"                "CW"
+EndSection
+
+Section "InputDevice"
+       Identifier      "Touchscreen"
+       Driver          "evdev"
+       Option          "CorePointer"
+       Option          "Device"        "/dev/input/event2"
+EndSection
+
+Section "InputClass"
+	Identifier	"calibration"
+	MatchProduct	"Touchscreen"
+	Option	"Calibration"	"210 3599 311 3796"
+EndSection
+
+Section "Monitor"
+        Identifier      "Generic Monitor"
+        Option          "DPMS"
+        HorizSync       28-32
+        VertRefresh     43-60
+EndSection
+
+Section "Screen"
+        Identifier      "Default Screen"
+        Device          "Generic Video Card"
+        Monitor         "Generic Monitor"
+        DefaultDepth    16
+        SubSection "Display"
+                Depth           1
+                Modes           "640x480"
+        EndSubSection
+        SubSection "Display"
+                Depth           4
+                Modes           "640x480"
+        EndSubSection
+        SubSection "Display"
+                Depth           8
+                Modes           "640x480"
+        EndSubSection
+        SubSection "Display"
+                Depth           15
+                Modes           "640x480"
+        EndSubSection
+        SubSection "Display"
+                Depth           16
+                Modes           "640x480"
+        EndSubSection
+        SubSection "Display"
+                Depth           24
+                Modes           "640x480"
+        EndSubSection
+EndSection
+
+Section "ServerLayout"
+        Identifier      "Default Layout"
+        Screen          "Default Screen"
+EndSection