diff options
Diffstat (limited to 'meta-oe/recipes-graphics')
21 files changed, 434 insertions, 221 deletions
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/gplv2-license.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch index ec9325334..29dd71ab0 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/gplv2-license.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch | |||
@@ -1,10 +1,18 @@ | |||
1 | COPYING: add GPLv2 license file | 1 | From 834fa06920f88ceedf752964c8e296c653d541e4 Mon Sep 17 00:00:00 2001 |
2 | From: Yu Ke <ke.yu@intel.com> | ||
3 | Date: Wed, 11 Apr 2012 14:26:16 +0200 | ||
4 | Subject: [PATCH 01/12] COPYING: add GPLv2 license file | ||
2 | 5 | ||
3 | this is a local file recipe and the license file is missing.In order | 6 | this is a local file recipe and the license file is missing.In order |
4 | to pass the license checksum checking, the license file is needed. So | 7 | to pass the license checksum checking, the license file is needed. So |
5 | this patch add the GPLv2 license file. | 8 | this patch add the GPLv2 license file. |
6 | 9 | ||
7 | Signed-off-by: Yu Ke <ke.yu@intel.com> | 10 | Signed-off-by: Yu Ke <ke.yu@intel.com> |
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | COPYING | 339 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
14 | 1 files changed, 339 insertions(+), 0 deletions(-) | ||
15 | create mode 100644 COPYING | ||
8 | 16 | ||
9 | diff --git a/COPYING b/COPYING | 17 | diff --git a/COPYING b/COPYING |
10 | new file mode 100644 | 18 | new file mode 100644 |
@@ -351,3 +359,6 @@ index 0000000..d511905 | |||
351 | +consider it more useful to permit linking proprietary applications with the | 359 | +consider it more useful to permit linking proprietary applications with the |
352 | +library. If this is what you want to do, use the GNU Lesser General | 360 | +library. If this is what you want to do, use the GNU Lesser General |
353 | +Public License instead of this License. | 361 | +Public License instead of this License. |
362 | -- | ||
363 | 1.7.8.5 | ||
364 | |||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch new file mode 100644 index 000000000..23b5345a1 --- /dev/null +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch | |||
@@ -0,0 +1,112 @@ | |||
1 | From 3d1a1a8273112668927a6c6bb3e361e896f5b229 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 11 Apr 2012 14:28:45 +0200 | ||
4 | Subject: [PATCH 02/12] add setdpi Xinit.d script | ||
5 | |||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | ||
8 | X11/Xinit.d/50setdpi | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
9 | 1 files changed, 92 insertions(+), 0 deletions(-) | ||
10 | create mode 100644 X11/Xinit.d/50setdpi | ||
11 | |||
12 | diff --git a/X11/Xinit.d/50setdpi b/X11/Xinit.d/50setdpi | ||
13 | new file mode 100644 | ||
14 | index 0000000..04a2edd | ||
15 | --- /dev/null | ||
16 | +++ b/X11/Xinit.d/50setdpi | ||
17 | @@ -0,0 +1,92 @@ | ||
18 | +#! /bin/sh | ||
19 | +# | ||
20 | +# Copyright Matthias Hentges <devel@hentges.net> (c) 2006 | ||
21 | +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) | ||
22 | +# | ||
23 | +# Filename: setDPI.sh | ||
24 | +# Date: 09-Apr-06 | ||
25 | + | ||
26 | +# This script configures Xft.dpi dependent on your screens DPI. This insures that the same font-size | ||
27 | +# setting of 7 can be used on all machines. | ||
28 | + | ||
29 | + | ||
30 | +XDEFAULTS="/etc/X11/Xdefaults" | ||
31 | + | ||
32 | + | ||
33 | + | ||
34 | +set_dpi() { | ||
35 | + | ||
36 | + CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Xft.dpi\:/s/.*\:\(.*\)/\1/p" | sed -n "s/\ //p"`" | ||
37 | + | ||
38 | + if test "$CURRENT_SETTING" != "$1" | ||
39 | + then | ||
40 | + echo "Using Xft.dpi of $SET_SCREEN_DPI for your $SCREEN_DPI DPI screen" | ||
41 | + | ||
42 | + if grep -q "Xft.dpi" "$XDEFAULTS" | ||
43 | + then | ||
44 | + cat "${XDEFAULTS}" | sed "s/^Xft.dpi\:.*/Xft.dpi\: $SET_SCREEN_DPI/" > "${XDEFAULTS}_" | ||
45 | + mv "${XDEFAULTS}_" "${XDEFAULTS}" | ||
46 | + else | ||
47 | + echo -e "Xft.dpi: $SET_SCREEN_DPI\n" >> "$XDEFAULTS" | ||
48 | + fi | ||
49 | + else | ||
50 | + echo "Your $SCREEN_DPI DPI screen is already configured." | ||
51 | + fi | ||
52 | +} | ||
53 | + | ||
54 | +set_rxvt_font() { | ||
55 | + | ||
56 | + CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Rxvt\*font/s/\(.*\pixelsize=\)\(.*\)/\2/p"`" | ||
57 | + | ||
58 | + if test "$1" -gt 100 | ||
59 | + then | ||
60 | + | ||
61 | + # Configure the rxvt font-size for your screen here: | ||
62 | + test "$1" -gt 180 -a "$1" -lt "221" && RXVT_FONT_SIZE=16 | ||
63 | + | ||
64 | + if test -z "$RXVT_FONT_SIZE" | ||
65 | + then | ||
66 | + echo "WARNING: No rxvt font-size configured for a $SCREEN_DPI DPI screen!" | ||
67 | + echo "Defaulting to size 9" | ||
68 | + RXVT_FONT_SIZE=9 | ||
69 | + fi | ||
70 | + | ||
71 | + if test "$CURRENT_SETTING" != "$RXVT_FONT_SIZE" | ||
72 | + then | ||
73 | + echo "Using a rxvt font-size of $RXVT_FONT_SIZE" | ||
74 | + cat ${XDEFAULTS} | sed "/Rxvt\*font/s/\(.*\pixelsize\)\(=*.*\)/\1=$RXVT_FONT_SIZE/" > ${XDEFAULTS}_ | ||
75 | + mv ${XDEFAULTS}_ ${XDEFAULTS} | ||
76 | + else | ||
77 | + echo "The rxvt font-size is already configured" | ||
78 | + fi | ||
79 | + fi | ||
80 | +} | ||
81 | + | ||
82 | +if test -z "$DISPLAY" | ||
83 | +then | ||
84 | + echo "DISPLAY is not set, aborting..." | ||
85 | + exit 0 | ||
86 | +fi | ||
87 | + | ||
88 | +SCREEN_DPI="`/usr/bin/xdpyinfo | grep "dots per inch" | awk '{print $2}'| sed -n "s/\(.*\)x\(.*\)/\2/p"`" | ||
89 | + | ||
90 | +if test -z "$SCREEN_DPI" | ||
91 | +then | ||
92 | + echo "WARNING: Couldn't read your screens DPI, defaulting to 100" | ||
93 | + SCREEN_DPI=100 | ||
94 | +fi | ||
95 | + | ||
96 | +# Configure your screen here: | ||
97 | +test "$SCREEN_DPI" -gt 180 -a "$SCREEN_DPI" -lt "221" && SET_SCREEN_DPI=160 | ||
98 | +test "$SCREEN_DPI" -gt 90 -a "$SCREEN_DPI" -lt "121" && SET_SCREEN_DPI=100 | ||
99 | + | ||
100 | + | ||
101 | +if test -z "$SET_SCREEN_DPI" | ||
102 | +then | ||
103 | + echo "WARNING: No default configuration found for your $SCREEN_DPI DPI screen!" | ||
104 | + echo "Using 100 DPI" | ||
105 | + SET_SCREEN_DPI=100 | ||
106 | +fi | ||
107 | + | ||
108 | +set_dpi "$SET_SCREEN_DPI" | ||
109 | +set_rxvt_font "$SCREEN_DPI" | ||
110 | -- | ||
111 | 1.7.8.5 | ||
112 | |||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0003-add-89xdgautostart-Xsession.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0003-add-89xdgautostart-Xsession.d-script.patch new file mode 100644 index 000000000..bf806a991 --- /dev/null +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0003-add-89xdgautostart-Xsession.d-script.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From a93a86c2ff1ca5eb35615f4e1568409ff342aa7f Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 11 Apr 2012 14:29:41 +0200 | ||
4 | Subject: [PATCH 03/12] add 89xdgautostart Xsession.d script | ||
5 | |||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | ||
8 | X11/Xsession.d/89xdgautostart | 9 +++++++++ | ||
9 | 1 files changed, 9 insertions(+), 0 deletions(-) | ||
10 | create mode 100644 X11/Xsession.d/89xdgautostart | ||
11 | |||
12 | diff --git a/X11/Xsession.d/89xdgautostart b/X11/Xsession.d/89xdgautostart | ||
13 | new file mode 100644 | ||
14 | index 0000000..9886f9f | ||
15 | --- /dev/null | ||
16 | +++ b/X11/Xsession.d/89xdgautostart | ||
17 | @@ -0,0 +1,9 @@ | ||
18 | +#!/bin/sh | ||
19 | + | ||
20 | +XDGAUTOSTART=/etc/xdg/autostart | ||
21 | +if [ -d $XDGAUTOSTART ] ; then | ||
22 | + for SCRIPT in $XDGAUTOSTART/*; do | ||
23 | + CMD=`grep ^Exec= $SCRIPT | cut -d '=' -f 2` | ||
24 | + $CMD & | ||
25 | + done | ||
26 | +fi | ||
27 | -- | ||
28 | 1.7.8.5 | ||
29 | |||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0004-add-Ts_Calibrate_xinput_calibrator-Xsession.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0004-add-Ts_Calibrate_xinput_calibrator-Xsession.d-script.patch new file mode 100644 index 000000000..135b2a693 --- /dev/null +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0004-add-Ts_Calibrate_xinput_calibrator-Xsession.d-script.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 2877156d5bbc11f8d8e8d6aafd138173d2a4bd3b Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 11 Apr 2012 14:31:34 +0200 | ||
4 | Subject: [PATCH 04/12] add Ts_Calibrate_xinput_calibrator Xsession.d script | ||
5 | |||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | ||
8 | X11/Xsession.d/89xTs_Calibrate_xinput_calibrator | 7 +++++++ | ||
9 | 1 files changed, 7 insertions(+), 0 deletions(-) | ||
10 | create mode 100644 X11/Xsession.d/89xTs_Calibrate_xinput_calibrator | ||
11 | |||
12 | diff --git a/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator b/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator | ||
13 | new file mode 100644 | ||
14 | index 0000000..6ef4d1e | ||
15 | --- /dev/null | ||
16 | +++ b/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator | ||
17 | @@ -0,0 +1,7 @@ | ||
18 | +#!/bin/sh | ||
19 | + | ||
20 | +if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then | ||
21 | + if [ -e /etc/pointercal.xinput ] ; then | ||
22 | + /usr/bin/xinput_calibrator_once.sh | ||
23 | + fi | ||
24 | +fi | ||
25 | -- | ||
26 | 1.7.8.5 | ||
27 | |||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch new file mode 100644 index 000000000..f5c2c786d --- /dev/null +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From b01a532ebb525552e23d7169a2aeb55c42b3ec99 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 11 Apr 2012 14:32:13 +0200 | ||
4 | Subject: [PATCH 05/12] add XWindowManager Xsession.d script | ||
5 | |||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | ||
8 | X11/Xsession.d/90xXWindowManager | 6 ++++++ | ||
9 | 1 files changed, 6 insertions(+), 0 deletions(-) | ||
10 | create mode 100644 X11/Xsession.d/90xXWindowManager | ||
11 | |||
12 | diff --git a/X11/Xsession.d/90xXWindowManager b/X11/Xsession.d/90xXWindowManager | ||
13 | new file mode 100644 | ||
14 | index 0000000..3df8435 | ||
15 | --- /dev/null | ||
16 | +++ b/X11/Xsession.d/90xXWindowManager | ||
17 | @@ -0,0 +1,6 @@ | ||
18 | +#!/bin/sh | ||
19 | +if [ -x $HOME/.Xsession ]; then | ||
20 | + exec $HOME/.Xsession | ||
21 | +else | ||
22 | + exec /usr/bin/x-window-manager | ||
23 | +fi | ||
24 | -- | ||
25 | 1.7.8.5 | ||
26 | |||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch new file mode 100644 index 000000000..7ee8572b8 --- /dev/null +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 0c42e1fb84cc2bfe768bed17f3b979aca868cf64 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 11 Apr 2012 14:34:43 +0200 | ||
4 | Subject: [PATCH 06/12] add support for /etc/X11/xserver-system | ||
5 | |||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | ||
8 | X11/xserver-common | 5 +++++ | ||
9 | 1 files changed, 5 insertions(+), 0 deletions(-) | ||
10 | |||
11 | diff --git a/X11/xserver-common b/X11/xserver-common | ||
12 | index 4c7ed6e..6d8c9df 100644 | ||
13 | --- a/X11/xserver-common | ||
14 | +++ b/X11/xserver-common | ||
15 | @@ -204,3 +204,8 @@ fi | ||
16 | if [ "$XSERVER" != "Xorg" ] ; then | ||
17 | ARGS="$ARGS $MOUSE $KDRIVEARGS" | ||
18 | fi | ||
19 | + | ||
20 | +# let a local script modify the variables | ||
21 | +if [ -e /etc/X11/xserver-system ] ; then | ||
22 | + . /etc/X11/xserver-system | ||
23 | +fi | ||
24 | -- | ||
25 | 1.7.8.5 | ||
26 | |||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch new file mode 100644 index 000000000..8791226cd --- /dev/null +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch | |||
@@ -0,0 +1,87 @@ | |||
1 | From 63e6b9a54e1f12dbf7ddbfe3376fff4c382421a5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 11 Apr 2012 14:36:02 +0200 | ||
4 | Subject: [PATCH 07/12] use own functions file instead /etc/init.d/functions | ||
5 | |||
6 | * so we don't have to depend on initscripts | ||
7 | |||
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
9 | --- | ||
10 | Makefile | 1 + | ||
11 | X11/Xinit.d/11zaurus | 2 +- | ||
12 | X11/Xinit.d/12keymap | 2 +- | ||
13 | X11/functions | 11 +++++++++++ | ||
14 | X11/xserver-common | 2 +- | ||
15 | 5 files changed, 15 insertions(+), 3 deletions(-) | ||
16 | create mode 100644 X11/functions | ||
17 | |||
18 | diff --git a/Makefile b/Makefile | ||
19 | index e2d9af9..caa5de1 100644 | ||
20 | --- a/Makefile | ||
21 | +++ b/Makefile | ||
22 | @@ -23,6 +23,7 @@ install-program: | ||
23 | install -m 755 X11/Xserver $(DESTDIR)/etc/X11/Xserver | ||
24 | install -m 755 X11/Xsession $(DESTDIR)/etc/X11/Xsession | ||
25 | install -m 755 X11/xserver-common $(DESTDIR)/etc/X11/xserver-common | ||
26 | + install -m 755 X11/functions $(DESTDIR)/etc/X11/functions | ||
27 | install -d $(DESTDIR)/etc/X11/xmodmap | ||
28 | install -m 644 X11/xmodmap/*.xmodmap $(DESTDIR)/etc/X11/xmodmap | ||
29 | install -m 644 X11/xmodmap/xmodmap-* $(DESTDIR)/etc/X11/xmodmap | ||
30 | diff --git a/X11/Xinit.d/11zaurus b/X11/Xinit.d/11zaurus | ||
31 | index 54ea6f5..23e7713 100644 | ||
32 | --- a/X11/Xinit.d/11zaurus | ||
33 | +++ b/X11/Xinit.d/11zaurus | ||
34 | @@ -8,7 +8,7 @@ else | ||
35 | CHCK=chkhinge | ||
36 | fi | ||
37 | |||
38 | -. /etc/init.d/functions | ||
39 | +. /etc/X11/functions | ||
40 | |||
41 | $CHCK -e | ||
42 | if [ $? = 12 ]; then | ||
43 | diff --git a/X11/Xinit.d/12keymap b/X11/Xinit.d/12keymap | ||
44 | index 7eac296..b7a7f2d 100644 | ||
45 | --- a/X11/Xinit.d/12keymap | ||
46 | +++ b/X11/Xinit.d/12keymap | ||
47 | @@ -1,6 +1,6 @@ | ||
48 | #!/bin/sh | ||
49 | |||
50 | -. /etc/init.d/functions | ||
51 | +. /etc/X11/functions | ||
52 | |||
53 | # since kdrive 1.4 there is no default keymap in server | ||
54 | xmodmap - </etc/X11/xmodmap/default.xmodmap | ||
55 | diff --git a/X11/functions b/X11/functions | ||
56 | new file mode 100644 | ||
57 | index 0000000..a1311ad | ||
58 | --- /dev/null | ||
59 | +++ b/X11/functions | ||
60 | @@ -0,0 +1,11 @@ | ||
61 | +# -*-Shell-script-*- | ||
62 | +# | ||
63 | +# functions This file contains functions shared by few X11 scripts | ||
64 | +# machine_id also exists in /etc/init.d/functions but some | ||
65 | +# people don't use initscripts anymore | ||
66 | +# | ||
67 | + | ||
68 | +machine_id() { # return the machine ID | ||
69 | + awk 'BEGIN { FS=": " } /Hardware/ \ | ||
70 | + { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo | ||
71 | +} | ||
72 | diff --git a/X11/xserver-common b/X11/xserver-common | ||
73 | index 6d8c9df..de92bb7 100644 | ||
74 | --- a/X11/xserver-common | ||
75 | +++ b/X11/xserver-common | ||
76 | @@ -30,7 +30,7 @@ if [ -f /etc/profile ]; then | ||
77 | . /etc/profile | ||
78 | fi | ||
79 | |||
80 | -. /etc/init.d/functions | ||
81 | +. /etc/X11/functions | ||
82 | |||
83 | fallback_screen_arg() { | ||
84 | geom=`fbset | grep geometry` | ||
85 | -- | ||
86 | 1.7.8.5 | ||
87 | |||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.add.dpi.for.gta.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch index f6e36d9e1..e35e4a74a 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.add.dpi.for.gta.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch | |||
@@ -1,9 +1,19 @@ | |||
1 | xdpyinfo returns 96, but 285 is right value (but 280 is used as it renders 4 columns of illume icons instead of 3 and empty space) | 1 | From 0ee7bf87e0c83abc79de3a99dfa3c87dd5c5b229 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 11 Apr 2012 14:37:29 +0200 | ||
4 | Subject: [PATCH 08/12] xserver-common: add dpi and nocursor params for gta01 | ||
5 | and gta02 | ||
2 | 6 | ||
3 | diff -uNr xserver-common-1.33.orig//X11/xserver-common xserver-common-1.33/X11/xserver-common | 7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
4 | --- xserver-common-1.33.orig//X11/xserver-common 2010-04-28 23:27:10.000000000 +0200 | 8 | --- |
5 | +++ xserver-common-1.33/X11/xserver-common 2010-04-28 23:29:07.000000000 +0200 | 9 | X11/xserver-common | 8 ++++++-- |
6 | @@ -133,19 +133,19 @@ | 10 | 1 files changed, 6 insertions(+), 2 deletions(-) |
11 | |||
12 | diff --git a/X11/xserver-common b/X11/xserver-common | ||
13 | index de92bb7..f76fa5f 100644 | ||
14 | --- a/X11/xserver-common | ||
15 | +++ b/X11/xserver-common | ||
16 | @@ -133,15 +133,19 @@ else | ||
7 | ARGS="$ARGS -screen ${SCREEN_SIZE}" | 17 | ARGS="$ARGS -screen ${SCREEN_SIZE}" |
8 | DPI="225" ;; | 18 | DPI="225" ;; |
9 | "gta01" ) | 19 | "gta01" ) |
@@ -11,8 +21,7 @@ diff -uNr xserver-common-1.33.orig//X11/xserver-common xserver-common-1.33/X11/x | |||
11 | + DPI="280" | 21 | + DPI="280" |
12 | if [ "$XSERVER" != "Xorg" ] ; then | 22 | if [ "$XSERVER" != "Xorg" ] ; then |
13 | ARGS="$ARGS -screen 480x640" | 23 | ARGS="$ARGS -screen 480x640" |
14 | else | 24 | + else |
15 | - ARGS="$ARGS -nocursor" | ||
16 | + ARGS="$ARGS -dpi ${DPI} -nocursor" | 25 | + ARGS="$ARGS -dpi ${DPI} -nocursor" |
17 | fi | 26 | fi |
18 | ;; | 27 | ;; |
@@ -21,9 +30,11 @@ diff -uNr xserver-common-1.33.orig//X11/xserver-common xserver-common-1.33/X11/x | |||
21 | + DPI="280" | 30 | + DPI="280" |
22 | if [ "$XSERVER" != "Xorg" ] ; then | 31 | if [ "$XSERVER" != "Xorg" ] ; then |
23 | ARGS="$ARGS -screen ${SCREEN_SIZE}" | 32 | ARGS="$ARGS -screen ${SCREEN_SIZE}" |
24 | else | 33 | + else |
25 | - ARGS="$ARGS -nocursor" | ||
26 | + ARGS="$ARGS -dpi ${DPI} -nocursor" | 34 | + ARGS="$ARGS -dpi ${DPI} -nocursor" |
27 | fi | 35 | fi |
28 | ;; | 36 | ;; |
29 | "motorola_ezx_platform") | 37 | "motorola_ezx_platform") |
38 | -- | ||
39 | 1.7.8.5 | ||
40 | |||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.n900.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch index 4d36f5f71..1a0bde894 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.n900.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch | |||
@@ -1,7 +1,19 @@ | |||
1 | diff -uri xserver-common-1.33.orig/X11/xserver-common xserver-common-1.33/X11/xserver-common | 1 | From 6d6caecb7172b9b33e7364564b0e6eabf67b6e8b Mon Sep 17 00:00:00 2001 |
2 | --- xserver-common-1.33.orig/X11/xserver-common 2010-09-14 17:10:35.955430177 +0200 | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | +++ xserver-common-1.33/X11/xserver-common 2010-09-14 17:17:12.484423440 +0200 | 3 | Date: Wed, 11 Apr 2012 14:40:14 +0200 |
4 | @@ -132,6 +132,13 @@ | 4 | Subject: [PATCH 09/12] xserver-common: add support for n900 alias |
5 | nokia_rx-51_board | ||
6 | |||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | --- | ||
9 | X11/xserver-common | 7 +++++++ | ||
10 | 1 files changed, 7 insertions(+), 0 deletions(-) | ||
11 | |||
12 | diff --git a/X11/xserver-common b/X11/xserver-common | ||
13 | index f76fa5f..86ed17f 100644 | ||
14 | --- a/X11/xserver-common | ||
15 | +++ b/X11/xserver-common | ||
16 | @@ -132,6 +132,13 @@ else | ||
5 | "nokia_n800" | "nokia_rx-44" | "nokia_n770") | 17 | "nokia_n800" | "nokia_rx-44" | "nokia_n770") |
6 | ARGS="$ARGS -screen ${SCREEN_SIZE}" | 18 | ARGS="$ARGS -screen ${SCREEN_SIZE}" |
7 | DPI="225" ;; | 19 | DPI="225" ;; |
@@ -15,3 +27,6 @@ diff -uri xserver-common-1.33.orig/X11/xserver-common xserver-common-1.33/X11/xs | |||
15 | "gta01" ) | 27 | "gta01" ) |
16 | DPI="280" | 28 | DPI="280" |
17 | if [ "$XSERVER" != "Xorg" ] ; then | 29 | if [ "$XSERVER" != "Xorg" ] ; then |
30 | -- | ||
31 | 1.7.8.5 | ||
32 | |||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch new file mode 100644 index 000000000..688be40da --- /dev/null +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 52003e6b52b1417c1a0e57243d83349addcdacf6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 11 Apr 2012 14:40:44 +0200 | ||
4 | Subject: [PATCH 10/12] xserver-common: add support for nexus S alias herring | ||
5 | |||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | ||
8 | X11/xserver-common | 3 +++ | ||
9 | 1 files changed, 3 insertions(+), 0 deletions(-) | ||
10 | |||
11 | diff --git a/X11/xserver-common b/X11/xserver-common | ||
12 | index 86ed17f..5c9a6eb 100644 | ||
13 | --- a/X11/xserver-common | ||
14 | +++ b/X11/xserver-common | ||
15 | @@ -126,6 +126,9 @@ else | ||
16 | "htc_tornado") | ||
17 | ARGS="$ARGS -hide-cursor" | ||
18 | DPI="100" ;; | ||
19 | + "herring") | ||
20 | + DPI="235" | ||
21 | + ARGS="$ARGS -dpi ${DPI} -nocursor";; | ||
22 | "generic_omap1510/1610/1710") | ||
23 | ARGS="$ARGS -screen ${SCREEN_SIZE}" | ||
24 | DPI="225" ;; | ||
25 | -- | ||
26 | 1.7.8.5 | ||
27 | |||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch new file mode 100644 index 000000000..f80456dfd --- /dev/null +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 0ecc978b7d8cb6867646fb2a29523ebef3afa016 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 11 Apr 2012 14:41:06 +0200 | ||
4 | Subject: [PATCH 11/12] xserver-common: add support for nexus one alias | ||
5 | mahimahi | ||
6 | |||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | --- | ||
9 | X11/xserver-common | 3 +++ | ||
10 | 1 files changed, 3 insertions(+), 0 deletions(-) | ||
11 | |||
12 | diff --git a/X11/xserver-common b/X11/xserver-common | ||
13 | index 5c9a6eb..55594fd 100644 | ||
14 | --- a/X11/xserver-common | ||
15 | +++ b/X11/xserver-common | ||
16 | @@ -129,6 +129,9 @@ else | ||
17 | "herring") | ||
18 | DPI="235" | ||
19 | ARGS="$ARGS -dpi ${DPI} -nocursor";; | ||
20 | + "mahimahi") | ||
21 | + DPI="254" | ||
22 | + ARGS="$ARGS -dpi ${DPI}";; | ||
23 | "generic_omap1510/1610/1710") | ||
24 | ARGS="$ARGS -screen ${SCREEN_SIZE}" | ||
25 | DPI="225" ;; | ||
26 | -- | ||
27 | 1.7.8.5 | ||
28 | |||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.gta04.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch index 8a17c9aa9..54a032973 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.gta04.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch | |||
@@ -1,15 +1,16 @@ | |||
1 | From 95d741d6849a2faddf8c1e930c7250ead90e7bed Mon Sep 17 00:00:00 2001 | 1 | From d194f0302582f1ca599f2ea58c15e15f4fd6bdef Mon Sep 17 00:00:00 2001 |
2 | From: Klaus Kurzmann <mok@fluxnetz.de> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Thu, 20 Oct 2011 09:05:43 +0200 | 3 | Date: Wed, 11 Apr 2012 14:41:52 +0200 |
4 | Subject: [PATCH] gta04 | 4 | Subject: [PATCH 12/12] xserver-common: add support for gta04 alias |
5 | OpenPhoenux | ||
5 | 6 | ||
6 | Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de> | 7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
7 | --- | 8 | --- |
8 | X11/xserver-common | 8 ++++++++ | 9 | X11/xserver-common | 8 ++++++++ |
9 | 1 files changed, 8 insertions(+), 0 deletions(-) | 10 | 1 files changed, 8 insertions(+), 0 deletions(-) |
10 | 11 | ||
11 | diff --git a/X11/xserver-common b/X11/xserver-common | 12 | diff --git a/X11/xserver-common b/X11/xserver-common |
12 | index 448b262..208bbfd 100644 | 13 | index 55594fd..434333e 100644 |
13 | --- a/X11/xserver-common | 14 | --- a/X11/xserver-common |
14 | +++ b/X11/xserver-common | 15 | +++ b/X11/xserver-common |
15 | @@ -161,6 +161,14 @@ else | 16 | @@ -161,6 +161,14 @@ else |
@@ -28,5 +29,5 @@ index 448b262..208bbfd 100644 | |||
28 | ARGS="$ARGS -screen 240x320" | 29 | ARGS="$ARGS -screen 240x320" |
29 | DPI="170" ;; | 30 | DPI="170" ;; |
30 | -- | 31 | -- |
31 | 1.7.7 | 32 | 1.7.8.5 |
32 | 33 | ||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/89xTs_Calibrate.xinput_calibrator.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/89xTs_Calibrate.xinput_calibrator.patch deleted file mode 100644 index c04ad961a..000000000 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/89xTs_Calibrate.xinput_calibrator.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Index: xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator | ||
2 | =================================================================== | ||
3 | --- xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator (revision 0) | ||
4 | +++ xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator (revision 0) | ||
5 | @@ -0,0 +1,7 @@ | ||
6 | +#!/bin/sh | ||
7 | + | ||
8 | +if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then | ||
9 | + if [ -e /etc/pointercal.xinput ] ; then | ||
10 | + /usr/bin/xinput_calibrator_once.sh | ||
11 | + fi | ||
12 | +fi | ||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/89xdgautostart.sh b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/89xdgautostart.sh deleted file mode 100644 index 9886f9fee..000000000 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/89xdgautostart.sh +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | XDGAUTOSTART=/etc/xdg/autostart | ||
4 | if [ -d $XDGAUTOSTART ] ; then | ||
5 | for SCRIPT in $XDGAUTOSTART/*; do | ||
6 | CMD=`grep ^Exec= $SCRIPT | cut -d '=' -f 2` | ||
7 | $CMD & | ||
8 | done | ||
9 | fi | ||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/90xXWindowManager.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/90xXWindowManager.patch deleted file mode 100644 index be5f5ce70..000000000 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/90xXWindowManager.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | Index: xserver-common/X11/Xsession.d/90xXWindowManager | ||
2 | =================================================================== | ||
3 | --- xserver-common/X11/Xsession.d/90xXWindowManager (revision 0) | ||
4 | +++ xserver-common/X11/Xsession.d/90xXWindowManager (revision 0) | ||
5 | @@ -0,0 +1,6 @@ | ||
6 | +#!/bin/sh | ||
7 | +if [ -x $HOME/.Xsession ]; then | ||
8 | + exec $HOME/.Xsession | ||
9 | +else | ||
10 | + exec /usr/bin/x-window-manager | ||
11 | +fi | ||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.add.nocursor.for.gta.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.add.nocursor.for.gta.patch deleted file mode 100644 index bd16efc10..000000000 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.add.nocursor.for.gta.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | diff -uNr xserver-common-1.33.orig//X11/xserver-common xserver-common-1.33/X11/xserver-common | ||
2 | --- xserver-common-1.33.orig//X11/xserver-common 2010-04-28 10:44:23.000000000 +0200 | ||
3 | +++ xserver-common-1.33/X11/xserver-common 2010-04-28 10:46:41.000000000 +0200 | ||
4 | @@ -136,12 +136,16 @@ | ||
5 | DPI="285" | ||
6 | if [ "$XSERVER" != "Xorg" ] ; then | ||
7 | ARGS="$ARGS -screen 480x640" | ||
8 | + else | ||
9 | + ARGS="$ARGS -nocursor" | ||
10 | fi | ||
11 | ;; | ||
12 | "gta02") | ||
13 | DPI="285" | ||
14 | if [ "$XSERVER" != "Xorg" ] ; then | ||
15 | ARGS="$ARGS -screen ${SCREEN_SIZE}" | ||
16 | + else | ||
17 | + ARGS="$ARGS -nocursor" | ||
18 | fi | ||
19 | ;; | ||
20 | "motorola_ezx_platform") | ||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.add.xserver-system.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.add.xserver-system.patch deleted file mode 100644 index 5d9d5d128..000000000 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.add.xserver-system.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | diff -uNr xserver-common-1.33.orig//X11/xserver-common xserver-common-1.33/X11/xserver-common | ||
2 | --- xserver-common-1.33.orig//X11/xserver-common 2010-04-28 23:27:10.000000000 +0200 | ||
3 | +++ xserver-common-1.33/X11/xserver-common 2010-04-28 23:29:07.000000000 +0200 | ||
4 | @@ -192,3 +196,8 @@ | ||
5 | if [ "$XSERVER" != "Xorg" ] ; then | ||
6 | ARGS="$ARGS $MOUSE" | ||
7 | fi | ||
8 | + | ||
9 | +# let a local script modify the variables | ||
10 | +if [ -e /etc/X11/xserver-system ] ; then | ||
11 | + . /etc/X11/xserver-system | ||
12 | +fi | ||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.nexusone.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.nexusone.patch deleted file mode 100644 index 7d528ae6e..000000000 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.nexusone.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | Index: xserver-common-1.34/X11/xserver-common | ||
2 | =================================================================== | ||
3 | --- xserver-common-1.34.orig/X11/xserver-common 2011-10-10 22:36:14.163129002 +0200 | ||
4 | +++ xserver-common-1.34/X11/xserver-common 2011-10-10 22:37:47.513129001 +0200 | ||
5 | @@ -129,6 +129,9 @@ | ||
6 | "herring") | ||
7 | DPI="235" | ||
8 | ARGS="$ARGS -dpi ${DPI} -nocursor";; | ||
9 | + "mahimahi") | ||
10 | + DPI="254" | ||
11 | + ARGS="$ARGS -dpi ${DPI}";; | ||
12 | "generic_omap1510/1610/1710") | ||
13 | ARGS="$ARGS -screen ${SCREEN_SIZE}" | ||
14 | DPI="225" ;; | ||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.nexuss.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.nexuss.patch deleted file mode 100644 index 1e564ce4b..000000000 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.nexuss.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | Index: xserver-common-1.34/X11/xserver-common | ||
2 | =================================================================== | ||
3 | --- xserver-common-1.34.orig/X11/xserver-common 2011-10-09 14:57:10.716896996 +0200 | ||
4 | +++ xserver-common-1.34/X11/xserver-common 2011-10-09 14:57:31.226897012 +0200 | ||
5 | @@ -126,6 +126,9 @@ | ||
6 | "htc_tornado") | ||
7 | ARGS="$ARGS -hide-cursor" | ||
8 | DPI="100" ;; | ||
9 | + "herring") | ||
10 | + DPI="235" | ||
11 | + ARGS="$ARGS -dpi ${DPI} -nocursor";; | ||
12 | "generic_omap1510/1610/1710") | ||
13 | ARGS="$ARGS -screen ${SCREEN_SIZE}" | ||
14 | DPI="225" ;; | ||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/setDPI.sh b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/setDPI.sh deleted file mode 100644 index 04a2edd6c..000000000 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/setDPI.sh +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | #! /bin/sh | ||
2 | # | ||
3 | # Copyright Matthias Hentges <devel@hentges.net> (c) 2006 | ||
4 | # License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) | ||
5 | # | ||
6 | # Filename: setDPI.sh | ||
7 | # Date: 09-Apr-06 | ||
8 | |||
9 | # This script configures Xft.dpi dependent on your screens DPI. This insures that the same font-size | ||
10 | # setting of 7 can be used on all machines. | ||
11 | |||
12 | |||
13 | XDEFAULTS="/etc/X11/Xdefaults" | ||
14 | |||
15 | |||
16 | |||
17 | set_dpi() { | ||
18 | |||
19 | CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Xft.dpi\:/s/.*\:\(.*\)/\1/p" | sed -n "s/\ //p"`" | ||
20 | |||
21 | if test "$CURRENT_SETTING" != "$1" | ||
22 | then | ||
23 | echo "Using Xft.dpi of $SET_SCREEN_DPI for your $SCREEN_DPI DPI screen" | ||
24 | |||
25 | if grep -q "Xft.dpi" "$XDEFAULTS" | ||
26 | then | ||
27 | cat "${XDEFAULTS}" | sed "s/^Xft.dpi\:.*/Xft.dpi\: $SET_SCREEN_DPI/" > "${XDEFAULTS}_" | ||
28 | mv "${XDEFAULTS}_" "${XDEFAULTS}" | ||
29 | else | ||
30 | echo -e "Xft.dpi: $SET_SCREEN_DPI\n" >> "$XDEFAULTS" | ||
31 | fi | ||
32 | else | ||
33 | echo "Your $SCREEN_DPI DPI screen is already configured." | ||
34 | fi | ||
35 | } | ||
36 | |||
37 | set_rxvt_font() { | ||
38 | |||
39 | CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Rxvt\*font/s/\(.*\pixelsize=\)\(.*\)/\2/p"`" | ||
40 | |||
41 | if test "$1" -gt 100 | ||
42 | then | ||
43 | |||
44 | # Configure the rxvt font-size for your screen here: | ||
45 | test "$1" -gt 180 -a "$1" -lt "221" && RXVT_FONT_SIZE=16 | ||
46 | |||
47 | if test -z "$RXVT_FONT_SIZE" | ||
48 | then | ||
49 | echo "WARNING: No rxvt font-size configured for a $SCREEN_DPI DPI screen!" | ||
50 | echo "Defaulting to size 9" | ||
51 | RXVT_FONT_SIZE=9 | ||
52 | fi | ||
53 | |||
54 | if test "$CURRENT_SETTING" != "$RXVT_FONT_SIZE" | ||
55 | then | ||
56 | echo "Using a rxvt font-size of $RXVT_FONT_SIZE" | ||
57 | cat ${XDEFAULTS} | sed "/Rxvt\*font/s/\(.*\pixelsize\)\(=*.*\)/\1=$RXVT_FONT_SIZE/" > ${XDEFAULTS}_ | ||
58 | mv ${XDEFAULTS}_ ${XDEFAULTS} | ||
59 | else | ||
60 | echo "The rxvt font-size is already configured" | ||
61 | fi | ||
62 | fi | ||
63 | } | ||
64 | |||
65 | if test -z "$DISPLAY" | ||
66 | then | ||
67 | echo "DISPLAY is not set, aborting..." | ||
68 | exit 0 | ||
69 | fi | ||
70 | |||
71 | SCREEN_DPI="`/usr/bin/xdpyinfo | grep "dots per inch" | awk '{print $2}'| sed -n "s/\(.*\)x\(.*\)/\2/p"`" | ||
72 | |||
73 | if test -z "$SCREEN_DPI" | ||
74 | then | ||
75 | echo "WARNING: Couldn't read your screens DPI, defaulting to 100" | ||
76 | SCREEN_DPI=100 | ||
77 | fi | ||
78 | |||
79 | # Configure your screen here: | ||
80 | test "$SCREEN_DPI" -gt 180 -a "$SCREEN_DPI" -lt "221" && SET_SCREEN_DPI=160 | ||
81 | test "$SCREEN_DPI" -gt 90 -a "$SCREEN_DPI" -lt "121" && SET_SCREEN_DPI=100 | ||
82 | |||
83 | |||
84 | if test -z "$SET_SCREEN_DPI" | ||
85 | then | ||
86 | echo "WARNING: No default configuration found for your $SCREEN_DPI DPI screen!" | ||
87 | echo "Using 100 DPI" | ||
88 | SET_SCREEN_DPI=100 | ||
89 | fi | ||
90 | |||
91 | set_dpi "$SET_SCREEN_DPI" | ||
92 | set_rxvt_font "$SCREEN_DPI" | ||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb index 4f99a9050..b0823bf61 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb | |||
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files" | |||
2 | LICENSE = "GPLv2" | 2 | LICENSE = "GPLv2" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
4 | 4 | ||
5 | PR = "r5" | 5 | PR = "r6" |
6 | 6 | ||
7 | # we are using a gpe-style Makefile | 7 | # we are using a gpe-style Makefile |
8 | inherit gpe | 8 | inherit gpe |
@@ -11,24 +11,21 @@ SRC_URI[md5sum] = "82f2f84cd96610e8f7b92c700cd31c14" | |||
11 | SRC_URI[sha256sum] = "cd04c33418f776b1e13fcc7af3d6bd0c7cccd03fbabd7dbcd97f88166cc34210" | 11 | SRC_URI[sha256sum] = "cd04c33418f776b1e13fcc7af3d6bd0c7cccd03fbabd7dbcd97f88166cc34210" |
12 | 12 | ||
13 | SRC_URI_append = " \ | 13 | SRC_URI_append = " \ |
14 | file://gplv2-license.patch \ | 14 | file://0001-COPYING-add-GPLv2-license-file.patch \ |
15 | file://setDPI.sh \ | 15 | file://0002-add-setdpi-Xinit.d-script.patch \ |
16 | file://89xdgautostart.sh \ | 16 | file://0003-add-89xdgautostart-Xsession.d-script.patch \ |
17 | file://89xTs_Calibrate.xinput_calibrator.patch \ | 17 | file://0004-add-Ts_Calibrate_xinput_calibrator-Xsession.d-script.patch \ |
18 | file://90xXWindowManager.patch \ | 18 | file://0005-add-XWindowManager-Xsession.d-script.patch \ |
19 | file://Xserver.add.xserver-system.patch \ | 19 | file://0006-add-support-for-etc-X11-xserver-system.patch \ |
20 | file://Xserver.add.nocursor.for.gta.patch \ | 20 | file://0007-use-own-functions-file-instead-etc-init.d-functions.patch \ |
21 | file://Xserver.add.dpi.for.gta.patch \ | 21 | file://0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch \ |
22 | file://Xserver.n900.patch \ | 22 | file://0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch \ |
23 | file://Xserver.nexuss.patch \ | 23 | file://0010-xserver-common-add-support-for-nexus-S-alias-herring.patch \ |
24 | file://Xserver.nexusone.patch \ | 24 | file://0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch \ |
25 | file://Xserver.gta04.patch \ | 25 | file://0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch \ |
26 | " | 26 | " |
27 | 27 | ||
28 | |||
29 | do_install_append() { | 28 | do_install_append() { |
30 | install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" | ||
31 | install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xsession.d/89xdgautostart" | ||
32 | sed -i 's:^BINDIR=.*$:BINDIR=${bindir}:' ${D}/etc/X11/xserver-common | 29 | sed -i 's:^BINDIR=.*$:BINDIR=${bindir}:' ${D}/etc/X11/xserver-common |
33 | } | 30 | } |
34 | 31 | ||