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