Date: Monday, July 23, 2018 @ 15:15:20 Author: foutrelis Revision: 362967
archrelease: copy trunk to community-staging-x86_64 Added: libffado/repos/community-staging-x86_64/ libffado/repos/community-staging-x86_64/PKGBUILD (from rev 362966, libffado/trunk/PKGBUILD) libffado/repos/community-staging-x86_64/libffado-fix-python3-pyqt5.diff (from rev 362966, libffado/trunk/libffado-fix-python3-pyqt5.diff) ---------------------------------+ PKGBUILD | 53 ++++++++++++++++++++++++++++++++++++ libffado-fix-python3-pyqt5.diff | 55 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) Copied: libffado/repos/community-staging-x86_64/PKGBUILD (from rev 362966, libffado/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2018-07-23 15:15:20 UTC (rev 362967) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: David Runge <d...@sleepmap.de> +# Maintainer: Ray Rashif <sc...@archlinux.org> +# Contributor: galiyo...@gmail.com +# Contributor: Jon Kristian Nilsen <jokr.nil...@gmail.com> + +pkgname=libffado +pkgver=2.4.1 +pkgrel=2 +pkgdesc="Driver for FireWire audio devices" +arch=('x86_64') +url="http://www.ffado.org/" +license=('GPL') +depends=('dbus-c++' 'jack' 'libavc1394' 'libconfig' 'libiec61883' 'libxml++' 'python-dbus') +makedepends=('python-pyqt5' 'python-dbus' 'scons') +optdepends=('python-pyqt5: ffado-mixer') +provides=('ffado') +source=("http://www.ffado.org/files/${pkgname}-${pkgver}.tgz" + "${pkgname}-fix-python3-pyqt5.diff" +) +sha512sums=('0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74' + '39beb2399377d7ee13a43ddd7a80907eb94a2f8f146c5a94a4ba0e1471b3369d2b1519cb8b15c3e2352d9854048882cc037058a1992e6e87270fe9e17fdba91e') + +prepare() { + cd "${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/${pkgname}-fix-python3-pyqt5.diff" +} + +build() { + cd "${pkgname}-${pkgver}" + scons PREFIX=/usr \ + DEBUG=no \ + MANDIR='/usr/share/man' \ + PYTHON_INTERPRETER='/usr/bin/python3' \ + PYPKGDIR='/usr/lib/python3.7/site-packages' \ + UDEVDIR='/usr/lib/udev/rules.d' +} + +package() { + cd "${pkgname}-${pkgver}" + scons DESTDIR="${pkgdir}" WILL_DEAL_WITH_XDG_MYSELF="True" install + + # XDG + install -vDm644 support/xdg/ffado.org-ffadomixer.desktop \ + "${pkgdir}/usr/share/applications/ffadomixer.desktop" + install -vDm644 support/xdg/hi64-apps-ffado.png \ + "${pkgdir}/usr/share/pixmaps/hi64-apps-ffado.png" + + # docs + install -t "${pkgdir}/usr/share/doc/${pkgname}" -vDm644 {AUTHORS,README} +} + +# vim:set ts=2 sw=2 et: Copied: libffado/repos/community-staging-x86_64/libffado-fix-python3-pyqt5.diff (from rev 362966, libffado/trunk/libffado-fix-python3-pyqt5.diff) =================================================================== --- community-staging-x86_64/libffado-fix-python3-pyqt5.diff (rev 0) +++ community-staging-x86_64/libffado-fix-python3-pyqt5.diff 2018-07-23 15:15:20 UTC (rev 362967) @@ -0,0 +1,55 @@ +--- libffado-2.4.1-a/support/mixer-qt4/ffado/import_pyqt.py 2017-06-03 10:34:29.000000000 +0200 ++++ libffado-2.4.1-b/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 <http://www.gnu.org/licenses/>. + # + ++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,)