20 lines
949 B
Diff
20 lines
949 B
Diff
--- libffado-2.4.0.org/SConstruct 2017-12-23 05:43:57.000000000 -0500
|
|
+++ libffado-2.4.0/SConstruct 2018-01-02 22:35:01.793115884 -0500
|
|
@@ -29,6 +29,7 @@ FFADO_VERSION="2.4.0"
|
|
from subprocess import Popen, PIPE
|
|
import os
|
|
import re
|
|
+import sys
|
|
from string import Template
|
|
import imp
|
|
import distutils.sysconfig
|
|
@@ -395,7 +396,7 @@ results above get rechecked.
|
|
|
|
# PyQT checks
|
|
if env['BUILD_MIXER'] != 'false':
|
|
- have_dbus = (conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ))
|
|
+ have_dbus = ((conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' )) or (conf.CheckForApp( 'which pyuic5' ) and conf.CheckForPyModule( 'dbus.mainloop.pyqt5' )))
|
|
have_pyqt4 = (conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'PyQt4' ))
|
|
have_pyqt5 = (conf.CheckForApp( 'which pyuic5' ) and conf.CheckForPyModule( 'PyQt5' ))
|
|
if ((have_pyqt4 or have_pyqt5) and have_dbus):
|