summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2014-03-07 14:33:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-11 08:11:41 -0700
commitfe8140636b86f6c1b6418f297e9ae990024a0985 (patch)
tree9edb609a63f6aebcb4aa2f601e451812054a1090
parenta3f0852b1460188a7f95fb9079e665797fc63f7c (diff)
downloadpoky-fe8140636b86f6c1b6418f297e9ae990024a0985.tar.gz
xf86-video-intel: add recipe for 2.99.910, remove the git one
Intel graphics stack releases >= 2013Q3 need xf86-video-intel >= 2.99.902. However, keep the stable release around too, in case people need it. The git recipe is not really used. Remove, since it has missing PACKAGECONFIG, license checksums and so on. (From OE-Core rev: f707b6d81d2548e1bc8effdf267d1e40cc2cb806) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/default-versions.inc3
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.910.bb31
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb23
3 files changed, 34 insertions, 23 deletions
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index 53ec2e7caf..a9a931d772 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -9,3 +9,6 @@ PREFERRED_VERSION_python-native ?= "2.7.3"
9 9
10# Force the older version of liberation-fonts until we fix the fontforge issue 10# Force the older version of liberation-fonts until we fix the fontforge issue
11PREFERRED_VERSION_liberation-fonts ?= "1.04" 11PREFERRED_VERSION_liberation-fonts ?= "1.04"
12
13# Intel video stack 2013Q3 and newer need a version >=2.99.902
14PREFERRED_VERSION_xf86-video-intel ?= "2.99.910"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.910.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.910.bb
new file mode 100644
index 0000000000..b74d1741cc
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.910.bb
@@ -0,0 +1,31 @@
1require xorg-driver-video.inc
2
3SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver"
4
5DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \
6chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \
7the driver supports hardware accelerated 3D via the Direct Rendering \
8Infrastructure (DRI)."
9
10LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
11
12DEPENDS += "virtual/libx11 drm libpciaccess pixman"
13
14SRC_URI += "file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \
15 "
16
17PACKAGECONFIG ??= "sna udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"
18
19PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto"
20PACKAGECONFIG[sna] = "--enable-sna,--disable-sna"
21PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa"
22PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev"
23PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
24
25# --enable-kms-only option is required by ROOTLESS_X
26EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}'
27
28COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
29
30SRC_URI[md5sum] = "a9a5c2c15766c06a024381efe0d724bb"
31SRC_URI[sha256sum] = "203d46064449da0e23a111418dfb189422ba96ea08707167c8dee463e2d745b1"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
deleted file mode 100644
index d4c7654938..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1require xorg-driver-video.inc
2
3SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver"
4
5DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \
6chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \
7the driver supports hardware accelerated 3D via the Direct Rendering \
8Infrastructure (DRI)."
9
10DEPENDS += "virtual/libx11 drm dri2proto glproto \
11 virtual/libgl xineramaproto libpciaccess udev"
12
13SRCREV = "87ea531c5dc5b39809395b277c330854aaaaf019"
14PV = "2.10.0+git${SRCPV}"
15PR = "${INC_PR}.1"
16
17EXTRA_OECONF += "--disable-xvmc --enable-dri --disable-static"
18
19SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel"
20
21S = "${WORKDIR}/git"
22
23COMPATIBLE_HOST = '(i.86|x86_64).*-linux'