diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
commit | 293b05335ab540c4c8402e0a5caf2886b786a318 (patch) | |
tree | 11e5a7c2dce338058f150e08d1ff47c9d4d8eccd /recipes/dri | |
parent | 1ee2156592ba17f64f3c9b8970285a259730b871 (diff) | |
parent | e9aacc4ce4784c91cb4908145b8fb7b3ec8aa6e0 (diff) | |
download | openembedded-293b05335ab540c4c8402e0a5caf2886b786a318.tar.gz |
Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010
Conflicts:
recipes/linux/linux-openmoko-devel_git.bb
recipes/openmoko-3rdparty/pisi_0.5.2.bb
recipes/openmoko-3rdparty/pisi_0.5.3.bb
recipes/openmoko-3rdparty/pisi_0.5.bb
recipes/uclibc/uclibc_nptl.bb
Diffstat (limited to 'recipes/dri')
-rw-r--r-- | recipes/dri/drm-kernel_cvs.bb | 2 | ||||
-rw-r--r-- | recipes/dri/libdrm.inc | 8 | ||||
-rw-r--r-- | recipes/dri/libdrm_2.3.0.bb | 11 | ||||
-rw-r--r-- | recipes/dri/libdrm_2.3.1.bb | 11 | ||||
-rw-r--r-- | recipes/dri/libdrm_2.4.11.bb | 13 | ||||
-rw-r--r-- | recipes/dri/libdrm_2.4.17.bb | 13 | ||||
-rw-r--r-- | recipes/dri/libdrm_2.4.18.bb | 18 | ||||
-rw-r--r-- | recipes/dri/libdrm_git.bb | 12 |
8 files changed, 25 insertions, 63 deletions
diff --git a/recipes/dri/drm-kernel_cvs.bb b/recipes/dri/drm-kernel_cvs.bb index 9e04cc4d7e..15ec0de2b4 100644 --- a/recipes/dri/drm-kernel_cvs.bb +++ b/recipes/dri/drm-kernel_cvs.bb @@ -6,7 +6,7 @@ PR = "r3" LICENSE = "MIT" SRC_URI = "${FREEDESKTOP_CVS}/dri;module=drm;method=pserver \ - file://make.patch;patch=1" + file://make.patch" inherit module-base diff --git a/recipes/dri/libdrm.inc b/recipes/dri/libdrm.inc new file mode 100644 index 0000000000..eebd6b2200 --- /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 8aa62fabaf..1d7046ba49 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 f28094f5cb..dc0e91e082 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 5d85042ca7..e49d6a2b5b 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 96edd2a5f8..902db026ab 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 085a730861..e3bb393d8a 100644 --- a/recipes/dri/libdrm_2.4.18.bb +++ b/recipes/dri/libdrm_2.4.18.bb @@ -1,20 +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 -SRC_URI[archive.md5sum] = "d2b5fbfd37742af7d2169f7d26ce3007" -SRC_URI[archive.sha256sum] = "f6c5b44fff5cb602096cc48a1bced426496bc8060463c577a7d86f2e56eeb604" +PR = "${INC_PR}.0" -inherit autotools pkgconfig +SRC_URI[md5sum] = "d2b5fbfd37742af7d2169f7d26ce3007" +SRC_URI[sha256sum] = "f6c5b44fff5cb602096cc48a1bced426496bc8060463c577a7d86f2e56eeb604" -EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '', '--disable-intel',d)}" -do_stage() { - autotools_stage_all -} +EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '', '--disable-intel',d)}" PACKAGES =+ "${@base_contains('MACHINE_FEATURES', 'x86', '${PN}-intel', '',d)}" diff --git a/recipes/dri/libdrm_git.bb b/recipes/dri/libdrm_git.bb index 3f81cdd8ff..e48a2aa33a 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 -} |