Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: tim.gore@intel.com
Cc: intel-gfx@lists.freedesktop.org, thomas.wood@intel.com
Subject: Re: [PATCH i-g-t] Demos/Android.mk: build intel_sprite_on
Date: Wed, 17 Dec 2014 21:54:06 +0100	[thread overview]
Message-ID: <20141217205406.GI2711@phenom.ffwll.local> (raw)
In-Reply-To: <1418813051-3171-1-git-send-email-tim.gore@intel.com>

On Wed, Dec 17, 2014 at 10:44:11AM +0000, tim.gore@intel.com wrote:
> From: Tim Gore <tim.gore@intel.com>
> 
> This reverts the effect of two commits
> 06fb6c233dd82aac766aa9206644f6eff668ca99
> 264e1ac10ac14a098a78cc9f96c4e7cabb124ee5
> 
> Both of these were to stop demos/intel_sprite_on
> from being built, but the first was just broken.
> 
> So this commit re-enables building intel_sprite_on.
> However, intel_sprite_on will not build in recent
> Android trees. To overcome this the version
> of IGT kept in the Android repository will carry a patch
> to intel_sprite_on, and the automatic build test of
> IGT on android will patch the freedesktop code on the fly.
> 
> Signed-off-by: Tim Gore <tim.gore@intel.com>

Merged, thanks.
-Daniel

> ---
>  demos/Android.mk | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/demos/Android.mk b/demos/Android.mk
> index 5a00116..7d06c9a 100644
> --- a/demos/Android.mk
> +++ b/demos/Android.mk
> @@ -23,7 +23,6 @@ LOCAL_STATIC_LIBRARIES := libintel_gpu_tools
>  
>  LOCAL_SHARED_LIBRARIES := libdrm
>  
> -# This demo (intel_sprite_on.c) wont build on android
> -#include $(BUILD_EXECUTABLE)
> +include $(BUILD_EXECUTABLE)
>  
>  #================#
> -- 
> 2.1.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

      reply	other threads:[~2014-12-17 20:53 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-17 10:44 [PATCH i-g-t] Demos/Android.mk: build intel_sprite_on tim.gore
2014-12-17 20:54 ` Daniel Vetter [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20141217205406.GI2711@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=thomas.wood@intel.com \
    --cc=tim.gore@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox