| Message ID | 20191023062220.5646-3-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] package/x11r7/xserver_xorg-server: fix optional glx dependency | expand |
On Wed, 23 Oct 2019 08:22:20 +0200 Bernd Kuhls <bernd.kuhls@t-online.de> wrote: > This allows to use xserver_xorg-server without mesa3d. > > Build-tested using this defconfig: > > BR2_TOOLCHAIN_BUILDROOT_GLIBC=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_PACKAGE_XORG7=y > BR2_PACKAGE_XSERVER_XORG_SERVER=y > BR2_PACKAGE_NVIDIA_DRIVER=y > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas
Am Fri, 25 Oct 2019 20:10:55 +0200 schrieb Thomas Petazzoni: > On Wed, 23 Oct 2019 08:22:20 +0200 Bernd Kuhls > <bernd.kuhls@t-online.de> wrote: > >> This allows to use xserver_xorg-server without mesa3d. >> >> Build-tested using this defconfig: >> >> BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_TOOLCHAIN_BUILDROOT_CXX=y >> BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y >> BR2_PACKAGE_NVIDIA_DRIVER=y >> >> Signed-off-by: Bernd Kuhls >> <bernd.kuhls@t-online.de> >> --- >> package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) > > Applied to master, thanks. > > Thomas Hi Thomas, you applied patches 1 & 3 of this series but did not commit patch 2: http://patchwork.ozlabs.org/patch/1181847/ This will cause a build error with xserver_xorg-server as noted in the commit message of patch 2. Regards, Bernd
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 41c82ad930..8ccc04224d 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -120,9 +120,9 @@ else # modular XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev endif -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx -XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d +XSERVER_XORG_SERVER_DEPENDENCIES += libgl else XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx endif
This allows to use xserver_xorg-server without mesa3d. Build-tested using this defconfig: BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_NVIDIA_DRIVER=y Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)