From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mail.openembedded.org (Postfix) with ESMTP id 5663C6A4D2 for ; Fri, 28 Jun 2013 17:41:31 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 28 Jun 2013 10:39:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,960,1363158000"; d="scan'208";a="337133834" Received: from unknown (HELO [10.255.13.119]) ([10.255.13.119]) by orsmga001.jf.intel.com with ESMTP; 28 Jun 2013 10:41:27 -0700 Message-ID: <51CDCAC7.50202@linux.intel.com> Date: Fri, 28 Jun 2013 10:41:27 -0700 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130514 Thunderbird/17.0.6 MIME-Version: 1.0 To: rongqing.li@windriver.com References: <391d4b34129e491a4ee0c6737369e8470c3b98ca.1372381458.git.rongqing.li@windriver.com> In-Reply-To: <391d4b34129e491a4ee0c6737369e8470c3b98ca.1372381458.git.rongqing.li@windriver.com> Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH 1/1] xf86-video-intel: backport a patch to fix a compile failure X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jun 2013 17:41:32 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 06/27/2013 06:11 PM, rongqing.li@windriver.com wrote: > From: "Roy.Li" > > backport a patch to fix a compile failure when xorg-xserver's version > is less than 1.10 > I am not understanding why we need this patch, our xorg-xserver version is at 1.14, why would we need to have patch for an older version of the server? Sau! > Signed-off-by: Roy.Li > --- > ...-compilation-error-with-xorg-xserver-1.10.patch | 31 ++++++++++++++++++++ > .../xorg-driver/xf86-video-intel_2.21.9.bb | 2 ++ > 2 files changed, 33 insertions(+) > create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch > > diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch > new file mode 100644 > index 0000000..0d0d99f > --- /dev/null > +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch > @@ -0,0 +1,31 @@ > +From b5e85e495e55e2537d305b7bebacdf6f97b66199 Mon Sep 17 00:00:00 2001 > +From: "Roy.Li" > +Date: Thu, 27 Jun 2013 14:10:14 +0800 > +Subject: [PATCH] uxa: fix the compilation error with xorg-xserver <= 1.10 > + > +Upstream-Status: Backported > + > +struct _Screen has no canDoBGNoneRoot when ABI_VIDEODRV_VERSION is less than 10.0 > + > +Signed-off-by: Roy.Li > +--- > + src/intel_display.c | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/src/intel_display.c b/src/intel_display.c > +index 17168e5..0acb86d 100644 > +--- a/src/intel_display.c > ++++ b/src/intel_display.c > +@@ -2113,7 +2113,9 @@ void intel_copy_fb(ScrnInfoPtr scrn) > + 0, 0, > + scrn->virtualX, scrn->virtualY); > + intel->uxa_driver->done_copy(dst); > ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(10, 0) > + pScreen->canDoBGNoneRoot = TRUE; > ++#endif > + > + cleanup_dst: > + (*pScreen->DestroyPixmap)(dst); > +-- > +1.7.10.4 > + > diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb > index 6112089..01c767b 100644 > --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb > +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb > @@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" > DEPENDS += "virtual/libx11 drm xf86driproto glproto \ > virtual/libgl xineramaproto xf86driproto libpciaccess udev" > > +SRC_URI += "file://0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch" > + > PACKAGECONFIG ??= "" > PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" > PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" >