diff options
author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
---|---|---|
committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
commit | f45580a1527dccdda100eee7f25f9f2c41af4db8 (patch) | |
tree | 2218d4955f368e1804d86f212cc78317b4327f77 /recipes/clutter | |
parent | 887b437869709625f5323438808ded9990cf590a (diff) | |
parent | e3df24d64a48aff19aa9960dd9308a071b243b09 (diff) | |
download | openembedded-f45580a1527dccdda100eee7f25f9f2c41af4db8.tar.gz |
Merge commit 'origin/shr/merge' into shr/testing2009
Conflicts:
conf/distro/include/sane-srcrevs.inc
recipes/enotes/enotes_svn.bb
recipes/intone-video/intone-video_svn.bb
recipes/intone/intone_svn.bb
recipes/shr/shr-wizard_git.bb
recipes/tasks/task-shr-minimal.bb
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'recipes/clutter')
-rw-r--r-- | recipes/clutter/clutter-0.9_git.bb | 2 | ||||
-rw-r--r-- | recipes/clutter/clutter-glx_svn.bb | 1 | ||||
-rw-r--r-- | recipes/clutter/clutter.inc | 2 | ||||
-rw-r--r-- | recipes/clutter/clutter_0.4svn.bb | 1 | ||||
-rw-r--r-- | recipes/clutter/clutter_0.6svn.bb | 1 | ||||
-rw-r--r-- | recipes/clutter/clutter_0.8+git.bb | 1 | ||||
-rw-r--r-- | recipes/clutter/clutter_svn.bb | 2 |
7 files changed, 8 insertions, 2 deletions
diff --git a/recipes/clutter/clutter-0.9_git.bb b/recipes/clutter/clutter-0.9_git.bb index b7a04ca03a..039417c626 100644 --- a/recipes/clutter/clutter-0.9_git.bb +++ b/recipes/clutter/clutter-0.9_git.bb @@ -3,7 +3,7 @@ require clutter.inc SRCREV = "13e055a351f83c56b895b131566a6e842d24ed2a" PV = "1.1.0" -PR = "r0" +PR = "${INC_PR}.0" PR_append = "+git${SRCREV}" SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git \ diff --git a/recipes/clutter/clutter-glx_svn.bb b/recipes/clutter/clutter-glx_svn.bb index 8a2a1fa1ed..0590330412 100644 --- a/recipes/clutter/clutter-glx_svn.bb +++ b/recipes/clutter/clutter-glx_svn.bb @@ -1,6 +1,7 @@ require clutter.inc PV = "0.3.1+svn${SRCDATE}" +PR = "${INC_PR}.0" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http" diff --git a/recipes/clutter/clutter.inc b/recipes/clutter/clutter.inc index 371544de00..a80d9b6f5a 100644 --- a/recipes/clutter/clutter.inc +++ b/recipes/clutter/clutter.inc @@ -37,6 +37,8 @@ EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative" PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " +INC_PR = "r1" + inherit autotools pkgconfig gtk-doc PACKAGES =+ "clutter-examples" diff --git a/recipes/clutter/clutter_0.4svn.bb b/recipes/clutter/clutter_0.4svn.bb index faf7a8766f..121b96480f 100644 --- a/recipes/clutter/clutter_0.4svn.bb +++ b/recipes/clutter/clutter_0.4svn.bb @@ -1,6 +1,7 @@ require clutter.inc PV = "0.4.0+svnr${SRCPV}" +PR = "${INC_PR}.0" SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-4;proto=http \ file://enable_tests-0.4.patch;patch=1 " diff --git a/recipes/clutter/clutter_0.6svn.bb b/recipes/clutter/clutter_0.6svn.bb index 15c87a52a1..21cafef85d 100644 --- a/recipes/clutter/clutter_0.6svn.bb +++ b/recipes/clutter/clutter_0.6svn.bb @@ -1,6 +1,7 @@ require clutter.inc PV = "0.6.0+svnr${SRCPV}" +PR = "${INC_PR}.0" SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-6;proto=http \ file://enable_tests-0.6.patch;patch=1 " diff --git a/recipes/clutter/clutter_0.8+git.bb b/recipes/clutter/clutter_0.8+git.bb index e31e250431..391e5fea35 100644 --- a/recipes/clutter/clutter_0.8+git.bb +++ b/recipes/clutter/clutter_0.8+git.bb @@ -3,6 +3,7 @@ require clutter.inc CLUTTER_REV = "af16378899699376fe7e84c7c11eb3bb5c4668cd" PV = "0.8.8" +PR = "${INC_PR}.0" PR_append = "+gitr${CLUTTER_REV}" SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8;rev=${CLUTTER_REV} \ diff --git a/recipes/clutter/clutter_svn.bb b/recipes/clutter/clutter_svn.bb index 55a434c583..d8d623c2fe 100644 --- a/recipes/clutter/clutter_svn.bb +++ b/recipes/clutter/clutter_svn.bb @@ -3,7 +3,7 @@ require clutter.inc DEFAULT_PREFERENCE = "-1" PV = "0.8.0+svnr${SRCPV}" -PR = "r0" +PR = "${INC_PR}.0" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \ file://enable_tests.patch;patch=1;maxrev=2989 \ |