summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-graphics/xserver-common/xserver-common-1.34')
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/89xTs_Calibrate.xinput_calibrator.patch12
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/89xdgautostart.sh9
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/90xXWindowManager.patch11
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.add.dpi.for.gta.patch29
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.add.nocursor.for.gta.patch20
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.add.xserver-system.patch12
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.n900.patch17
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/gplv2-license.patch353
-rw-r--r--meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/setDPI.sh92
9 files changed, 555 insertions, 0 deletions
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
new file mode 100644
index 000000000..c04ad961a
--- /dev/null
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/89xTs_Calibrate.xinput_calibrator.patch
@@ -0,0 +1,12 @@
1Index: 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
new file mode 100644
index 000000000..9886f9fee
--- /dev/null
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/89xdgautostart.sh
@@ -0,0 +1,9 @@
1#!/bin/sh
2
3XDGAUTOSTART=/etc/xdg/autostart
4if [ -d $XDGAUTOSTART ] ; then
5 for SCRIPT in $XDGAUTOSTART/*; do
6 CMD=`grep ^Exec= $SCRIPT | cut -d '=' -f 2`
7 $CMD &
8 done
9fi
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
new file mode 100644
index 000000000..be5f5ce70
--- /dev/null
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/90xXWindowManager.patch
@@ -0,0 +1,11 @@
1Index: 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.dpi.for.gta.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.add.dpi.for.gta.patch
new file mode 100644
index 000000000..f6e36d9e1
--- /dev/null
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.add.dpi.for.gta.patch
@@ -0,0 +1,29 @@
1xdpyinfo 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)
2
3diff -uNr xserver-common-1.33.orig//X11/xserver-common xserver-common-1.33/X11/xserver-common
4--- xserver-common-1.33.orig//X11/xserver-common 2010-04-28 23:27:10.000000000 +0200
5+++ xserver-common-1.33/X11/xserver-common 2010-04-28 23:29:07.000000000 +0200
6@@ -133,19 +133,19 @@
7 ARGS="$ARGS -screen ${SCREEN_SIZE}"
8 DPI="225" ;;
9 "gta01" )
10- DPI="285"
11+ DPI="280"
12 if [ "$XSERVER" != "Xorg" ] ; then
13 ARGS="$ARGS -screen 480x640"
14 else
15- ARGS="$ARGS -nocursor"
16+ ARGS="$ARGS -dpi ${DPI} -nocursor"
17 fi
18 ;;
19 "gta02")
20- DPI="285"
21+ DPI="280"
22 if [ "$XSERVER" != "Xorg" ] ; then
23 ARGS="$ARGS -screen ${SCREEN_SIZE}"
24 else
25- ARGS="$ARGS -nocursor"
26+ ARGS="$ARGS -dpi ${DPI} -nocursor"
27 fi
28 ;;
29 "motorola_ezx_platform")
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
new file mode 100644
index 000000000..bd16efc10
--- /dev/null
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.add.nocursor.for.gta.patch
@@ -0,0 +1,20 @@
1diff -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
new file mode 100644
index 000000000..5d9d5d128
--- /dev/null
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.add.xserver-system.patch
@@ -0,0 +1,12 @@
1diff -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.n900.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.n900.patch
new file mode 100644
index 000000000..4d36f5f71
--- /dev/null
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/Xserver.n900.patch
@@ -0,0 +1,17 @@
1diff -uri 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-09-14 17:10:35.955430177 +0200
3+++ xserver-common-1.33/X11/xserver-common 2010-09-14 17:17:12.484423440 +0200
4@@ -132,6 +132,13 @@
5 "nokia_n800" | "nokia_rx-44" | "nokia_n770")
6 ARGS="$ARGS -screen ${SCREEN_SIZE}"
7 DPI="225" ;;
8+ "nokia_rx-51_board" )
9+ DPI="267"
10+ if [ "$XSERVER" != "Xorg" ] ; then
11+ ARGS="$ARGS -screen ${SCREEN_SIZE}"
12+ else
13+ ARGS="$ARGS -dpi ${DPI} -nocursor"
14+ fi ;;
15 "gta01" )
16 DPI="280"
17 if [ "$XSERVER" != "Xorg" ] ; then
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/gplv2-license.patch
new file mode 100644
index 000000000..ec9325334
--- /dev/null
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/gplv2-license.patch
@@ -0,0 +1,353 @@
1COPYING: add GPLv2 license file
2
3this is a local file recipe and the license file is missing.In order
4to pass the license checksum checking, the license file is needed. So
5this patch add the GPLv2 license file.
6
7Signed-off-by: Yu Ke <ke.yu@intel.com>
8
9diff --git a/COPYING b/COPYING
10new file mode 100644
11index 0000000..d511905
12--- /dev/null
13+++ b/COPYING
14@@ -0,0 +1,339 @@
15+ GNU GENERAL PUBLIC LICENSE
16+ Version 2, June 1991
17+
18+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
19+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20+ Everyone is permitted to copy and distribute verbatim copies
21+ of this license document, but changing it is not allowed.
22+
23+ Preamble
24+
25+ The licenses for most software are designed to take away your
26+freedom to share and change it. By contrast, the GNU General Public
27+License is intended to guarantee your freedom to share and change free
28+software--to make sure the software is free for all its users. This
29+General Public License applies to most of the Free Software
30+Foundation's software and to any other program whose authors commit to
31+using it. (Some other Free Software Foundation software is covered by
32+the GNU Lesser General Public License instead.) You can apply it to
33+your programs, too.
34+
35+ When we speak of free software, we are referring to freedom, not
36+price. Our General Public Licenses are designed to make sure that you
37+have the freedom to distribute copies of free software (and charge for
38+this service if you wish), that you receive source code or can get it
39+if you want it, that you can change the software or use pieces of it
40+in new free programs; and that you know you can do these things.
41+
42+ To protect your rights, we need to make restrictions that forbid
43+anyone to deny you these rights or to ask you to surrender the rights.
44+These restrictions translate to certain responsibilities for you if you
45+distribute copies of the software, or if you modify it.
46+
47+ For example, if you distribute copies of such a program, whether
48+gratis or for a fee, you must give the recipients all the rights that
49+you have. You must make sure that they, too, receive or can get the
50+source code. And you must show them these terms so they know their
51+rights.
52+
53+ We protect your rights with two steps: (1) copyright the software, and
54+(2) offer you this license which gives you legal permission to copy,
55+distribute and/or modify the software.
56+
57+ Also, for each author's protection and ours, we want to make certain
58+that everyone understands that there is no warranty for this free
59+software. If the software is modified by someone else and passed on, we
60+want its recipients to know that what they have is not the original, so
61+that any problems introduced by others will not reflect on the original
62+authors' reputations.
63+
64+ Finally, any free program is threatened constantly by software
65+patents. We wish to avoid the danger that redistributors of a free
66+program will individually obtain patent licenses, in effect making the
67+program proprietary. To prevent this, we have made it clear that any
68+patent must be licensed for everyone's free use or not licensed at all.
69+
70+ The precise terms and conditions for copying, distribution and
71+modification follow.
72+
73+ GNU GENERAL PUBLIC LICENSE
74+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
75+
76+ 0. This License applies to any program or other work which contains
77+a notice placed by the copyright holder saying it may be distributed
78+under the terms of this General Public License. The "Program", below,
79+refers to any such program or work, and a "work based on the Program"
80+means either the Program or any derivative work under copyright law:
81+that is to say, a work containing the Program or a portion of it,
82+either verbatim or with modifications and/or translated into another
83+language. (Hereinafter, translation is included without limitation in
84+the term "modification".) Each licensee is addressed as "you".
85+
86+Activities other than copying, distribution and modification are not
87+covered by this License; they are outside its scope. The act of
88+running the Program is not restricted, and the output from the Program
89+is covered only if its contents constitute a work based on the
90+Program (independent of having been made by running the Program).
91+Whether that is true depends on what the Program does.
92+
93+ 1. You may copy and distribute verbatim copies of the Program's
94+source code as you receive it, in any medium, provided that you
95+conspicuously and appropriately publish on each copy an appropriate
96+copyright notice and disclaimer of warranty; keep intact all the
97+notices that refer to this License and to the absence of any warranty;
98+and give any other recipients of the Program a copy of this License
99+along with the Program.
100+
101+You may charge a fee for the physical act of transferring a copy, and
102+you may at your option offer warranty protection in exchange for a fee.
103+
104+ 2. You may modify your copy or copies of the Program or any portion
105+of it, thus forming a work based on the Program, and copy and
106+distribute such modifications or work under the terms of Section 1
107+above, provided that you also meet all of these conditions:
108+
109+ a) You must cause the modified files to carry prominent notices
110+ stating that you changed the files and the date of any change.
111+
112+ b) You must cause any work that you distribute or publish, that in
113+ whole or in part contains or is derived from the Program or any
114+ part thereof, to be licensed as a whole at no charge to all third
115+ parties under the terms of this License.
116+
117+ c) If the modified program normally reads commands interactively
118+ when run, you must cause it, when started running for such
119+ interactive use in the most ordinary way, to print or display an
120+ announcement including an appropriate copyright notice and a
121+ notice that there is no warranty (or else, saying that you provide
122+ a warranty) and that users may redistribute the program under
123+ these conditions, and telling the user how to view a copy of this
124+ License. (Exception: if the Program itself is interactive but
125+ does not normally print such an announcement, your work based on
126+ the Program is not required to print an announcement.)
127+
128+These requirements apply to the modified work as a whole. If
129+identifiable sections of that work are not derived from the Program,
130+and can be reasonably considered independent and separate works in
131+themselves, then this License, and its terms, do not apply to those
132+sections when you distribute them as separate works. But when you
133+distribute the same sections as part of a whole which is a work based
134+on the Program, the distribution of the whole must be on the terms of
135+this License, whose permissions for other licensees extend to the
136+entire whole, and thus to each and every part regardless of who wrote it.
137+
138+Thus, it is not the intent of this section to claim rights or contest
139+your rights to work written entirely by you; rather, the intent is to
140+exercise the right to control the distribution of derivative or
141+collective works based on the Program.
142+
143+In addition, mere aggregation of another work not based on the Program
144+with the Program (or with a work based on the Program) on a volume of
145+a storage or distribution medium does not bring the other work under
146+the scope of this License.
147+
148+ 3. You may copy and distribute the Program (or a work based on it,
149+under Section 2) in object code or executable form under the terms of
150+Sections 1 and 2 above provided that you also do one of the following:
151+
152+ a) Accompany it with the complete corresponding machine-readable
153+ source code, which must be distributed under the terms of Sections
154+ 1 and 2 above on a medium customarily used for software interchange; or,
155+
156+ b) Accompany it with a written offer, valid for at least three
157+ years, to give any third party, for a charge no more than your
158+ cost of physically performing source distribution, a complete
159+ machine-readable copy of the corresponding source code, to be
160+ distributed under the terms of Sections 1 and 2 above on a medium
161+ customarily used for software interchange; or,
162+
163+ c) Accompany it with the information you received as to the offer
164+ to distribute corresponding source code. (This alternative is
165+ allowed only for noncommercial distribution and only if you
166+ received the program in object code or executable form with such
167+ an offer, in accord with Subsection b above.)
168+
169+The source code for a work means the preferred form of the work for
170+making modifications to it. For an executable work, complete source
171+code means all the source code for all modules it contains, plus any
172+associated interface definition files, plus the scripts used to
173+control compilation and installation of the executable. However, as a
174+special exception, the source code distributed need not include
175+anything that is normally distributed (in either source or binary
176+form) with the major components (compiler, kernel, and so on) of the
177+operating system on which the executable runs, unless that component
178+itself accompanies the executable.
179+
180+If distribution of executable or object code is made by offering
181+access to copy from a designated place, then offering equivalent
182+access to copy the source code from the same place counts as
183+distribution of the source code, even though third parties are not
184+compelled to copy the source along with the object code.
185+
186+ 4. You may not copy, modify, sublicense, or distribute the Program
187+except as expressly provided under this License. Any attempt
188+otherwise to copy, modify, sublicense or distribute the Program is
189+void, and will automatically terminate your rights under this License.
190+However, parties who have received copies, or rights, from you under
191+this License will not have their licenses terminated so long as such
192+parties remain in full compliance.
193+
194+ 5. You are not required to accept this License, since you have not
195+signed it. However, nothing else grants you permission to modify or
196+distribute the Program or its derivative works. These actions are
197+prohibited by law if you do not accept this License. Therefore, by
198+modifying or distributing the Program (or any work based on the
199+Program), you indicate your acceptance of this License to do so, and
200+all its terms and conditions for copying, distributing or modifying
201+the Program or works based on it.
202+
203+ 6. Each time you redistribute the Program (or any work based on the
204+Program), the recipient automatically receives a license from the
205+original licensor to copy, distribute or modify the Program subject to
206+these terms and conditions. You may not impose any further
207+restrictions on the recipients' exercise of the rights granted herein.
208+You are not responsible for enforcing compliance by third parties to
209+this License.
210+
211+ 7. If, as a consequence of a court judgment or allegation of patent
212+infringement or for any other reason (not limited to patent issues),
213+conditions are imposed on you (whether by court order, agreement or
214+otherwise) that contradict the conditions of this License, they do not
215+excuse you from the conditions of this License. If you cannot
216+distribute so as to satisfy simultaneously your obligations under this
217+License and any other pertinent obligations, then as a consequence you
218+may not distribute the Program at all. For example, if a patent
219+license would not permit royalty-free redistribution of the Program by
220+all those who receive copies directly or indirectly through you, then
221+the only way you could satisfy both it and this License would be to
222+refrain entirely from distribution of the Program.
223+
224+If any portion of this section is held invalid or unenforceable under
225+any particular circumstance, the balance of the section is intended to
226+apply and the section as a whole is intended to apply in other
227+circumstances.
228+
229+It is not the purpose of this section to induce you to infringe any
230+patents or other property right claims or to contest validity of any
231+such claims; this section has the sole purpose of protecting the
232+integrity of the free software distribution system, which is
233+implemented by public license practices. Many people have made
234+generous contributions to the wide range of software distributed
235+through that system in reliance on consistent application of that
236+system; it is up to the author/donor to decide if he or she is willing
237+to distribute software through any other system and a licensee cannot
238+impose that choice.
239+
240+This section is intended to make thoroughly clear what is believed to
241+be a consequence of the rest of this License.
242+
243+ 8. If the distribution and/or use of the Program is restricted in
244+certain countries either by patents or by copyrighted interfaces, the
245+original copyright holder who places the Program under this License
246+may add an explicit geographical distribution limitation excluding
247+those countries, so that distribution is permitted only in or among
248+countries not thus excluded. In such case, this License incorporates
249+the limitation as if written in the body of this License.
250+
251+ 9. The Free Software Foundation may publish revised and/or new versions
252+of the General Public License from time to time. Such new versions will
253+be similar in spirit to the present version, but may differ in detail to
254+address new problems or concerns.
255+
256+Each version is given a distinguishing version number. If the Program
257+specifies a version number of this License which applies to it and "any
258+later version", you have the option of following the terms and conditions
259+either of that version or of any later version published by the Free
260+Software Foundation. If the Program does not specify a version number of
261+this License, you may choose any version ever published by the Free Software
262+Foundation.
263+
264+ 10. If you wish to incorporate parts of the Program into other free
265+programs whose distribution conditions are different, write to the author
266+to ask for permission. For software which is copyrighted by the Free
267+Software Foundation, write to the Free Software Foundation; we sometimes
268+make exceptions for this. Our decision will be guided by the two goals
269+of preserving the free status of all derivatives of our free software and
270+of promoting the sharing and reuse of software generally.
271+
272+ NO WARRANTY
273+
274+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
275+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
276+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
277+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
278+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
279+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
280+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
281+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
282+REPAIR OR CORRECTION.
283+
284+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
285+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
286+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
287+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
288+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
289+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
290+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
291+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
292+POSSIBILITY OF SUCH DAMAGES.
293+
294+ END OF TERMS AND CONDITIONS
295+
296+ How to Apply These Terms to Your New Programs
297+
298+ If you develop a new program, and you want it to be of the greatest
299+possible use to the public, the best way to achieve this is to make it
300+free software which everyone can redistribute and change under these terms.
301+
302+ To do so, attach the following notices to the program. It is safest
303+to attach them to the start of each source file to most effectively
304+convey the exclusion of warranty; and each file should have at least
305+the "copyright" line and a pointer to where the full notice is found.
306+
307+ <one line to give the program's name and a brief idea of what it does.>
308+ Copyright (C) <year> <name of author>
309+
310+ This program is free software; you can redistribute it and/or modify
311+ it under the terms of the GNU General Public License as published by
312+ the Free Software Foundation; either version 2 of the License, or
313+ (at your option) any later version.
314+
315+ This program is distributed in the hope that it will be useful,
316+ but WITHOUT ANY WARRANTY; without even the implied warranty of
317+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
318+ GNU General Public License for more details.
319+
320+ You should have received a copy of the GNU General Public License along
321+ with this program; if not, write to the Free Software Foundation, Inc.,
322+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
323+
324+Also add information on how to contact you by electronic and paper mail.
325+
326+If the program is interactive, make it output a short notice like this
327+when it starts in an interactive mode:
328+
329+ Gnomovision version 69, Copyright (C) year name of author
330+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
331+ This is free software, and you are welcome to redistribute it
332+ under certain conditions; type `show c' for details.
333+
334+The hypothetical commands `show w' and `show c' should show the appropriate
335+parts of the General Public License. Of course, the commands you use may
336+be called something other than `show w' and `show c'; they could even be
337+mouse-clicks or menu items--whatever suits your program.
338+
339+You should also get your employer (if you work as a programmer) or your
340+school, if any, to sign a "copyright disclaimer" for the program, if
341+necessary. Here is a sample; alter the names:
342+
343+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
344+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
345+
346+ <signature of Ty Coon>, 1 April 1989
347+ Ty Coon, President of Vice
348+
349+This General Public License does not permit incorporating your program into
350+proprietary programs. If your program is a subroutine library, you may
351+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
353+Public License instead of this License.
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
new file mode 100644
index 000000000..04a2edd6c
--- /dev/null
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/setDPI.sh
@@ -0,0 +1,92 @@
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
13XDEFAULTS="/etc/X11/Xdefaults"
14
15
16
17set_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
37set_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
65if test -z "$DISPLAY"
66then
67 echo "DISPLAY is not set, aborting..."
68 exit 0
69fi
70
71SCREEN_DPI="`/usr/bin/xdpyinfo | grep "dots per inch" | awk '{print $2}'| sed -n "s/\(.*\)x\(.*\)/\2/p"`"
72
73if test -z "$SCREEN_DPI"
74then
75 echo "WARNING: Couldn't read your screens DPI, defaulting to 100"
76 SCREEN_DPI=100
77fi
78
79# Configure your screen here:
80test "$SCREEN_DPI" -gt 180 -a "$SCREEN_DPI" -lt "221" && SET_SCREEN_DPI=160
81test "$SCREEN_DPI" -gt 90 -a "$SCREEN_DPI" -lt "121" && SET_SCREEN_DPI=100
82
83
84if test -z "$SET_SCREEN_DPI"
85then
86 echo "WARNING: No default configuration found for your $SCREEN_DPI DPI screen!"
87 echo "Using 100 DPI"
88 SET_SCREEN_DPI=100
89fi
90
91set_dpi "$SET_SCREEN_DPI"
92set_rxvt_font "$SCREEN_DPI"