| Message ID | 20220514175612.2510884-6-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [01/19] package/x11r7/xserver_xorg-server: bump version to 21.1.3 | expand |
On Sat, 14 May 2022 19:55:59 +0200 Bernd Kuhls <bernd.kuhls@t-online.de> wrote: > The package depends on gbm and not mesa3d: > https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/blob/master/configure.ac#L155 > > Remove the dependency to BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON in order > to prevent a circular dependency here. This option will be removed in > a follow-patch anyway because Mesa3D will drop DRI drivers in version > 22.x. > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > package/x11r7/xdriver_xf86-video-ati/Config.in | 7 +++---- > .../x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk | 1 + > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/x11r7/xdriver_xf86-video-ati/Config.in b/package/x11r7/xdriver_xf86-video-ati/Config.in > index 1246014dca..81255d5a4c 100644 > --- a/package/x11r7/xdriver_xf86-video-ati/Config.in > +++ b/package/x11r7/xdriver_xf86-video-ati/Config.in > @@ -1,15 +1,14 @@ > config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI > bool "xf86-video-ati" > depends on BR2_i386 || BR2_x86_64 # DRI radeon r100 driver > - depends on BR2_PACKAGE_MESA3D > + depends on BR2_PACKAGE_HAS_LIBGBM > select BR2_PACKAGE_LIBDRM > select BR2_PACKAGE_LIBDRM_RADEON > - select BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON > select BR2_PACKAGE_XLIB_LIBXCOMPOSITE > select BR2_PACKAGE_XORGPROTO > help > ATI video driver > > -comment "xf86-video-ati needs mesa3d" > +comment "xf86-video-ati needs GBM" > depends on BR2_i386 || BR2_x86_64 > - depends on !BR2_PACKAGE_MESA3D > + depends on !BR2_PACKAGE_HAS_LIBGBM > diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk > index edb8b11add..e7f5852811 100644 > --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk > +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk > @@ -11,6 +11,7 @@ XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT > XDRIVER_XF86_VIDEO_ATI_LICENSE_FILES = COPYING > XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = \ > libdrm \ > + libgbm \ Same question: we had a Config.in dependency on mesa3d, but no build dependency, and now we have a build dependency on libgbm? Could you explain this? Thomas
diff --git a/package/x11r7/xdriver_xf86-video-ati/Config.in b/package/x11r7/xdriver_xf86-video-ati/Config.in index 1246014dca..81255d5a4c 100644 --- a/package/x11r7/xdriver_xf86-video-ati/Config.in +++ b/package/x11r7/xdriver_xf86-video-ati/Config.in @@ -1,15 +1,14 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI bool "xf86-video-ati" depends on BR2_i386 || BR2_x86_64 # DRI radeon r100 driver - depends on BR2_PACKAGE_MESA3D + depends on BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_RADEON - select BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON select BR2_PACKAGE_XLIB_LIBXCOMPOSITE select BR2_PACKAGE_XORGPROTO help ATI video driver -comment "xf86-video-ati needs mesa3d" +comment "xf86-video-ati needs GBM" depends on BR2_i386 || BR2_x86_64 - depends on !BR2_PACKAGE_MESA3D + depends on !BR2_PACKAGE_HAS_LIBGBM diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index edb8b11add..e7f5852811 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -11,6 +11,7 @@ XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT XDRIVER_XF86_VIDEO_ATI_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = \ libdrm \ + libgbm \ xlib_libXcomposite \ xorgproto \ xserver_xorg-server
The package depends on gbm and not mesa3d: https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/blob/master/configure.ac#L155 Remove the dependency to BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON in order to prevent a circular dependency here. This option will be removed in a follow-patch anyway because Mesa3D will drop DRI drivers in version 22.x. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/x11r7/xdriver_xf86-video-ati/Config.in | 7 +++---- .../x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk | 1 + 2 files changed, 4 insertions(+), 4 deletions(-)