summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@ted.(none)>2009-06-04 19:46:22 +0100
committerRichard Purdie <richard@ted.(none)>2009-06-04 19:46:22 +0100
commite9832b10b2cc26a0dbe50566739eeb09e607b0c4 (patch)
treebc0b8c66e64548a5972979ba977c8ea5ca110379
parent176fad85ec0b39b2c397f1c1a1665be4b43baa7b (diff)
downloadpoky-e9832b10b2cc26a0dbe50566739eeb09e607b0c4.tar.gz
xf86-video-intel: Disable xvmc explicitly and don't use dolt in the git version
Signed-off-by: Richard Purdie <richard@ted.(none)>
-rw-r--r--meta/packages/xorg-driver/xf86-video-intel/nodolt.patch12
-rw-r--r--meta/packages/xorg-driver/xf86-video-intel_2.7.1.bb2
-rw-r--r--meta/packages/xorg-driver/xf86-video-intel_git.bb5
3 files changed, 18 insertions, 1 deletions
diff --git a/meta/packages/xorg-driver/xf86-video-intel/nodolt.patch b/meta/packages/xorg-driver/xf86-video-intel/nodolt.patch
new file mode 100644
index 0000000000..68ca9694ae
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-video-intel/nodolt.patch
@@ -0,0 +1,12 @@
1Index: git/configure.ac
2===================================================================
3--- git.orig/configure.ac 2009-06-02 14:47:46.000000000 +0100
4+++ git/configure.ac 2009-06-02 14:49:41.000000000 +0100
5@@ -43,7 +43,6 @@
6 # Checks for programs.
7 AC_DISABLE_STATIC
8 AC_PROG_LIBTOOL
9-DOLT
10 AC_PROG_CC
11 AM_PROG_CC_C_O
12
diff --git a/meta/packages/xorg-driver/xf86-video-intel_2.7.1.bb b/meta/packages/xorg-driver/xf86-video-intel_2.7.1.bb
index 30e713538d..f60bdd2697 100644
--- a/meta/packages/xorg-driver/xf86-video-intel_2.7.1.bb
+++ b/meta/packages/xorg-driver/xf86-video-intel_2.7.1.bb
@@ -1,5 +1,7 @@
1require xf86-video-common.inc 1require xf86-video-common.inc
2 2
3EXTRA_OECONF += "--disable-xvmc"
4
3DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" 5DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
4DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \ 6DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
5 virtual/libgl xineramaproto xf86driproto libpciaccess" 7 virtual/libgl xineramaproto xf86driproto libpciaccess"
diff --git a/meta/packages/xorg-driver/xf86-video-intel_git.bb b/meta/packages/xorg-driver/xf86-video-intel_git.bb
index 7abf0677e1..6b5ab74de6 100644
--- a/meta/packages/xorg-driver/xf86-video-intel_git.bb
+++ b/meta/packages/xorg-driver/xf86-video-intel_git.bb
@@ -7,6 +7,8 @@ DEPENDS += "virtual/libx11 libxvmc drm dri2proto glproto \
7PR = "r1" 7PR = "r1"
8PV = "2.4.98.0+git${SRCREV}" 8PV = "2.4.98.0+git${SRCREV}"
9 9
10EXTRA_OECONF += "--disable-xvmc"
11
10DEFAULT_PREFERENCE = "-1" 12DEFAULT_PREFERENCE = "-1"
11 13
12#TODO: Investigate the fact that these patches fail to apply to git master a.t.m 14#TODO: Investigate the fact that these patches fail to apply to git master a.t.m
@@ -14,7 +16,8 @@ DEFAULT_PREFERENCE = "-1"
14#file://004_reduce_driver_boottime.patch;patch=1 16#file://004_reduce_driver_boottime.patch;patch=1
15SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel;protocol=git \ 17SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel;protocol=git \
16 file://005_disable_sdvo_TV_port_restoreHW.patch;patch=1 \ 18 file://005_disable_sdvo_TV_port_restoreHW.patch;patch=1 \
17 file://006_disable_check_lvds_panelpower_status.patch;patch=1" 19 file://006_disable_check_lvds_panelpower_status.patch;patch=1 \
20 file://nodolt.patch;patch=1 "
18 21
19S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"
20 23