From patchwork Wed Mar 6 23:14:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadym Kochan X-Patchwork-Id: 1052559 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MXk3p73m"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44F8VZ0Nnvz9s4Y for ; Thu, 7 Mar 2019 10:05:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CDB5D86D11; Wed, 6 Mar 2019 23:05:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id olufU+LWZKwM; Wed, 6 Mar 2019 23:05:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5BE5C86DB0; Wed, 6 Mar 2019 23:05:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 5B6F01BF5A2 for ; Wed, 6 Mar 2019 23:05:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5953686DB0 for ; Wed, 6 Mar 2019 23:05:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pvOVfMKGISV1 for ; Wed, 6 Mar 2019 23:05:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 7C60486D11 for ; Wed, 6 Mar 2019 23:05:04 +0000 (UTC) Received: by mail-lf1-f65.google.com with SMTP id u9so6087408lfe.11 for ; Wed, 06 Mar 2019 15:05:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=YRqtmz8LYiWbgVSyVel+VkmZdAU//2m7SCAIIew6e44=; b=MXk3p73mufknpoZrW3Zt52NIw19Jz4rwlo/rtaN6cEee1ANMIwIvavskzd7bqAxo8M zy9mhxslgADznfjFKUBGOT7cb2YCKrDjMtfKC2jbqA+Wx5noa60HDPSe3VE9jG6GcTHU TXXtZtLhXsFYaxkkVvMx7LjNvLPVrdZuYFeXd3AfO9e/X+KsTa0Q3Pmzt/NZfmmUF7tK W2s2rR/65r9t8HhMaUvb1hy1f1B6CqWJiURaCIs27N2lbNW259UL52H5deYNakOg+uko 4ob1Pr3Iv0xRKLnZ7NAHe+T3fGU5mt/dfZ2DwAS2F8IL71hOThuhsaKzawt/lsaP3EO6 ssIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=YRqtmz8LYiWbgVSyVel+VkmZdAU//2m7SCAIIew6e44=; b=h+gVr6b3d9ODc/N3E8rBVpbdn7uGWuTcy4KUn7uKvfgc1LKKSUClvtCisvQOukSMj/ V2C2Rdf0nSx4wyesqGVVQ0Wlxnf1Mr9vxOfMrY5Q4FuEbOLD3Nvuh8lIJozv/YablBHa 0VH/1tPcvcxdub+t6OKbixiiZqEOVcE+RvNTSRXgE4qOWVYZvs6XxzInGQY0mKs+eyR2 6hIAGhCciJICfi+YPkOMTZMHXRKAkmv2rLSyXlKVk8tsK60c1zlWhes5PXZCllHIM9+I WWXxBs/GHZHO4Xscw3l77OPJcPRXqMCMbubKZIcwwK9j5uIPgumqnNAUGj1XFtfOs+uq c97w== X-Gm-Message-State: APjAAAXagkxIr5mi0I2wJvD6vLUk8O19KDJJ8d3dGfCWOLG9y4gnMfNp +mU3Qz/j018bszayIVxzG5fDgusF X-Google-Smtp-Source: APXvYqxuooS+IGAsI4v6QpgZqVJKaxwmfqjnyJ3RqSTjWL61y39UfS4Gi3pNegpApYhUbgS+PSQeyg== X-Received: by 2002:a19:4f0e:: with SMTP id d14mr65576lfb.147.1551913502144; Wed, 06 Mar 2019 15:05:02 -0800 (PST) Received: from vkochan-ThinkPad-T470p.lan ([93.75.250.209]) by smtp.gmail.com with ESMTPSA id y30sm537319ljd.12.2019.03.06.15.05.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 15:05:01 -0800 (PST) From: Vadim Kochan To: buildroot@buildroot.org Date: Thu, 7 Mar 2019 01:14:29 +0200 Message-Id: <20190306231429.22849-1-vadim4j@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH v2 1/1] package/efl: Fix build with mesa X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Vadim Kochan MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" efl does not compile with mesa without OpenGL ES because it checks for GL_ES_VERSION_2_0 and declares own GLintptr and GLsizeiptr types if such version is not defined, but mesa declares them too for OpenGL version 1.5, so fix it by add check also for OpenGL 1.5 where these types are defined. Use patch from: https://git.enlightenment.org/core/efl.git/commit/?id=0d2b624f1e24240a1c4e651aa1cfe9a8dd10a573 Fixes: http://autobuild.buildroot.net/results/62ca120f1e54e8c3ae445f98b2624b526569f007 Signed-off-by: Vadim Kochan --- v2: 1) Add signed-off to efl fix patch ...e-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch diff --git a/package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch b/package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch new file mode 100644 index 0000000000..b64a200ffb --- /dev/null +++ b/package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch @@ -0,0 +1,34 @@ +From d045dd99acdd47be238642d4f9384dccacde2b42 Mon Sep 17 00:00:00 2001 +From: "Carsten Haitzler (Rasterman)" +Date: Sat, 15 Dec 2018 16:19:01 +0000 +Subject: [PATCH] evas gl - make GLintptr etc. also ndefed for GL_VERSION_1_5 + fix typedef + +It seems that GL_VERSION_1_5 define == these provided by gl already. At +least reading the mesa headers I do, so this should fix T7502 + +Signed-off-by: Vadim Kochan +--- + src/lib/evas/Evas_GL.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h +index fa3e6f4..5524d82 100644 +--- a/src/lib/evas/Evas_GL.h ++++ b/src/lib/evas/Evas_GL.h +@@ -4272,9 +4272,11 @@ typedef signed int GLfixed; // Changed khronos_int32_t + + #ifndef GL_ES_VERSION_2_0 + /* GL types for handling large vertex buffer objects */ +-#include ++# ifndef GL_VERSION_1_5 ++# include + typedef ptrdiff_t GLintptr; // Changed khronos_intptr_t + typedef ptrdiff_t GLsizeiptr; // Changed khronos_ssize_t ++# endif + #endif + + /* Some definitions from GLES 3.0. +-- +2.14.1 +