From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2FA14C83F11 for ; Sun, 27 Aug 2023 16:23:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 9C91440866; Sun, 27 Aug 2023 16:23:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9C91440866 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KQ_LnErKrdxB; Sun, 27 Aug 2023 16:23:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 33DCE4088C; Sun, 27 Aug 2023 16:23:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 33DCE4088C Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id C20731BF34D for ; Sun, 27 Aug 2023 16:23:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A803F60A9B for ; Sun, 27 Aug 2023 16:23:17 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org A803F60A9B X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7Do3jVykZseB for ; Sun, 27 Aug 2023 16:23:15 +0000 (UTC) Received: from smtp4-g21.free.fr (smtp4-g21.free.fr [IPv6:2a01:e0c:1:1599::13]) by smtp3.osuosl.org (Postfix) with ESMTPS id 8B4A660A61 for ; Sun, 27 Aug 2023 16:23:15 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 8B4A660A61 Received: from webmail.free.fr (unknown [172.20.246.1]) (Authenticated sender: ju.o@free.fr) by smtp4-g21.free.fr (Postfix) with ESMTPA id 7715519F5B4; Sun, 27 Aug 2023 18:23:11 +0200 (CEST) Received: from 82-64-214-120.subs.proxad.net ([82.64.214.120:52254]) via 82-64-214-120.subs.proxad.net ([82.64.214.120]) by webmail.free.fr with HTTP (HTTP/1.0 POST); Sun, 27 Aug 2023 18:23:11 +0200 MIME-Version: 1.0 Date: Sun, 27 Aug 2023 18:23:11 +0200 From: Julien Olivain To: Romain Naour In-Reply-To: <20230827151828.515020-1-romain.naour@gmail.com> References: <20230827151828.515020-1-romain.naour@gmail.com> User-Agent: Webmail Free/1.6.1 Message-ID: <4f6d319d0d6fe19e8d7532eabeb159fa@free.fr> X-Sender: ju.o@free.fr X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1693153392; bh=7cRDAFR+GBof4qhBPJXbcDU6JRYFJAj/t6pAFE3dOxs=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Z7AugzIicUYopNA0WozrgFPrrOO5zlkIG47X1yRvLk/aumzznJ34VS/Z6pSNYfgnI 9S4qsHRLlwjOe7pvmNBV4yx6e8+Yg0ZAFhiPmKeg+O9mdSJF2TUgR8/5akyhsIAnLW VtKEHfcgv7patb0anrc/PFcE3IQSUN5Dcho4FErqK7V5jJltTDkvLkfaesE1EiPWpg v2IfAuRAf2IRcP4JMM7Paz/Kn3+fPRTP4D/9/frZe87qFH2ft3tDvtKPlBD69O56gk ylJRe1K+EGksHMXr3UYXnQMRDHF7RDJwX7u14EqGciOTILbEJNOsmz+KyBTqgV3y/Y FoMNzCSpDYETQ== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=free.fr header.i=@free.fr header.a=rsa-sha256 header.s=smtp-20201208 header.b=Z7AugzIi Subject: Re: [Buildroot] [PATCH] package/mesa3d-demos: update optional opengl patch due to new glu dependency in util X-BeenThere: buildroot@buildroot.org 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 , buildroot@buildroot.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Hi Romain, Thank you for the patch! I reproduced the build issue (without this patch). I also successfully tested that this patch fixes the issue. On 27/08/2023 17:18, Romain Naour wrote: > matrix-code from es2gears has been moved to util in version 9.0.0 [1] > so now es2gears is linked with mesa3d-demo libutil (idep_util). > But at the same time the dependency on glu (dep_glu) has been added > to libutil [2]. dep_glu requires opengl (FULL_GL) to build. > > In order to keep the es2gears for egl only builds we have to > split the libutil files list to build readtex.c and showbuffer.c > only if opengl is available. > > Add back dep_glu since it's used in util's meson. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/4936948236 > https://gitlab.com/buildroot.org/buildroot/-/jobs/4936948042 > > [1] > https://gitlab.freedesktop.org/mesa/demos/-/commit/c33e2f731c2eab86bbad7b6a028f8a90ea40a00c > [2] > https://gitlab.freedesktop.org/mesa/demos/-/commit/ef24aae22978d4d357340074ca9a1c04d9cf81e6 > > Signed-off-by: Romain Naour > Cc: Julien Olivain Reviewed-by: Julien Olivain Tested-by: Julien Olivain > --- > ...s-makes-opengl-an-optional-component.patch | 95 ++++++++++--------- > 1 file changed, 50 insertions(+), 45 deletions(-) > > diff --git > a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch > b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch > index af929003db..72bf72719c 100644 > --- > a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch > +++ > b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch > @@ -1,25 +1,44 @@ > -From 9ec9f7b4d0ef5e799ca4cc5103163e4630d184d8 Mon Sep 17 00:00:00 2001 > +From 5b45f98255b74589015d5cb0d8ca31d7169c9f34 Mon Sep 17 00:00:00 2001 > From: Julien Olivain > Date: Fri, 16 Sep 2022 22:30:59 +0200 > Subject: [PATCH] demos: makes opengl an optional component > > This patch is a port of [1] for the new meson build system. > > +matrix-code from es2gears has been moved to util in version 9.0.0 [2] > +so now es2gears is linked with mesa3d-demo libutil (idep_util). > +But at the same time the dependency on glu (dep_glu) has been added > +to libutil [3]. dep_glu requires opengl (FULL_GL) to build. > + > +In order to keep the es2gears for egl only builds we have to > +split the libutil files list to build readtex.c and showbuffer.c > +only if opengl is available. > + > +Add back dep_glu since it's used in util's meson. > + > +Fixes: > +https://gitlab.com/buildroot.org/buildroot/-/jobs/4936948236 > +https://gitlab.com/buildroot.org/buildroot/-/jobs/4936948042 > + > [1]. > > https://git.busybox.net/buildroot/tree/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch?h=2022.08 > +[2] > https://gitlab.freedesktop.org/mesa/demos/-/commit/c33e2f731c2eab86bbad7b6a028f8a90ea40a00c > +[3] > https://gitlab.freedesktop.org/mesa/demos/-/commit/ef24aae22978d4d357340074ca9a1c04d9cf81e6 > > Signed-off-by: Julien Olivain > [Bernd: rebased for version 9.0.0] > Signed-off-by: Bernd Kuhls > +[Romain: fix egl only builds in util] > +Signed-off-by: Romain Naour > --- > - meson.build | 19 ++++++++++++------- > - meson_options.txt | 1 + > - src/egl/meson.build | 5 ++++- > - src/meson.build | 4 +++- > - 4 files changed, 20 insertions(+), 9 deletions(-) > + meson.build | 5 ++++- > + meson_options.txt | 1 + > + src/egl/meson.build | 5 ++++- > + src/util/meson.build | 12 +++++++++--- > + 4 files changed, 18 insertions(+), 5 deletions(-) > > diff --git a/meson.build b/meson.build > -index e1968fab..a15699d6 100644 > +index 3e39b5a2..f27e1a18 100644 > --- a/meson.build > +++ b/meson.build > @@ -39,7 +39,10 @@ add_project_arguments( > @@ -34,34 +53,8 @@ index e1968fab..a15699d6 100644 > > dep_epoll = dependency('epoll-shim', required : false) > dep_gles1 = dependency('glesv1_cm', required : get_option('gles1')) > -@@ -87,15 +87,17 @@ > - > - dep_threads = dependency('threads') > - > --dep_glu = dependency('glu', required : false) > --# GLU is part of OpenGL.Framework > --if not dep_glu.found() and host_machine.system() != 'darwin' > -- _glu_name = 'GLU' > -- if host_machine.system() == 'windows' > -- _glu_name = 'glu32' > -+if dep_gl.found() > -+ dep_glu = dependency('glu', required : false) > -+ # GLU is part of OpenGL.Framework > -+ if not dep_glu.found() and host_machine.system() != 'darwin' > -+ _glu_name = 'GLU' > -+ if host_machine.system() == 'windows' > -+ _glu_name = 'glu32' > -+ endif > -+ dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h', > -+ required : dep_x11.found()) > - endif > -- dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h', > -- required : dep_x11.found()) > - endif > - > - dep_glx = dependency('glx', required: false, disabler : true) > diff --git a/meson_options.txt b/meson_options.txt > -index ddadd2e3..f5405698 100644 > +index 832b916a..c954a710 100644 > --- a/meson_options.txt > +++ b/meson_options.txt > @@ -1,5 +1,6 @@ > @@ -87,21 +80,33 @@ index d1846921..42bf8ecd 100644 > > if dep_gles1.found() > subdir('opengles1') > -diff --git a/src/meson.build b/src/meson.build > -index 39cac78d..7607c6de 100644 > ---- a/src/meson.build > -+++ b/src/meson.build > -@@ -20,7 +20,9 @@ > +diff --git a/src/util/meson.build b/src/util/meson.build > +index b4fe614f..4420f28a 100644 > +--- a/src/util/meson.build > ++++ b/src/util/meson.build > +@@ -22,13 +22,19 @@ inc_util = include_directories('.') > > - subdir('glad') > + files_libutil = files( > + 'glinfo_common.c', > +- 'readtex.c', > +- 'showbuffer.c', > + 'trackball.c', > + 'matrix.c', > + ) > > --subdir('util') > +-_deps = [dep_glu, dep_m] > ++_deps = [dep_m] > +if dep_gl.found() > -+ subdir('util') > ++ files_libutil += files( > ++ 'readtex.c', > ++ 'showbuffer.c', > ++ ) > ++ _deps += dep_glu > +endif > - > ++ > if dep_glut.found() > - subdir('demos') > + files_libutil += files('shaderutil.c') > + _deps += dep_glut > -- > -2.37.3 > +2.41.0 Best regards, Julien. _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot