moblin-proto: Move to meta-extras

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2010-09-30 20:08:29 +01:00
parent 27b68f9f4c
commit 96235897e6
4 changed files with 0 additions and 0 deletions

View File

@@ -1,44 +0,0 @@
diff --git a/Makefile b/Makefile
index e05b5b7..c348a1e 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ HFILES = $(wildcard *.h)
%.o: %.c $(HFILES)
$(CC) -g $(CFLAGS) $(INCS) -c $< -o$@
$(BINARY): $(OBJECTS)
- $(CXX) -o $@ $(OBJECTS) $(LIBS)
+ $(CXX) -rdynamic -o $@ $(OBJECTS) $(LIBS)
#$(BINARY): $(CFILES)
# $(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@
diff --git a/moblin-desktop.c b/moblin-desktop.c
index 6dd4f2c..fb9d231 100644
--- a/moblin-desktop.c
+++ b/moblin-desktop.c
@@ -103,6 +103,8 @@ void moblin_blur (void)
if (desktop->maincopy)
return;
+ if (clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
+ {
#if 0
desktop->maincopy = clutter_texture_new_from_actor (desktop->mainstuff);
#else
@@ -158,6 +160,17 @@ void moblin_blur (void)
1.0f / moblin_desktop_width ());
}
clutter_actor_set_shader_param (desktop->maincopy, "radius", 3.0);
+ }
+ else
+ {
+ ClutterColor clr= { 0x44, 0x44, 0x44, 0x77 };
+ guint w, h;
+
+ desktop->maincopy = clutter_rectangle_new_with_color (&clr);
+ clutter_actor_get_size (desktop->mainstuff, &w, &h);
+ clutter_actor_set_size (desktop->maincopy, w, h);
+ clutter_group_add (desktop->copyholder, desktop->maincopy);
+ }
}
void moblin_unblur (void)

View File

@@ -1,22 +0,0 @@
Index: git/Makefile
===================================================================
--- git.orig/Makefile 2008-08-11 22:49:48.000000000 +0100
+++ git/Makefile 2008-08-12 12:16:52.000000000 +0100
@@ -15,7 +15,7 @@
SCP_DESTINATION=pug.vpn:tmp
-BINARY=$(shell basename `pwd`)#
+BINARY=moblin-proto
PACKAGE=../$(BINARY).tar.bz2 # you can use both .gz and .bz2 as extension here
#CFLAGS= -Wall -I /home/pippin/src/clutter-box2d/clutter-box2d
@@ -61,7 +61,7 @@
%.o: %.c $(HFILES)
$(CC) -g $(CFLAGS) $(INCS) -c $< -o$@
$(BINARY): $(OBJECTS)
- $(CC) -o $@ $(OBJECTS) $(LIBS)
+ $(CXX) -o $@ $(OBJECTS) $(LIBS)
#$(BINARY): $(CFILES)
# $(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@

View File

@@ -1,15 +0,0 @@
diff --git a/moblin-desktop.h b/moblin-desktop.h
index 880a9ad..3d51a14 100644
--- a/moblin-desktop.h
+++ b/moblin-desktop.h
@@ -29,8 +29,8 @@
#define __MAIN_H__
-#define ASSET_ROOT "./assets/"
-#define JSON_ROOT "./layouts/"
+#define ASSET_ROOT "/usr/share/moblin-proto/assets/"
+#define JSON_ROOT "/usr/share/moblin-proto/layouts/"
typedef struct
{

View File

@@ -1,19 +0,0 @@
DEPENDS = "clutter-box2d"
PV = "0.0+git${SRCPV}"
PR = "r2"
SRC_URI = "git://moblin.org/repos/users/pippin/prototype.git/;protocol=http \
file://paths.patch;patch=1 \
file://fix-shader-and-callbacks.patch;patch=1"
S = "${WORKDIR}/git"
do_install () {
install -d ${D}${bindir}
install ${S}/moblin-proto ${D}${bindir}
install -d ${D}${datadir}/moblin-proto/
cp -a ${S}/assets ${D}${datadir}/moblin-proto/
cp -a ${S}/layouts ${D}${datadir}/moblin-proto/
}