libdrm: Create a common include file and att virtual/libx11 to DEPENDS

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

3 files changed, 17 insertions, 20 deletions

diff --git a/meta/packages/drm/libdrm.inc b/meta/packages/drm/libdrm.inc
new file mode 100644
index 0000000000..11d89a5d2c
--- /dev/null
+++ b/meta/packages/drm/libdrm.inc
@@ -0,0 +1,12 @@
+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"
+
+PACKAGES =+ "libdrm-tests"
+FILES_libdrm-tests = "${bindir}/dr* ${bindir}/mode*"
+
+LEAD_SONAME = "libdrm.so"
+
+inherit autotools_stage pkgconfig
diff --git a/meta/packages/drm/libdrm_2.4.15.bb b/meta/packages/drm/libdrm_2.4.15.bb
index f0d5668937..7679035866 100644
--- a/meta/packages/drm/libdrm_2.4.15.bb
+++ b/meta/packages/drm/libdrm_2.4.15.bb
@@ -1,12 +1,4 @@
-SECTION = "x11/base"
-LICENSE = "MIT"
-SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2 \
-           file://installtests.patch;patch=1"
-PR = "r1"
-PROVIDES = "drm"
-DEPENDS = "libpthread-stubs udev cairo"
-
-PACKAGES =+ "libdrm-tests"
-FILES_libdrm-tests = "${bindir}/dr* ${bindir}/mode*"
+require libdrm.inc
 
-inherit autotools_stage pkgconfig
+SRC_URI += "file://installtests.patch;patch=1"
+PR = "r1"
diff --git a/meta/packages/drm/libdrm_git.bb b/meta/packages/drm/libdrm_git.bb
index bb8402294b..d80dd5f433 100644
--- a/meta/packages/drm/libdrm_git.bb
+++ b/meta/packages/drm/libdrm_git.bb
@@ -1,15 +1,8 @@
-SECTION = "x11/base"
-LICENSE = "MIT"
+require libdrm.inc
+
 SRC_URI = "git://anongit.freedesktop.org/git/mesa/drm;protocol=git"
-PROVIDES = "drm"
 
 S = ${WORKDIR}/git
 
-DEPENDS = "libpthread-stubs"
-
 PV = "2.4.15+git${SRCREV}"
 PR = "r0"
-
-LEAD_SONAME = "libdrm.so"
-
-inherit autotools_stage pkgconfig