summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-07-03 11:18:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-08 00:01:22 +0100
commit4913e35bfe136fec2b291a35d36aad69f900ba92 (patch)
tree9d7e109659f2d510fdc22133234afdbcb4a09e7c /meta/recipes-graphics
parent86fc0b2e3a79b5f0e50ec8d6f46794ae37a10858 (diff)
downloadpoky-4913e35bfe136fec2b291a35d36aad69f900ba92.tar.gz
libdrm: remove git recipe, merge inc
The git recipe hasn't been touched since 2012 and is out of date, so simplify the recipe by removing the git form and merging the remaining bb and inc file. (From OE-Core rev: f71909f5eacc23d8533f1860ab890892d4f93f29) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/drm/libdrm.inc41
-rw-r--r--meta/recipes-graphics/drm/libdrm_2.4.59.bb41
-rw-r--r--meta/recipes-graphics/drm/libdrm_git.bb12
3 files changed, 38 insertions, 56 deletions
diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc
deleted file mode 100644
index d3e1e92b61..0000000000
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ /dev/null
@@ -1,41 +0,0 @@
1SUMMARY = "Userspace interface to the kernel DRM services"
2DESCRIPTION = "The runtime library for accessing the kernel DRM services. DRM \
3stands for \"Direct Rendering Manager\", which is the kernel portion of the \
4\"Direct Rendering Infrastructure\" (DRI). DRI is required for many hardware \
5accelerated OpenGL drivers."
6HOMEPAGE = "http://dri.freedesktop.org"
7SECTION = "x11/base"
8LICENSE = "MIT"
9LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
10SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
11PROVIDES = "drm"
12DEPENDS = "libpthread-stubs udev"
13
14# be aware that libdrm_2.4.44.bb ignores this
15INC_PR = "r4"
16
17#libpciaccess is required starting from libdrm 2.4.26
18DEPENDS += " libpciaccess"
19
20inherit autotools pkgconfig
21
22EXTRA_OECONF += "--disable-cairo-tests \
23 --enable-omap-experimental-api \
24 --enable-install-test-programs \
25 --disable-manpages \
26 "
27ALLOW_EMPTY_${PN}-drivers = "1"
28PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \
29 ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno"
30
31RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
32 ${PN}-exynos ${PN}-freedreno"
33
34FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test"
35FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*"
36FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*"
37FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*"
38FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*"
39FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*"
40FILES_${PN}-kms = "${libdir}/libkms*.so.*"
41FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*"
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.59.bb b/meta/recipes-graphics/drm/libdrm_2.4.59.bb
index 14bf44affb..97f75ff029 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.59.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.59.bb
@@ -1,6 +1,41 @@
1require libdrm.inc 1SUMMARY = "Userspace interface to the kernel DRM services"
2 2DESCRIPTION = "The runtime library for accessing the kernel DRM services. DRM \
3SRC_URI += "file://installtests.patch " 3stands for \"Direct Rendering Manager\", which is the kernel portion of the \
4\"Direct Rendering Infrastructure\" (DRI). DRI is required for many hardware \
5accelerated OpenGL drivers."
6HOMEPAGE = "http://dri.freedesktop.org"
7SECTION = "x11/base"
8LICENSE = "MIT"
9LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
10PROVIDES = "drm"
11DEPENDS = "libpthread-stubs udev libpciaccess"
4 12
13SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
14 file://installtests.patch "
5SRC_URI[md5sum] = "d32a1d37c2546ee11fc5924abeedb23e" 15SRC_URI[md5sum] = "d32a1d37c2546ee11fc5924abeedb23e"
6SRC_URI[sha256sum] = "68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b" 16SRC_URI[sha256sum] = "68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b"
17
18inherit autotools pkgconfig
19
20EXTRA_OECONF += "--disable-cairo-tests \
21 --enable-omap-experimental-api \
22 --enable-install-test-programs \
23 --disable-manpages \
24 "
25
26ALLOW_EMPTY_${PN}-drivers = "1"
27PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \
28 ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno"
29
30RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
31 ${PN}-exynos ${PN}-freedreno"
32
33FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test"
34FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*"
35FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*"
36FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*"
37FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*"
38FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*"
39FILES_${PN}-kms = "${libdir}/libkms*.so.*"
40FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*"
41
diff --git a/meta/recipes-graphics/drm/libdrm_git.bb b/meta/recipes-graphics/drm/libdrm_git.bb
deleted file mode 100644
index d7245ee865..0000000000
--- a/meta/recipes-graphics/drm/libdrm_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require libdrm.inc
2
3SRC_URI = "git://anongit.freedesktop.org/git/mesa/drm"
4
5S = "${WORKDIR}/git"
6
7DEFAULT_PREFERENCE = "-1"
8
9SRCREV = "e01d68f9f3acfc35fe164283904b5d058c2ab378"
10PV = "2.4.40+git${SRCPV}"
11PR = "${INC_PR}.0"
12