Skip to content

Commit

Permalink
xxf86vm is needed for some linux gl distros
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Mar 16, 2024
1 parent 6250a88 commit 25da4c2
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/workflows/bootstrap-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,14 @@ case "${1}" in
libvulkan-dev:${linux_arch} \
libx11-dev:${linux_arch} \
libxcb1-dev:${linux_arch} \
libxcb-dri2-0-dev:${linux_arch} \
libxcursor-dev:${linux_arch} \
libxdamage-dev:${linux_arch} \
libxext-dev:${linux_arch} \
libxfixes-dev:${linux_arch} \
libxrandr-dev:${linux_arch} \
libxrender-dev:${linux_arch} \
libxxf86vm-dev:${linux_arch} \
uuid-dev:${linux_arch}
apt-get install -yqq --allow-downgrades \
qtbase5-dev-tools \
Expand Down
18 changes: 17 additions & 1 deletion bootstrap-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ if [ "${LINUX}" -eq 1 ]; then
elif [ "${LINUX_TARGET}" = "linux-x86_64" ]; then
export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
fi
if ! pkg-config --print-errors --exists alsa dbus-1 gl glib-2.0 libpcre libpcre2-8 pthread-stubs uuid x11 xcb xcursor xext xfixes xproto xrandr xrender; then
if ! pkg-config --print-errors --exists alsa dbus-1 gl glib-2.0 libpcre libpcre2-8 pthread-stubs uuid x11 xcb xcb-dri2 xcursor xdamage xext xfixes xproto xrandr xrender xxf86vm; then
echo "some system libs are not available, cannot continue"
exit 2
fi
Expand Down Expand Up @@ -249,14 +249,26 @@ if [ "${LINUX}" -eq 1 ]; then
cp $(pkg-config --variable=pcfiledir xcb)/{xau,xcb,xdmcp}.pc ${TARGET_PKG_CONFIG_PATH}/
sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/{xau,xcb,xdmcp}.pc
fi
if [ ! -e "${TARGET_PKG_CONFIG_PATH}/xcb-dri2.pc" ]; then
cp $(pkg-config --variable=pcfiledir xcb-dri2)/xcb-dri2.pc ${TARGET_PKG_CONFIG_PATH}/
sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/xcb-dri2.pc
fi
if [ ! -e "${TARGET_PKG_CONFIG_PATH}/xcursor.pc" ]; then
cp $(pkg-config --variable=pcfiledir xcursor)/xcursor.pc ${TARGET_PKG_CONFIG_PATH}/
sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/xcursor.pc
fi
if [ ! -e "${TARGET_PKG_CONFIG_PATH}/xdamage.pc" ]; then
cp $(pkg-config --variable=pcfiledir xdamage)/xdamage.pc ${TARGET_PKG_CONFIG_PATH}/
sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/xdamage.pc
fi
if [ ! -e "${TARGET_PKG_CONFIG_PATH}/xext.pc" ]; then
cp $(pkg-config --variable=pcfiledir xext)/xext.pc ${TARGET_PKG_CONFIG_PATH}/
sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/xext.pc
fi
if [ ! -e "${TARGET_PKG_CONFIG_PATH}/xf86vidmodeproto.pc" ]; then
cp $(pkg-config --variable=pcfiledir xf86vidmodeproto)/xf86vidmodeproto.pc ${TARGET_PKG_CONFIG_PATH}/
sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/xf86vidmodeproto.pc
fi
if [ ! -e "${TARGET_PKG_CONFIG_PATH}/xfixes.pc" ]; then
cp $(pkg-config --variable=pcfiledir xfixes)/xfixes.pc ${TARGET_PKG_CONFIG_PATH}/
sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/xfixes.pc
Expand All @@ -273,6 +285,10 @@ if [ "${LINUX}" -eq 1 ]; then
cp $(pkg-config --variable=pcfiledir xrender)/xrender.pc ${TARGET_PKG_CONFIG_PATH}/
sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/xrender.pc
fi
if [ ! -e "${TARGET_PKG_CONFIG_PATH}/xxf86vm.pc" ]; then
cp $(pkg-config --variable=pcfiledir xxf86vm)/xxf86vm.pc ${TARGET_PKG_CONFIG_PATH}/
sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/xxf86vm.pc
fi
fi

# ---------------------------------------------------------------------------------------------------------------------
Expand Down

0 comments on commit 25da4c2

Please sign in to comment.