| Message ID | VI1P190MB0493F15E5CA3D6BC8CCD52029FFF9@VI1P190MB0493.EURP190.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] package/freescale-imx/imx-gpu-viv: drop X11 output | expand |
On Tue, 10 Jan 2023 09:32:43 +0000 Lang Daniel via buildroot <buildroot@buildroot.org> wrote: > Since e8df0f7 (package/freescale-imx/imx-gpu-viv: bump to version 6.4.3.p4.4) > the X11 folder is no longer included in the archive. > > Signed-off-by: Daniel Lang <d.lang@abatec.at> I've applied with minor tweaks. See below. > +config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 > + bool "imx-gpu-viv X11 output has been removed" select BR2_LEGACY was missing here to make sure the build doesn't start if this option is enabled. > + help > + The X11 output was dropped by NXP. > + > config BR2_PACKAGE_QEMU_CUSTOM_TARGETS > string "the QEMU specific targets option has been removed" > help > diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in > index 9ba3d0428e..bc30798ca5 100644 > --- a/package/freescale-imx/imx-gpu-viv/Config.in > +++ b/package/freescale-imx/imx-gpu-viv/Config.in > @@ -27,8 +27,8 @@ config BR2_PACKAGE_IMX_GPU_VIV > Userspace libraries for Vivante GPU on i.MX platforms > > It contains libraries and headers for GLES, OpenCL, and > - OpenVG. It also contains a DRI plugin for X11. It also > - contains a plugin for DirectFB-1.4.0, but that doesn't work > + OpenVG. It also contains a plugin for DirectFB-1.4.0, > + but that doesn't work > together with buildroot's DirectFB version. This paragraph should have been rewrapped after your change. Other than that, looks good so I've applied. Of course, it might be surprising for people who might be using X11 with OpenGL support on i.MX platforms... but we're simply following the choice made by upstream. Best regards, Thomas
>>>>> "Thomas" == Thomas Petazzoni via buildroot <buildroot@buildroot.org> writes: Hi, >> It contains libraries and headers for GLES, OpenCL, and >> - OpenVG. It also contains a DRI plugin for X11. It also >> - contains a plugin for DirectFB-1.4.0, but that doesn't work >> + OpenVG. It also contains a plugin for DirectFB-1.4.0, >> + but that doesn't work >> together with buildroot's DirectFB version. > This paragraph should have been rewrapped after your change. > Other than that, looks good so I've applied. Of course, it might be > surprising for people who might be using X11 with OpenGL support on > i.MX platforms... but we're simply following the choice made by > upstream. I see we still have xf86-video-imx-viv which depends on the now removed BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 symbol, so I guess we should remove that package as well.
On Mon, 06 Feb 2023 15:37:43 +0100 Peter Korsgaard <peter@korsgaard.com> wrote: > I see we still have xf86-video-imx-viv which depends on the now removed > BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 symbol, so I guess we should remove > that package as well. Gah, I did not notice that: indeed it should be removed as well. Daniel, will you cook some patch doing that? Thanks! Thomas
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes: > On Mon, 06 Feb 2023 15:37:43 +0100 > Peter Korsgaard <peter@korsgaard.com> wrote: >> I see we still have xf86-video-imx-viv which depends on the now removed >> BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 symbol, so I guess we should remove >> that package as well. > Gah, I did not notice that: indeed it should be removed as well. > Daniel, will you cook some patch doing that? I've already pushed a commit dropping the package.
diff --git a/Config.in.legacy b/Config.in.legacy index 6d66f1b958..d2c69fa31c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,11 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 + bool "imx-gpu-viv X11 output has been removed" + help + The X11 output was dropped by NXP. + config BR2_PACKAGE_QEMU_CUSTOM_TARGETS string "the QEMU specific targets option has been removed" help diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index 9ba3d0428e..bc30798ca5 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -27,8 +27,8 @@ config BR2_PACKAGE_IMX_GPU_VIV Userspace libraries for Vivante GPU on i.MX platforms It contains libraries and headers for GLES, OpenCL, and - OpenVG. It also contains a DRI plugin for X11. It also - contains a plugin for DirectFB-1.4.0, but that doesn't work + OpenVG. It also contains a plugin for DirectFB-1.4.0, + but that doesn't work together with buildroot's DirectFB version. This library is provided by Freescale as-is and doesn't have @@ -40,22 +40,9 @@ choice prompt "Output option" help There are two versions of this library: one for - direct framebuffer access, one for X11 rendering. + direct framebuffer access, one for wayland rendering. Choose here which version to install. -config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - bool "X11" - depends on BR2_PACKAGE_XORG7 - # The i.MX8 blob doesn't support X11 output - depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXFIXES - -comment "X11 backend needs Xorg package" - depends on !BR2_PACKAGE_XORG7 - depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M - config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB bool "Framebuffer" # The i.MX8 blob doesn't support FB output @@ -70,7 +57,6 @@ endchoice config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT string - default "x11" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 default "fb" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB default "wayland" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 06fbbc7343..e0e8a31533 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -26,14 +26,6 @@ endif IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT)) -ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) -# The libGAL.so library provided by imx-gpu-viv uses X functions. Packages -# may want to link against libGAL.so (QT5 Base with OpenGL and X support -# does so). For this to work we need build dependencies to libXdamage, -# libXext and libXfixes so that X functions used in libGAL.so are referenced. -IMX_GPU_VIV_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes -endif - # Libraries are linked against libdrm, except framebuffer output on ARM ifneq ($(IMX_GPU_VIV_LIB_TARGET)$(BR2_arm),fby) IMX_GPU_VIV_DEPENDENCIES += libdrm @@ -55,12 +47,6 @@ else ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland) define IMX_GPU_VIV_FIXUP_PKGCONFIG ln -sf egl_wayland.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc endef -else ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) -define IMX_GPU_VIV_FIXUP_PKGCONFIG - $(foreach lib,egl glesv1_cm glesv2 vg, \ - ln -sf $(lib)_x11.pc $(@D)/gpu-core/usr/lib/pkgconfig/$(lib).pc - ) -endef endif # Instead of building, we fix up the inconsistencies that exist @@ -68,7 +54,7 @@ endif # Make sure these commands are idempotent. define IMX_GPU_VIV_BUILD_CMDS cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_LIB_TARGET)/* $(@D)/gpu-core/usr/lib/ - $(foreach backend,fb x11 wayland, \ + $(foreach backend,fb wayland, \ $(RM) -r $(@D)/gpu-core/usr/lib/$(backend) ) $(IMX_GPU_VIV_FIXUP_PKGCONFIG)
Since e8df0f7 (package/freescale-imx/imx-gpu-viv: bump to version 6.4.3.p4.4) the X11 folder is no longer included in the archive. Signed-off-by: Daniel Lang <d.lang@abatec.at> --- Config.in.legacy | 5 +++++ package/freescale-imx/imx-gpu-viv/Config.in | 20 +++---------------- .../freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 16 +-------------- 3 files changed, 9 insertions(+), 32 deletions(-)