* [Buildroot] [PATCH v2 2/3] package/glmark2: drm-glesv2 needs libgbm
2021-11-13 9:30 [Buildroot] [PATCH v2 1/3] package/glmark2: drm-glesv2 needs libdrm Bernd Kuhls
@ 2021-11-13 9:30 ` Bernd Kuhls
2021-11-13 9:53 ` Yann E. MORIN
` (2 more replies)
2021-11-13 9:30 ` [Buildroot] [PATCH 3/3] package/glmark2: fix selection of dependencies Bernd Kuhls
` (2 subsequent siblings)
3 siblings, 3 replies; 10+ messages in thread
From: Bernd Kuhls @ 2021-11-13 9:30 UTC (permalink / raw)
To: buildroot
Fixes build error with defconfig from:
http://autobuild.buildroot.net/results/e393dbfba7c2989fe983df47ea0638c3ba62ae7a/
Checking for 'libdrm': yes
Checking for 'gbm' : not found
after http://patchwork.ozlabs.org/project/buildroot/patch/20200104193919.91589-1-bernd.kuhls@t-online.de/
was applied. Both patches are needed to fix the build error.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: no changes
package/glmark2/Config.in | 1 +
package/glmark2/glmark2.mk | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/glmark2/Config.in b/package/glmark2/Config.in
index 3ef3a0e8e3..6761397d3f 100644
--- a/package/glmark2/Config.in
+++ b/package/glmark2/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2
bool
default y
depends on BR2_PACKAGE_HAS_LIBEGL
+ depends on BR2_PACKAGE_HAS_LIBGBM
depends on BR2_PACKAGE_HAS_LIBGLES
depends on BR2_PACKAGE_HAS_UDEV
# libpthread-stubs -> libdrm
diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk
index 5ad3ea2cb4..e8d6f71dad 100644
--- a/package/glmark2/glmark2.mk
+++ b/package/glmark2/glmark2.mk
@@ -11,7 +11,7 @@ GLMARK2_LICENSE_FILES = COPYING COPYING.SGI
GLMARK2_DEPENDENCIES = host-pkgconf jpeg libegl libpng
ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2),y)
-GLMARK2_DEPENDENCIES += libdrm libgles udev
+GLMARK2_DEPENDENCIES += libdrm libgbm libgles udev
GLMARK2_FLAVORS += drm-glesv2
endif
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [Buildroot] [PATCH v2 2/3] package/glmark2: drm-glesv2 needs libgbm
2021-11-13 9:30 ` [Buildroot] [PATCH v2 2/3] package/glmark2: drm-glesv2 needs libgbm Bernd Kuhls
@ 2021-11-13 9:53 ` Yann E. MORIN
2021-11-17 22:01 ` Peter Korsgaard
[not found] ` <87h7catpaz.fsf__1784.76354792423$1637186493$gmane$org@dell.be.48ers.dk>
2 siblings, 0 replies; 10+ messages in thread
From: Yann E. MORIN @ 2021-11-13 9:53 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot
Bernd, All,
On 2021-11-13 10:30 +0100, Bernd Kuhls spake thusly:
> Fixes build error with defconfig from:
> http://autobuild.buildroot.net/results/e393dbfba7c2989fe983df47ea0638c3ba62ae7a/
>
> Checking for 'libdrm': yes
> Checking for 'gbm' : not found
>
> after http://patchwork.ozlabs.org/project/buildroot/patch/20200104193919.91589-1-bernd.kuhls@t-online.de/
> was applied. Both patches are needed to fix the build error.
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> v2: no changes
>
> package/glmark2/Config.in | 1 +
> package/glmark2/glmark2.mk | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/package/glmark2/Config.in b/package/glmark2/Config.in
> index 3ef3a0e8e3..6761397d3f 100644
> --- a/package/glmark2/Config.in
> +++ b/package/glmark2/Config.in
> @@ -5,6 +5,7 @@ config BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2
> bool
> default y
> depends on BR2_PACKAGE_HAS_LIBEGL
> + depends on BR2_PACKAGE_HAS_LIBGBM
> depends on BR2_PACKAGE_HAS_LIBGLES
> depends on BR2_PACKAGE_HAS_UDEV
> # libpthread-stubs -> libdrm
> diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk
> index 5ad3ea2cb4..e8d6f71dad 100644
> --- a/package/glmark2/glmark2.mk
> +++ b/package/glmark2/glmark2.mk
> @@ -11,7 +11,7 @@ GLMARK2_LICENSE_FILES = COPYING COPYING.SGI
> GLMARK2_DEPENDENCIES = host-pkgconf jpeg libegl libpng
>
> ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2),y)
> -GLMARK2_DEPENDENCIES += libdrm libgles udev
> +GLMARK2_DEPENDENCIES += libdrm libgbm libgles udev
> GLMARK2_FLAVORS += drm-glesv2
> endif
>
> --
> 2.30.2
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Buildroot] [PATCH v2 2/3] package/glmark2: drm-glesv2 needs libgbm
2021-11-13 9:30 ` [Buildroot] [PATCH v2 2/3] package/glmark2: drm-glesv2 needs libgbm Bernd Kuhls
2021-11-13 9:53 ` Yann E. MORIN
@ 2021-11-17 22:01 ` Peter Korsgaard
[not found] ` <87h7catpaz.fsf__1784.76354792423$1637186493$gmane$org@dell.be.48ers.dk>
2 siblings, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2021-11-17 22:01 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:
> Fixes build error with defconfig from:
> http://autobuild.buildroot.net/results/e393dbfba7c2989fe983df47ea0638c3ba62ae7a/
> Checking for 'libdrm': yes
> Checking for 'gbm' : not found
> after http://patchwork.ozlabs.org/project/buildroot/patch/20200104193919.91589-1-bernd.kuhls@t-online.de/
> was applied. Both patches are needed to fix the build error.
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v2: no changes
We don't have BR2_PACKAGE_HAS_LIBGBM / the virtual gbm package in
2021.02.x / 2021.08.x, so I have NOT applied this to the stable
branches.
What is the solution here? Depend on mesa?
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread[parent not found: <87h7catpaz.fsf__1784.76354792423$1637186493$gmane$org@dell.be.48ers.dk>]
* [Buildroot] [PATCH 3/3] package/glmark2: fix selection of dependencies
2021-11-13 9:30 [Buildroot] [PATCH v2 1/3] package/glmark2: drm-glesv2 needs libdrm Bernd Kuhls
2021-11-13 9:30 ` [Buildroot] [PATCH v2 2/3] package/glmark2: drm-glesv2 needs libgbm Bernd Kuhls
@ 2021-11-13 9:30 ` Bernd Kuhls
2021-11-13 9:52 ` Yann E. MORIN
2021-11-17 21:59 ` Peter Korsgaard
2021-11-13 9:53 ` [Buildroot] [PATCH v2 1/3] package/glmark2: drm-glesv2 needs libdrm Yann E. MORIN
2021-11-17 22:00 ` Peter Korsgaard
3 siblings, 2 replies; 10+ messages in thread
From: Bernd Kuhls @ 2021-11-13 9:30 UTC (permalink / raw)
To: buildroot
Commit 9c068b4be8 (package/glmark2: fix wayland build) extended the set
of required libraries for various "flavor" options by selecting those
libraries from the blind options.
However, that option is true as soon as the requirements are met (the
depends on), even when glmark2 itself is not enabled.
This means that extra libraries are pulled in to the build, even when
not required.
We fix that by moving the actual selects to the main symbol, along with
the proper conditions. This means that we have two lines that select
wayland-protocols, under two different conditions; we could make that a
single select, but the codition would need to be on two lines anyway,
so meh...
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
Requested by Yann:
http://lists.busybox.net/pipermail/buildroot/2021-November/628389.html
package/glmark2/Config.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/glmark2/Config.in b/package/glmark2/Config.in
index 6761397d3f..5897ccb3ff 100644
--- a/package/glmark2/Config.in
+++ b/package/glmark2/Config.in
@@ -27,7 +27,6 @@ config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GLESV2
depends on BR2_PACKAGE_HAS_LIBGLES
depends on BR2_PACKAGE_WAYLAND
select BR2_PACKAGE_GLMARK2_FLAVOR_ANY
- select BR2_PACKAGE_WAYLAND_PROTOCOLS
config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL
bool
@@ -36,7 +35,6 @@ config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL
depends on BR2_PACKAGE_HAS_LIBGL
depends on BR2_PACKAGE_WAYLAND
select BR2_PACKAGE_GLMARK2_FLAVOR_ANY
- select BR2_PACKAGE_WAYLAND_PROTOCOLS
config BR2_PACKAGE_GLMARK2_FLAVOR_X11_GLESV2
bool
@@ -68,6 +66,8 @@ config BR2_PACKAGE_GLMARK2
select BR2_PACKAGE_JPEG
select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2
select BR2_PACKAGE_LIBPNG
+ select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL
+ select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GLESV2
help
glmark2 is an OpenGL 2.0 and ES 2.0 benchmark.
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 3/3] package/glmark2: fix selection of dependencies
2021-11-13 9:30 ` [Buildroot] [PATCH 3/3] package/glmark2: fix selection of dependencies Bernd Kuhls
@ 2021-11-13 9:52 ` Yann E. MORIN
2021-11-17 21:59 ` Peter Korsgaard
1 sibling, 0 replies; 10+ messages in thread
From: Yann E. MORIN @ 2021-11-13 9:52 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot
Bernd, All,
On 2021-11-13 10:30 +0100, Bernd Kuhls spake thusly:
> Commit 9c068b4be8 (package/glmark2: fix wayland build) extended the set
> of required libraries for various "flavor" options by selecting those
> libraries from the blind options.
>
> However, that option is true as soon as the requirements are met (the
> depends on), even when glmark2 itself is not enabled.
>
> This means that extra libraries are pulled in to the build, even when
> not required.
>
> We fix that by moving the actual selects to the main symbol, along with
> the proper conditions. This means that we have two lines that select
> wayland-protocols, under two different conditions; we could make that a
> single select, but the codition would need to be on two lines anyway,
> so meh...
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Aha! I see you re-used my previous commit as-is. You even kept all my
typoes! ;-)
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> Requested by Yann:
> http://lists.busybox.net/pipermail/buildroot/2021-November/628389.html
>
> package/glmark2/Config.in | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/glmark2/Config.in b/package/glmark2/Config.in
> index 6761397d3f..5897ccb3ff 100644
> --- a/package/glmark2/Config.in
> +++ b/package/glmark2/Config.in
> @@ -27,7 +27,6 @@ config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GLESV2
> depends on BR2_PACKAGE_HAS_LIBGLES
> depends on BR2_PACKAGE_WAYLAND
> select BR2_PACKAGE_GLMARK2_FLAVOR_ANY
> - select BR2_PACKAGE_WAYLAND_PROTOCOLS
>
> config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL
> bool
> @@ -36,7 +35,6 @@ config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL
> depends on BR2_PACKAGE_HAS_LIBGL
> depends on BR2_PACKAGE_WAYLAND
> select BR2_PACKAGE_GLMARK2_FLAVOR_ANY
> - select BR2_PACKAGE_WAYLAND_PROTOCOLS
>
> config BR2_PACKAGE_GLMARK2_FLAVOR_X11_GLESV2
> bool
> @@ -68,6 +66,8 @@ config BR2_PACKAGE_GLMARK2
> select BR2_PACKAGE_JPEG
> select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2
> select BR2_PACKAGE_LIBPNG
> + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL
> + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GLESV2
> help
> glmark2 is an OpenGL 2.0 and ES 2.0 benchmark.
>
> --
> 2.30.2
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH 3/3] package/glmark2: fix selection of dependencies
2021-11-13 9:30 ` [Buildroot] [PATCH 3/3] package/glmark2: fix selection of dependencies Bernd Kuhls
2021-11-13 9:52 ` Yann E. MORIN
@ 2021-11-17 21:59 ` Peter Korsgaard
1 sibling, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2021-11-17 21:59 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:
> Commit 9c068b4be8 (package/glmark2: fix wayland build) extended the set
> of required libraries for various "flavor" options by selecting those
> libraries from the blind options.
> However, that option is true as soon as the requirements are met (the
> depends on), even when glmark2 itself is not enabled.
> This means that extra libraries are pulled in to the build, even when
> not required.
> We fix that by moving the actual selects to the main symbol, along with
> the proper conditions. This means that we have two lines that select
> wayland-protocols, under two different conditions; we could make that a
> single select, but the codition would need to be on two lines anyway,
> so meh...
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> Requested by Yann:
> http://lists.busybox.net/pipermail/buildroot/2021-November/628389.html
Committed to 2021.02.x and 2021.08.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH v2 1/3] package/glmark2: drm-glesv2 needs libdrm
2021-11-13 9:30 [Buildroot] [PATCH v2 1/3] package/glmark2: drm-glesv2 needs libdrm Bernd Kuhls
2021-11-13 9:30 ` [Buildroot] [PATCH v2 2/3] package/glmark2: drm-glesv2 needs libgbm Bernd Kuhls
2021-11-13 9:30 ` [Buildroot] [PATCH 3/3] package/glmark2: fix selection of dependencies Bernd Kuhls
@ 2021-11-13 9:53 ` Yann E. MORIN
2021-11-17 22:00 ` Peter Korsgaard
3 siblings, 0 replies; 10+ messages in thread
From: Yann E. MORIN @ 2021-11-13 9:53 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot
Bernd, All,
On 2021-11-13 10:30 +0100, Bernd Kuhls spake thusly:
> Fixes:
> http://autobuild.buildroot.net/results/58a/58a498fac83cbb55b252ab54cd8db04570bb5ec9/
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v2: moved libdrm select to main symbol (Yann)
>
> package/glmark2/Config.in | 3 +++
> package/glmark2/glmark2.mk | 2 +-
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/package/glmark2/Config.in b/package/glmark2/Config.in
> index 40d0adcc8a..3ef3a0e8e3 100644
> --- a/package/glmark2/Config.in
> +++ b/package/glmark2/Config.in
> @@ -7,6 +7,8 @@ config BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2
> depends on BR2_PACKAGE_HAS_LIBEGL
> depends on BR2_PACKAGE_HAS_LIBGLES
> depends on BR2_PACKAGE_HAS_UDEV
> + # libpthread-stubs -> libdrm
> + depends on BR2_TOOLCHAIN_HAS_THREADS
The comment to explain the dependency goes on the same line as the
dependency.
Applied to master, thanks.
Regards,
Yann E. MORIN.
> select BR2_PACKAGE_GLMARK2_FLAVOR_ANY
>
> config BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GL
> @@ -63,6 +65,7 @@ config BR2_PACKAGE_GLMARK2
> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14
> depends on BR2_PACKAGE_GLMARK2_FLAVOR_ANY
> select BR2_PACKAGE_JPEG
> + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2
> select BR2_PACKAGE_LIBPNG
> help
> glmark2 is an OpenGL 2.0 and ES 2.0 benchmark.
> diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk
> index 5c2dd06362..5ad3ea2cb4 100644
> --- a/package/glmark2/glmark2.mk
> +++ b/package/glmark2/glmark2.mk
> @@ -11,7 +11,7 @@ GLMARK2_LICENSE_FILES = COPYING COPYING.SGI
> GLMARK2_DEPENDENCIES = host-pkgconf jpeg libegl libpng
>
> ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2),y)
> -GLMARK2_DEPENDENCIES += libgles udev
> +GLMARK2_DEPENDENCIES += libdrm libgles udev
> GLMARK2_FLAVORS += drm-glesv2
> endif
>
> --
> 2.30.2
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH v2 1/3] package/glmark2: drm-glesv2 needs libdrm
2021-11-13 9:30 [Buildroot] [PATCH v2 1/3] package/glmark2: drm-glesv2 needs libdrm Bernd Kuhls
` (2 preceding siblings ...)
2021-11-13 9:53 ` [Buildroot] [PATCH v2 1/3] package/glmark2: drm-glesv2 needs libdrm Yann E. MORIN
@ 2021-11-17 22:00 ` Peter Korsgaard
3 siblings, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2021-11-17 22:00 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:
> Fixes:
> http://autobuild.buildroot.net/results/58a/58a498fac83cbb55b252ab54cd8db04570bb5ec9/
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v2: moved libdrm select to main symbol (Yann)
Committed to 2021.02.x and 2021.08.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread