| Message ID | 20210928223754.3398867-5-kamel.bouhara@bootlin.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [v2,1/7] package/opengl/libgbm: new virtual package | expand |
On Wed, 29 Sep 2021 00:37:52 +0200 Kamel Bouhara <kamel.bouhara@bootlin.com> wrote: > Registers the package as a libgbm provider. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com> > --- > Changes v1 -> v2: > - Fixed gbm features are provided only when wayland is set > > package/sunxi-mali-mainline/Config.in | 6 ++++++ > package/sunxi-mali-mainline/gbm.pc | 12 ++++++++++++ > package/sunxi-mali-mainline/sunxi-mali-mainline.mk | 1 + > 3 files changed, 19 insertions(+) > create mode 100644 package/sunxi-mali-mainline/gbm.pc > > diff --git a/package/sunxi-mali-mainline/Config.in b/package/sunxi-mali-mainline/Config.in > index 31a9152407..0a32cb456c 100644 > --- a/package/sunxi-mali-mainline/Config.in > +++ b/package/sunxi-mali-mainline/Config.in > @@ -3,6 +3,7 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE > depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm) > depends on BR2_TOOLCHAIN_USES_GLIBC > select BR2_PACKAGE_HAS_LIBEGL > + select BR2_PACKAGE_HAS_LIBGBM > select BR2_PACKAGE_HAS_LIBGLES > help > Install userspace Allwinner OpenGL libraries. > @@ -14,6 +15,9 @@ if BR2_PACKAGE_SUNXI_MALI_MAINLINE > config BR2_PACKAGE_PROVIDES_LIBEGL > default "sunxi-mali-mainline" > > +config BR2_PACKAGE_PROVIDES_LIBGBM > + default "sunxi-mali-mainline" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_OUTPUT_WAYLAND > + > config BR2_PACKAGE_PROVIDES_LIBGLES > default "sunxi-mali-mainline" > > @@ -26,6 +30,8 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE_OUTPUT_FBDEV > config BR2_PACKAGE_SUNXI_MALI_MAINLINE_OUTPUT_WAYLAND > bool "wayland" > depends on BR2_PACKAGE_WAYLAND > + select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF > + select BR2_PACKAGE_HAS_LIBGBM It still doesn't make sense: you're selecting BR2_PACKAGE_HAS_LIBGBM both in the main package option and here. So either libgbm is only provided by the wayland-variant of the sunxi-mali-mainline OpenGL implementation, or it's provided by all. But having the "select BR2_PACKAGE_HAS_LIBGBM" in two places doesn't make sense. > ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE_OUTPUT_WAYLAND),y) > SUNXI_MALI_MAINLINE_DEPENDENCIES += wayland > +SUNXI_MALI_MAINLINE_PROVIDES += libgbm > endif According to this, it's only the wayland-variant that supports libgbm. So the "select BR2_PACKAGE_HAS_LIBGBM" in BR2_PACKAGE_SUNXI_MALI_MAINLINE is wrong. I think this was already pointed out in the review of v1. Thanks! Thomas
diff --git a/package/sunxi-mali-mainline/Config.in b/package/sunxi-mali-mainline/Config.in index 31a9152407..0a32cb456c 100644 --- a/package/sunxi-mali-mainline/Config.in +++ b/package/sunxi-mali-mainline/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE depends on BR2_aarch64 || (BR2_ARM_EABIHF && BR2_arm) depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_HAS_LIBGLES help Install userspace Allwinner OpenGL libraries. @@ -14,6 +15,9 @@ if BR2_PACKAGE_SUNXI_MALI_MAINLINE config BR2_PACKAGE_PROVIDES_LIBEGL default "sunxi-mali-mainline" +config BR2_PACKAGE_PROVIDES_LIBGBM + default "sunxi-mali-mainline" if BR2_PACKAGE_SUNXI_MALI_MAINLINE_OUTPUT_WAYLAND + config BR2_PACKAGE_PROVIDES_LIBGLES default "sunxi-mali-mainline" @@ -26,6 +30,8 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE_OUTPUT_FBDEV config BR2_PACKAGE_SUNXI_MALI_MAINLINE_OUTPUT_WAYLAND bool "wayland" depends on BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF + select BR2_PACKAGE_HAS_LIBGBM config BR2_PACKAGE_SUNXI_MALI_MAINLINE_OUTPUT_X11_DMABUF bool "x11 dma-buf" diff --git a/package/sunxi-mali-mainline/gbm.pc b/package/sunxi-mali-mainline/gbm.pc new file mode 100644 index 0000000000..e2f6c04a82 --- /dev/null +++ b/package/sunxi-mali-mainline/gbm.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=/usr +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: gbm +Description: ARM Mali implementation of gbm +Requires.private: +Version: 1.0 +Libs: -L${libdir} -lgbm +Libs.private: +Cflags: -I${includedir} diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk index e9091b05a2..8a76b46aba 100644 --- a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk +++ b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk @@ -38,6 +38,7 @@ endif ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE_OUTPUT_WAYLAND),y) SUNXI_MALI_MAINLINE_DEPENDENCIES += wayland +SUNXI_MALI_MAINLINE_PROVIDES += libgbm endif # FIXME: install gbm.pc conditionally