From patchwork Mon Mar 31 20:06:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 335571 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 603EC1400D9 for ; Tue, 1 Apr 2014 07:07:09 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D57148B66D; Mon, 31 Mar 2014 20:07:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mhpDYonKXNvT; Mon, 31 Mar 2014 20:06:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4C8D18B642; Mon, 31 Mar 2014 20:06:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6366B1BF992 for ; Mon, 31 Mar 2014 20:06:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5EE218AF7C for ; Mon, 31 Mar 2014 20:06:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 50I3oK03jP+J for ; Mon, 31 Mar 2014 20:06:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout08.t-online.de (mailout08.t-online.de [194.25.134.20]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9A8898AF6F for ; Mon, 31 Mar 2014 20:06:44 +0000 (UTC) Received: from fwd30.aul.t-online.de (fwd30.aul.t-online.de ) by mailout08.t-online.de with smtp id 1WUiTf-00055Q-0L; Mon, 31 Mar 2014 22:06:39 +0200 Received: from fli4l.lan.fli4l (XNBZ1yZYohn7IuL5Eatek8TwYEFblDvLx972qpdL-nDxZxqOVauaR+kAL6CHOBQZ1d@[87.146.222.86]) by fwd30.t-online.de with esmtp id 1WUiTe-05zm7c0; Mon, 31 Mar 2014 22:06:38 +0200 Received: from [192.168.1.122] (port=41152 helo=fli4lbuild64.lan.fli4l) by fli4l.lan.fli4l with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.80.1) (envelope-from ) id 1WUiTe-00055d-2E; Mon, 31 Mar 2014 22:06:38 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Mon, 31 Mar 2014 22:06:20 +0200 Message-Id: <1396296389-28821-8-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1396296389-28821-1-git-send-email-bernd.kuhls@t-online.de> References: <1396296389-28821-1-git-send-email-bernd.kuhls@t-online.de> X-ID: XNBZ1yZYohn7IuL5Eatek8TwYEFblDvLx972qpdL-nDxZxqOVauaR+kAL6CHOBQZ1d X-TOI-MSGID: 4f309f88-0e4f-4243-b00e-bd02abf34234 Cc: Bernd Kuhls , Bernd Kuhls Subject: [Buildroot] [PATCH v4 07/16] xdriver_xf86-video-intel: Bump version to 2.99.911 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Bernd Kuhls - add necessary dependencies - add -D_GNU_SOURCE to avoid getline compilation error Signed-off-by: Bernd Kuhls Signed-off-by: Bernd Kuhls --- v4: no changes v3: - add optional dependency BR2_PACKAGE_XPROTO_XF86DRIPROTO (Thomas) v2: - depend on mesa3d only when the i965 DRI driver is selected (Thomas) - allow both kms and ums support (Thomas): Support for Kernel Mode Setting? yes Support for legacy User Mode Setting (for i810)? yes package/x11r7/xdriver_xf86-video-intel/Config.in | 13 ++++---- .../xdriver_xf86-video-intel.mk | 31 ++++++++++++++++---- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-intel/Config.in b/package/x11r7/xdriver_xf86-video-intel/Config.in index 83b714a..1917319 100644 --- a/package/x11r7/xdriver_xf86-video-intel/Config.in +++ b/package/x11r7/xdriver_xf86-video-intel/Config.in @@ -1,13 +1,14 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL bool "xf86-video-intel" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XLIB_LIBPCIACCESS select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_INTEL - select BR2_PACKAGE_MESA3D + select BR2_PACKAGE_XLIB_LIBXCOMPOSITE + select BR2_PACKAGE_XLIB_LIBPCIACCESS + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_LIBXTST + select BR2_PACKAGE_XPROTO_FONTSPROTO + select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 + select BR2_PACKAGE_XPROTO_XPROTO depends on (BR2_i386 || BR2_x86_64) help Intel video driver diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk index 332de54..e9d3871 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk @@ -4,18 +4,18 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.99.907 +XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.99.911 XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES + +# this fixes a getline-related compilation in src/sna/kgem.c +XDRIVER_XF86_VIDEO_INTEL_CONF_ENV = \ + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = \ - --enable-dri \ - --enable-kms-only \ --disable-xvmc \ - --disable-ums-only \ --enable-sna \ --disable-uxa \ --disable-glamor \ @@ -23,6 +23,25 @@ XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = \ --disable-dga \ --disable-async-swap -XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto libdrm xlib_libpciaccess +XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = \ + libdrm \ + xlib_libXcomposite \ + xlib_libXrandr \ + xlib_libXtst \ + xlib_libpciaccess \ + xproto_fontsproto \ + xproto_xproto \ + xserver_xorg-server + +ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965),y) +XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += \ + --enable-dri +XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES += \ + mesa3d \ + xproto_xf86driproto +else +XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += \ + --disable-dri +endif $(eval $(autotools-package))