tizen 2.3 release

diff --git a/conf-i386-emulfb-mobile/input.conf b/conf-i386-emulfb-mobile/input.conf
index 0d2770f..0975681 100644 (file)
--- a/conf-i386-emulfb-mobile/input.conf
+++ b/conf-i386-emulfb-mobile/input.conf
@@ -17,7 +17,7 @@ Section "InputClass"
         MatchIsTouchScreen "on"
         MatchDevicePath "/dev/input/event*"
         Driver "evdevmultitouch"
-       Option "MultiTouch"     "10"
+       Option "MultiTouch"     "6"
 EndSection
 
 Section "InputClass"

diff --git a/conf-i386-emulfb-wearable/input.conf b/conf-i386-emulfb-wearable/input.conf
index b7a1961..e263e48 100644 (file)
--- a/conf-i386-emulfb-wearable/input.conf
+++ b/conf-i386-emulfb-wearable/input.conf
@@ -35,7 +35,7 @@ Section "InputDevice"
         Option "ScreenWidth"                   "320"
         Option "ScreenHeight"                  "320"
         Option  "FlickDownKeycode"             "166"
-        Option  "FlickUpKeycode"               "177"
+        Option  "FlickUpKeycode"               "147"
         Option  "FlickPressArea"               "15"
         Option  "FlickPressArea_LEFT"          "50"
         Option "FlickMinimumHeight"    "25"

diff --git a/i386-common/startx b/i386-common/startx
new file mode 100755 (executable)
index 0000000..9166ab1
--- /dev/null
+++ b/i386-common/startx
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+[ -r /etc/X11/Xorg.arch-options ] && . /etc/X11/Xorg.arch-options
+
+DISPLAY=":0"
+LOGDIR="/var/log"
+XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d "
+OTHER_OPTIONS=" -logfile /var/log/Xorg.0.log -ac -noreset +accessx 0 +dpmsphone $XORG_ARCH_OPTS"
+
+# Xorg automatically preserves logs in $LOGDIR/Xorg.DPY.log.(old)
+
+
+for scriptlet in $(find /etc/X11/arch-preinit.d ! -type d); do
+    test -x "$scriptlet" && . "$scriptlet"
+done
+
+if [ -e /etc/emulator/opengl-es-setup-yagl-env.sh ]; then
+    /etc/emulator/opengl-es-setup-yagl-env.sh
+fi
+
+#remove previous Xorg.0.log file
+if [ -e /var/log/Xorg.0.log ]; then
+    rm /var/log/Xorg.0.log
+fi
+
+#remove previous Xorg.0.log.old file
+if [ -e /var/log/Xorg.0.log.old ]; then
+    rm /var/log/Xorg.0.log.old
+fi
+
+if [ -e ~/.xinitrc ]; then
+    XINITRC=~/.xinitrc
+else
+    XINITRC=/etc/X11/xinitrc
+fi
+
+XSERVER_OPTIONS=" ${DISPLAY} ${OTHER_OPTIONS} ${XORG_CONF} "
+
+if [ "$1" = "--gdb" ]; then
+    /usr/bin/gdb --args /usr/bin/Xorg ${XSERVER_OPTIONS}
+else
+    if [ "$1" = "--only" ]; then
+        export XSERVER_WAIT_MS=100000
+
+        /usr/bin/Xorg ${XSERVER_OPTIONS} &
+    else
+        export WMRC=/etc/X11/wmrc
+        export WMUSERID=`/usr/bin/id -u app`
+        export WMGROUPID=`/usr/bin/id -g app`
+        export WMUSER=app
+        export WMUSERHOME=/opt/home/app
+        export XSERVER_WAIT_MS=100000
+
+        /usr/bin/xinit ${XINITRC} -- /usr/bin/Xorg ${XSERVER_OPTIONS} &
+    fi
+fi
+

diff --git a/i386-common/xinitrc b/i386-common/xinitrc
new file mode 100755 (executable)
index 0000000..6446a7c
--- /dev/null
+++ b/i386-common/xinitrc
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+/usr/bin/scim -d &
+/usr/bin/xmodmap /etc/X11/Xmodmap
+
+# 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
+

diff --git a/i386-common/xorg.service b/i386-common/xorg.service
index 9cffb97..ac5e885 100644 (file)
--- a/i386-common/xorg.service
+++ b/i386-common/xorg.service
@@ -1,13 +1,13 @@
 [Unit]
 Description=xserver
 DefaultDependencies=no
-After=opt.mount smack.service smack_pre_labeling_priv.service
+After=systemd-udev-trigger.service opt.mount smack-default-labeling.service
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-Environment=EVAS_NO_DRI_SWAPBUF=1
 ExecStart=/usr/bin/startx
