diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-30 20:08:29 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-30 20:46:11 +0100 |
commit | 96235897e6cb93f636283edbf30bf8fda93e002a (patch) | |
tree | fbdd6f1e59b36cdcd7ef39842361909570003655 /meta | |
parent | 27b68f9f4c178c60e7095001a7dda3864068c6ae (diff) | |
download | poky-96235897e6cb93f636283edbf30bf8fda93e002a.tar.gz |
moblin-proto: Move to meta-extras
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
4 files changed, 0 insertions, 100 deletions
diff --git a/meta/recipes-graphics/clutter/moblin-proto/fix-shader-and-callbacks.patch b/meta/recipes-graphics/clutter/moblin-proto/fix-shader-and-callbacks.patch deleted file mode 100644 index 4a3eddb8cd..0000000000 --- a/meta/recipes-graphics/clutter/moblin-proto/fix-shader-and-callbacks.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | diff --git a/Makefile b/Makefile | ||
2 | index e05b5b7..c348a1e 100644 | ||
3 | --- a/Makefile | ||
4 | +++ b/Makefile | ||
5 | @@ -64,7 +64,7 @@ HFILES = $(wildcard *.h) | ||
6 | %.o: %.c $(HFILES) | ||
7 | $(CC) -g $(CFLAGS) $(INCS) -c $< -o$@ | ||
8 | $(BINARY): $(OBJECTS) | ||
9 | - $(CXX) -o $@ $(OBJECTS) $(LIBS) | ||
10 | + $(CXX) -rdynamic -o $@ $(OBJECTS) $(LIBS) | ||
11 | |||
12 | #$(BINARY): $(CFILES) | ||
13 | # $(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@ | ||
14 | diff --git a/moblin-desktop.c b/moblin-desktop.c | ||
15 | index 6dd4f2c..fb9d231 100644 | ||
16 | --- a/moblin-desktop.c | ||
17 | +++ b/moblin-desktop.c | ||
18 | @@ -103,6 +103,8 @@ void moblin_blur (void) | ||
19 | if (desktop->maincopy) | ||
20 | return; | ||
21 | |||
22 | + if (clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL)) | ||
23 | + { | ||
24 | #if 0 | ||
25 | desktop->maincopy = clutter_texture_new_from_actor (desktop->mainstuff); | ||
26 | #else | ||
27 | @@ -158,6 +160,17 @@ void moblin_blur (void) | ||
28 | 1.0f / moblin_desktop_width ()); | ||
29 | } | ||
30 | clutter_actor_set_shader_param (desktop->maincopy, "radius", 3.0); | ||
31 | + } | ||
32 | + else | ||
33 | + { | ||
34 | + ClutterColor clr= { 0x44, 0x44, 0x44, 0x77 }; | ||
35 | + guint w, h; | ||
36 | + | ||
37 | + desktop->maincopy = clutter_rectangle_new_with_color (&clr); | ||
38 | + clutter_actor_get_size (desktop->mainstuff, &w, &h); | ||
39 | + clutter_actor_set_size (desktop->maincopy, w, h); | ||
40 | + clutter_group_add (desktop->copyholder, desktop->maincopy); | ||
41 | + } | ||
42 | } | ||
43 | |||
44 | void moblin_unblur (void) | ||
diff --git a/meta/recipes-graphics/clutter/moblin-proto/fix.patch b/meta/recipes-graphics/clutter/moblin-proto/fix.patch deleted file mode 100644 index 8bde67762c..0000000000 --- a/meta/recipes-graphics/clutter/moblin-proto/fix.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | Index: git/Makefile | ||
2 | =================================================================== | ||
3 | --- git.orig/Makefile 2008-08-11 22:49:48.000000000 +0100 | ||
4 | +++ git/Makefile 2008-08-12 12:16:52.000000000 +0100 | ||
5 | @@ -15,7 +15,7 @@ | ||
6 | |||
7 | SCP_DESTINATION=pug.vpn:tmp | ||
8 | |||
9 | -BINARY=$(shell basename `pwd`)# | ||
10 | +BINARY=moblin-proto | ||
11 | PACKAGE=../$(BINARY).tar.bz2 # you can use both .gz and .bz2 as extension here | ||
12 | |||
13 | #CFLAGS= -Wall -I /home/pippin/src/clutter-box2d/clutter-box2d | ||
14 | @@ -61,7 +61,7 @@ | ||
15 | %.o: %.c $(HFILES) | ||
16 | $(CC) -g $(CFLAGS) $(INCS) -c $< -o$@ | ||
17 | $(BINARY): $(OBJECTS) | ||
18 | - $(CC) -o $@ $(OBJECTS) $(LIBS) | ||
19 | + $(CXX) -o $@ $(OBJECTS) $(LIBS) | ||
20 | |||
21 | #$(BINARY): $(CFILES) | ||
22 | # $(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@ | ||
diff --git a/meta/recipes-graphics/clutter/moblin-proto/paths.patch b/meta/recipes-graphics/clutter/moblin-proto/paths.patch deleted file mode 100644 index d241c8ff71..0000000000 --- a/meta/recipes-graphics/clutter/moblin-proto/paths.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | diff --git a/moblin-desktop.h b/moblin-desktop.h | ||
2 | index 880a9ad..3d51a14 100644 | ||
3 | --- a/moblin-desktop.h | ||
4 | +++ b/moblin-desktop.h | ||
5 | @@ -29,8 +29,8 @@ | ||
6 | #define __MAIN_H__ | ||
7 | |||
8 | |||
9 | -#define ASSET_ROOT "./assets/" | ||
10 | -#define JSON_ROOT "./layouts/" | ||
11 | +#define ASSET_ROOT "/usr/share/moblin-proto/assets/" | ||
12 | +#define JSON_ROOT "/usr/share/moblin-proto/layouts/" | ||
13 | |||
14 | typedef struct | ||
15 | { | ||
diff --git a/meta/recipes-graphics/clutter/moblin-proto_git.bb b/meta/recipes-graphics/clutter/moblin-proto_git.bb deleted file mode 100644 index b86d622385..0000000000 --- a/meta/recipes-graphics/clutter/moblin-proto_git.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | DEPENDS = "clutter-box2d" | ||
2 | |||
3 | PV = "0.0+git${SRCPV}" | ||
4 | PR = "r2" | ||
5 | |||
6 | SRC_URI = "git://moblin.org/repos/users/pippin/prototype.git/;protocol=http \ | ||
7 | file://paths.patch;patch=1 \ | ||
8 | file://fix-shader-and-callbacks.patch;patch=1" | ||
9 | |||
10 | S = "${WORKDIR}/git" | ||
11 | |||
12 | do_install () { | ||
13 | install -d ${D}${bindir} | ||
14 | install ${S}/moblin-proto ${D}${bindir} | ||
15 | |||
16 | install -d ${D}${datadir}/moblin-proto/ | ||
17 | cp -a ${S}/assets ${D}${datadir}/moblin-proto/ | ||
18 | cp -a ${S}/layouts ${D}${datadir}/moblin-proto/ | ||
19 | } | ||