summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Sasha2020-11-03 20:24:47 +0100
committer Matteo Bernardini2021-02-27 10:29:58 +0100
commita63899c01e05b8385f8dc4af4e7996a1ac98b80a (patch)
tree03bd56c7abe1184ef8bbabd139e4368f9f18b4d1
parent50d94e42c174a68c107d63157e723732ecc985b5 (diff)
downloadslackbuilds-libffado.tar.gz
libraries/libffado: Updated for version 2.4.4, point to python3.libffado
This fixes ffado-mixer Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--libraries/libffado/libffado-2.4.2-python38.patch24
-rw-r--r--libraries/libffado/libffado.SlackBuild11
-rw-r--r--libraries/libffado/libffado.info6
3 files changed, 10 insertions, 31 deletions
diff --git a/libraries/libffado/libffado-2.4.2-python38.patch b/libraries/libffado/libffado-2.4.2-python38.patch
deleted file mode 100644
index d0ad2e956d..0000000000
--- a/libraries/libffado/libffado-2.4.2-python38.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN a/support/mixer-qt4/ffado/configuration.py b/support/mixer-qt4/ffado/configuration.py
---- a/support/mixer-qt4/ffado/configuration.py 2017-03-28 13:38:34.000000000 +0200
-+++ b/support/mixer-qt4/ffado/configuration.py 2019-11-24 20:55:05.284341627 +0100
-@@ -20,7 +20,8 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
- #
-
--import re, os
-+import os
-+import dbus
-
- import shlex
-
-@@ -53,6 +54,10 @@
- self.addDevice( dev )
-
- def getDeviceById( self, vendor, model ):
-+ if isinstance(vendor, dbus.Int32):
-+ vendor = str(int(vendor))
-+ if isinstance(model, dbus.Int32):
-+ model = str(int(model))
- log.debug("DeviceList::getDeviceById( %s, %s )" % (vendor, model ))
- for dev in self.devices:
- if int("%s" % dev['vendorid'], 0) == int("%s" % vendor, 0) and \
diff --git a/libraries/libffado/libffado.SlackBuild b/libraries/libffado/libffado.SlackBuild
index 3bdea71f19..22bf575e07 100644
--- a/libraries/libffado/libffado.SlackBuild
+++ b/libraries/libffado/libffado.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libffado
-VERSION=${VERSION:-2.4.2}
+VERSION=${VERSION:-2.4.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -54,6 +54,8 @@ elif [ "$ARCH" = "x86_64" ]; then
TARGET="x86_64"
fi
+PYTHON_VERSION=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
+
set -e
rm -rf $PKG
@@ -69,16 +71,17 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-patch -p1 < $CWD/libffado-2.4.2-python38.patch
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS -std=gnu++11 -Wno-deprecated-declarations" \
scons \
PREFIX=/usr \
LIBDIR=/usr/lib${LIBDIRSUFFIX} \
DIST_TARGET="$TARGET" \
+ PYTHON_INTERPRETER='/usr/bin/python3' \
+ PYPKGDIR="/usr/lib$LIBDIRSUFFIX/python${PYTHON_VERSION}/site-packages" \
CUSTOM_ENV="True" \
- DEBUG="False"
+ DEBUG="False" \
+ UDEVDIR='/lib/udev/rules.d'
scons \
DESTDIR=$PKG \
diff --git a/libraries/libffado/libffado.info b/libraries/libffado/libffado.info
index 69c2e4e9cb..4949534f21 100644
--- a/libraries/libffado/libffado.info
+++ b/libraries/libffado/libffado.info
@@ -1,8 +1,8 @@
PRGNAM="libffado"
-VERSION="2.4.2"
+VERSION="2.4.4"
HOMEPAGE="http://www.ffado.org/"
-DOWNLOAD="http://www.ffado.org/files/libffado-2.4.2.tgz"
-MD5SUM="2b7eddffeaac68cdd145928a6cb62540"
+DOWNLOAD="http://www.ffado.org/files/libffado-2.4.4.tgz"
+MD5SUM="f27970e21a80a1e9ccc1842c4a6a3c62"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libconfig libdbus-c++ libiec61883 libxml++"