NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/x11r7/xserver_xorg-server: fix xlib_libXfont2 dependency

Browse Source 
The dependency to xlib_libXfont2 was mistakenly removed in
https://git.buildroot.net/buildroot/commit/?id=e6dc4f1857eed27a19abd57fae7428bea38b69e5

Add it back again to fix build errors detected by the autobuilders and
remove handling of xlib_libXfont as well because only older versions of
xserver_xorg-server needed it.

Fixes:
http://autobuild.buildroot.net/results/f72/f72cc9b30e55e2c665de7a00482a1c3ba702118c/
http://autobuild.buildroot.net/results/9dd/9dd99e633dee8f11e7b2b973d4a72e51a2812ec9/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2020-09-05 16:53:23 +02:00 committed by Thomas Petazzoni
parent 39148cd3d2
commit a9add4da32
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/x11r7/xserver_xorg-server/Config.in
View File

@ -22,6 +22,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XLIB_LIBXDMCP
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXFIXES
select BR2_PACKAGE_XLIB_LIBXFONT2
select BR2_PACKAGE_XLIB_LIBXFT
select BR2_PACKAGE_XLIB_LIBXI
select BR2_PACKAGE_XLIB_LIBXINERAMA

9
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
View File

@ -20,6 +20,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
xlib_libXdmcp \
xlib_libXext \
xlib_libXfixes \
xlib_libXfont2 \
xlib_libXi \
xlib_libXrender \
xlib_libXres \
@ -160,14 +161,6 @@ else
XSERVER_XORG_SERVER_CONF_OPTS += --disable-libunwind
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont2
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont
endif
ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y)
XSERVER_XORG_SERVER_CONF_OPTS += --disable-xvmc
endif