312b556893
- Upstream some patches - Remove dependency on Qt 5 OpenGL (will be upstreamed) - Add dependency on math/fftw3 - Completely disable VDPAU option (broken upstream)
36 lines
1.4 KiB
Text
36 lines
1.4 KiB
Text
src/modules/qt/configure | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- src/modules/qt/configure.orig 2016-12-20 14:22:22 UTC
|
|
+++ src/modules/qt/configure
|
|
@@ -107,14 +107,6 @@ else
|
|
then
|
|
echo QTCXXFLAGS=-I$qt_includedir -I$qt_includedir/QtCore -I$qt_includedir/QtGui -I$qt_includedir/QtXml -I$qt_includedir/QtSvg -I$qt_includedir/QtWidgets >> config.mak
|
|
echo QTLIBS=-Wl,-rpath-link,"$qt_libdir" -L"$qt_libdir" -lQt5Core -lQt5Gui -lQt5Xml -lQt5Svg -lQt5Widgets >> config.mak
|
|
- if [ -f "$qt_libdir/libQt5OpenGL.so" ] || [ -f "$qt_libdir/libQt5OpenGL.a" ]
|
|
- then
|
|
- echo QTCXXFLAGS+=-I$qt_includedir/QtOpenGL >> config.mak
|
|
- echo QTLIBS+=-lQt5OpenGL >> config.mak
|
|
- else
|
|
- echo "- Qt5OpenGL not found: disabling"
|
|
- without_opengl=true
|
|
- fi
|
|
# Qt5 on OS X
|
|
elif [ -d "$qt_libdir/QtWidgets.framework" ]
|
|
then
|
|
@@ -151,15 +143,6 @@ else
|
|
without_kde=true
|
|
echo QTCXXFLAGS=$(pkg-config --cflags Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak
|
|
echo QTLIBS=$(pkg-config --libs Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak
|
|
- pkg-config --exists 'Qt5OpenGL'
|
|
- if [ $? -eq 0 ]
|
|
- then
|
|
- echo QTCXXFLAGS+=$(pkg-config --cflags Qt5OpenGL) >> config.mak
|
|
- echo QTLIBS+=$(pkg-config --libs Qt5OpenGL) >> config.mak
|
|
- else
|
|
- echo "- Qt5OpenGL not found: disabling"
|
|
- without_opengl=true
|
|
- fi
|
|
else
|
|
pkg-config --exists 'QtGui >= 4'
|
|
if [ $? -eq 0 ]
|