merge with master

Change-Id: Ia5a169b08248ebdeb061759a15e09b2be1fbd1e2

5 files changed, 44 insertions, 4 deletions

diff --git a/arm-common/xresources b/arm-common/xresources
new file mode 100755
index 0000000..d3a9d36
--- /dev/null
+++ b/arm-common/xresources
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  start|stop|restart|reload|force-reload)
+  # Setting dpi to 72
+    if [ -x /usr/bin/xrdb ]; then
+      if [ -e ~/.Xresources ]; then
+		/usr/bin/xrdb -load -nocpp ~/.Xresources
+      else
+        /usr/bin/xrdb -load -nocpp /etc/X11/Xresources
+      fi
+	  touch /tmp/hibernation/xresources_ready
+    fi
+  ;;
+
+  status)
+    if [ -x /usr/bin/xrdb ]; then
+      /usr/bin/xrdb -query -nocpp
+    fi
+  ;;
+
+  *)
+    echo "Usage: /etc/init.d/xresource {start|stop|status|restart|reload|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/arm-e4412/xorg.conf.d/input.conf b/arm-e4412/xorg.conf.d/input.conf
index 6e9171a..bf77392 100755
--- a/arm-e4412/xorg.conf.d/input.conf
+++ b/arm-e4412/xorg.conf.d/input.conf
@@ -8,8 +8,7 @@ Section "InputClass"
         Identifier "evdev touchscreen catchall"
         MatchIsTouchScreen "on"
         MatchDevicePath "/dev/input/event*"
-        Driver "evdevmultitouch"
-        Option "MultiTouch"     "3"
+        Driver "evdev"
 EndSection
 
 Section "InputClass"
@@ -30,5 +29,4 @@ Section "InputDevice"
         Identifier "Gesture"
         Driver  "gesture"
         Option  "Device"        "/dev/null"
-        Option  "Activate"      "1"
 EndSection
diff --git a/arm-e4412/xorg.conf.d/module.conf b/arm-e4412/xorg.conf.d/module.conf
new file mode 100644
index 0000000..05b566c
--- /dev/null
+++ b/arm-e4412/xorg.conf.d/module.conf
@@ -0,0 +1,5 @@
+Section "Module"
+    SubSection  "xdbg"
+        Option  "log_path"   "/var/log/Xorg.0.log2"
+    EndSubSection
+EndSection
diff --git a/packaging/xorg-x11-misc-exynos.spec b/packaging/xorg-x11-misc-exynos.spec
index e7fc5f5..5327eec 100644
--- a/packaging/xorg-x11-misc-exynos.spec
+++ b/packaging/xorg-x11-misc-exynos.spec
@@ -1,7 +1,7 @@
 #sbs-git:slp/pkgs/xorg/driver/xserver-xorg-misc xserver-xorg-misc 0.0.1 13496ac354ad7f6709f1ef9b880a206a2df41c80
 Name:	xorg-x11-misc-exynos
 Summary:    X11 X server misc files for exynos
-Version:    0.0.4
+Version:    0.0.5
 Release:    3
 ExclusiveArch:  %arm
 Group:      System/X11
@@ -9,6 +9,7 @@ License:    MIT
 Source0:    %{name}-%{version}.tar.gz
 
 Requires:   xserver-xorg-core
+Requires(post):   xkeyboard-config
 
 %description
 Description: %{summary}
@@ -46,11 +47,14 @@ mkdir -p %{buildroot}/etc/rc.d/rc4.d/
 mkdir -p %{buildroot}/etc/profile.d/
 mkdir -p %{buildroot}/etc/X11/
 cp -af arm-common/xserver %{buildroot}/etc/rc.d/init.d/
+cp -af arm-common/xresources %{buildroot}/etc/rc.d/init.d/
 cp -af arm-common/xsetrc %{buildroot}/etc/X11/
 cp -af arm-common/Xmodmap %{buildroot}/etc/X11/
 cp -af arm-common/xinitrc %{buildroot}/etc/X11/
 ln -s /etc/rc.d/init.d/xserver %{buildroot}/etc/rc.d/rc3.d/S02xserver
 ln -s /etc/rc.d/init.d/xserver %{buildroot}/etc/rc.d/rc4.d/S02xserver
+ln -s /etc/rc.d/init.d/xresources %{buildroot}/etc/rc.d/rc3.d/S80xresources
+ln -s /etc/rc.d/init.d/xresources %{buildroot}/etc/rc.d/rc4.d/S80xresources
 cp -af arm-common/Xorg.sh %{buildroot}/etc/profile.d/
 
 cp -rf arm-e4412/* %{buildroot}/etc/X11/
diff --git a/xorg-x11-misc-exynos.manifest b/xorg-x11-misc-exynos.manifest
index d26701d..5df55dc 100644
--- a/xorg-x11-misc-exynos.manifest
+++ b/xorg-x11-misc-exynos.manifest
@@ -4,7 +4,10 @@
 	</request>
 	<assign>
                 <filesystem path="/etc/rc.d/init.d/xserver" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/init.d/xresources" label="_" exec_label="none" />
                 <filesystem path="/etc/rc.d/rc3.d/S02xserver" label="_" exec_label="none" />
                 <filesystem path="/etc/rc.d/rc4.d/S02xserver" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc3.d/S80xresources" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc4.d/S80xresources" label="_" exec_label="none" />
 	</assign>
 </manifest>