merge with master

Change-Id: I71be12d564da18c5648b840a181f3dc31680dffa

diff --git a/common/xinitrc b/common/xinitrc
index ffaec07..95f0960 100755 (executable)
--- a/common/xinitrc
+++ b/common/xinitrc
@@ -2,15 +2,6 @@
 
 /usr/bin/scim -d &
 
-# set dpi
-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
-fi
-
 # Link .e
 export HOME=/opt/home/app
 

diff --git a/conf-arm-emulfb/input.conf b/conf-arm-emulfb/input.conf
index 6e9171a..bf77392 100644 (file)
--- a/conf-arm-emulfb/input.conf
+++ b/conf-arm-emulfb/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/conf-arm-emulfb/module.conf b/conf-arm-emulfb/module.conf
new file mode 100644 (file)
index 0000000..05b566c
--- /dev/null
+++ b/conf-arm-emulfb/module.conf
@@ -0,0 +1,5 @@
+Section "Module"
+    SubSection  "xdbg"
+        Option  "log_path"   "/var/log/Xorg.0.log2"
+    EndSubSection
+EndSection

diff --git a/conf-i386-emulfb/input.conf b/conf-i386-emulfb/input.conf
index 0975681..8e6934c 100644 (file)
--- a/conf-i386-emulfb/input.conf
+++ b/conf-i386-emulfb/input.conf
@@ -16,8 +16,7 @@ Section "InputClass"
         Identifier "evdev touchscreen catchall"
         MatchIsTouchScreen "on"
         MatchDevicePath "/dev/input/event*"
-        Driver "evdevmultitouch"
-       Option "MultiTouch"     "6"
+        Driver "evdev"
 EndSection
 
 Section "InputClass"

diff --git a/conf-i386-emulfb/module.conf b/conf-i386-emulfb/module.conf
new file mode 100644 (file)
index 0000000..05b566c
--- /dev/null
+++ b/conf-i386-emulfb/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.spec b/packaging/xorg-x11-misc.spec
index a8c94d1..f1c7c2d 100644 (file)
--- a/packaging/xorg-x11-misc.spec
+++ b/packaging/xorg-x11-misc.spec
@@ -9,7 +9,7 @@
 Name:      xorg-x11-misc
 Summary:    X.Org X11 X server misc packages
 Version:    0.0.3
-Release:    3
+Release:    5
 Group:      System/X11
 License:    MIT
 Source0:    %{name}-%{version}.tar.gz
@@ -21,6 +21,7 @@ Description: %{summary}
 Summary:    architecture independent set of X11 X server configuration files
 Group:      System/X11
 Requires:   xserver-xorg-core
+Requires:   xorg-x11-drv-evdev-multitouch
 
 %description common
 Set of architecture independent files and scripts for X server
@@ -71,6 +72,7 @@ install -m 644 common/xorg.conf %{buildroot}/etc/X11/xorg.conf
 
 install -m 755 common/Xorg.sh %{buildroot}/etc/profile.d/Xorg.sh
 install -m 755 common/xserver %{buildroot}/etc/rc.d/init.d/xserver
+install -m 755 common/xresources %{buildroot}/etc/rc.d/init.d/xresources
 
 install -m 644 %{ARCH}-common/Xmodmap %{buildroot}/etc/X11/Xmodmap
 install -m 644 %{ARCH}-common/Xresources %{buildroot}/etc/X11/Xresources
@@ -91,6 +93,9 @@ 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
 %endif
 
+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 -Rd conf-%{ARCH}* %{buildroot}/etc/X11/
 
 # XXX Copy-paste terror - could some rpm guy help me unify this?

diff --git a/xorg-x11-misc-arm-common.manifest b/xorg-x11-misc-arm-common.manifest
index d26701d..5df55dc 100644 (file)
--- a/xorg-x11-misc-arm-common.manifest
+++ b/xorg-x11-misc-arm-common.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>

diff --git a/xorg-x11-misc-i386-common.manifest b/xorg-x11-misc-i386-common.manifest
index dedd005..306c7f8 100644 (file)
--- a/xorg-x11-misc-i386-common.manifest
+++ b/xorg-x11-misc-i386-common.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/S20xserver" label="_" exec_label="none" />
                 <filesystem path="/etc/rc.d/rc4.d/S20xserver" 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>