2019-09-07 21:41:40 +02:00
|
|
|
Index: VirtualBox-6.0.12/configure
|
2019-01-28 21:37:13 +01:00
|
|
|
===================================================================
|
2019-09-07 21:41:40 +02:00
|
|
|
--- VirtualBox-6.0.12.orig/configure
|
|
|
|
+++ VirtualBox-6.0.12/configure
|
|
|
|
@@ -1546,14 +1546,14 @@ EOF
|
2019-01-28 21:37:13 +01:00
|
|
|
INCQT5="$q/include $q/include/QtCore"
|
|
|
|
FLGQT5="-DQT_SHARED"
|
|
|
|
I_INCQT5=`prefix_I "$INCQT5"`
|
|
|
|
- LIBQT5="-L$q/lib -lQt5CoreVBox"
|
|
|
|
+ LIBQT5="-L$q/lib -L$q/usr/lib64 -lQt5CoreVBox"
|
|
|
|
TOOLQT5="$q"
|
|
|
|
if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal &&
|
2019-09-07 21:41:40 +02:00
|
|
|
test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal; then
|
2019-01-28 21:37:13 +01:00
|
|
|
foundqt5=2 # internal
|
|
|
|
break;
|
|
|
|
fi
|
|
|
|
- LIBQT5="-L$q/lib -lQt5Core"
|
|
|
|
+ LIBQT5="-L$q/lib -L$q/usr/lib64 -lQt5Core"
|
|
|
|
if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal &&
|
2019-09-07 21:41:40 +02:00
|
|
|
test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal; then
|
2019-01-28 21:37:13 +01:00
|
|
|
foundqt5=1 # no pkg-config, Qt directory
|
2019-09-07 21:41:40 +02:00
|
|
|
Index: VirtualBox-6.0.12/src/VBox/Additions/common/crOpenGL/Makefile.kmk
|
2019-01-28 21:37:13 +01:00
|
|
|
===================================================================
|
2019-09-07 21:41:40 +02:00
|
|
|
--- VirtualBox-6.0.12.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
|
|
|
|
+++ VirtualBox-6.0.12/src/VBox/Additions/common/crOpenGL/Makefile.kmk
|
|
|
|
@@ -224,15 +224,7 @@ VBoxOGL_LIBS.win += \
|
2019-01-28 21:37:13 +01:00
|
|
|
$(PATH_STAGE_LIB)/additions/VBoxCrHgsmi$(VBOX_SUFF_LIB)
|
|
|
|
|
|
|
|
if1of ($(KBUILD_TARGET), linux solaris freebsd)
|
|
|
|
- ifdef VBOX_USE_SYSTEM_GL_HEADERS
|
|
|
|
VBoxOGL_LIBS += Xcomposite Xdamage Xfixes Xext
|
|
|
|
- else
|
|
|
|
- VBoxOGL_LIBS += \
|
|
|
|
- $(PATH_STAGE_LIB)/libXcomposite.so \
|
|
|
|
- $(PATH_STAGE_LIB)/libXdamage.so \
|
|
|
|
- $(PATH_STAGE_LIB)/libXfixes.so \
|
|
|
|
- $(PATH_STAGE_LIB)/libXext.so
|
|
|
|
- endif
|
|
|
|
ifdef VBoxOGL_FAKEDRI
|
|
|
|
ifeq ($(KBUILD_TARGET), freebsd)
|
|
|
|
VBoxOGL_LIBS += \
|