drm updates

PATCH Applied Ross Burton 3 participants 7 messages Jul 27, 2012 – Jul 29, 2012

lore

Share & tools

lore

Ross Burton

author

2012-07-27 12:05 UTC #0 lore raw

cover drm updates

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

 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(-)

Signature · 1 line

1.7.10

Ross Burton

author

2012-07-27 12:05 UTC #1 lore raw

PATCH 1/4 drm: move to PR/INC_PR, starting at r1 as libdrm_git was at r1

Signed-off-by Ross Burton <[email protected]>

---
 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(-)

meta/recipes-graphics/drm/libdrm.inc +2 -0

index 20d7f1f..8a2c760 100644
@@ -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"

meta/recipes-graphics/drm/libdrm_2.4.35.bb +1 -1

index 3677b8d..9d9ada1 100644
@@ -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 \

meta/recipes-graphics/drm/libdrm_git.bb +1 -1

index c2f9855..d71b7f7 100644
@@ -6,4 +6,4 @@ S = "${WORKDIR}/git"
 
 SRCREV = "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
 PV = "2.4.15+git${SRCPV}"
-PR = "r1"
+PR = "${INC_PR}.0"

Signature · 1 line

1.7.10

Ross Burton

author

2012-07-27 12:05 UTC #2 lore raw

PATCH 2/4 libdrm: libdrm does not depend on xcb any more

In reply to Ross Burton

From: Damien Lespiau <[email protected]>

Signed-off-by Damien Lespiau <[email protected]>

Signed-off-by Ross Burton <[email protected]>

---
 meta/recipes-graphics/drm/libdrm.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

meta/recipes-graphics/drm/libdrm.inc +2 -2

index 8a2c760..e9ca2f9 100644
@@ -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"

Signature · 1 line

1.7.10

Ross Burton

author

2012-07-27 12:05 UTC #3 lore raw

PATCH 3/4 libdrm: Put the license md5sum in the common include

In reply to Ross Burton

From: Damien Lespiau <[email protected]>

With this, libdrm_git now does have LIC_FILES_CHKSUM as well.

Signed-off-by Damien Lespiau <[email protected]>

Signed-off-by Ross Burton <[email protected]>

---
 meta/recipes-graphics/drm/libdrm.inc       |    1 +
 meta/recipes-graphics/drm/libdrm_2.4.35.bb |    2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

meta/recipes-graphics/drm/libdrm.inc +1 -0

index e9ca2f9..5ddab85 100644
@@ -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"

meta/recipes-graphics/drm/libdrm_2.4.35.bb +0 -2

index 9d9ada1..58ee449 100644
@@ -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 \

Signature · 1 line

1.7.10

Ross Burton

author

2012-07-27 12:05 UTC #4 lore raw

PATCH 4/4 libdrm: Bump libdrm_git to 2.4.37

In reply to Ross Burton

From: Damien Lespiau <[email protected]>

Signed-off-by Damien Lespiau <[email protected]>

Signed-off-by Ross Burton <[email protected]>

---
 meta/recipes-graphics/drm/libdrm_git.bb |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

meta/recipes-graphics/drm/libdrm_git.bb +3 -2

index d71b7f7..2b3ef47 100644
@@ -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"
+

Signature · 1 line

1.7.10

Martin Jansa

2012-07-29 09:51 UTC #5 lore raw

PATCH 1/1 libdrm: add DEFAULT_PREFERENCE = -1 to git recipe

* recipe from tarball should be default version

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/drm/libdrm_git.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

meta/recipes-graphics/drm/libdrm_git.bb +2 -0

index 2b3ef47..4f4d4f7 100644
@@ -4,6 +4,8 @@ SRC_URI = "git://anongit.freedesktop.org/git/mesa/drm;protocol=git"
 
 S = "${WORKDIR}/git"
 
+DEFAULT_PREFERENCE = "-1"
+
 SRCREV = "1b1a4f0a779f7ab2ba5673b9c9fe2a37047fe765"
 PV = "2.4.37+git${SRCPV}"
 PR = "${INC_PR}.0"

Signature · 1 line

1.7.8.6

Richard Purdie

Applied

2012-07-29 09:33 UTC #6 lore raw

In reply to Ross Burton

Quoted 28 lines · Ross Burton

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(-)

Quoted 7 lines

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