Sync with OBS version

diff --git a/arm-common/Xmodmap b/arm-common/Xmodmap
new file mode 100644 (file)
index 0000000..8d3facb
--- /dev/null
+++ b/arm-common/Xmodmap
@@ -0,0 +1,17 @@
+keycode 123 = XF86AudioRaiseVolume
+keycode 122 = XF86AudioLowerVolume
+keycode 231 = Cancel
+keycode 177 = XF86Send
+keycode 147 = XF86Phone
+keycode 166 = XF86Stop
+keycode 225 = XF86Search
+keycode 124 = XF86PowerOff
+keycode 179 = XF86WebCam
+keycode 220 = XF86Pictures
+keycode 153 = 
+keycode 239 = 
+keycode 136 = 
+keycode 140 =
+keycode 182 =
+keycode 215 =
+keycode 172 =

diff --git a/debian/changelog b/debian/changelog
index 38e5e56..afa7502 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-misc (0.0.1-116) unstable; urgency=low
+
+  * Fix Xmodmap installation problem for arm-emulfb
+  * Git: slp/pkgs/xorg/driver/xserver-xorg-misc
+  * Tag: xserver-xorg-misc_0.0.1-116
+
+ -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 22 Feb 2012 11:28:58 +0900
+
 xserver-xorg-misc (0.0.1-115) unstable; urgency=low
 
   * change driver name

diff --git a/debian/rules b/debian/rules
index c3f3155..0a2b4aa 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -110,6 +110,7 @@ install-common:
        ln -s /etc/rc.d/init.d/xresources $(CURDIR)/debian/tmp/etc/rc.d/rc3.d/S80xresources
        ln -s /etc/rc.d/init.d/xresources $(CURDIR)/debian/tmp/etc/rc.d/rc4.d/S80xresources
        cp -af $(CURDIR)/$(ARCH_COMMON)/Xorg.sh $(CURDIR)/debian/tmp/etc/profile.d/
