From 672b5dccd60f1011d06140e5eecf1902b3c47ffb Mon Sep 17 00:00:00 2001 From: Jinkun Jang Date: Wed, 13 Mar 2013 01:36:19 +0900 Subject: [PATCH 02/13] Tizen 2.1 base Change-Id: Id5adc42d6d1749e6ed734de69c03dd2a3b2610c6 --- AUTHORS | 3 + COPYING | 20 +++ ChangeLog | 0 INSTALL | 291 ++++++++++++++++++++++++++++++++++++ LICENSE.MIT | 20 +++ Makefile.am | 29 ++++ NEWS | 0 NOTICE | 3 + README | 0 arm-common/Xmodmap | 25 ++++ arm-common/Xorg.sh | 2 + arm-common/Xresources | 1 + arm-common/startx.in | 42 ++++++ arm-common/xinitrc | 23 +++ arm-common/xorg.conf | 6 + arm-common/xserver | 53 +++++++ arm-common/xsetrc | 1 + arm-e4412/xorg.conf.d/display.conf | 30 ++++ arm-e4412/xorg.conf.d/input.conf | 34 +++++ autogen.sh | 12 ++ configure.ac | 56 +++++++ packaging/xorg-x11-misc-exynos.spec | 77 ++++++++++ xorg-x11-misc-exynos.manifest | 10 ++ 23 files changed, 738 insertions(+) create mode 100644 AUTHORS create mode 100644 COPYING create mode 100644 ChangeLog create mode 100644 INSTALL create mode 100644 LICENSE.MIT create mode 100644 Makefile.am create mode 100644 NEWS create mode 100644 NOTICE create mode 100644 README create mode 100644 arm-common/Xmodmap create mode 100755 arm-common/Xorg.sh create mode 100644 arm-common/Xresources create mode 100755 arm-common/startx.in create mode 100755 arm-common/xinitrc create mode 100755 arm-common/xorg.conf create mode 100755 arm-common/xserver create mode 100755 arm-common/xsetrc create mode 100755 arm-e4412/xorg.conf.d/display.conf create mode 100755 arm-e4412/xorg.conf.d/input.conf create mode 100755 autogen.sh create mode 100644 configure.ac create mode 100644 packaging/xorg-x11-misc-exynos.spec create mode 100644 xorg-x11-misc-exynos.manifest diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..ef316d6 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,3 @@ +SooChan Lim +Sung-Jin Park +Sangjin LEE diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..b5aebf0 --- /dev/null +++ b/COPYING @@ -0,0 +1,20 @@ +Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..e69de29 diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..8b82ade --- /dev/null +++ b/INSTALL @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/LICENSE.MIT b/LICENSE.MIT new file mode 100644 index 0000000..1c81bdc --- /dev/null +++ b/LICENSE.MIT @@ -0,0 +1,20 @@ +Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without +fee, provided that the above copyright notice appear in all copies +and that both that copyright notice and this permission notice +appear in supporting documentation, and that the name of Red Hat +not be used in advertising or publicity pertaining to distribution +of the software without specific, written prior permission. Red +Hat makes no representations about the suitability of this software +for any purpose. It is provided "as is" without express or implied +warranty. + +THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN +NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..f6c30fd --- /dev/null +++ b/Makefile.am @@ -0,0 +1,29 @@ +# Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Red Hat not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Red Hat makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# + +bin_SCRIPTS = $(top_srcdir)/@ARCH@-common/startx + +confdir = @CONF_PREFIX@/etc/X11 +conf_DATA = $(top_srcdir)/@ARCH@-common/xorg.conf \ + $(top_srcdir)/@ARCH@-common/Xresources + + + diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..e69de29 diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..c10a9c5 --- /dev/null +++ b/NOTICE @@ -0,0 +1,3 @@ +Copyright (c) 2011 Samsung Electronics Co., Ltd. All rights reserved. +Except as noted, this software is licensed under MIT License. +Please, see the LICENSE.MIT file for MIT License terms and conditions. diff --git a/README b/README new file mode 100644 index 0000000..e69de29 diff --git a/arm-common/Xmodmap b/arm-common/Xmodmap new file mode 100644 index 0000000..be42e4b --- /dev/null +++ b/arm-common/Xmodmap @@ -0,0 +1,25 @@ +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 208 = XF86AudioPlay +keycode 209 = XF86AudioPause +keycode 174 = XF86AudioStop +keycode 171 = XF86AudioNext +keycode 173 = XF86AudioPrev +keycode 176 = XF86AudioRewind +keycode 216 = XF86AudioForward +keycode 234 = XF86AudioMedia +keycode 153 = +keycode 239 = +keycode 136 = +keycode 140 = +keycode 182 = +keycode 172 = +keycode 215 = diff --git a/arm-common/Xorg.sh b/arm-common/Xorg.sh new file mode 100755 index 0000000..79a0def --- /dev/null +++ b/arm-common/Xorg.sh @@ -0,0 +1,2 @@ +export HOME=/root +export DISPLAY=:0 diff --git a/arm-common/Xresources b/arm-common/Xresources new file mode 100644 index 0000000..032fd26 --- /dev/null +++ b/arm-common/Xresources @@ -0,0 +1 @@ +Xft.dpi: 72 diff --git a/arm-common/startx.in b/arm-common/startx.in new file mode 100755 index 0000000..f3bf9c6 --- /dev/null +++ b/arm-common/startx.in @@ -0,0 +1,42 @@ +#!/bin/sh + +DISPLAY=":0" +LOGDIR="/var/log" +XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d " +OTHER_OPTIONS=" -logfile ${LOGDIR}/Xorg.0.log -ac -noreset +accessx 0 +dpmsphone " + +#backup previous Xorg.0.log file +if [ -e ${LOGDIR}/Xorg.0.log ]; then + mv ${LOGDIR}/Xorg.0.log ${LOGDIR}/prev.Xorg.0.log +fi + +#backup previous Xorg.0.log.old file +if [ -e ${LOGDIR}/Xorg.0.log.old ]; then + mv ${LOGDIR}/Xorg.0.log.old ${LOGDIR}/prev.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 + if [ -x /usr/bin/pvrsrvinit ]; then + pvrsrvinit start + fi + gdb --args Xorg ${XSERVER_OPTIONS} +else + if [ "$1" = "--only" ]; then + if [ -x /usr/bin/pvrsrvinit ]; then + pvrsrvinit start + fi + + Xorg ${XSERVER_OPTIONS} & + else + xinit ${XINITRC} -- @PREFIX@/bin/Xorg ${XSERVER_OPTIONS} & + fi +fi + diff --git a/arm-common/xinitrc b/arm-common/xinitrc new file mode 100755 index 0000000..3f9ce40 --- /dev/null +++ b/arm-common/xinitrc @@ -0,0 +1,23 @@ +#!/bin/sh + +/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 + +# Copy .e directory if not exist +export HOME=/opt/home/app + +if [ ! -d ${HOME}/.e ]; then + cp -rf /opt/home/root/.e ${HOME}/.e + chown -R app:app ${HOME}/.e +fi + +su -c "HOME=/opt/home/app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &" -l app + diff --git a/arm-common/xorg.conf b/arm-common/xorg.conf new file mode 100755 index 0000000..53d0b72 --- /dev/null +++ b/arm-common/xorg.conf @@ -0,0 +1,6 @@ +Section "ServerFlags" + Option "blank time" "0" + Option "standby time" "0" + Option "suspend time" "0" + Option "off time" "0" +EndSection diff --git a/arm-common/xserver b/arm-common/xserver new file mode 100755 index 0000000..40f2667 --- /dev/null +++ b/arm-common/xserver @@ -0,0 +1,53 @@ +#!/bin/sh + +set -e + +export DISPLAY=:0 +export PATH=/bin:/usr/bin/:/sbin:/usr/sbin + +case "$1" in + start) + is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true + if [ "${is_running}" = "" ]; then + echo "Starting Xorg server..." + /usr/bin/startx + else + echo "Xorg server is running already..." + fi + ;; + + restart|reload|force-reload) + is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true + if [ "${is_running}" != "" ]; then + $0 stop || true + sleep 3 + fi + $0 start || true + ;; + + stop) + is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true + if [ "${is_running}" != "" ]; then + echo "Stopping Xorg server..." + killall -9 Xorg + else + echo "Xorg server is not running..." + fi + ;; + + status) + is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true + if [ "${is_running}" = "" ]; then + echo "Xorg server is not running..." + else + echo "Xorg server is running..." + fi + ;; + + *) + echo "Usage: /etc/init.d/xserver {start|stop|status|restart|reload|force-reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/arm-common/xsetrc b/arm-common/xsetrc new file mode 100755 index 0000000..e614117 --- /dev/null +++ b/arm-common/xsetrc @@ -0,0 +1 @@ +xset -r 123 -r 122 -r 231 -r 177 -r 147 -r 166 -r 225 -r 124 -r 179 -r 220 -r 208 -r 209 -r 174 -r 171 -r 173 -r 176 -r 216 -r 234 & diff --git a/arm-e4412/xorg.conf.d/display.conf b/arm-e4412/xorg.conf.d/display.conf new file mode 100755 index 0000000..5467a6c --- /dev/null +++ b/arm-e4412/xorg.conf.d/display.conf @@ -0,0 +1,30 @@ +Section "ServerLayout" + Identifier "Test Layout" + Screen 0 "Screen0" 0 0 + InputDevice "Gesture" +EndSection + +Section "Screen" + Identifier "Screen0" + Device "exynos" + Monitor "Monitor0" +# SubSection "Display" +# Modes "320x480" +# EndSubSection +EndSection + +Section "Monitor" + Identifier "Monitor0" + Option "DPMS" "true" +# DisplaySize 46 76 +EndSection + +Section "Device" + Identifier "exynos" + Driver "exynos" + Option "exa" "true" + Option "dri2" "true" + Option "sw_exa" "true" + Option "tfb" "true" + Option "cachable" "false" +EndSection diff --git a/arm-e4412/xorg.conf.d/input.conf b/arm-e4412/xorg.conf.d/input.conf new file mode 100755 index 0000000..6e9171a --- /dev/null +++ b/arm-e4412/xorg.conf.d/input.conf @@ -0,0 +1,34 @@ +Section "ServerFlags" + Option "AllowEmptyInput" "true" + Option "AutoAddDevices" "true" + Option "AutoEnableDevices" "true" +EndSection + +Section "InputClass" + Identifier "evdev touchscreen catchall" + MatchIsTouchScreen "on" + MatchDevicePath "/dev/input/event*" + Driver "evdevmultitouch" + Option "MultiTouch" "3" +EndSection + +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 + +Section "InputDevice" + Identifier "Gesture" + Driver "gesture" + Option "Device" "/dev/null" + Option "Activate" "1" +EndSection diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..218197d --- /dev/null +++ b/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +#$srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..945ceb9 --- /dev/null +++ b/configure.ac @@ -0,0 +1,56 @@ +# Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Red Hat not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Red Hat makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# + +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.61) +AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS) + +# Checks for programs. +AC_PROG_INSTALL +AC_PROG_MAKE_SET + +AC_CONFIG_SRCDIR([Makefile.am]) +AM_CONFIG_HEADER([config.h]) +AC_CONFIG_AUX_DIR(.) + +AM_INIT_AUTOMAKE([dist-bzip2]) + +AM_MAINTAINER_MODE + +# Checks for programs. +AC_DISABLE_STATIC +AC_PROG_LIBTOOL +AC_PROG_CC + +AC_ARG_WITH(arch, AS_HELP_STRING([--with-arch=ARCH], [Architecture (default: arm)]), + [ ARCH="$withval" ], + [ ARCH="arm" ]) +AC_ARG_WITH(conf-prefix, AS_HELP_STRING([--with-conf-prefix=CONF_PREFIX], [Architecture (default: /opt/etc)]), + [ CONF_PREFIX="$withval" ], + [ CONF_PREFIX="/opt/etc" ]) + +AC_SUBST(ARCH) +AC_SUBST(CONF_PREFIX) + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/packaging/xorg-x11-misc-exynos.spec b/packaging/xorg-x11-misc-exynos.spec new file mode 100644 index 0000000..e7fc5f5 --- /dev/null +++ b/packaging/xorg-x11-misc-exynos.spec @@ -0,0 +1,77 @@ +#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 +Release: 3 +ExclusiveArch: %arm +Group: System/X11 +License: MIT +Source0: %{name}-%{version}.tar.gz + +Requires: xserver-xorg-core + +%description +Description: %{summary} + + +%prep +%setup -q + + +%build +{ +for f in `find arm-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=arm \ + --with-conf-prefix=/ + +make %{?jobs:-j%jobs} + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}/usr/share/license +cp -af COPYING %{buildroot}/usr/share/license/%{name} +%make_install + +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}/etc/X11/ +cp -af arm-common/xserver %{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 +cp -af arm-common/Xorg.sh %{buildroot}/etc/profile.d/ + +cp -rf arm-e4412/* %{buildroot}/etc/X11/ + +%post +mkdir -p /opt/var/log + +%files +%manifest xorg-x11-misc-exynos.manifest +%defattr(-,root,root,-) +/usr/share/license/%{name} +%{_sysconfdir}/profile.d/Xorg.sh +%{_sysconfdir}/rc.d/init.d/* +%{_sysconfdir}/rc.d/rc3.d/* +%{_sysconfdir}/rc.d/rc4.d/* +%attr(-,inhouse,inhouse) +/etc/X11/Xresources +/etc/X11/xinitrc +/etc/X11/xsetrc +/etc/X11/Xmodmap +/etc/X11/xorg.conf +/etc/X11/xorg.conf.d/*.conf +%{_bindir}/startx + diff --git a/xorg-x11-misc-exynos.manifest b/xorg-x11-misc-exynos.manifest new file mode 100644 index 0000000..d26701d --- /dev/null +++ b/xorg-x11-misc-exynos.manifest @@ -0,0 +1,10 @@ + + + + + + + + + + -- 2.7.4 From 3e17e754826d0888313c0abd0b868fd37b66c064 Mon Sep 17 00:00:00 2001 From: Jinkun Jang Date: Sat, 16 Mar 2013 01:03:01 +0900 Subject: [PATCH 03/13] merge with master Change-Id: Ia5a169b08248ebdeb061759a15e09b2be1fbd1e2 --- arm-common/xresources | 30 ++++++++++++++++++++++++++++++ arm-e4412/xorg.conf.d/input.conf | 4 +--- arm-e4412/xorg.conf.d/module.conf | 5 +++++ packaging/xorg-x11-misc-exynos.spec | 6 +++++- xorg-x11-misc-exynos.manifest | 3 +++ 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100755 arm-common/xresources create mode 100644 arm-e4412/xorg.conf.d/module.conf 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 @@ + + + -- 2.7.4 From 2f2d22757a0acb3bf0d675a248f0c6212bf3d6c1 Mon Sep 17 00:00:00 2001 From: Sung-Jin Park Date: Mon, 18 Mar 2013 07:55:53 -0400 Subject: [PATCH 04/13] Rollback : Modify input.conf files to use evdev driver for touchscreen Change-Id: I83f48a615011fdad44e350cbab31b642ab2c3d2e --- arm-e4412/xorg.conf.d/input.conf | 3 ++- packaging/xorg-x11-misc-exynos.spec | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arm-e4412/xorg.conf.d/input.conf b/arm-e4412/xorg.conf.d/input.conf index bf77392..460addb 100755 --- a/arm-e4412/xorg.conf.d/input.conf +++ b/arm-e4412/xorg.conf.d/input.conf @@ -8,7 +8,8 @@ Section "InputClass" Identifier "evdev touchscreen catchall" MatchIsTouchScreen "on" MatchDevicePath "/dev/input/event*" - Driver "evdev" + Driver "evdevmultitouch" + Option "MultiTouch" "3" EndSection Section "InputClass" diff --git a/packaging/xorg-x11-misc-exynos.spec b/packaging/xorg-x11-misc-exynos.spec index 5327eec..d5295dd 100644 --- a/packaging/xorg-x11-misc-exynos.spec +++ b/packaging/xorg-x11-misc-exynos.spec @@ -2,7 +2,7 @@ Name: xorg-x11-misc-exynos Summary: X11 X server misc files for exynos Version: 0.0.5 -Release: 3 +Release: 4 ExclusiveArch: %arm Group: System/X11 License: MIT -- 2.7.4 From a3d2a97e76c397267feeb56a135ccbf1be10ece5 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Fri, 12 Apr 2013 11:29:11 +0900 Subject: [PATCH 05/13] Added "winsys_log_dump.sh" script for crash log. Change-Id: I0e6e3dbbbee9d916fedde45d571eb52a4928d61d --- arm-common/winsys_log_dump.sh | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100755 arm-common/winsys_log_dump.sh diff --git a/arm-common/winsys_log_dump.sh b/arm-common/winsys_log_dump.sh new file mode 100755 index 0000000..cd808d2 --- /dev/null +++ b/arm-common/winsys_log_dump.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +#-------------------------------------- +# winsys +#-------------------------------------- +export DISPLAY=:0.0 +WINSYS_DEBUG=$1/winsys +E17_HOME=/home/app +mkdir -p ${WINSYS_DEBUG} +xinfo -p 2> ${WINSYS_DEBUG}/ping.log +xinfo -xwd_topvwins ${WINSYS_DEBUG} +cp -af /opt/var/log/keygrab_status.txt ${WINSYS_DEBUG} +screenshot bmp ${WINSYS_DEBUG}/slp_screenshot.bmp +xinfo -topvwins 2> ${WINSYS_DEBUG}/xinfo_topvwins.txt +xdbg clist > ${WINSYS_DEBUG}/xdbg_clist.log 2>&1 +xdbg drmevent_pending > ${WINSYS_DEBUG}/drmevent_pending.log 2>&1 +xberc drmmode_dump > ${WINSYS_DEBUG}/drmmode_dump.log +find /var/log/ -name "*Xorg*" -exec cp {} ${WINSYS_DEBUG}/ \; +xprop -root -f _E_LOG 8s -set _E_LOG ${E17_HOME}/e.log +cat ${E17_HOME}/e.log > ${WINSYS_DEBUG}/e.log +border_win_info -p ALL -f ${E17_HOME}/e_illume2.log +cat ${E17_HOME}/e_illume2.log > ${WINSYS_DEBUG}/e_illume2.log +e_comp_util -l DUMP_INFO -f ${E17_HOME}/e_comp.log +cat ${E17_HOME}/e_comp.log > ${WINSYS_DEBUG}/e_comp.log +cat ${E17_HOME}/e_comp.log_move > ${WINSYS_DEBUG}/e_comp.log_move +rm ${E17_HOME}/e.log +rm ${E17_HOME}/e_comp.log +rm ${E17_HOME}/e_comp.log_move +rm ${E17_HOME}/e_illume2.log -- 2.7.4 From 734b79c72650611c9708e11d0dbb98c695298c37 Mon Sep 17 00:00:00 2001 From: Sung-Jin Park Date: Sat, 13 Apr 2013 06:22:38 -0400 Subject: [PATCH 06/13] Modify command lines for executing enlightenment with app user/group Change-Id: I35e8b3fdcd395181d95f14d7731643912f7e0868 --- arm-common/xinitrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arm-common/xinitrc b/arm-common/xinitrc index 3f9ce40..58b7924 100755 --- a/arm-common/xinitrc +++ b/arm-common/xinitrc @@ -19,5 +19,9 @@ if [ ! -d ${HOME}/.e ]; then chown -R app:app ${HOME}/.e fi -su -c "HOME=/opt/home/app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &" -l app +E17_USER=`id -u app` +E17_GROUP=`id -g app` + +HOME=/opt/home/app USER=app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it -user ${E17_USER} -group ${E17_GROUP} & +#su -c "HOME=/opt/home/app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &" -l app -- 2.7.4 From e67d1891a0963eb8220613eadf06b0f95441bed8 Mon Sep 17 00:00:00 2001 From: Sung-Jin Park Date: Sat, 13 Apr 2013 07:11:31 -0400 Subject: [PATCH 07/13] Modify smack label of winsys_log_dump.sh to _ for copying dumped winsys logs properly Change-Id: I87b5dbe4000cca16cce089c400c62f2d33898e3e --- xorg-x11-misc-exynos.manifest | 1 + 1 file changed, 1 insertion(+) diff --git a/xorg-x11-misc-exynos.manifest b/xorg-x11-misc-exynos.manifest index 5df55dc..19e954d 100644 --- a/xorg-x11-misc-exynos.manifest +++ b/xorg-x11-misc-exynos.manifest @@ -9,5 +9,6 @@ + -- 2.7.4 From 8e8f601bc608613e45e90b58d1f3830951107301 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Sun, 14 Apr 2013 14:45:11 +0900 Subject: [PATCH 08/13] rollback: use su again Change-Id: Ic6af6a721e6ad5eef7acbccc88e433332810f96b --- arm-common/xinitrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arm-common/xinitrc b/arm-common/xinitrc index 58b7924..e67b2cb 100755 --- a/arm-common/xinitrc +++ b/arm-common/xinitrc @@ -19,9 +19,9 @@ if [ ! -d ${HOME}/.e ]; then chown -R app:app ${HOME}/.e fi -E17_USER=`id -u app` -E17_GROUP=`id -g app` +#E17_USER=`id -u app` +#E17_GROUP=`id -g app` +#HOME=/opt/home/app USER=app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it -user ${E17_USER} -group ${E17_GROUP} & -HOME=/opt/home/app USER=app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it -user ${E17_USER} -group ${E17_GROUP} & -#su -c "HOME=/opt/home/app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &" -l app +su -c "HOME=/opt/home/app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &" -l app -- 2.7.4 From b27b1adf47e79ab83ea2cfbadcb83c3f46d93f3d Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Sun, 14 Apr 2013 15:40:38 +0900 Subject: [PATCH 09/13] do not use su command Change-Id: If655921f3f1f73c52f0d2631b7b1bb28beebd684 --- arm-common/xinitrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arm-common/xinitrc b/arm-common/xinitrc index e67b2cb..d08ab20 100755 --- a/arm-common/xinitrc +++ b/arm-common/xinitrc @@ -19,9 +19,9 @@ if [ ! -d ${HOME}/.e ]; then chown -R app:app ${HOME}/.e fi -#E17_USER=`id -u app` -#E17_GROUP=`id -g app` -#HOME=/opt/home/app USER=app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it -user ${E17_USER} -group ${E17_GROUP} & +E17_USER=`id -u app` +E17_GROUP=`id -g app` +HOME=/opt/home/app USER=app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it -user ${E17_USER} -group ${E17_GROUP} & -su -c "HOME=/opt/home/app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &" -l app +#su -c "HOME=/opt/home/app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &" -l app -- 2.7.4 From e4f0d6da0af14f75b035e741ae5d898106529968 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Tue, 23 Apr 2013 19:25:28 +0900 Subject: [PATCH 10/13] set EVAS_NO_DRI_SWAPBUF=1 when e17 starts Change-Id: I0b150bd31c12fa72140e31facb9b7b7a633c017d --- arm-common/xinitrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm-common/xinitrc b/arm-common/xinitrc index d08ab20..ce851e6 100755 --- a/arm-common/xinitrc +++ b/arm-common/xinitrc @@ -21,7 +21,7 @@ fi E17_USER=`id -u app` E17_GROUP=`id -g app` -HOME=/opt/home/app USER=app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it -user ${E17_USER} -group ${E17_GROUP} & +HOME=/opt/home/app USER=app EVAS_NO_DRI_SWAPBUF=1 /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it -user ${E17_USER} -group ${E17_GROUP} & #su -c "HOME=/opt/home/app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &" -l app -- 2.7.4 From babf94f077b5d715a1d2c61e7345015a2565cf79 Mon Sep 17 00:00:00 2001 From: Sung-Jin Park Date: Tue, 14 May 2013 02:59:07 -0400 Subject: [PATCH 11/13] Apply systemd patch for xresources service Change-Id: I56037c24b248feef43e3d85e73ecd1f257437cd8 --- packaging/xorg-x11-misc-exynos.spec | 6 ++++++ packaging/xresources.service | 12 ++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 packaging/xresources.service diff --git a/packaging/xorg-x11-misc-exynos.spec b/packaging/xorg-x11-misc-exynos.spec index d5295dd..a3d4622 100644 --- a/packaging/xorg-x11-misc-exynos.spec +++ b/packaging/xorg-x11-misc-exynos.spec @@ -7,6 +7,7 @@ ExclusiveArch: %arm Group: System/X11 License: MIT Source0: %{name}-%{version}.tar.gz +Source1: xresources.service Requires: xserver-xorg-core Requires(post): xkeyboard-config @@ -56,6 +57,9 @@ 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/ +mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants +install -m 0644 %SOURCE1 %{buildroot}%{_libdir}/systemd/system/xresources.service +ln -s ../xresources.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/xresources.service cp -rf arm-e4412/* %{buildroot}/etc/X11/ @@ -78,4 +82,6 @@ mkdir -p /opt/var/log /etc/X11/xorg.conf /etc/X11/xorg.conf.d/*.conf %{_bindir}/startx +%{_libdir}/systemd/system/xresources.service +%{_libdir}/systemd/system/multi-user.target.wants/xresources.service diff --git a/packaging/xresources.service b/packaging/xresources.service new file mode 100644 index 0000000..38464b3 --- /dev/null +++ b/packaging/xresources.service @@ -0,0 +1,12 @@ +[Unit] +Description=Xresources +After=rc-sdlevelinit.service +Requires=rc-sdlevelinit.service + +[Service] +Type=forking +ExecStart=/etc/rc.d/init.d/xresources start +ExecStop=/etc/rc.d/init.d/xresources stop + +[Install] +WantedBy=multi-user.target -- 2.7.4 From 39c3e52de25520d6deac507f45f7c462174d14a0 Mon Sep 17 00:00:00 2001 From: Sung-Jin Park Date: Wed, 15 May 2013 09:21:07 -0400 Subject: [PATCH 12/13] Change MultiTouch option in xorg.conf.d/input.conf from 3 to 10 Change-Id: Ide35724e5baa6ff15c1963613e8da33b89aab33d --- arm-e4412/xorg.conf.d/input.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm-e4412/xorg.conf.d/input.conf b/arm-e4412/xorg.conf.d/input.conf index 460addb..c7dce7f 100755 --- a/arm-e4412/xorg.conf.d/input.conf +++ b/arm-e4412/xorg.conf.d/input.conf @@ -9,7 +9,7 @@ Section "InputClass" MatchIsTouchScreen "on" MatchDevicePath "/dev/input/event*" Driver "evdevmultitouch" - Option "MultiTouch" "3" + Option "MultiTouch" "10" EndSection Section "InputClass" -- 2.7.4 From ce7b2e5d941aaea3705ade4bf3e09a405ad43e63 Mon Sep 17 00:00:00 2001 From: Sung-Jin Park Date: Tue, 21 May 2013 01:37:08 -0400 Subject: [PATCH 13/13] Fix forking failure of /etc/rc.d/init.d/xresources and xresources.service using systemd Change-Id: Idf3996c53e582ee1524dd785e02e023c8db6789d --- arm-common/xresources | 1 + packaging/xresources.service | 1 + 2 files changed, 2 insertions(+) diff --git a/arm-common/xresources b/arm-common/xresources index d3a9d36..0693afe 100755 --- a/arm-common/xresources +++ b/arm-common/xresources @@ -11,6 +11,7 @@ case "$1" in else /usr/bin/xrdb -load -nocpp /etc/X11/Xresources fi + mkdir -p /tmp/hibernation touch /tmp/hibernation/xresources_ready fi ;; diff --git a/packaging/xresources.service b/packaging/xresources.service index 38464b3..2ea466c 100644 --- a/packaging/xresources.service +++ b/packaging/xresources.service @@ -5,6 +5,7 @@ Requires=rc-sdlevelinit.service [Service] Type=forking +EnvironmentFile=/run/tizen-mobile-env ExecStart=/etc/rc.d/init.d/xresources start ExecStop=/etc/rc.d/init.d/xresources stop -- 2.7.4