--- /dev/null
+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 =
+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
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
keycode 122 = XF86AudioLowerVolume
keycode 231 = XF86Standby
keycode 177 = XF86Send
-keycode 110 = XF86Phone
+keycode 140 = XF86Phone
keycode 182 = XF86Stop
keycode 124 = XF86PowerOff
keycode 179 = XF86WebCam
+++ /dev/null
-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
-
+++ /dev/null
-#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
-
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 &
/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 &
Section "Screen"
Identifier "Screen0"
- Device "emulfb"
+ Device "intel"
Monitor "Monitor0"
# SubSection "Display"
# Modes "480x800"
EndSection
Section "Device"
- Identifier "emulfb"
- Driver "emulfb"
+ Identifier "intel"
+ Driver "intel"
Option "fbdev" "/dev/fb0"
EndSection
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*"
+++ /dev/null
-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
-* 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
--- /dev/null
+<manifest>
+ <request>
+ <domain name="_"/>
+ </request>
+</manifest>
+%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}
%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
%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}
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