adding touchscreen calibration file for the Openmoko gta02 "Freerunner" and some...

SVN-Revision: 13797

diff --git a/Xorg/xserver/xglamo/Makefile b/Xorg/xserver/xglamo/Makefile
index 5e4c5036153e7d9b5fbb1601c59b80ee6bf9fb23..bfc6664bfee7f0767dc5a4eac36c561448dfa83a 100644 (file)
--- a/Xorg/xserver/xglamo/Makefile
+++ b/Xorg/xserver/xglamo/Makefile
@@ -52,8 +52,13 @@ CONFIGURE_ARGS += --disable-dga \
 
 CONFIGURE_VARS+=ac_cv_file__usr_share_sgml_X11_defs_ent=yes
 
-ifeq ($(CONFIG_TARGET_om_gta02),y)
+ifeq ($(CONFIG_TARGET_s3c24xx_openmoko-gta02-graphical),y)
   X_CONFIG=om_gta02
+  TS_POINTERCAL=om_gta02
+endif
+ifeq ($(CONFIG_TARGET_s3c24xx_openmoko-gta02-minimal),y)
+  X_CONFIG=om_gta02
+  TS_POINTERCAL=om_gta02
 endif
 
 define Package/xglamo
@@ -120,7 +125,8 @@ define Package/xglamo/install
        $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/etc/init.d $(1)/etc/config
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/Xglamo $(1)/usr/bin/
        $(CP) ./files/x.init $(1)/etc/init.d/x11
-       $(if $(X_CONFIG),$(CP) ./files/config/$(X_CONFIG) $(1)/etc/config/x11)
+       $(if $(TS_POINTERCAL),$(CP) ./files/pointercal.$(TS_POINTERCAL) $(1)/etc/pointercal)
+       $(if $(X_CONFIG),$(CP) ./files/config/x11.$(X_CONFIG) $(1)/etc/config/x11)
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
 endef
 

diff --git a/Xorg/xserver/xglamo/files/config/om_gta02 b/Xorg/xserver/xglamo/files/config/om_gta02
deleted file mode 100644 (file)
index f265cc7..0000000
--- a/Xorg/xserver/xglamo/files/config/om_gta02
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (C) 2006 OpenWrt.org
-
-config screen
-       option  resolution      480x640
-       option  dpi     285

diff --git a/Xorg/xserver/xglamo/files/config/x11.om_gta02 b/Xorg/xserver/xglamo/files/config/x11.om_gta02
new file mode 100644 (file)
index 0000000..f265cc7
--- /dev/null
+++ b/Xorg/xserver/xglamo/files/config/x11.om_gta02
@@ -0,0 +1,5 @@
+# Copyright (C) 2006 OpenWrt.org
+
+config screen
+       option  resolution      480x640
+       option  dpi     285

diff --git a/Xorg/xserver/xglamo/files/pointercal.om_gta02 b/Xorg/xserver/xglamo/files/pointercal.om_gta02
new file mode 100644 (file)
index 0000000..841ec7f
Binary files /dev/null and b/Xorg/xserver/xglamo/files/pointercal.om_gta02 differ