diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-08-14 18:06:32 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-08-14 18:06:32 +0100 |
commit | a19a75fc31718a5d6a5791573cd520b650690885 (patch) | |
tree | 1ae32041c1d16df4afaf044ca63a1eff654212be /meta | |
parent | 69005b217bc95de41f9f4fb2c864c1aea71f5183 (diff) | |
download | poky-a19a75fc31718a5d6a5791573cd520b650690885.tar.gz |
Various PR bumps
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/packages/clutter/clutter-1.0_git.bb | 2 | ||||
-rw-r--r-- | meta/packages/clutter/clutter-gst_git.bb | 2 | ||||
-rw-r--r-- | meta/packages/clutter/clutter-gtk_git.bb | 2 | ||||
-rw-r--r-- | meta/packages/clutter/clutter-mozembed_git.bb | 2 | ||||
-rw-r--r-- | meta/packages/clutter/clutter_git.bb | 4 | ||||
-rw-r--r-- | meta/packages/xorg-driver/xf86-video-intel_git.bb | 5 | ||||
-rw-r--r-- | meta/packages/xorg-proto/dri2proto_git.bb | 2 |
7 files changed, 10 insertions, 9 deletions
diff --git a/meta/packages/clutter/clutter-1.0_git.bb b/meta/packages/clutter/clutter-1.0_git.bb index bfa41cd30c..d02622133b 100644 --- a/meta/packages/clutter/clutter-1.0_git.bb +++ b/meta/packages/clutter/clutter-1.0_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require clutter.inc | 1 | require clutter.inc |
2 | 2 | ||
3 | PV = "1.0+git${SRCPV}" | 3 | PV = "1.0+git${SRCPV}" |
4 | PR = "r0" | 4 | PR = "r2" |
5 | 5 | ||
6 | PACKAGES =+ "clutter-examples-1.0" | 6 | PACKAGES =+ "clutter-examples-1.0" |
7 | FILES_clutter-examples-1.0 = "${bindir}/test-* ${pkgdatadir}/redhand.png" | 7 | FILES_clutter-examples-1.0 = "${bindir}/test-* ${pkgdatadir}/redhand.png" |
diff --git a/meta/packages/clutter/clutter-gst_git.bb b/meta/packages/clutter/clutter-gst_git.bb index 7d0c53ba36..f69406473a 100644 --- a/meta/packages/clutter/clutter-gst_git.bb +++ b/meta/packages/clutter/clutter-gst_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require clutter-gst.inc | 1 | require clutter-gst.inc |
2 | 2 | ||
3 | PV = "0.9.0+git${SRCPV}" | 3 | PV = "0.9.0+git${SRCPV}" |
4 | PR = "r1" | 4 | PR = "r2" |
5 | 5 | ||
6 | SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git \ | 6 | SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git \ |
7 | file://autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch;patch=1;rev=9db4a61a25677764bb927369c5c68ada958fb65c \ | 7 | file://autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch;patch=1;rev=9db4a61a25677764bb927369c5c68ada958fb65c \ |
diff --git a/meta/packages/clutter/clutter-gtk_git.bb b/meta/packages/clutter/clutter-gtk_git.bb index 4bf7105c22..4c8b89d451 100644 --- a/meta/packages/clutter/clutter-gtk_git.bb +++ b/meta/packages/clutter/clutter-gtk_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require clutter-gtk.inc | 1 | require clutter-gtk.inc |
2 | 2 | ||
3 | PV = "0.9.0+git${SRCPV}" | 3 | PV = "0.9.0+git${SRCPV}" |
4 | PR = "r0" | 4 | PR = "r1" |
5 | 5 | ||
6 | SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git" | 6 | SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git" |
7 | 7 | ||
diff --git a/meta/packages/clutter/clutter-mozembed_git.bb b/meta/packages/clutter/clutter-mozembed_git.bb index 4a51422e2e..e2da2d6a7d 100644 --- a/meta/packages/clutter/clutter-mozembed_git.bb +++ b/meta/packages/clutter/clutter-mozembed_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require clutter-mozembed.inc | 1 | require clutter-mozembed.inc |
2 | 2 | ||
3 | PV = "0.8.0+git${SRCPV}" | 3 | PV = "0.8.0+git${SRCPV}" |
4 | PR = "r6" | 4 | PR = "r7" |
5 | 5 | ||
6 | SRC_URI = "git://git.clutter-project.org/clutter-mozembed.git;protocol=git \ | 6 | SRC_URI = "git://git.clutter-project.org/clutter-mozembed.git;protocol=git \ |
7 | file://link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch;patch=1;rev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41 \ | 7 | file://link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch;patch=1;rev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41 \ |
diff --git a/meta/packages/clutter/clutter_git.bb b/meta/packages/clutter/clutter_git.bb index a33468b30a..c6204e1383 100644 --- a/meta/packages/clutter/clutter_git.bb +++ b/meta/packages/clutter/clutter_git.bb | |||
@@ -1,8 +1,8 @@ | |||
1 | require clutter.inc | 1 | require clutter.inc |
2 | require clutter-package.inc | 2 | require clutter-package.inc |
3 | 3 | ||
4 | PV = "0.9.0+git${SRCPV}" | 4 | PV = "1.0.0+git${SRCPV}" |
5 | PR = "r4" | 5 | PR = "r6" |
6 | 6 | ||
7 | SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \ | 7 | SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \ |
8 | file://enable_tests.patch;patch=1 " | 8 | file://enable_tests.patch;patch=1 " |
diff --git a/meta/packages/xorg-driver/xf86-video-intel_git.bb b/meta/packages/xorg-driver/xf86-video-intel_git.bb index a3c63bffe7..29894002b9 100644 --- a/meta/packages/xorg-driver/xf86-video-intel_git.bb +++ b/meta/packages/xorg-driver/xf86-video-intel_git.bb | |||
@@ -4,10 +4,10 @@ DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" | |||
4 | DEPENDS += "virtual/libx11 libxvmc drm dri2proto glproto \ | 4 | DEPENDS += "virtual/libx11 libxvmc drm dri2proto glproto \ |
5 | virtual/libgl xineramaproto libpciaccess" | 5 | virtual/libgl xineramaproto libpciaccess" |
6 | 6 | ||
7 | PR = "r1" | 7 | PR = "r3" |
8 | PV = "2.7.1+git${SRCPV}" | 8 | PV = "2.7.1+git${SRCPV}" |
9 | 9 | ||
10 | EXTRA_OECONF += "--disable-xvmc" | 10 | EXTRA_OECONF += "--disable-xvmc --enable-dri --disable-static" |
11 | 11 | ||
12 | #TODO: Investigate the fact that these patches fail to apply to git master a.t.m | 12 | #TODO: Investigate the fact that these patches fail to apply to git master a.t.m |
13 | #file://002_avoid_duplicate_SaveHWState.patch;patch=1 | 13 | #file://002_avoid_duplicate_SaveHWState.patch;patch=1 |
@@ -21,5 +21,4 @@ S = "${WORKDIR}/git" | |||
21 | 21 | ||
22 | COMPATIBLE_HOST = '(i.86.*-linux)' | 22 | COMPATIBLE_HOST = '(i.86.*-linux)' |
23 | 23 | ||
24 | EXTRA_OECONF = "--enable-dri --disable-static" | ||
25 | 24 | ||
diff --git a/meta/packages/xorg-proto/dri2proto_git.bb b/meta/packages/xorg-proto/dri2proto_git.bb index 83922e08f9..7d5d69b8e7 100644 --- a/meta/packages/xorg-proto/dri2proto_git.bb +++ b/meta/packages/xorg-proto/dri2proto_git.bb | |||
@@ -3,7 +3,9 @@ DESCRIPTION = "DRI2 extension headers" | |||
3 | require xorg-proto-common.inc | 3 | require xorg-proto-common.inc |
4 | 4 | ||
5 | PV = "1.99.3+git${SRCPV}" | 5 | PV = "1.99.3+git${SRCPV}" |
6 | PR = "r2" | ||
6 | 7 | ||
7 | SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/dri2proto;protocol=git" | 8 | SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/dri2proto;protocol=git" |
9 | # file://dri2-proto-DRI2Swapbuffer.patch;patch=1" | ||
8 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
9 | 11 | ||