+       -cp -af $(CURDIR)/$(ARCH_COMMON)/Xmodmap $(CURDIR)/debian/tmp/opt/etc/X11/ > /dev/null
 
 install-emulfb: build-emulfb install-common
        -cp -af $(CURDIR)/$(ARCH)-emulfb/* $(CURDIR)/debian/tmp/opt/etc/X11/ > /dev/null

diff --git a/i386-emulfb/Xmodmap b/i386-common/Xmodmap
similarity index 91%
rename from i386-emulfb/Xmodmap
rename to i386-common/Xmodmap
index 2bac135..2d7c6b9 100644 (file)
--- a/i386-emulfb/Xmodmap
+++ b/i386-common/Xmodmap
@@ -2,7 +2,7 @@ keycode 123 = XF86AudioRaiseVolume
 keycode 122 = XF86AudioLowerVolume
 keycode 231 = XF86Standby
 keycode 177 = XF86Send
-keycode 110 = XF86Phone
+keycode 140 = XF86Phone
 keycode 182 = XF86Stop
 keycode 124 = XF86PowerOff
 keycode 179 = XF86WebCam

diff --git a/i386-common/evdev.conf b/i386-common/evdev.conf
deleted file mode 100755 (executable)
index 5d53d05..0000000
--- a/i386-common/evdev.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-Section "InputClass"
-        Identifier "evdev pointer catchall"
-        MatchIsPointer "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
-
-Section "InputClass"
-        Identifier "evdev touchscreen catchall"
-        MatchIsTouchScreen "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdevmultitouch"
-        Option "MultiTouch"     "2"
-EndSection
-
-Section "InputClass"
-        Identifier "evdev keyboard catchall"
-        MatchIsKeyboard "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
-

diff --git a/i386-common/rotate.sh b/i386-common/rotate.sh
deleted file mode 100755 (executable)
index 10c101c..0000000
--- a/i386-common/rotate.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#Variables
-syntax_error=0
-orientation=0
-
-#Detect the current orientation
-current_orientation="$(xrandr -q --verbose | grep 'connected' | egrep -o  '\) (normal|left|inverted|right) \(' | egrep -o '(normal|left|inverted|right)')"
-# 1=left, 2=inverted, 3=right, 0=normal
-
-#Next orintation, rotate 90 degrees
-case $current_orientation in
-        normal)
-                orientation=3
-        ;;
-        left)
-                orientation=0
-        ;;
-        inverted)
-                orientation=1
-        ;;
-        right)
-                orientation=2
-        ;;
-esac
-
-#Use the orientation if it is given
-if [ "$1." != "." ]; then
-        orientation=$1
-fi
-
-#Touchscreen input method
-method=evdev
-
-#Detect input device id
-device=`xinput --list | grep Cando|awk '{ print $12 }' | awk -F '=' '{ print $2 }'`
-
-#Default input settings (first 2 rows of a 3x3 rotation matrix)
-mata=1
-matb=0
-matc=0
-matd=0
-mate=1
-matf=0
-
-#Work out the input settng for each orientatiom
-case $orientation in
-        0)
-                mata=1
-                matb=0
-                matc=0
-                matd=0
-                mate=1
-                matf=0
-        ;;
-        1)
-                mata=0
-                matb=-1
-                matc=1
-                matd=1
-                mate=0
-                matf=0
-        ;;
-        2 )
-                mata=-1
-                matb=0
-                matc=1
-                matd=0
-                mate=-1
-                matf=1
-        ;;
-        3 )
-                mata=0
-                matb=1
-                matc=0
-                matd=-1
-                mate=0
-                matf=1
-        ;;
-esac
-
-#Set the touchscreen rotation
-if [ $method = "evdev" ]; then
-        xinput set-prop "$device" "Coordinate Transformation Matrix" $mata $matb $matc $matd $mate $matf 0 0 1
-fi
-
-#Set the screen rotation
-xrandr -o $orientation
-

diff --git a/i386-common/startx.in b/i386-common/startx.in
index 696a75d..063a932 100755 (executable)
--- a/i386-common/startx.in
+++ b/i386-common/startx.in
@@ -2,7 +2,7 @@
 
 DISPLAY=":0"
 XORG_CONF=" -config @DATADIR@/etc/X11/xorg.conf -configdir /opt/etc/X11/xorg.conf.d "
-OTHER_OPTIONS=" -ac -noreset -r +accessx 0 vt07 -nocursor"
+OTHER_OPTIONS=" -ac -noreset -r +accessx 0 -sharevts"
 
 udevadm trigger --subsystem-match=input &
 

diff --git a/i386-common/xinitrc b/i386-common/xinitrc
index 3d95165..5e8419e 100755 (executable)
--- a/i386-common/xinitrc
+++ b/i386-common/xinitrc
@@ -25,5 +25,5 @@ if [ -x /usr/bin/xrdb ]; then
                /usr/bin/xrdb -load -nocpp /opt/etc/X11/Xresources
        fi
 fi
-[ -x /usr/bin/rotate.sh ] && /usr/bin/rotate.sh
-/usr/bin/enlightenment_start  -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &
+
+/usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &

diff --git a/i386-common/xorg.conf b/i386-common/xorg.conf
index 651c5a2..6fa911d 100755 (executable)
--- a/i386-common/xorg.conf
+++ b/i386-common/xorg.conf
@@ -5,7 +5,7 @@ EndSection
 
 Section "Screen"
        Identifier              "Screen0"
-       Device                  "emulfb"
+       Device                  "intel"
        Monitor                 "Monitor0"
        #       SubSection              "Display"
        #               Modes           "480x800"
@@ -25,8 +25,8 @@ Section "ServerFlags"
 EndSection
 
 Section "Device"
-       Identifier              "emulfb"
-       Driver                  "emulfb"
+       Identifier              "intel"
+       Driver                  "intel"
        Option                  "fbdev"         "/dev/fb0"
 EndSection
 
@@ -38,14 +38,6 @@ Section "InputClass"
 EndSection
 
 Section "InputClass"
-        Identifier "evdev touchscreen catchall"
-        MatchIsTouchScreen "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdevmultitouch"
-        Option "MultiTouch"     "2"
-EndSection
-
-Section "InputClass"
        Identifier "evdev keyboard catchall"
        MatchIsKeyboard "on"
        MatchDevicePath "/dev/input/event*"

diff --git a/i386-emulfb/xorg.conf.d/evdev.conf b/i386-emulfb/xorg.conf.d/evdev.conf
deleted file mode 100644 (file)
index b4d4f94..0000000
--- a/i386-emulfb/xorg.conf.d/evdev.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-Section "InputClass"
-        Identifier "evdev pointer catchall"
-        MatchIsPointer "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
-
-
-Section "InputClass"
-        Identifier "evdev keyboard catchall"
-        MatchIsKeyboard "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection

diff --git a/packaging/xorg-x11-server-misc.changes b/packaging/xorg-x11-server-misc.changes
index b8ae806..b88141c 100644 (file)
--- a/packaging/xorg-x11-server-misc.changes
+++ b/packaging/xorg-x11-server-misc.changes
@@ -1,3 +1,34 @@
-* Fri May 18 03:42:11 UTC 2012 - tracy.graydon@intel.com
-- Initial commit 
+* Tue Jul 24 2012 Austin Zhang <austin.zhang@intel.com> - 0.0.1
+- Removed default touchscreen config for IA, instead different
+  products have their own config.
+
+* Fri Jul 20 2012 Peng Li <peng.li@intel.com> - 0.0.1
+- add "-sharevts" parameter for X launch on IA
+
+* Wed Jul 18 2012 Chengwei Yang <chengwei.yang@intel.com> HEAD
+- Fix xorg.conf for IA
+
+* Fri Jul 06 2012 Patrick McCarty <patrick.mccarty@linux.intel.com> 5caa035
+- Fix installation of the .conf files for ARM
+
+* Fri Jul 06 2012 Patrick McCarty <patrick.mccarty@linux.intel.com> 4ea9cb5
+- Install arch-specific conf files in xorg.conf.d
+
+* Mon Jul 02 2012 William Douglas <william.douglas@intel.com> bde22db
+- move from /opt/etc to /etc
+
+* Tue May 29 2012 Ryan Ware <ryan.r.ware@intel.com> 2173407
+- Add default Smack manifest for xorg-x11-server-misc.spec
+
+* Sun Apr 29 2012 Kim Kibum <kb0929.kim@samsung.com> 4d68730
+- upload tizen1.0 source
+
+* Tue Feb 21 2012 Sung-Jin Park <sj76.park@samsung.com> 26b7f02
+- update xorg-x11-server-misc.spec file
+- Fix Xmodmap installation problem for arm-emulfb
+
+* Fri Jan 06 2012 Kibum Kim <kb0929.kim@samsung.com> 4ac7e6f
+- Git init
+[ Eunkyoung Kim ]
+- Initial empty repository
 

diff --git a/packaging/xorg-x11-server-misc.manifest b/packaging/xorg-x11-server-misc.manifest
new file mode 100644 (file)
index 0000000..017d22d
--- /dev/null
+++ b/packaging/xorg-x11-server-misc.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>

diff --git a/packaging/xorg-x11-server-misc.spec b/packaging/xorg-x11-server-misc.spec
index 428c85d..16d3926 100644 (file)
--- a/packaging/xorg-x11-server-misc.spec
+++ b/packaging/xorg-x11-server-misc.spec
@@ -1,10 +1,19 @@
+%ifarch %ix86
+%define ARCH i386
+%endif
+
+%ifarch %{arm}
+%define ARCH arm
+%endif
+
 Name:       xorg-x11-server-misc
 Summary:    X.Org X11 X server misc packages
-Version:       0.0.4
+Version:    0.0.1
 Release:    1
 Group:      System/X11
 License:    MIT
-Source0:    %{name}-%{version}.tar.bz2
+Source0:    %{name}-%{version}.tar.gz
+Source1001: packaging/xorg-x11-server-misc.manifest 
 
 %description
 Description: %{summary}
@@ -13,9 +22,7 @@ Description: %{summary}
 %package emulfb
 Summary:    X11 X server misc files for s5pc110
 Group:      System/X11
-Requires:   xorg-x11-server
-#Requires:  xorg-x11-utils-xrandr
-#Requires:  xorg-x11-utils-xinput
+Requires:   xserver-xorg-core
 
 %description emulfb
 Xorg server misc package which contains startx, xinitrc and xorg.conf file for emulfb
@@ -26,18 +33,16 @@ Xorg server misc package which contains startx, xinitrc and xorg.conf file for e
 
 
 %build
-{
-for f in `find i386-common/ -name "*.in"`; do
-       cat $f > ${f%.in};
-       sed -i -e "s#@PREFIX@#/usr#g" ${f%.in};
-       sed -i -e "s#@DATADIR@#/opt#g" ${f%.in};
-       chmod a+x ${f%.in};
+cp %{SOURCE1001} .
+for f in `find %{ARCH}-common/ -name "*.in"`; do
+        cat $f > ${f%.in};
+        sed -i -e "s#@PREFIX@#/usr#g" ${f%.in};
+        sed -i -e "s#@DATADIR@#/opt#g" ${f%.in};
+        chmod a+x ${f%.in};
 done
-}
 
-%reconfigure \
-       --with-arch=i386 \
-       --with-conf-prefix=/opt
+./autogen.sh
+%configure --with-arch=%{ARCH}
 
 make %{?jobs:-j%jobs}
 
@@ -45,51 +50,48 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
-rm -fr %{buildroot}/opt/etc/X11/xorg.conf.d*
-mkdir -p %{buildroot}/etc/rc.d/init.d/
-mkdir -p %{buildroot}/etc/rc.d/rc3.d/
-mkdir -p %{buildroot}/etc/rc.d/rc4.d/
-mkdir -p %{buildroot}/etc/profile.d/
-mkdir -p %{buildroot}/%{_prefix}/etc/X11/
-mkdir -p  %{buildroot}/opt/etc/X11/i386-emulfb/xorg.conf.d/
-cp -af i386-common/evdev.conf  %{buildroot}/opt/etc/X11/i386-emulfb/xorg.conf.d/
-cp -af i386-common/rotate.sh  %{buildroot}/usr/bin
-cp -af i386-common/xserver %{buildroot}/etc/rc.d/init.d/
-cp -af i386-common/xresources %{buildroot}/etc/rc.d/init.d/
-cp -af i386-common/xinitrc %{buildroot}/%{_prefix}/etc/X11/
-ln -sf /etc/rc.d/init.d/xserver %{buildroot}/etc/rc.d/rc3.d/S20xserver
-ln -sf /etc/rc.d/init.d/xserver %{buildroot}/etc/rc.d/rc4.d/S20xserver
-ln -sf /etc/rc.d/init.d/xresources %{buildroot}/etc/rc.d/rc3.d/S80xresources
-ln -sf /etc/rc.d/init.d/xresources %{buildroot}/etc/rc.d/rc4.d/S80xresources
-cp -af i386-common/Xorg.sh %{buildroot}/etc/profile.d/
-
-cp -rf i386-emulfb %{buildroot}/opt/etc/X11/
-mkdir -p %{buildroot}/opt/etc/X11/xorg.conf.d
-
-%post emulfb
-ln -sf /opt/etc/X11/i386-emulfb/Xmodmap /opt/etc/X11/
-
-ln -sf /opt/etc/X11/i386-emulfb/xorg.conf.d/* /opt/etc/X11/xorg.conf.d
-
-%preun
-rm -f /opt/etc/X11/Xmodmap
-rm -f /opt/etc/X11/xorg.conf.d.*
-
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d/
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d/
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc4.d/
+mkdir -p %{buildroot}%{_sysconfdir}/profile.d/
+mkdir -p %{buildroot}/opt/%{_sysconfdir}
+mkdir -p %{buildroot}%{_sysconfdir}/X11/
+ln -sf %{_sysconfdir}/X11 %{buildroot}/opt/%{_sysconfdir}/X11
+cp -af %{ARCH}-common/xserver %{buildroot}%{_sysconfdir}/rc.d/init.d/
+cp -af %{ARCH}-common/xresources %{buildroot}%{_sysconfdir}/rc.d/init.d/
+cp -af %{ARCH}-common/xinitrc %{buildroot}/%{_sysconfdir}/X11/
+ln -sf %{_sysconfdir}/rc.d/init.d/xserver %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S20xserver
+ln -sf %{_sysconfdir}/rc.d/init.d/xserver %{buildroot}%{_sysconfdir}/rc.d/rc4.d/S20xserver
+ln -sf %{_sysconfdir}/rc.d/init.d/xresources %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S80xresources
+ln -sf %{_sysconfdir}/rc.d/init.d/xresources %{buildroot}%{_sysconfdir}/rc.d/rc4.d/S80xresources
+cp -af %{ARCH}-common/Xorg.sh %{buildroot}%{_sysconfdir}/profile.d/
+cp -af %{ARCH}-common/Xmodmap %{buildroot}/%{_sysconfdir}/X11/
+
+mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
+%ifarch %{arm}
+cp -a arm-emulfb/xorg.conf.d.default/* %{buildroot}/%{_sysconfdir}/X11/xorg.conf.d/
+%endif
+
+mv %{buildroot}/opt/%{_sysconfdir}%{_sysconfdir}/X11/Xresources %{buildroot}%{_sysconfdir}/X11/Xresources
+mv %{buildroot}/opt/%{_sysconfdir}%{_sysconfdir}/X11/xorg.conf %{buildroot}%{_sysconfdir}/X11/xorg.conf
 
 
 %files emulfb
-/opt/etc/X11/xorg.conf.d
+%manifest xorg-x11-server-misc.manifest
 %{_sysconfdir}/profile.d/Xorg.sh
 %{_sysconfdir}/rc.d/init.d/*
 %{_sysconfdir}/rc.d/rc3.d/*
 %{_sysconfdir}/rc.d/rc4.d/*
-%attr(-,inhouse,inhouse) /opt/etc/X11/Xresources
-%exclude /opt/etc/X11/xorg.conf
-%{_prefix}/etc/X11/xinitrc
+%{_sysconfdir}/X11/xinitrc
 %{_bindir}/setcpu
 %{_bindir}/setpoll
 %{_bindir}/startx
-%{_bindir}/rotate.sh
-/opt/etc/X11/i386-emulfb/Xmodmap
-/opt/etc/X11/i386-emulfb/xorg.conf.d/dummy
-/opt/etc/X11/i386-emulfb/xorg.conf.d/evdev.conf
+%config %{_sysconfdir}/X11/Xmodmap
+/opt/%{_sysconfdir}/X11
+%{_sysconfdir}/X11/xorg.conf.d
+%ifarch %{arm}
+   %config %{_sysconfdir}/X11/xorg.conf.d/display.conf
+   %config %{_sysconfdir}/X11/xorg.conf.d/input.conf
+%endif
+%config %attr(-,app,app) %{_sysconfdir}/X11/Xresources
+%config %{_sysconfdir}/X11/xorg.conf