mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-29 00:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add moblin-proto, drop ununused clutter-box2d patch

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5056 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-08-12 11:18:59 +00:00
parent 67e520f96f
commit 5bbdd31d82
3 changed files with 58 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
meta/packages/clutter/clutter-box2d/clutter08.patch
View File

@@ -1,13 +0,0 @@
Index: clutter-box2d/configure.ac
===================================================================
--- clutter-box2d.orig/configure.ac 2008-07-16 10:09:40.000000000 +0100
+++ clutter-box2d/configure.ac 2008-07-16 10:09:51.000000000 +0100
@@ -70,7 +70,7 @@
dnl ========================================================================
-pkg_modules="clutter-0.7 >= 0.7.0"
+pkg_modules="clutter-0.8 >= 0.8.0"
PKG_CHECK_MODULES(DEPS, [$pkg_modules])
if test "x$GCC" = "xyes"; then

44
meta/packages/clutter/moblin-proto/fix.patch Normal file
View File

@@ -0,0 +1,44 @@
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 $@
Index: git/moblin-desktop.c
===================================================================
--- git.orig/moblin-desktop.c 2008-08-11 22:49:49.000000000 +0100
+++ git/moblin-desktop.c 2008-08-12 12:14:44.000000000 +0100
@@ -620,17 +620,10 @@
attach_reactivate_on_press (old_app);
-<<<<<<< HEAD:moblin-desktop.c
shuttle = clutter_group_new ();
clutter_group_add (CLUTTER_GROUP(desktop->mainstuff), shuttle);
copy_geometry (desktop->middle, shuttle);
clutter_actor_reparent (old_app, shuttle);
-=======
- box = clutter_group_new ();
- clutter_group_add (CLUTTER_GROUP(desktop->stage), box);
- copy_geometry (desktop->middle, box);
- clutter_actor_reparent (old_app, box);
->>>>>>> Removed now unneeded forcible shows of apps.:moblin-desktop.c
{
gint x, y;

14
meta/packages/clutter/moblin-proto_git.bb Normal file
View File

@@ -0,0 +1,14 @@
DEPENDS = "clutter-box2d"
PV = "0.0+git${SRCREV}"
SRC_URI = "git://moblin.org/repos/users/pippin/prototype.git/;protocol=http \
file://fix.patch;patch=1"
S = "${WORKDIR}/git"
do_install () {
install -d ${D}${bindir}
install ${S}/moblin-proto ${D}${bindir}
}