From patchwork Wed Mar 6 23:07:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadym Kochan X-Patchwork-Id: 1052557 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.138; helo=whitealder.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="DuPx1HMQ"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44F8Lf5fBdz9s70 for ; Thu, 7 Mar 2019 09:58:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 03897861FD; Wed, 6 Mar 2019 22:58:13 +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 KEaMNFtO8K+7; Wed, 6 Mar 2019 22:58:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 059038618E; Wed, 6 Mar 2019 22:58:12 +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 6EA251BF402 for ; Wed, 6 Mar 2019 22:58:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6A55381F4D for ; Wed, 6 Mar 2019 22:58:10 +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 WnHkULlVxo-x for ; Wed, 6 Mar 2019 22:58:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by hemlock.osuosl.org (Postfix) with ESMTPS id 410C381F2E for ; Wed, 6 Mar 2019 22:58:09 +0000 (UTC) Received: by mail-lj1-f194.google.com with SMTP id t13so12471052lji.2 for ; Wed, 06 Mar 2019 14:58:09 -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=lkvZTCINpWrOxFXvi16ojasfNDk3/MmL5qD2kLU5Yj8=; b=DuPx1HMQKK+yQj7Wgm3T3WmT2FzmdwRYahc9lQoLF5sxkek3wFXYK7rUDGef7jLktX 55oYZtMtP8huutXHlxUNZ+uoq0FPhWrnJH2W99JDZ/Ww7niTeGjgW1dO5gppHubpVI8c tEuhYfXIOl6LuAO++vv+69Ox0tYI+GcfCVdi8zdx/C4io6LtNNiVmqcSw8boBkIP+WNY rqtmigKfhqO//G4XBPPOgsx8dIwbRG6Kmq4pVmhwsTgRugxyboFz9WfTmPhlrbc2oZwq l6zukM9YTQ4RfURlnkOpxJri6XI/YLGohx2phXyaLIZO5hXeCdTo7l1GBdgvlexIVqDx C4jg== 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=lkvZTCINpWrOxFXvi16ojasfNDk3/MmL5qD2kLU5Yj8=; b=XByPYrmGQoQwM9ycpaqpmUN/ivQQ0T8CcBpkiB87yS9dIqJABDAq80Fm/fnlX/K2lb Std1U86gfckg+z3RO260Py/jOoh5mB5q23a/vzqb/lApWKcVflECQmvqKElMq1HVMIx9 bZ9ZJro+ek+rhs/gctXae4mjQrGXzIXNx4Jyv6jPRW8pZmEZcqjxkpO7dE2sa57vIXlA m9tHrUxWlKb8i/pvcKUMKt04mIrQCiuPIX7+zHC5jRy6TwS9Ot5/4cjJBE8m1d2MY2Vw eKIwBNR8++sKQQVutbzTDz1oGibuRdyabL2/fTKTnAFPMGyp0rHoHAgLeYRiDAmSxNDp DPaw== X-Gm-Message-State: APjAAAXq7QG9o/nCxCUjpaWbOsAKkUJ2XprpT6SHhbMhfwigHexd9gYx d+mGoFO7e501gVtRJ7NN17/Ke/mB X-Google-Smtp-Source: APXvYqzFA2JkJEojvef05cpu688ZBovA5haQm19EjhYIELT3ly9OZu/61nKcktVaWYh9YqtuM4qODw== X-Received: by 2002:a2e:6d02:: with SMTP id i2mr3900070ljc.6.1551913086888; Wed, 06 Mar 2019 14:58:06 -0800 (PST) Received: from vkochan-ThinkPad-T470p.lan ([93.75.250.209]) by smtp.gmail.com with ESMTPSA id c16sm529902lfj.29.2019.03.06.14.58.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 14:58:06 -0800 (PST) From: Vadim Kochan To: buildroot@buildroot.org Date: Thu, 7 Mar 2019 01:07:33 +0200 Message-Id: <20190306230733.22325-1-vadim4j@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 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 --- ...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 +