Skip to content

Commit 1d916a5

Browse files
atenartjacmet
authored andcommitted
imx-gpu-viv: fix build dependencies when linking against libGAL.so
Packages like QT5 Base with OpenGL and X support link against libGAL.so at build time. This results in an error because some X functions used in libGAL.so aren't referenced as the libXdamage, libXext and libXfixes packages aren't built and installed into sysroot at the time. Fix this by adding these three packages as build dependencies of imx-gpu-viv. Signed-off-by: Antoine Tenart <[email protected]> Acked-by: Thomas Petazzoni <[email protected]> Signed-off-by: Peter Korsgaard <[email protected]>
1 parent 25b218c commit 1d916a5

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

package/freescale-imx/imx-gpu-viv/Config.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ choice
3333
config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11
3434
bool "X11"
3535
depends on BR2_PACKAGE_XORG7
36-
select BR2_PACKAGE_XLIB_LIBXDAMAGE # Runtime dependency
37-
select BR2_PACKAGE_XLIB_LIBXEXT # Runtime dependency
36+
select BR2_PACKAGE_XLIB_LIBXDAMAGE
37+
select BR2_PACKAGE_XLIB_LIBXEXT
38+
select BR2_PACKAGE_XLIB_LIBXFIXES
3839

3940
comment "X11 backend needs Xorg package"
4041
depends on !BR2_PACKAGE_XORG7

package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ IMX_GPU_VIV_REDISTRIBUTE = NO
2222
IMX_GPU_VIV_PROVIDES = libegl libgles libopenvg
2323
IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT))
2424

25+
ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11)
26+
# The libGAL.so library provided by imx-gpu-viv uses X functions. Packages
27+
# may want to link against libGAL.so (QT5 Base with OpenGL and X support
28+
# does so). For this to work we need build dependencies to libXdamage,
29+
# libXext and libXfixes so that X functions used in libGAL.so are referenced.
30+
IMX_GPU_VIV_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes
31+
endif
32+
2533
define IMX_GPU_VIV_EXTRACT_CMDS
2634
$(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_GPU_VIV_SOURCE))
2735
endef

0 commit comments

Comments
 (0)