| Message ID | 20211113093009.6915-1-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/3] package/glmark2: drm-glesv2 needs libdrm | expand |
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
>>>>> "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.
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 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
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(-)