+EnvironmentFile=/run/tizen-mobile-env
 
 [Install]
 WantedBy=basic.target

diff --git a/i386-common/xresources b/i386-common/xresources
new file mode 100755 (executable)
index 0000000..d7a6b1f
--- /dev/null
+++ b/i386-common/xresources
@@ -0,0 +1,31 @@
+#!/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
+      mkdir -p /tmp/hibernation
+      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/packaging/xorg-x11-misc.spec b/packaging/xorg-x11-misc.spec
index 9598766..7ff66bb 100644 (file)
--- a/packaging/xorg-x11-misc.spec
+++ b/packaging/xorg-x11-misc.spec
@@ -8,8 +8,8 @@
 
 Name:      xorg-x11-misc
 Summary:    X.Org X11 X server misc packages
-Version:    0.0.8
-Release:    2
+Version:    0.0.10
+Release:    1
 Group:      System/X11
 License:    MIT
 Source0:    %{name}-%{version}.tar.gz
@@ -63,15 +63,24 @@ mkdir -p %{buildroot}/etc/rc.d/rc3.d
 mkdir -p %{buildroot}/etc/rc.d/rc4.d
 mkdir -p %{buildroot}/etc/profile.d
 
+%ifarch %{arm}
 install -m 755 common/startx %{buildroot}/usr/bin/startx
+install -m 755 common/xinitrc %{buildroot}/etc/X11/xinitrc
+install -m 755 common/xresources %{buildroot}/etc/rc.d/init.d/xresources
+%endif
+
+%ifarch %ix86
+install -m 755 %{ARCH}-common/startx %{buildroot}/usr/bin/startx
+install -m 755 %{ARCH}-common/xinitrc %{buildroot}/etc/X11/xinitrc
+install -m 755 %{ARCH}-common/xresources %{buildroot}/etc/rc.d/init.d/xresources
+%endif
+
 install -m 755 common/scripts/setcpu %{buildroot}/usr/bin/setcpu
 install -m 755 common/scripts/setpoll %{buildroot}/usr/bin/setpoll
-install -m 755 common/xinitrc %{buildroot}/etc/X11/xinitrc
 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
@@ -94,7 +103,7 @@ 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
-%if "%{_repository}" == "wearable"
+%if "%{?tizen_profile_name}" == "wearable"
 cp -Rd conf-%{ARCH}-emulfb-wearable %{buildroot}/etc/X11/conf-%{ARCH}-emulfb
 %else
 cp -Rd conf-%{ARCH}-emulfb-mobile %{buildroot}/etc/X11/conf-%{ARCH}-emulfb
@@ -102,7 +111,6 @@ cp -Rd conf-%{ARCH}-emulfb-mobile %{buildroot}/etc/X11/conf-%{ARCH}-emulfb
 
 # XXX Copy-paste terror - could some rpm guy help me unify this?
 
-%if "%{_repository}" == "wearable"
 %ifarch %{ix86}
 mkdir -p %{buildroot}%{_libdir}/systemd/system/basic.target.wants
 install -m 0644 %{ARCH}-common/xorg.service %{buildroot}%{_libdir}/systemd/system/xorg.service
@@ -111,7 +119,6 @@ mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
 install -m 0644 %{ARCH}-common/xresources.service %{buildroot}%{_libdir}/systemd/system/xresources.service
 ln -s ../xresources.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/xresources.service
 %endif
-%endif
 
 # arm/i386 emulfb
 
@@ -131,19 +138,12 @@ done
 /etc/X11/xinitrc
 /etc/profile.d/Xorg.sh
 /etc/rc.d/init.d/*
-%if "%{_repository}" == "wearable"
 /etc/rc.d/rc3.d/*
 /etc/rc.d/rc4.d/*
-%endif
 /etc/X11/xorg.conf
 
 
 %files %{ARCH}-common
-%if "%{_repository}" == "mobile"
-%manifest xorg-x11-misc-%{ARCH}-common.manifest
-/etc/rc.d/rc3.d/*
-/etc/rc.d/rc4.d/*
-%endif
 /etc/X11/Xmodmap
 /etc/X11/Xresources
 %attr(755,root,root) /etc/X11/xsetrc
@@ -156,13 +156,11 @@ done
 %manifest xorg-x11-misc-emulfb.manifest
 /usr/share/license/%{name}-emulfb
 /etc/X11/conf-%{ARCH}-emulfb/*
-%if "%{_repository}" == "wearable"
 %{_libdir}/systemd/system/xorg.service
 %{_libdir}/systemd/system/basic.target.wants/xorg.service
 %{_libdir}/systemd/system/xresources.service
 %{_libdir}/systemd/system/multi-user.target.wants/xresources.service
 %endif
-%endif
 
 %ifarch %{arm}