diff --git a/srcpkgs/libffado/patches/cross-build.patch b/srcpkgs/libffado/patches/cross-build.patch
new file mode 100644
index 0000000000..15aaee8b49
--- /dev/null
+++ b/srcpkgs/libffado/patches/cross-build.patch
@@ -0,0 +1,60 @@
+--- support/tools/SConscript.orig
++++ support/tools/SConscript
+@@ -40,12 +40,12 @@
+ else:
+ e.PrependUnique( LIBS=["expat"] )
+
+-e.Command( "static_info.txt", "ffado-diag", "support/tools/ffado-diag --static > $TARGET" )
++# e.Command( "static_info.txt", "ffado-diag", "support/tools/ffado-diag --static > $TARGET" )
+
+ e.ScanReplace( "ffado-diag.in" )
+
+ e.Install( "$bindir", "ffado-diag" )
+-e.Install( "$libdatadir", "static_info.txt" )
++# e.Install( "$libdatadir", "static_info.txt" )
+
+ if env['ENABLE_DICE']:
+ e.Program( target = "ffado-set-nickname", source = "ffado-set-nickname.cpp" )
+--- SConstruct.orig
++++ SConstruct
+@@ -254,13 +254,6 @@
+ env['REQUIRE_LIBAVC']=0
+
+ if not env.GetOption('clean'):
+- #
+- # Check for working gcc and g++ compilers and their environment.
+- #
+- if not conf.CompilerCheck():
+- print("\nIt seems as if your system isn't even able to compile any C-/C++-programs. Probably you don't have gcc and g++ installed. Compiling a package from source without a working compiler is very hard to do, please install the needed packages.\nHint: on *ubuntu you need both gcc- and g++-packages installed, easiest solution is to install build-essential which depends on gcc and g++.")
+- Exit( 1 )
+-
+ # Check for pkg-config before using pkg-config to check for other dependencies.
+ if not conf.CheckForPKGConfig():
+ print("\nThe program 'pkg-config' could not be found.\nEither you have to install the corresponding package first or make sure that PATH points to the right directions.")
+--- SConstruct.orig
++++ SConstruct
+@@ -537,7 +537,7 @@
+ env.Alias( "install", env['libdir'] )
+ env.Alias( "install", env['includedir'] )
+ env.Alias( "install", env['sharedir'] )
+-env.Alias( "install", env['libdatadir'] )
++# env.Alias( "install", env['libdatadir'] )
+ env.Alias( "install", env['bindir'] )
+ env.Alias( "install", env['mandir'] )
+ if env['BUILD_MIXER'] == 'true':
+--- SConstruct.orig
++++ SConstruct
+@@ -395,12 +395,7 @@
+
+ # PyQT checks
+ if env['BUILD_MIXER'] != 'false':
+- if ( conf.CheckForApp( 'which pyuic4' ) \
+- and conf.CheckForPyModule( 'PyQt4' ) \
+- and conf.CheckForPyModule( 'dbus.mainloop.qt' )) \
+- or ( conf.CheckForApp( 'which pyuic5' ) \
+- and conf.CheckForPyModule( 'PyQt5' ) \
+- and conf.CheckForPyModule( 'dbus.mainloop.pyqt5' )):
++ if conf.CheckForApp( 'which pyuic4' ) or conf.CheckForApp( 'which pyuic5' ):
+ env['BUILD_MIXER'] = 'true'
+ elif not env.GetOption('clean'):
+ if env['BUILD_MIXER'] == 'auto':
diff --git a/srcpkgs/libffado/patches/fix-python3-pyqt5.patch b/srcpkgs/libffado/patches/fix-python3-pyqt5.patch
deleted file mode 100644
index 8bdba2486b..0000000000
--- a/srcpkgs/libffado/patches/fix-python3-pyqt5.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- support/mixer-qt4/ffado/import_pyqt.py 2017-06-03 10:34:29.000000000 +0200
-+++ support/mixer-qt4/ffado/import_pyqt.py 2018-03-06 17:19:15.024087729 +0100
-@@ -20,27 +20,37 @@
- # along with this program. If not, see .
- #
-
-+import sys
-+ffado_python3 = sys.version_info >= (3,)
- ffado_pyqt_version = 4
-
--# This module handles the importing of PyQt modules for both PyQt4 and PyQt5.
--# The idea is to first try importing PyQt4. If there's an import error it's
-+# This module handles the importing of PyQt modules for both PyQt4 and PyQt5 on
-+# python2 or python3.
-+# Using python2 the first try is to import PyQt4. If there's an import error it's
- # assumed PyQt5 is present instead and that is tried.
-+# Using python3 PyQt5 is assumed (PyQt4 is missing the old APIs and can
-+# therefore not be used).
- #
- # All modules used by any part of ffado-mixer are imported. This greatly
- # simplifies the process. Otherwise the modules to import would be delivered
- # by string variables, and there isn't a supported way to do this across
- # Python2 and Python3.
--try:
-- from PyQt4 import QtGui, QtCore, Qt, uic
-- from PyQt4.QtCore import QByteArray, QObject, QTimer, Qt, pyqtSignal, QString, pyqtSlot
-- from PyQt4.QtGui import *
-- ffado_pyqt_version = 4
--except ImportError:
-- from PyQt5 import QtGui, Qt, QtCore, Qt, QtWidgets, uic
-- from PyQt5.QtCore import QByteArray, QObject, pyqtSignal, pyqtSlot, QTimer, Qt
-- from PyQt5.QtGui import *
-- from PyQt5.QtWidgets import *
-- ffado_pyqt_version = 5
-+if ffado_python3:
-+ from PyQt5 import QtGui, Qt, QtCore, Qt, QtWidgets, uic
-+ from PyQt5.QtCore import QByteArray, QObject, pyqtSignal, pyqtSlot, QTimer, Qt
-+ from PyQt5.QtGui import *
-+ from PyQt5.QtWidgets import *
-+ ffado_pyqt_version = 5
-+else:
-+ try:
-+ from PyQt4 import QtGui, QtCore, Qt, uic
-+ from PyQt4.QtCore import QByteArray, QObject, QTimer, Qt, pyqtSignal, QString, pyqtSlot
-+ from PyQt4.QtGui import *
-+ ffado_pyqt_version = 4
-+ except ImportError:
-+ from PyQt5 import QtGui, Qt, QtCore, Qt, QtWidgets, uic
-+ from PyQt5.QtCore import QByteArray, QObject, pyqtSignal, pyqtSlot, QTimer, Qt
-+ from PyQt5.QtGui import *
-+ from PyQt5.QtWidgets import *
-+ ffado_pyqt_version = 5
-
--import sys
--ffado_python3 = sys.version_info >= (3,)
-
diff --git a/srcpkgs/libffado/template b/srcpkgs/libffado/template
index 8fc7fdf336..e3bf2544ce 100644
--- a/srcpkgs/libffado/template
+++ b/srcpkgs/libffado/template
@@ -1,12 +1,13 @@
# Template file for 'libffado'
pkgname=libffado
-version=2.4.1
-revision=2
+version=2.4.4
+revision=1
build_style=scons
make_build_args="PREFIX=/usr MANDIR=/usr/share/man
UDEVDIR=/usr/lib/udev/rules.d CUSTOM_ENV=1 BUILD_TESTS=0
ENABLE_OPTIMIZATIONS=0 DEBUG=0 PYTHON_INTERPRETER=/usr/bin/python3
- DETECT_USERSPACE_ENV=0 PYPKGDIR=/${py3_sitelib}"
+ DETECT_USERSPACE_ENV=0 PYPKGDIR=/${py3_sitelib}
+ DIST_TARGET=none DETECT_USERSPACE_ENV=0"
make_install_args="$make_build_args WILL_DEAL_WITH_XDG_MYSELF=1"
hostmakedepends="pkg-config xdg-utils python3-PyQt5-devel-tools which"
makedepends="libxml++-devel libdbus-c++-devel libsigc++-devel libconfig++-devel
@@ -14,12 +15,11 @@ makedepends="libxml++-devel libdbus-c++-devel libsigc++-devel libconfig++-devel
python3-PyQt5-dbus"
depends="libffado-python"
short_desc="Library for accessing BeBoB IEEE1394 devices"
-maintainer="Duncaen "
+maintainer="Duncaen "
license="GPL-2.0-only, GPL-3.0-only"
homepage="http://www.ffado.org"
distfiles="http://www.ffado.org/files/libffado-${version}.tgz"
-checksum=3ee19b6841c436dc48a230e127e89e8e7e645073c9e40d8cf7393454f61cd92f
-nocross="Tries to run compiled code to test features"
+checksum=a47178cdc8c0c91e91edbaabe23d19ca12a752cbcf81c27314adb27cc00d60f0
case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" argp-standalone" ;;
@@ -42,7 +42,6 @@ post_install() {
libffado-python_package() {
depends="python3-PyQt5-dbus python3-dbus"
short_desc+=" - python3 bindings"
- pycompile_module="ffado"
pkg_install() {
vmove ${py3_sitelib}
}