diff options
| -rw-r--r-- | rules/xorg-driver-video-intel.in | 15 | ||||
| -rw-r--r-- | rules/xorg-driver-video-intel.make | 5 |
2 files changed, 5 insertions, 15 deletions
diff --git a/rules/xorg-driver-video-intel.in b/rules/xorg-driver-video-intel.in index 810f3b2e3..ec3146644 100644 --- a/rules/xorg-driver-video-intel.in +++ b/rules/xorg-driver-video-intel.in @@ -40,22 +40,13 @@ if XORG_DRIVER_VIDEO_INTEL comment "X.org Intel Driver" -if BROKEN -config XORG_DRIVER_VIDEO_INTEL_DRI - bool - prompt "Enable DRI" - default y - help - --enable-dri - Note: The driver cannot be built without this option enabled. -endif -if !BROKEN config XORG_DRIVER_VIDEO_INTEL_DRI bool + prompt "Enable DRI" if BROKEN default y help - Its still not possible to build this driver without dri support -endif + --enable-dri + Note: The driver cannot be built without this option enabled. config XORG_DRIVER_VIDEO_INTEL_XVMC bool diff --git a/rules/xorg-driver-video-intel.make b/rules/xorg-driver-video-intel.make index 20866a46f..b102c4329 100644 --- a/rules/xorg-driver-video-intel.make +++ b/rules/xorg-driver-video-intel.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_XORG_DRIVER_VIDEO_INTEL) += xorg-driver-v # # Paths and names # -XORG_DRIVER_VIDEO_INTEL_VERSION := 2.12.0 +XORG_DRIVER_VIDEO_INTEL_VERSION := 2.13.0 XORG_DRIVER_VIDEO_INTEL := xf86-video-intel-$(XORG_DRIVER_VIDEO_INTEL_VERSION) XORG_DRIVER_VIDEO_INTEL_SUFFIX := tar.bz2 XORG_DRIVER_VIDEO_INTEL_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_VIDEO_INTEL).$(XORG_DRIVER_VIDEO_INTEL_SUFFIX) @@ -46,8 +46,7 @@ XORG_DRIVER_VIDEO_INTEL_ENV := \ # XORG_DRIVER_VIDEO_INTEL_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --with-xorg-module-dir=/usr/lib/xorg/modules \ - --disable-video-debug + --with-xorg-module-dir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)/xorg/modules ifdef PTXCONF_XORG_DRIVER_VIDEO_INTEL_XVMC XORG_DRIVER_VIDEO_INTEL_AUTOCONF += --enable-xvmc |