* [PATCH 1/4] drm: move to PR/INC_PR, starting at r1 as libdrm_git was at r1
2012-07-27 11:53 [PATCH 0/4] drm updates Ross Burton
@ 2012-07-27 11:53 ` Ross Burton
2012-07-27 11:53 ` [PATCH 2/4] libdrm: libdrm does not depend on xcb any more Ross Burton
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Ross Burton @ 2012-07-27 11:53 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/drm/libdrm.inc | 2 ++
meta/recipes-graphics/drm/libdrm_2.4.35.bb | 2 +-
meta/recipes-graphics/drm/libdrm_git.bb | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc
index 20d7f1f..8a2c760 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -10,6 +10,8 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
PROVIDES = "drm"
DEPENDS = "libpthread-stubs udev cairo virtual/libx11"
+INC_PR = "r1"
+
#libpciaccess is required starting from libdrm 2.4.26
DEPENDS += " libpciaccess"
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.35.bb b/meta/recipes-graphics/drm/libdrm_2.4.35.bb
index 3677b8d..9d9ada1 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.35.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.35.bb
@@ -2,7 +2,7 @@ require libdrm.inc
LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
-PR = "r0"
+PR = "${INC_PR}.0"
SRC_URI += "file://installtests.patch \
file://GNU_SOURCE_definition.patch \
diff --git a/meta/recipes-graphics/drm/libdrm_git.bb b/meta/recipes-graphics/drm/libdrm_git.bb
index c2f9855..d71b7f7 100644
--- a/meta/recipes-graphics/drm/libdrm_git.bb
+++ b/meta/recipes-graphics/drm/libdrm_git.bb
@@ -6,4 +6,4 @@ S = "${WORKDIR}/git"
SRCREV = "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
PV = "2.4.15+git${SRCPV}"
-PR = "r1"
+PR = "${INC_PR}.0"
--
1.7.10
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/4] libdrm: libdrm does not depend on xcb any more
2012-07-27 11:53 [PATCH 0/4] drm updates Ross Burton
2012-07-27 11:53 ` [PATCH 1/4] drm: move to PR/INC_PR, starting at r1 as libdrm_git was at r1 Ross Burton
@ 2012-07-27 11:53 ` Ross Burton
2012-07-27 11:53 ` [PATCH 3/4] libdrm: Put the license md5sum in the common include Ross Burton
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Ross Burton @ 2012-07-27 11:53 UTC (permalink / raw)
To: openembedded-core
From: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/drm/libdrm.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc
index 8a2c760..e9ca2f9 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -8,9 +8,9 @@ SECTION = "x11/base"
LICENSE = "MIT"
SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
PROVIDES = "drm"
-DEPENDS = "libpthread-stubs udev cairo virtual/libx11"
+DEPENDS = "libpthread-stubs udev cairo"
-INC_PR = "r1"
+INC_PR = "r2"
#libpciaccess is required starting from libdrm 2.4.26
DEPENDS += " libpciaccess"
--
1.7.10
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/4] libdrm: Put the license md5sum in the common include
2012-07-27 11:53 [PATCH 0/4] drm updates Ross Burton
2012-07-27 11:53 ` [PATCH 1/4] drm: move to PR/INC_PR, starting at r1 as libdrm_git was at r1 Ross Burton
2012-07-27 11:53 ` [PATCH 2/4] libdrm: libdrm does not depend on xcb any more Ross Burton
@ 2012-07-27 11:53 ` Ross Burton
2012-07-27 11:53 ` [PATCH 4/4] libdrm: Bump libdrm_git to 2.4.37 Ross Burton
2012-07-29 9:21 ` [PATCH 0/4] drm updates Richard Purdie
4 siblings, 0 replies; 7+ messages in thread
From: Ross Burton @ 2012-07-27 11:53 UTC (permalink / raw)
To: openembedded-core
From: Damien Lespiau <damien.lespiau@intel.com>
With this, libdrm_git now does have LIC_FILES_CHKSUM as well.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/drm/libdrm.inc | 1 +
meta/recipes-graphics/drm/libdrm_2.4.35.bb | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc
index e9ca2f9..5ddab85 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -6,6 +6,7 @@ accelerated OpenGL drivers."
HOMEPAGE = "http://dri.freedesktop.org"
SECTION = "x11/base"
LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
PROVIDES = "drm"
DEPENDS = "libpthread-stubs udev cairo"
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.35.bb b/meta/recipes-graphics/drm/libdrm_2.4.35.bb
index 9d9ada1..58ee449 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.35.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.35.bb
@@ -1,7 +1,5 @@
require libdrm.inc
-LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
-
PR = "${INC_PR}.0"
SRC_URI += "file://installtests.patch \
--
1.7.10
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/4] libdrm: Bump libdrm_git to 2.4.37
2012-07-27 11:53 [PATCH 0/4] drm updates Ross Burton
` (2 preceding siblings ...)
2012-07-27 11:53 ` [PATCH 3/4] libdrm: Put the license md5sum in the common include Ross Burton
@ 2012-07-27 11:53 ` Ross Burton
2012-07-29 9:39 ` [PATCH] libdrm: add DEFAULT_PREFERENCE = -1 to git recipe Martin Jansa
2012-07-29 9:21 ` [PATCH 0/4] drm updates Richard Purdie
4 siblings, 1 reply; 7+ messages in thread
From: Ross Burton @ 2012-07-27 11:53 UTC (permalink / raw)
To: openembedded-core
From: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/drm/libdrm_git.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/drm/libdrm_git.bb b/meta/recipes-graphics/drm/libdrm_git.bb
index d71b7f7..2b3ef47 100644
--- a/meta/recipes-graphics/drm/libdrm_git.bb
+++ b/meta/recipes-graphics/drm/libdrm_git.bb
@@ -4,6 +4,7 @@ SRC_URI = "git://anongit.freedesktop.org/git/mesa/drm;protocol=git"
S = "${WORKDIR}/git"
-SRCREV = "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
-PV = "2.4.15+git${SRCPV}"
+SRCREV = "1b1a4f0a779f7ab2ba5673b9c9fe2a37047fe765"
+PV = "2.4.37+git${SRCPV}"
PR = "${INC_PR}.0"
+
--
1.7.10
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 0/4] drm updates
2012-07-27 11:53 [PATCH 0/4] drm updates Ross Burton
` (3 preceding siblings ...)
2012-07-27 11:53 ` [PATCH 4/4] libdrm: Bump libdrm_git to 2.4.37 Ross Burton
@ 2012-07-29 9:21 ` Richard Purdie
4 siblings, 0 replies; 7+ messages in thread
From: Richard Purdie @ 2012-07-29 9:21 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2012-07-27 at 12:53 +0100, Ross Burton wrote:
> Forwarding some patches to libdrm. More mesa-related changes later.
>
> The following changes since commit fb53d69d9c726e6a663ea276cc440676e20f8326:
>
> documentation/dev-manual/dev-manual-intro.xml: typo fixed. (2012-07-26 18:53:04 +0100)
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib ross/mesa
>
> for you to fetch changes up to cae0f7ba7693529116ae5e21cdddc35bf96aa8fe:
>
> libdrm: Bump libdrm_git to 2.4.37 (2012-07-27 12:51:29 +0100)
>
> ----------------------------------------------------------------
> Damien Lespiau (3):
> libdrm: libdrm does not depend on xcb any more
> libdrm: Put the license md5sum in the common include
> libdrm: Bump libdrm_git to 2.4.37
>
> Ross Burton (1):
> drm: move to PR/INC_PR, starting at r1 as libdrm_git was at r1
>
> meta/recipes-graphics/drm/libdrm.inc | 5 ++++-
> meta/recipes-graphics/drm/libdrm_2.4.35.bb | 4 +---
> meta/recipes-graphics/drm/libdrm_git.bb | 7 ++++---
> 3 files changed, 9 insertions(+), 7 deletions(-)
>
> Damien Lespiau (3):
> libdrm: libdrm does not depend on xcb any more
> libdrm: Put the license md5sum in the common include
> libdrm: Bump libdrm_git to 2.4.37
>
> Ross Burton (1):
> drm: move to PR/INC_PR, starting at r1 as libdrm_git was at r1
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 7+ messages in thread