[oe-commits] Martin Jansa : libdrm: add libdrm.inc, INC_PR and move to new staging

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: a0acdeec009ff7ba196fce30abdd3e80f0158aad
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a0acdeec009ff7ba196fce30abdd3e80f0158aad

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed May 26 10:10:49 2010 +0200

libdrm: add libdrm.inc, INC_PR and move to new staging

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/dri/libdrm.inc       |    8 ++++++++
 recipes/dri/libdrm_2.3.0.bb  |   11 ++---------
 recipes/dri/libdrm_2.3.1.bb  |   11 ++---------
 recipes/dri/libdrm_2.4.11.bb |   13 ++-----------
 recipes/dri/libdrm_2.4.17.bb |   13 ++-----------
 recipes/dri/libdrm_2.4.18.bb |   15 +++------------
 recipes/dri/libdrm_git.bb    |   12 +++---------
 7 files changed, 22 insertions(+), 61 deletions(-)

diff --git a/recipes/dri/libdrm.inc b/recipes/dri/libdrm.inc
new file mode 100644
index 0000000..eebd6b2
--- /dev/null
+++ b/recipes/dri/libdrm.inc
@@ -0,0 +1,8 @@
+SECTION = "x11/base"
+LICENSE = "MIT"
+SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
+PROVIDES = "drm"
+
+INC_PR = "r3"
+
+inherit autotools pkgconfig
diff --git a/recipes/dri/libdrm_2.3.0.bb b/recipes/dri/libdrm_2.3.0.bb
index 8aa62fa..1d7046b 100644
--- a/recipes/dri/libdrm_2.3.0.bb
+++ b/recipes/dri/libdrm_2.3.0.bb
@@ -1,13 +1,6 @@
-SECTION = "x11/base"
-LICENSE = "MIT"
-SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
-PROVIDES = "drm"
+require libdrm.inc
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "01a1e1ee0268a2403db42fa630036ab2"
 SRC_URI[sha256sum] = "f8c711427fea50845811360c92f6350ff3dacb9533741470d54ae5d0a2f6848e"
diff --git a/recipes/dri/libdrm_2.3.1.bb b/recipes/dri/libdrm_2.3.1.bb
index f28094f..dc0e91e 100644
--- a/recipes/dri/libdrm_2.3.1.bb
+++ b/recipes/dri/libdrm_2.3.1.bb
@@ -1,13 +1,6 @@
-SECTION = "x11/base"
-LICENSE = "MIT"
-SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
-PROVIDES = "drm"
+require libdrm.inc
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "620fe7dd02c3236c3e9881a3a238173d"
 SRC_URI[sha256sum] = "ddfd398383729707846e1f1689e9acb3bc672e4f255a632c8f0d0c55ddf8718c"
diff --git a/recipes/dri/libdrm_2.4.11.bb b/recipes/dri/libdrm_2.4.11.bb
index 5d85042..e49d6a2 100644
--- a/recipes/dri/libdrm_2.4.11.bb
+++ b/recipes/dri/libdrm_2.4.11.bb
@@ -1,15 +1,6 @@
-SECTION = "x11/base"
-DEPENDS = "libpthread-stubs"
-LICENSE = "MIT"
-SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
-PROVIDES = "drm"
-PR = "r1"
+require libdrm.inc
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
+PR = "${INC_PR}.0"
 
 PACKAGES =+ "${PN}-intel"
 
diff --git a/recipes/dri/libdrm_2.4.17.bb b/recipes/dri/libdrm_2.4.17.bb
index 96edd2a..902db02 100644
--- a/recipes/dri/libdrm_2.4.17.bb
+++ b/recipes/dri/libdrm_2.4.17.bb
@@ -1,18 +1,9 @@
-SECTION = "x11/base"
-DEPENDS = "libpthread-stubs"
-LICENSE = "MIT"
-SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
-PROVIDES = "drm"
-PR = "r2"
+require libdrm.inc
 
-inherit autotools pkgconfig
+PR = "${INC_PR}.0"
 
 EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '', '--disable-intel',d)}"
 
-do_stage() {
-	autotools_stage_all
-}
-
 PACKAGES =+ "${@base_contains('MACHINE_FEATURES', 'x86', '${PN}-intel', '',d)}"
 
 FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*"
diff --git a/recipes/dri/libdrm_2.4.18.bb b/recipes/dri/libdrm_2.4.18.bb
index 085a730..1a4e8be 100644
--- a/recipes/dri/libdrm_2.4.18.bb
+++ b/recipes/dri/libdrm_2.4.18.bb
@@ -1,21 +1,12 @@
-SECTION = "x11/base"
-DEPENDS = "libpthread-stubs"
-LICENSE = "MIT"
-SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2;name=archive"
-PROVIDES = "drm"
-PR = "r0"
+require libdrm.inc
+
+PR = "${INC_PR}.0"
 
 SRC_URI[archive.md5sum] = "d2b5fbfd37742af7d2169f7d26ce3007"
 SRC_URI[archive.sha256sum] = "f6c5b44fff5cb602096cc48a1bced426496bc8060463c577a7d86f2e56eeb604"
 
-inherit autotools pkgconfig
-
 EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '', '--disable-intel',d)}"
 
-do_stage() {
-	autotools_stage_all
-}
-
 PACKAGES =+ "${@base_contains('MACHINE_FEATURES', 'x86', '${PN}-intel', '',d)}"
 
 FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*"
diff --git a/recipes/dri/libdrm_git.bb b/recipes/dri/libdrm_git.bb
index 3f81cdd..e48a2aa 100644
--- a/recipes/dri/libdrm_git.bb
+++ b/recipes/dri/libdrm_git.bb
@@ -1,11 +1,11 @@
-SECTION = "x11/base"
-LICENSE = "MIT"
+require libdrm.inc
 SRC_URI = "git://anongit.freedesktop.org/mesa/drm;protocol=git;branch=master"
 SRC_URI_shr = "git://git.bitwiz.org.uk/libdrm.git;protocol=git;branch=glamo"
 
-PROVIDES = "drm"
 DEPENDS = "libpthread-stubs virtual/kernel"
 
+PR = "${INC_PR}.0"
+
 PE = "1"
 PV = "2.4.18+gitr${SRCPV}"
 PR = "r0"
@@ -19,9 +19,3 @@ DEFAULT_PREFERENCE_shr = "1"
 S = "${WORKDIR}/git"
 
 EXTRA_OECONF_append_shr = " --enable-glamo-experimental-api --disable-radeon --disable-intel"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}