xf86-video-intel: Disable xvmc explicitly and don't use dolt in the git version

Signed-off-by: Richard Purdie <richard@ted.(none)>

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 @@
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac       2009-06-02 14:47:46.000000000 +0100
++++ git/configure.ac    2009-06-02 14:49:41.000000000 +0100
+@@ -43,7 +43,6 @@
+ # Checks for programs.
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-DOLT
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+ 
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 @@
 require xf86-video-common.inc
 
+EXTRA_OECONF += "--disable-xvmc"
+
 DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
 DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
             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 \
 PR = "r1"
 PV = "2.4.98.0+git${SRCREV}"
 
+EXTRA_OECONF += "--disable-xvmc"
+
 DEFAULT_PREFERENCE = "-1"
 
 #TODO: Investigate the fact that these patches fail to apply to git master a.t.m
@@ -14,7 +16,8 @@ DEFAULT_PREFERENCE = "-1"
 #file://004_reduce_driver_boottime.patch;patch=1
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel;protocol=git \
            file://005_disable_sdvo_TV_port_restoreHW.patch;patch=1 \
-           file://006_disable_check_lvds_panelpower_status.patch;patch=1"
+           file://006_disable_check_lvds_panelpower_status.patch;patch=1 \
+           file://nodolt.patch;patch=1 "
 
 S = "${WORKDIR}/git"