summaryrefslogtreecommitdiffstats
path: root/meta-demoapps/recipes-graphics
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-08 14:25:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-08 14:49:16 +0100
commit67f6baa72a2c4ab868ec9c333863476e4e77513a (patch)
tree00b72871d7f12e556eb98c67c1a0b3b0c94c3871 /meta-demoapps/recipes-graphics
parent71e56f8d89c05859ddb817731653d39a8145fb98 (diff)
downloadpoky-67f6baa72a2c4ab868ec9c333863476e4e77513a.tar.gz
meta-demoapps: Remove except for xeyes and pong-clock
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-May/022059.html As proposed by Martin Jansa with a couple of changes from me. (From OE-Core rev: 204ee7391c19f9b2fa7f8b2ef46d04c7ccf5bd42) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-demoapps/recipes-graphics')
-rw-r--r--meta-demoapps/recipes-graphics/clutter/tidy.inc20
-rw-r--r--meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch13
-rw-r--r--meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch22
-rw-r--r--meta-demoapps/recipes-graphics/clutter/tidy_git.bb14
-rw-r--r--meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch17
-rw-r--r--meta-demoapps/recipes-graphics/libxklavier/libxklavier_3.9.bb11
-rw-r--r--meta-demoapps/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c410
-rw-r--r--meta-demoapps/recipes-graphics/pong-clock/pong-clock_1.0.bb16
-rw-r--r--meta-demoapps/recipes-graphics/xorg-app/xbacklight_1.1.bb4
-rw-r--r--meta-demoapps/recipes-graphics/xorg-app/xeyes_1.0.1.bb4
-rw-r--r--meta-demoapps/recipes-graphics/xorg-app/xrdb/60XDefaults.sh3
-rw-r--r--meta-demoapps/recipes-graphics/xorg-app/xrdb_1.0.5.bb14
-rw-r--r--meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch65
-rw-r--r--meta-demoapps/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb11
-rw-r--r--meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb21
-rw-r--r--meta-demoapps/recipes-graphics/xorg-lib/libxevie_1.0.2.bb8
-rw-r--r--meta-demoapps/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb8
-rw-r--r--meta-demoapps/recipes-graphics/xorg-proto/xproxymanagementprotocol_1.0.3.bb5
-rw-r--r--meta-demoapps/recipes-graphics/xournal/files/ldflags.patch17
-rw-r--r--meta-demoapps/recipes-graphics/xournal/files/no-printing.diff180
-rw-r--r--meta-demoapps/recipes-graphics/xournal/xournal_0.2.bb12
21 files changed, 0 insertions, 875 deletions
diff --git a/meta-demoapps/recipes-graphics/clutter/tidy.inc b/meta-demoapps/recipes-graphics/clutter/tidy.inc
deleted file mode 100644
index 13d6fc7686..0000000000
--- a/meta-demoapps/recipes-graphics/clutter/tidy.inc
+++ /dev/null
@@ -1,20 +0,0 @@
1DESCRIPTION = "Tidy library"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2.1+"
4
5STDDEPENDS = "clutter-1.4"
6BASE_CONF = "--disable-gtk-doc"
7
8DEPENDS = "${STDDEPENDS}"
9EXTRA_OECONF = "${BASE_CONF}"
10
11inherit autotools pkgconfig
12
13PACKAGES =+ "tidy-examples"
14FILES_tidy-examples = "${bindir}/test-*"
15
16do_configure_prepend() {
17 touch ${S}/gtk-doc.make
18 sed -i s:docs/reference/Makefile::g ${S}/configure.ac
19 sed -i s:docs::g ${S}/Makefile.am
20}
diff --git a/meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch b/meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch
deleted file mode 100644
index 51b4eeaf28..0000000000
--- a/meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: tidy/doc/reference/Makefile.am
4===================================================================
5--- tidy.orig/doc/reference/Makefile.am 2007-11-06 19:36:56.000000000 +0000
6+++ tidy/doc/reference/Makefile.am 2007-11-06 19:37:02.000000000 +0000
7@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make
8
9 # Other files to distribute
10 # e.g. EXTRA_DIST += version.xml.in
11-EXTRA_DIST += version.xml.in
12+EXTRA_DIST = version.xml.in
13
diff --git a/meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch b/meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch
deleted file mode 100644
index 694257703f..0000000000
--- a/meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: trunk/tests/Makefile.am
4===================================================================
5--- trunk.orig/tests/Makefile.am 2008-03-04 12:22:10.000000000 +0000
6+++ trunk/tests/Makefile.am 2008-03-04 12:23:46.000000000 +0000
7@@ -1,4 +1,4 @@
8-noinst_PROGRAMS = \
9+bin_PROGRAMS = \
10 test-button \
11 test-finger-scroll \
12 test-list-view \
13@@ -14,6 +14,9 @@
14 test-grow \
15 test-viewport
16
17+test_texture_framedir = $(pkgdatadir)
18+test_texture_frame_DATA = frame.png
19+
20 INCLUDES = -I$(top_srcdir)
21 LDADD = $(top_builddir)/tidy/libtidy-1.0.la
22
diff --git a/meta-demoapps/recipes-graphics/clutter/tidy_git.bb b/meta-demoapps/recipes-graphics/clutter/tidy_git.bb
deleted file mode 100644
index 623de18a1d..0000000000
--- a/meta-demoapps/recipes-graphics/clutter/tidy_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require tidy.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
4 file://tidy/tidy.h;endline=21;md5=ac342e7aac55849bf0755d79967fa3e8"
5
6SRCREV = "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
7PV = "0.1.0+git${SRCPV}"
8PR = "r7"
9
10SRC_URI = "git://git.clutter-project.org/tidy.git;protocol=git \
11 file://tidy-enable-tests.patch;patch=1"
12
13S = "${WORKDIR}/git"
14
diff --git a/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch b/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
deleted file mode 100644
index f58f30b2cd..0000000000
--- a/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: libxklavier-3.7/libxklavier.pc.in
4===================================================================
5--- libxklavier-3.7.orig/libxklavier.pc.in 2009-06-10 15:58:46.000000000 +0100
6+++ libxklavier-3.7/libxklavier.pc.in 2009-06-10 16:00:45.000000000 +0100
7@@ -5,7 +5,7 @@
8
9 Name: libxklavier
10 Description: libxklavier library
11-Requires: libxml-2.0
12+Requires: libxml-2.0 glib-2.0
13 Version: @VERSION@
14-Libs: -L${libdir} -lxklavier @GLIB_LIBS@ @XML_LIBS@
15-Cflags: -I${includedir} @GLIB_CFLAGS@
16+Libs: -L${libdir} -lxklavier
17+Cflags: -I${includedir}
diff --git a/meta-demoapps/recipes-graphics/libxklavier/libxklavier_3.9.bb b/meta-demoapps/recipes-graphics/libxklavier/libxklavier_3.9.bb
deleted file mode 100644
index da077b82ac..0000000000
--- a/meta-demoapps/recipes-graphics/libxklavier/libxklavier_3.9.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "Utility library to make using XKB easier"
2SECTION = "x11/libs"
3DEPENDS = "iso-codes libxml2 glib-2.0 libxkbfile"
4LICENSE = "LGPL"
5PR = "r2"
6
7SRC_URI = "${SOURCEFORGE_MIRROR}/gswitchit/libxklavier-${PV}.tar.bz2 \
8 file://pkgconfigfix.patch;patch=1"
9
10inherit autotools
11
diff --git a/meta-demoapps/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c b/meta-demoapps/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
deleted file mode 100644
index 41cebc58a7..0000000000
--- a/meta-demoapps/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
+++ /dev/null
@@ -1,410 +0,0 @@
1/*
2 * Pong Clock - A clock that plays pong.
3 * See http://mocoloco.com/archives/001766.php for the inspiration.
4 *
5 * Copyright (C) 2005 Matthew Allum
6 *
7 * Author: Matthew Allum mallum@openedhand.com
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
22 *
23 */
24
25#include <stdlib.h>
26#include <time.h>
27#include <sys/time.h>
28#include <sys/types.h>
29#include <string.h>
30#include <stdio.h>
31#include <unistd.h>
32#include <signal.h>
33
34#include <X11/Xlib.h>
35#include <X11/Xutil.h>
36#include <X11/Xatom.h>
37
38/* Tweak values for different hw setups */
39
40#define FPS 50
41#define RESX 40
42#define RESY 40
43#define TO_MISS_SECS 55
44#define BALLDX 16
45#define BALLDY 4
46
47
48typedef struct PongClock
49{
50 Display *xdpy;
51 int xscreen;
52 Window xwin, xwin_root;
53 Pixmap backbuffer;
54 GC xgc;
55 int xwin_width, xwin_height;
56 int pixelw, pixelh;
57
58 int ball_x, ball_y, ball_dx, ball_dy;
59 int bata_y, batb_y;
60 Bool bata_to_miss, batb_to_miss;
61
62}
63PongClock;
64
65void
66get_time(int *hour, int *min, int *sec)
67{
68 struct timeval tv;
69 struct tm *localTime = NULL;
70 time_t actualTime;
71
72 gettimeofday(&tv, 0);
73 actualTime = tv.tv_sec;
74 localTime = localtime(&actualTime);
75
76 if (hour)
77 *hour = localTime->tm_hour;
78
79 if (min)
80 *min = localTime->tm_min;
81
82 if (sec)
83 *sec = localTime->tm_sec;
84}
85
86void
87draw_rect (PongClock *pong_clock,
88 int x,
89 int y,
90 int width,
91 int height)
92{
93 XFillRectangle (pong_clock->xdpy,
94 pong_clock->backbuffer,
95 pong_clock->xgc,
96 x * pong_clock->pixelw,
97 y * pong_clock->pixelh,
98 width * pong_clock->pixelw,
99 height * pong_clock->pixelh);
100}
101
102void
103draw_field (PongClock *pong_clock)
104{
105 int i;
106
107 draw_rect (pong_clock, 0, 0, RESX+1, 1);
108 draw_rect (pong_clock, 0, RESY-1, RESX+1, 1);
109
110 for (i=0; i < RESY/2; i++)
111 draw_rect (pong_clock, (RESX/2)-1, i*2, 2, 1);
112}
113
114void
115draw_digit (PongClock *pong_clock,
116 int x,
117 int y,
118 int digit)
119{
120 int digits[] = { 0x1f8c63f, 0x1f21086, 0x1f0fe1f, 0x1f87e1f, 0x1087e31,
121 0x1f87c3f, 0x1f8fc3f, 0x84421f, 0x1f8fe3f, 0x1087e3f };
122
123 XRectangle rects[5*5];
124 int i,j,k;
125
126 i = 0;
127
128 for (k=0; k<5; k++)
129 for (j=0; j<5; j++)
130 if (digits[digit] & (1 << ((k*5)+j)))
131 {
132 rects[i].x = (x + j) * pong_clock->pixelw;
133 rects[i].y = (y + k) * pong_clock->pixelh;
134 rects[i].width = pong_clock->pixelw;
135 rects[i].height = pong_clock->pixelh;
136 i++;
137 }
138
139 XFillRectangles (pong_clock->xdpy,
140 pong_clock->backbuffer,
141 pong_clock->xgc,
142 rects, i);
143}
144
145void
146draw_time (PongClock *pong_clock)
147{
148 int hour, min;
149
150 get_time(&hour, &min, NULL);
151
152 draw_digit (pong_clock,
153 (RESX/2) - 14,
154 5,
155 hour / 10 );
156
157 draw_digit (pong_clock,
158 (RESX/2) - 8,
159 5,
160 hour % 10 );
161
162 draw_digit (pong_clock,
163 (RESX/2) + 3,
164 5,
165 min / 10 );
166
167 draw_digit (pong_clock,
168 (RESX/2) + 9,
169 5,
170 min % 10 );
171}
172
173void
174draw_bat_and_ball (PongClock *pong_clock)
175{
176 /* ball */
177
178 XFillRectangle (pong_clock->xdpy,
179 pong_clock->backbuffer,
180 pong_clock->xgc,
181 pong_clock->ball_x,
182 pong_clock->ball_y,
183 pong_clock->pixelw,
184 pong_clock->pixelh);
185
186 /* bat a */
187
188 XFillRectangle (pong_clock->xdpy,
189 pong_clock->backbuffer,
190 pong_clock->xgc,
191 0,
192 pong_clock->bata_y - (2 * pong_clock->pixelh),
193 pong_clock->pixelw,
194 pong_clock->pixelh * 5);
195
196 /* bat b */
197
198 XFillRectangle (pong_clock->xdpy,
199 pong_clock->backbuffer,
200 pong_clock->xgc,
201 (pong_clock->xwin_width - pong_clock->pixelw),
202 pong_clock->batb_y - (2 * pong_clock->pixelh),
203 pong_clock->pixelw,
204 pong_clock->pixelh * 5);
205
206}
207
208void
209update_state (PongClock *pong_clock)
210{
211 int sec, min, hour;
212
213 get_time(&hour, &min, &sec);
214
215 /* Check ball is on field and no ones dues to miss a shot.
216 */
217 if ( (pong_clock->ball_x < 0 && !pong_clock->bata_to_miss)
218 || (pong_clock->ball_x > (pong_clock->xwin_width - pong_clock->pixelw)
219 && !pong_clock->batb_to_miss) )
220 pong_clock->ball_dx *= -1;
221
222 if ((pong_clock->ball_y < pong_clock->pixelh)
223 || pong_clock->ball_y > (pong_clock->xwin_height - (2*pong_clock->pixelh)))
224 pong_clock->ball_dy *= -1;
225
226 pong_clock->ball_x += pong_clock->ball_dx;
227 pong_clock->ball_y += pong_clock->ball_dy;
228
229 /* Set up someone to miss if we getting close to an hour or min.
230 */
231 if (sec > TO_MISS_SECS)
232 {
233 if (min == 59)
234 pong_clock->batb_to_miss = True;
235 else
236 pong_clock->bata_to_miss = True;
237 }
238 else
239 {
240 /* Reset the game */
241 if (pong_clock->bata_to_miss)
242 {
243 pong_clock->bata_to_miss = False;
244 pong_clock->ball_y = pong_clock->bata_y;
245 pong_clock->ball_x = pong_clock->pixelw;
246 pong_clock->ball_dx *= -1;
247 }
248
249 if (pong_clock->batb_to_miss)
250 {
251 pong_clock->batb_to_miss = False;
252 pong_clock->ball_y = pong_clock->batb_y;
253 pong_clock->ball_x = pong_clock->xwin_width - pong_clock->pixelw;
254 pong_clock->ball_dx *= -1;
255 }
256 }
257
258 /* Keep bats on field and only move in not setup to miss */
259 if (pong_clock->ball_y >= (3*pong_clock->pixelh)
260 && pong_clock->ball_y <= (pong_clock->xwin_height - (5*pong_clock->pixelh)))
261 {
262 if (!pong_clock->batb_to_miss)
263 pong_clock->batb_y = pong_clock->ball_y;
264
265 if (!pong_clock->bata_to_miss)
266 pong_clock->bata_y = pong_clock->ball_y;
267 }
268}
269
270void
271draw_frame (PongClock *pong_clock)
272{
273 update_state (pong_clock);
274
275 /* Clear playfield */
276 XSetForeground (pong_clock->xdpy,
277 pong_clock->xgc,
278 BlackPixel(pong_clock->xdpy,
279 pong_clock->xscreen));
280
281 XFillRectangle (pong_clock->xdpy,
282 pong_clock->backbuffer,
283 pong_clock->xgc,
284 0, 0,
285 pong_clock->xwin_width,
286 pong_clock->xwin_height);
287
288 XSetForeground (pong_clock->xdpy,
289 pong_clock->xgc,
290 WhitePixel(pong_clock->xdpy,
291 pong_clock->xscreen));
292
293 draw_field (pong_clock);
294
295 draw_time (pong_clock);
296
297 draw_bat_and_ball (pong_clock);
298
299 /* flip 'backbuffer' */
300 XSetWindowBackgroundPixmap (pong_clock->xdpy,
301 pong_clock->xwin,
302 pong_clock->backbuffer);
303 XClearWindow(pong_clock->xdpy, pong_clock->xwin);
304
305 XSync(pong_clock->xdpy, False);
306}
307
308int
309main (int argc, char **argv)
310{
311 XGCValues gcv;
312 Atom atoms_WINDOW_STATE, atoms_WINDOW_STATE_FULLSCREEN;
313 PongClock *pong_clock;
314
315 pong_clock = malloc(sizeof(PongClock));
316 memset(pong_clock, 0, sizeof(PongClock));
317
318 if ((pong_clock->xdpy = XOpenDisplay(getenv("DISPLAY"))) == NULL) {
319 fprintf(stderr, "Cannot connect to X server on display %s.",
320 getenv("DISPLAY"));
321 exit(-1);
322 }
323
324 pong_clock->xscreen = DefaultScreen(pong_clock->xdpy);
325 pong_clock->xwin_root = DefaultRootWindow(pong_clock->xdpy);
326 pong_clock->xwin_width = DisplayWidth(pong_clock->xdpy,
327 pong_clock->xscreen);
328 pong_clock->xwin_height = DisplayHeight(pong_clock->xdpy,
329 pong_clock->xscreen);
330
331 pong_clock->pixelw = pong_clock->xwin_width / RESX;
332 pong_clock->pixelh = pong_clock->xwin_height / RESY;
333
334 pong_clock->ball_x = 0;
335 pong_clock->ball_y = pong_clock->xwin_height / 2;
336
337 pong_clock->ball_dx = BALLDX;
338 pong_clock->ball_dy = BALLDY;
339
340 pong_clock->batb_y = pong_clock->bata_y = pong_clock->ball_y;
341
342 gcv.background = BlackPixel(pong_clock->xdpy,
343 pong_clock->xscreen);
344 gcv.foreground = WhitePixel(pong_clock->xdpy,
345 pong_clock->xscreen);
346 gcv.graphics_exposures = False;
347
348 pong_clock->xgc = XCreateGC (pong_clock->xdpy, pong_clock->xwin_root,
349 GCForeground|GCBackground|GCGraphicsExposures,
350 &gcv);
351
352 atoms_WINDOW_STATE
353 = XInternAtom(pong_clock->xdpy, "_NET_WM_STATE",False);
354 atoms_WINDOW_STATE_FULLSCREEN
355 = XInternAtom(pong_clock->xdpy, "_NET_WM_STATE_FULLSCREEN",False);
356
357 pong_clock->xwin = XCreateSimpleWindow(pong_clock->xdpy,
358 pong_clock->xwin_root,
359 0, 0,
360 pong_clock->xwin_width,
361 pong_clock->xwin_height,
362 0,
363 WhitePixel(pong_clock->xdpy,
364 pong_clock->xscreen),
365 BlackPixel(pong_clock->xdpy,
366 pong_clock->xscreen));
367
368 pong_clock->backbuffer = XCreatePixmap(pong_clock->xdpy,
369 pong_clock->xwin_root,
370 pong_clock->xwin_width,
371 pong_clock->xwin_height,
372 DefaultDepth(pong_clock->xdpy,
373 pong_clock->xscreen));
374
375 XSelectInput(pong_clock->xdpy, pong_clock->xwin, KeyPressMask);
376
377
378 /* Set the hints for fullscreen */
379 XChangeProperty(pong_clock->xdpy,
380 pong_clock->xwin,
381 atoms_WINDOW_STATE,
382 XA_ATOM,
383 32,
384 PropModeReplace,
385 (unsigned char *) &atoms_WINDOW_STATE_FULLSCREEN, 1);
386
387 XMapWindow(pong_clock->xdpy, pong_clock->xwin);
388
389 while (True)
390 {
391 struct timeval timeout;
392 XEvent xev;
393
394 timeout.tv_sec = 0;
395 timeout.tv_usec = 1000000 / FPS;
396 select (0, NULL, NULL, NULL, &timeout);
397
398 draw_frame (pong_clock);
399
400 XFlush(pong_clock->xdpy);
401
402 if (XPending(pong_clock->xdpy))
403 {
404 if (XCheckMaskEvent(pong_clock->xdpy,
405 KeyPressMask,
406 &xev))
407 exit(-1);
408 }
409 }
410}
diff --git a/meta-demoapps/recipes-graphics/pong-clock/pong-clock_1.0.bb b/meta-demoapps/recipes-graphics/pong-clock/pong-clock_1.0.bb
deleted file mode 100644
index 8d3659ff91..0000000000
--- a/meta-demoapps/recipes-graphics/pong-clock/pong-clock_1.0.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1DESCRIPTION = "A clock combined with a game of pong"
2LICENSE = "GPLv2+"
3DEPENDS = "virtual/libx11 xdmcp xau"
4
5SRC_URI = "file://pong-clock-no-flicker.c"
6
7S = "${WORKDIR}"
8
9do_compile () {
10 ${CC} -o pong-clock pong-clock-no-flicker.c `pkg-config --cflags --libs x11 xau xdmcp`
11}
12
13do_install () {
14 install -d ${D}${bindir}
15 install -m 0755 pong-clock ${D}${bindir}
16}
diff --git a/meta-demoapps/recipes-graphics/xorg-app/xbacklight_1.1.bb b/meta-demoapps/recipes-graphics/xorg-app/xbacklight_1.1.bb
deleted file mode 100644
index 78804d734e..0000000000
--- a/meta-demoapps/recipes-graphics/xorg-app/xbacklight_1.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "X Backlight Utility"
4DEPENDS += "libxrender libxrandr"
diff --git a/meta-demoapps/recipes-graphics/xorg-app/xeyes_1.0.1.bb b/meta-demoapps/recipes-graphics/xorg-app/xeyes_1.0.1.bb
deleted file mode 100644
index 07ce0724fa..0000000000
--- a/meta-demoapps/recipes-graphics/xorg-app/xeyes_1.0.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require xorg-app-common.inc
2PE = "1"
3
4DEPENDS += " virtual/libx11 libxau libxt libxext libxmu"
diff --git a/meta-demoapps/recipes-graphics/xorg-app/xrdb/60XDefaults.sh b/meta-demoapps/recipes-graphics/xorg-app/xrdb/60XDefaults.sh
deleted file mode 100644
index 08d8beca33..0000000000
--- a/meta-demoapps/recipes-graphics/xorg-app/xrdb/60XDefaults.sh
+++ /dev/null
@@ -1,3 +0,0 @@
1if [ -e $HOME/.Xdefaults ]; then
2 xrdb -merge -nocpp < $HOME/.Xdefaults
3fi
diff --git a/meta-demoapps/recipes-graphics/xorg-app/xrdb_1.0.5.bb b/meta-demoapps/recipes-graphics/xorg-app/xrdb_1.0.5.bb
deleted file mode 100644
index 906d7d8527..0000000000
--- a/meta-demoapps/recipes-graphics/xorg-app/xrdb_1.0.5.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "X server resource database utility"
4LICENSE = "xrdb"
5DEPENDS += "libxmu"
6PE = "1"
7PR = "r2"
8
9SRC_URI += "file://60XDefaults.sh"
10
11do_install_append() {
12 install -d ${D}${sysconfdir}/X11/Xsession.d/
13 install -m 0755 ${WORKDIR}/60XDefaults.sh ${D}${sysconfdir}/X11/Xsession.d/
14}
diff --git a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch b/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
deleted file mode 100644
index 63c1847223..0000000000
--- a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3During the build process the mkg3states binary needs to be run. This patch
4allows it to be built with the build systems gcc allowing this to work.
5
6RP 31/3/10
7
8Index: liblbxutil-1.1.0/configure.ac
9===================================================================
10--- liblbxutil-1.1.0.orig/configure.ac 2009-12-04 22:52:04.000000000 +0000
11+++ liblbxutil-1.1.0/configure.ac 2010-03-31 15:26:33.000000000 +0100
12@@ -50,4 +50,5 @@
13
14 AC_OUTPUT([Makefile
15 src/Makefile
16+ src/image/Makefile
17 lbxutil.pc])
18Index: liblbxutil-1.1.0/src/Makefile.am
19===================================================================
20--- liblbxutil-1.1.0.orig/src/Makefile.am 2009-12-04 23:03:17.000000000 +0000
21+++ liblbxutil-1.1.0/src/Makefile.am 2010-03-31 15:27:25.000000000 +0100
22@@ -3,10 +3,7 @@
23 AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS)
24 INCLUDES = -I$(top_srcdir)/include
25
26-noinst_PROGRAMS = mkg3states
27-
28-mkg3states_SOURCES = \
29- $(srcdir)/image/mkg3states.c
30+SUBDIRS = image
31
32 liblbxutil_la_SOURCES = \
33 $(srcdir)/lbx_zlib/reqstats.h \
34@@ -38,9 +35,8 @@
35
36 $(srcdir)/image/dfaxg42d.c: g3states.h
37
38-g3states.h: mkg3states
39- -rm -f g3states.h
40- $(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
41+g3states.h: image/mkg3states
42+ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
43
44 liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined
45
46Index: liblbxutil-1.1.0/src/image/Makefile.am
47===================================================================
48--- /dev/null 1970-01-01 00:00:00.000000000 +0000
49+++ liblbxutil-1.1.0/src/image/Makefile.am 2010-03-31 15:26:33.000000000 +0100
50@@ -0,0 +1,15 @@
51+# evil hack
52+CFLAGS=$(CFLAGS_FOR_BUILD)
53+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
54+LDFLAGS=$(LDFLAGS_FOR_BUILD)
55+
56+CC=$(CC_FOR_BUILD)
57+LIBTOOL = @LIBTOOL@ --tag=CC
58+
59+noinst_PROGRAMS = mkg3states
60+
61+mkg3states_SOURCES = \
62+ mkg3states.c
63+
64+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
65+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
diff --git a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb b/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
deleted file mode 100644
index cdf3509246..0000000000
--- a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "XFIXES Extension"
4DEPENDS += " libxext xextproto xproto zlib"
5PROVIDES = "lbxutil"
6PE = "1"
7PR = "r1"
8
9SRC_URI += "file://mkg3states.patch;patch=1"
10
11export CC_FOR_BUILD = "gcc"
diff --git a/meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb b/meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb
deleted file mode 100644
index 489f456647..0000000000
--- a/meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Athena Widget Set"
4DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
5PROVIDES = "xaw"
6PR = "r1"
7PE = "1"
8
9XORG_PN = "libXaw"
10
11do_install_append () {
12 ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6
13 ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7
14 ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so
15}
16
17PACKAGES =+ "libxaw6 libxaw7 libxaw8"
18
19FILES_libxaw6 = "${libdir}/libXaw6.so.6*"
20FILES_libxaw7 = "${libdir}/libXaw7.so.7*"
21FILES_libxaw8 = "${libdir}/libXaw8.so.8*"
diff --git a/meta-demoapps/recipes-graphics/xorg-lib/libxevie_1.0.2.bb b/meta-demoapps/recipes-graphics/xorg-lib/libxevie_1.0.2.bb
deleted file mode 100644
index 6c6b4595aa..0000000000
--- a/meta-demoapps/recipes-graphics/xorg-lib/libxevie_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X11 EvIE extension library"
4DEPENDS += "libxext evieext"
5PR = "r1"
6PE = "1"
7
8XORG_PN = "libXevie"
diff --git a/meta-demoapps/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb b/meta-demoapps/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
deleted file mode 100644
index 9a3f5f1327..0000000000
--- a/meta-demoapps/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X11 keyboard UI presentation library"
4LICENSE= "GPL"
5DEPENDS += "virtual/libx11 libxt libxkbfile"
6PROVIDES = "xkbui"
7PR = "r1"
8PE = "1"
diff --git a/meta-demoapps/recipes-graphics/xorg-proto/xproxymanagementprotocol_1.0.3.bb b/meta-demoapps/recipes-graphics/xorg-proto/xproxymanagementprotocol_1.0.3.bb
deleted file mode 100644
index 9c3d9efa71..0000000000
--- a/meta-demoapps/recipes-graphics/xorg-proto/xproxymanagementprotocol_1.0.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require xorg-proto-common.inc
2
3PROVIDES="xproxymngproto"
4PR = "r1"
5PE = "1"
diff --git a/meta-demoapps/recipes-graphics/xournal/files/ldflags.patch b/meta-demoapps/recipes-graphics/xournal/files/ldflags.patch
deleted file mode 100644
index ec75e71529..0000000000
--- a/meta-demoapps/recipes-graphics/xournal/files/ldflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 src/Makefile.am | 2 +-
5 1 file changed, 1 insertion(+), 1 deletion(-)
6
7Index: xournal-0.2/src/Makefile.am
8===================================================================
9--- xournal-0.2.orig/src/Makefile.am 2007-05-09 15:06:26.000000000 +0100
10+++ xournal-0.2/src/Makefile.am 2007-05-09 15:06:35.000000000 +0100
11@@ -21,5 +21,5 @@ xournal_SOURCES = \
12 xo-interface.c xo-interface.h \
13 xo-callbacks.c xo-callbacks.h
14
15-xournal_LDADD = @PACKAGE_LIBS@
16+xournal_LDADD = @PACKAGE_LIBS@ -lz
17
diff --git a/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff b/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff
deleted file mode 100644
index 9fac498084..0000000000
--- a/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff
+++ /dev/null
@@ -1,180 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff -ru xournal-0.2/configure.in xournal-0.2.noprint/configure.in
4--- xournal-0.2/configure.in 2006-01-29 22:25:10.000000000 +0000
5+++ xournal-0.2.noprint/configure.in 2006-03-17 13:08:01.000000000 +0000
6@@ -10,11 +10,16 @@
7 AM_PROG_CC_STDC
8 AC_HEADER_STDC
9
10-pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
11+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0"
12 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
13 AC_SUBST(PACKAGE_CFLAGS)
14 AC_SUBST(PACKAGE_LIBS)
15
16+#PKG_CHECK_MODULES(GNOMEPRINT, libgnomeprintui-2.2 >= 2.0.0
17+#AC_SUBST(GNOMEPRINT_CFLAGS)
18+#AC_SUBST(GNOMEPRINT_LIBS)
19+AM_CONDITIONAL(ENABLE_PRINTING, false)
20+
21 AC_OUTPUT([
22 Makefile
23 src/Makefile
24diff -ru xournal-0.2/src/main.c xournal-0.2.noprint/src/main.c
25--- xournal-0.2/src/main.c 2006-01-29 22:22:52.000000000 +0000
26+++ xournal-0.2.noprint/src/main.c 2006-03-17 13:14:50.000000000 +0000
27@@ -28,7 +28,9 @@
28
29 void hide_unimplemented(void)
30 {
31+#if ENABLE_PRINTING
32 gtk_widget_hide(GET_COMPONENT("filePrintOptions"));
33+#endif
34 gtk_widget_hide(GET_COMPONENT("journalFlatten"));
35 gtk_widget_hide(GET_COMPONENT("papercolorOther"));
36 gtk_widget_hide(GET_COMPONENT("journalApplyAllPages"));
37diff -ru xournal-0.2/src/Makefile.am xournal-0.2.noprint/src/Makefile.am
38--- xournal-0.2/src/Makefile.am 2005-12-14 20:54:42.000000000 +0000
39+++ xournal-0.2.noprint/src/Makefile.am 2006-03-17 13:07:47.000000000 +0000
40@@ -7,12 +7,16 @@
41
42 bin_PROGRAMS = xournal
43
44+if ENABLE_PRINTING
45+PRINT_SOURCE = xo-print.c xo-print.h
46+endif
47+
48 xournal_SOURCES = \
49 main.c xournal.h \
50 xo-misc.c xo-misc.h \
51 xo-file.c xo-file.h \
52 xo-paint.c xo-paint.h \
53- xo-print.c xo-print.h \
54+ $(PRINT_SOURCE) \
55 xo-support.c xo-support.h \
56 xo-interface.c xo-interface.h \
57 xo-callbacks.c xo-callbacks.h
58diff -ru xournal-0.2/src/xo-callbacks.c xournal-0.2.noprint/src/xo-callbacks.c
59--- xournal-0.2/src/xo-callbacks.c 2006-01-29 19:39:22.000000000 +0000
60+++ xournal-0.2.noprint/src/xo-callbacks.c 2006-03-17 13:12:01.000000000 +0000
61@@ -7,7 +7,9 @@
62 #include <gtk/gtk.h>
63 #include <libgnomecanvas/libgnomecanvas.h>
64 #include <time.h>
65+#if ENABLE_PRINTING
66 #include <libgnomeprintui/gnome-print-dialog.h>
67+#endif
68 #include <glib/gstdio.h>
69
70 #include "xournal.h"
71@@ -17,7 +19,9 @@
72 #include "xo-misc.h"
73 #include "xo-file.h"
74 #include "xo-paint.h"
75+#if ENABLE_PRINTING
76 #include "xo-print.h"
77+#endif
78
79 void
80 on_fileNew_activate (GtkMenuItem *menuitem,
81@@ -261,7 +265,7 @@
82
83 }
84
85-
86+#if ENABLE_PRINTING
87 void
88 on_filePrint_activate (GtkMenuItem *menuitem,
89 gpointer user_data)
90@@ -407,7 +411,7 @@
91
92 g_free(filename);
93 }
94-
95+#endif
96
97 void
98 on_fileQuit_activate (GtkMenuItem *menuitem,
99diff -ru xournal-0.2/src/xo-callbacks.h xournal-0.2.noprint/src/xo-callbacks.h
100--- xournal-0.2/src/xo-callbacks.h 2006-01-26 20:47:00.000000000 +0000
101+++ xournal-0.2.noprint/src/xo-callbacks.h 2006-03-17 13:08:45.000000000 +0000
102@@ -24,6 +24,7 @@
103 on_filePrintOptions_activate (GtkMenuItem *menuitem,
104 gpointer user_data);
105
106+#if ENABLE_PRINTING
107 void
108 on_filePrint_activate (GtkMenuItem *menuitem,
109 gpointer user_data);
110@@ -32,6 +33,8 @@
111 on_filePrintPDF_activate (GtkMenuItem *menuitem,
112 gpointer user_data);
113
114+#endif
115+
116 void
117 on_fileQuit_activate (GtkMenuItem *menuitem,
118 gpointer user_data);
119diff -ru xournal-0.2/src/xo-interface.c xournal-0.2.noprint/src/xo-interface.c
120--- xournal-0.2/src/xo-interface.c 2006-01-29 18:58:25.000000000 +0000
121+++ xournal-0.2.noprint/src/xo-interface.c 2006-03-17 13:11:31.000000000 +0000
122@@ -41,10 +41,12 @@
123 GtkWidget *fileSave;
124 GtkWidget *fileSaveAs;
125 GtkWidget *separator1;
126+#if ENABLE_PRINTING
127 GtkWidget *filePrintOptions;
128 GtkWidget *image501;
129 GtkWidget *filePrint;
130 GtkWidget *filePrintPDF;
131+#endif
132 GtkWidget *separator2;
133 GtkWidget *fileQuit;
134 GtkWidget *menuEdit;
135@@ -327,6 +329,7 @@
136 gtk_container_add (GTK_CONTAINER (menuFile_menu), separator1);
137 gtk_widget_set_sensitive (separator1, FALSE);
138
139+#if ENABLE_PRINTING
140 filePrintOptions = gtk_image_menu_item_new_with_mnemonic ("Print Options");
141 gtk_widget_show (filePrintOptions);
142 gtk_container_add (GTK_CONTAINER (menuFile_menu), filePrintOptions);
143@@ -347,6 +350,7 @@
144 gtk_widget_show (separator2);
145 gtk_container_add (GTK_CONTAINER (menuFile_menu), separator2);
146 gtk_widget_set_sensitive (separator2, FALSE);
147+#endif
148
149 fileQuit = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group);
150 gtk_widget_show (fileQuit);
151@@ -1522,6 +1526,7 @@
152 g_signal_connect ((gpointer) fileSaveAs, "activate",
153 G_CALLBACK (on_fileSaveAs_activate),
154 NULL);
155+#if ENABLE_PRINTING
156 g_signal_connect ((gpointer) filePrintOptions, "activate",
157 G_CALLBACK (on_filePrintOptions_activate),
158 NULL);
159@@ -1531,6 +1536,7 @@
160 g_signal_connect ((gpointer) filePrintPDF, "activate",
161 G_CALLBACK (on_filePrintPDF_activate),
162 NULL);
163+#endif
164 g_signal_connect ((gpointer) fileQuit, "activate",
165 G_CALLBACK (on_fileQuit_activate),
166 NULL);
167@@ -1941,11 +1947,13 @@
168 GLADE_HOOKUP_OBJECT (winMain, fileSave, "fileSave");
169 GLADE_HOOKUP_OBJECT (winMain, fileSaveAs, "fileSaveAs");
170 GLADE_HOOKUP_OBJECT (winMain, separator1, "separator1");
171+#if ENABLE_PRINTING
172 GLADE_HOOKUP_OBJECT (winMain, filePrintOptions, "filePrintOptions");
173 GLADE_HOOKUP_OBJECT (winMain, image501, "image501");
174 GLADE_HOOKUP_OBJECT (winMain, filePrint, "filePrint");
175 GLADE_HOOKUP_OBJECT (winMain, filePrintPDF, "filePrintPDF");
176 GLADE_HOOKUP_OBJECT (winMain, separator2, "separator2");
177+#endif
178 GLADE_HOOKUP_OBJECT (winMain, fileQuit, "fileQuit");
179 GLADE_HOOKUP_OBJECT (winMain, menuEdit, "menuEdit");
180 GLADE_HOOKUP_OBJECT (winMain, menuEdit_menu, "menuEdit_menu");
diff --git a/meta-demoapps/recipes-graphics/xournal/xournal_0.2.bb b/meta-demoapps/recipes-graphics/xournal/xournal_0.2.bb
deleted file mode 100644
index 1ca6e1ed7c..0000000000
--- a/meta-demoapps/recipes-graphics/xournal/xournal_0.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1HOMEPAGE = "http://www-math.mit.edu/~auroux/software/xournal/"
2DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus."
3DEPENDS = "gtk+ libgnomecanvas zlib"
4SECTION = "x11"
5LICENSE = "GPL"
6PR = "r2"
7
8SRC_URI = "http://math.mit.edu/~auroux/software/xournal/xournal-0.2.tar.gz \
9 file://ldflags.patch;patch=1 \
10 file://no-printing.diff;patch=1"
11
12inherit autotools pkgconfig