[gentoo-commits] repo/gentoo:master commit in: media-libs/libffado/, media-libs/libffado/files/

2024-07-04 Thread Miroslav Šulc 
commit: 69364e35bd5a05ed5c26f8806dbfdaf63741c32e
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Jul  4 14:24:10 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Jul  4 14:24:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69364e35

media-libs/libffado: added python 3.12

Closes: https://bugs.gentoo.org/929640
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../libffado-2.4.7-fix-config-load-crash.patch |  2 -
 .../libffado/files/libffado-2.4.8-python3.12.patch | 82 ++
 media-libs/libffado/libffado-2.4.8.ebuild  |  3 +-
 3 files changed, 84 insertions(+), 3 deletions(-)

diff --git 
a/media-libs/libffado/files/libffado-2.4.7-fix-config-load-crash.patch 
b/media-libs/libffado/files/libffado-2.4.7-fix-config-load-crash.patch
index 05ede6ebf653..e16629c7a47e 100644
--- a/media-libs/libffado/files/libffado-2.4.7-fix-config-load-crash.patch
+++ b/media-libs/libffado/files/libffado-2.4.7-fix-config-load-crash.patch
@@ -1,5 +1,3 @@
-diff --git a/libffado-2.4.1/support/mixer-qt4/ffado/mixer/globalmixer.py 
b/libffado-2.4.1-patched/support/mixer-qt4/ffado/mixer/globalmixer.py
-index 7078b0e..d184d73 100644
 --- libffado-2.4.1-old/support/mixer-qt4/ffado/mixer/globalmixer.py
 +++ libffado-2.4.1/support/mixer-qt4/ffado/mixer/globalmixer.py
 @@ -96,7 +96,6 @@ class GlobalMixer(QWidget):

diff --git a/media-libs/libffado/files/libffado-2.4.8-python3.12.patch 
b/media-libs/libffado/files/libffado-2.4.8-python3.12.patch
new file mode 100644
index ..da5bdecc245d
--- /dev/null
+++ b/media-libs/libffado/files/libffado-2.4.8-python3.12.patch
@@ -0,0 +1,82 @@
+--- libffado-2.4.8/SConstruct
 libffado-2.4.8-patched/SConstruct
+@@ -977,7 +977,7 @@ else:
+ # Create a tags-file for easier emacs/vim-source-browsing
+ #  I don't know if the dependency is right...
+ #
+-findcommand = "find . \( -path \"*.h\" -o -path \"*.cpp\" -o -path \"*.c\" \) 
\! -path \"*.svn*\" \! -path \"./doc*\" \! -path \"./cache*\""
++findcommand = "find . \\( -path \"*.h\" -o -path \"*.cpp\" -o -path \"*.c\" 
\\) \\! -path \"*.svn*\" \\! -path \"./doc*\" \\! -path \"./cache*\""
+ env.Command( "tags", "", findcommand + " |xargs ctags" )
+ env.Command( "TAGS", "", findcommand + " |xargs etags" )
+ env.AlwaysBuild( "tags", "TAGS" )
+--- libffado-2.4.8/admin/pyuic.py
 libffado-2.4.8-patched/admin/pyuic.py
+@@ -21,7 +22,7 @@
+ # along with this program.  If not, see .
+ #
+ 
+-import imp
++import importlib
+ 
+ def pyuic_action( target, source, env ):
+   env.Execute( "pyuic " + str( source[0] ) + " > " + str( target[0] ) )
+@@ -32,11 +33,7 @@ def pyuic_string( target, source, env ):
+ 
+ def PyQtCheck( context ):
+   context.Message( "Checking for pyuic (by checking for the python module 
pyqtconfig) " )
+-  ret = True
+-  try:
+-  imp.find_module( "pyqtconfig" )
+-  except ImportError:
+-  ret = False
++  ret = importlib.util.find_spec( "pyqtconfig" ) is not None
+   context.Result( ret )
+   return ret
+ 
+--- libffado-2.4.8/admin/pyuic4.py
 libffado-2.4.8-patched/admin/pyuic4.py
+@@ -21,7 +22,7 @@
+ # along with this program.  If not, see .
+ #
+ 
+-import imp
++import importlib
+ 
+ def pyuic4_action( target, source, env ):
+   env.Execute( "pyuic4 " + str( source[0] ) + " > " + str( target[0] ) )
+@@ -32,11 +33,7 @@ def pyuic4_string( target, source, env ):
+ 
+ def PyQt4Check( context ):
+   context.Message( "Checking for pyuic4 (by checking for the python 
module pyqtconfig) " )
+-  ret = True
+-  try:
+-  imp.find_module( "pyqtconfig" )
+-  except ImportError:
+-  ret = False
++  ret = importlib.util.find_spec( "pyqtconfig" ) is not None
+   context.Result( ret )
+   return ret
+ 
+--- libffado-2.4.8/admin/pyuic5.py
 libffado-2.4.8-patched/admin/pyuic5.py
+@@ -22,7 +23,7 @@
+ # along with this program.  If not, see .
+ #
+ 
+-import imp
++import importlib
+ 
+ def pyuic5_action( target, source, env ):
+   env.Execute( "pyuic5 " + str( source[0] ) + " > " + str( target[0] ) )
+@@ -33,11 +34,7 @@ def pyuic5_string( target, source, env ):
+ 
+ def PyQt5Check( context ):
+   context.Message( "Checking for pyuic5 (by checking for the python 
module pyqtconfig) " )
+-  ret = True
+-  try:
+-  imp.find_module( "pyqtconfig" )
+-  except ImportError:
+-  ret = False
++  ret = importlib.util.find_spec( "pyqtconfig" ) is not None
+   context.Result( ret )
+   return ret

diff --git a/media-libs/libffado/libffado-2.4.8.ebuild 
b/media-libs/libffado/libffado-2.4.8.ebuild
index 485806fc9807..2bf41f8f6808 100644
--- a/media-libs/libffado/libffado-2.4.8.ebuild
+++ b/media-libs/libffado/libffado-2.4.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=(

[gentoo-commits] repo/gentoo:master commit in: media-libs/libffado/, media-libs/libffado/files/

2022-11-28 Thread Miroslav Šulc 
commit: c25d9d6e155fb609e375e6a85aeb585fde5a2f67
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Nov 28 08:55:55 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Nov 28 08:56:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c25d9d6e

media-libs/libffado: bump to 2.4.7 + fix for config load crash

patch by Adam Wenocur  gmail.com>

Closes: https://bugs.gentoo.org/744364
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-libs/libffado/Manifest   |   1 +
 .../libffado-2.4.7-fix-config-load-crash.patch |  13 +++
 media-libs/libffado/libffado-2.4.7.ebuild  | 125 +
 3 files changed, 139 insertions(+)

diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index 522d1cda4de7..d09d38ce2d34 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1 +1,2 @@
 DIST libffado-2.4.6.tgz 1230455 BLAKE2B 
1e86e7f9179e94c00a74514dbd7c0c299de6d1870f22c4d9ba14cb6b105b41c9dda62d19d0d660e84eee7e0f02c0bf7c44fbe58e24634ccf9cc9e41f1d38b5c2
 SHA512 
dac651233ea94c19834e810c64230bcbd5516de9e694ced1b6497ad927d734c527b3a556281676393674d33da768cb2431e7da1a0fdfc6ceb268e897029aa584
+DIST libffado-2.4.7.tgz 1231931 BLAKE2B 
3c304011259ddbd35ce8fd725d38a5f50fca962981f9c5af6e377493a14985e4b96c64bcc54ba5a341028ec17dc6f2c42ce527422779f2edc6f9a1a61220cf51
 SHA512 
424a9ca7ded12e72d77a50d7ddf4e50dc0d55b80d725499df7609ce60d0eac8b24a41d9b8e4e74f78bdefe114b61bd5f1ec09a6d083f4a58475e66d61153f075

diff --git 
a/media-libs/libffado/files/libffado-2.4.7-fix-config-load-crash.patch 
b/media-libs/libffado/files/libffado-2.4.7-fix-config-load-crash.patch
new file mode 100644
index ..05ede6ebf653
--- /dev/null
+++ b/media-libs/libffado/files/libffado-2.4.7-fix-config-load-crash.patch
@@ -0,0 +1,13 @@
+diff --git a/libffado-2.4.1/support/mixer-qt4/ffado/mixer/globalmixer.py 
b/libffado-2.4.1-patched/support/mixer-qt4/ffado/mixer/globalmixer.py
+index 7078b0e..d184d73 100644
+--- libffado-2.4.1-old/support/mixer-qt4/ffado/mixer/globalmixer.py
 libffado-2.4.1/support/mixer-qt4/ffado/mixer/globalmixer.py
+@@ -96,7 +96,6 @@ class GlobalMixer(QWidget):
+ @pyqtSlot()
+ def on_txtNickname_returnPressed( self ):
+ if self.nickname.canChangeValue():
+-asciiData = self.txtNickname.text().toAscii()
+-self.nickname.setText( asciiData.data() )
++self.nickname.setText( self.txtNickname.text().encode('utf-8') )
+ else:
+ self.txtNickname.setText( self.nickname.text() )

diff --git a/media-libs/libffado/libffado-2.4.7.ebuild 
b/media-libs/libffado/libffado-2.4.7.ebuild
new file mode 100644
index ..116efcf9375f
--- /dev/null
+++ b/media-libs/libffado/libffado-2.4.7.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit desktop python-single-r1 scons-utils toolchain-funcs udev 
multilib-minimal
+
+DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces"
+HOMEPAGE="http://www.ffado.org;
+
+if [[ "${PV}" = "" ]]; then
+   inherit subversion
+   ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN};
+else
+   SRC_URI="http://www.ffado.org/files/${P}.tgz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+IUSE="debug qt5 test-programs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+   virtual/pkgconfig
+"
+CDEPEND="${PYTHON_DEPS}
+   dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
+   dev-libs/dbus-c++
+   dev-libs/libconfig:=[cxx,${MULTILIB_USEDEP}]
+   media-libs/alsa-lib
+   media-libs/libiec61883[${MULTILIB_USEDEP}]
+   sys-apps/dbus
+   sys-libs/libavc1394[${MULTILIB_USEDEP}]
+   sys-libs/libraw1394[${MULTILIB_USEDEP}]
+   qt5? (
+   $(python_gen_cond_dep '
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   dev-python/PyQt5[dbus,${PYTHON_USEDEP}]
+   ')
+   x11-misc/xdg-utils
+   )"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/libffado-2.4.7-fix-config-load-crash.patch"
+)
+
+myescons() {
+   local myesconsargs=(
+   PREFIX="${EPREFIX}/usr"
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+   MANDIR="${EPREFIX}/usr/share/man"
+   UDEVDIR="$(get_udevdir)/rules.d"
+   CUSTOM_ENV=true
+   DETECT_USERSPACE_ENV=false
+   DEBUG=$(usex debug)
+   PYPKGDIR="$(python_get_sitedir)"
+   # ENABLE_OPTIMIZATIONS detects cpu type and sets flags 
accordingly
+   # -fomit-frame-pointer is added also which can cripple 
debugging.
+   # we set flags from portage instead
+   ENABLE_OPTIMIZATIONS=false
+   # This only works

[gentoo-commits] repo/gentoo:master commit in: media-libs/libffado/, media-libs/libffado/files/

2019-02-14 Thread Andreas Sturmlechner 
commit: 9f37b84b5d01e0d465aedb75a664c1994bd7bee1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 14 17:04:31 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 14 18:36:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f37b84b

media-libs/libffado: Drop 2.4.0

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/libffado/Manifest   |   1 -
 .../libffado-2.4.0-additional-py3-fixes.patch  |  96 --
 .../files/libffado-2.4.0-crossbar-router-fix.patch |  11 --
 .../files/libffado-2.4.0-py3-pyqt5-fixes.patch | 197 -
 .../libffado-2.4.0-pyqt5-dbus-detection.patch  |  30 
 .../files/libffado-2.4.0-rme-bigendian-fix.patch   |  50 --
 media-libs/libffado/libffado-2.4.0.ebuild  | 119 -
 7 files changed, 504 deletions(-)

diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index f0bb141ce4c..d3949e14d04 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,2 +1 @@
-DIST libffado-2.4.0.tgz 1228916 BLAKE2B 
21a3a2a96377f698e7c1a43912c761624aabe5401f0e147fee4fa203c4534166494de8867320b4b6bc3ff200b65c77bb62ab2c4e98948ed0ee74e6171d162deb
 SHA512 
7df37584925cc908cc284dba344609928d39e006f71ae4ede62e4531b2628271ebd0db00407418e943fb569b5b8b919a76c90aaeed03005cefbd3c1c16ee1627
 DIST libffado-2.4.1.tgz 1229295 BLAKE2B 
3b42493b68fc8648e116784e04baee2278c21e01fa92b22d990340ef329f67c898e247891e76d494410a758009fcf186ba556e900598eaca539a9879664cc704
 SHA512 
0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74

diff --git 
a/media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch 
b/media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch
deleted file mode 100644
index fd5d2f44bab..000
--- a/media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch
+++ /dev/null
@@ -1,96 +0,0 @@
 a/support/mixer-qt4/ffado/panelmanager.py  2018-01-11 12:27:20.518923209 
+0900
-+++ a/support/mixer-qt4/ffado/panelmanager.py  2018-01-11 12:31:03.956299962 
+0900
-@@ -38,6 +38,7 @@
- 
- import sys
- import time
-+import importlib
- 
- import logging
- log = logging.getLogger('panelmanager')
-@@ -302,20 +303,15 @@
- #
- # Specific (or dummy) mixer widgets get loaded in the following
- #
-+found = False
- if 'mixer' in dev and dev['mixer'] != None:
- mixerapp = dev['mixer']
--global mixerwidget
--exec( """
--try:
--import ffado.mixer.%s
--globals()["mixerwidget"] = ffado.mixer.%s.%s( w )
--found = True
--except ImportError:
--log.debug("bypassdbus set, %s module not available: ignored")
--found = False
--""" % (mixerapp.lower(), mixerapp.lower(), mixerapp, mixerapp.lower()) )
--else:
--found = False
-+try:
-+mixer_module = importlib.import_module("ffado.mixer.%s" % 
mixerapp.lower())
-+mixerwidget = getattr(mixer_module, mixerapp)(w)
-+found = True
-+except ImportError:
-+log.debug("bypassdbus set, %s module not available: ignored" 
% mixerapp.lower())
- 
- if not found:
- mixerwidget = Dummy( w )
 a/support/mixer-qt4/ffado/widgets/crossbarrouter.py2018-01-11 
12:34:10.200777889 +0900
-+++ b/support/mixer-qt4/ffado/widgets/crossbarrouter.py2018-01-11 
12:45:13.278911705 +0900
-@@ -194,7 +194,7 @@
- #log.debug("Got %i peaks" % len(peakvalues))
- for peak in peakvalues:
- #log.debug("peak = [%s,%s]" % (str(peak[0]),str(peak[1])))
--if peak[0] >= 0:
-+if peak[1] >= 0:
- self.switchers[peak[0]].peakValue(peak[1])
- 
- def updateMixerRouting(self):
 a/support/mixer-qt4/ffado/widgets/matrixmixer.py   2018-01-11 
12:54:27.545361864 +0900
-+++ b/support/mixer-qt4/ffado/widgets/matrixmixer.py   2018-01-11 
12:56:36.899124318 +0900
-@@ -512,7 +512,7 @@
- self.rowHeaders[j].lbl.setText(row_name)
- 
- def updateValues(self, n):
--nbitems = len(n)/3
-+nbitems = len(n) // 3
- for i in range(nbitems):
- n_0 = n[3*i]
- n_1 = n[3*i+1]   
-@@ -951,7 +951,7 @@
- return self.interface.setValue(In, Out, val)
- 
- def updateValues(self, n):
--nbitems = len(n)/3
-+nbitems = len(n) // 3
- for j in range(nbitems):
- n_0 = n[3*j]
- n_1 = n[3*j+1]   
-@@ -1406,7 +1406,7 @@
- def matrixControlChanged(self, n):
- # Update value needed for "per Out" view
- #log.debug("Update per Output( %s )" % str(n))
--nbitems = len(n)/3
-+nbitems = len(n) // 3
- if (self.rule ==

[gentoo-commits] repo/gentoo:master commit in: media-libs/libffado/, media-libs/libffado/files/

2018-01-23 Thread Andreas Sturmlechner 
commit: 17ed34d641046efcfedff475eb6dc7af409e33cb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 23 10:40:34 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 23 10:41:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ed34d6

media-libs/libffado: Drop old

Closes: https://bugs.gentoo.org/642530
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-libs/libffado/Manifest   |   1 -
 .../libffado/files/libffado-2.3.0-gcc6.patch   |  26 -
 .../files/libffado-2.3.0-include-signal.patch  |  29 --
 .../files/libffado-2.3.0-modelname-strip.patch |  45 -
 media-libs/libffado/libffado-2.3.0.ebuild  | 107 -
 media-libs/libffado/metadata.xml   |   1 -
 6 files changed, 209 deletions(-)

diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index 16c3238487b..d61f0431273 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,2 +1 @@
-DIST libffado-2.3.0.tgz 1239253 BLAKE2B 
cb470a590df8018975f40f56cde50468a2b51c9504b719b70ce5941406829f25452a96b8ac897aba1ed6c8d4cafa712e7872430e7bb2ebec0822f7b4720084c5
 SHA512 
24a8853281a17b04623e41dc590f7a9b8f4aebe4dfaece2e3b8fe28457a6ff011586e817712b4913d1fca660b701dddc70576c12d8c56470cf991eb17b4297c4
 DIST libffado-2.4.0.tgz 1228916 BLAKE2B 
21a3a2a96377f698e7c1a43912c761624aabe5401f0e147fee4fa203c4534166494de8867320b4b6bc3ff200b65c77bb62ab2c4e98948ed0ee74e6171d162deb
 SHA512 
7df37584925cc908cc284dba344609928d39e006f71ae4ede62e4531b2628271ebd0db00407418e943fb569b5b8b919a76c90aaeed03005cefbd3c1c16ee1627

diff --git a/media-libs/libffado/files/libffado-2.3.0-gcc6.patch 
b/media-libs/libffado/files/libffado-2.3.0-gcc6.patch
deleted file mode 100644
index 2a73ee1cf8c..000
--- a/media-libs/libffado/files/libffado-2.3.0-gcc6.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-
-r2629 | jwoithe | 2016-10-09 13:00:28 +0900 (Sun, 09 Oct 2016) | 1 line
-
-TimestampedBuffer.cpp: move the include of math.h to the top of the file which 
is where most people would expect it to be.  The patch comes from a Fedora RPM 
source package via Simon Lewis, who suggested that without it gcc6 had trouble 
with the file (the nature of the problem is not known by the FFADO project at 
this time).  Earlier versions of gcc (for example, 4.8.2) had no trouble 
compiling this file without any math.h include, so the issue that some have 
seen with gcc6 must be due to math.h being removed from some other system-level 
include file at some point.
-
-Index: src/libutil/TimestampedBuffer.cpp
-===
 a/src/libutil/TimestampedBuffer.cpp(revision 2628)
-+++ b/src/libutil/TimestampedBuffer.cpp(revision 2629)
-@@ -32,6 +32,7 @@
- 
- #include 
- #include 
-+#include 
- 
- #define DLL_PI(3.141592653589793238)
- #define DLL_SQRT2 (1.414213562373095049)
-@@ -179,8 +180,6 @@
- m_wrap_at=w;
- return true;
- }
--#include 
--
- /**
-  * \brief return the effective rate
-  *

diff --git a/media-libs/libffado/files/libffado-2.3.0-include-signal.patch 
b/media-libs/libffado/files/libffado-2.3.0-include-signal.patch
deleted file mode 100644
index 4eabf12eef0..000
--- a/media-libs/libffado/files/libffado-2.3.0-include-signal.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-
-r2706 | jwoithe | 2017-08-08 08:39:56 +0900 (Tue, 08 Aug 2017) | 11 lines
-
-PosixMessageQueue: ensure visibility of SIGEV_THREAD declaration.
-
-Orcan Ogetbil reported on the ffado-devel list that during the recent Fedora
-rebuild effort FFADO 2.3.0 failed to compile because SIGEV_THREAD was
-undeclared.  Jano Svitok made the plausible suggestion that signal.h needs
-to be included explicitly under newer glibc versions.  This trivial patch 
-implements this.  As of this commit it has not been verified that the
-problem is fixed with this addition.  However, there's no harm done by the
-change in general and conceptionally the change is consistent with the
-source file's content given the use of signal-related functionality.
-
-
-Index: src/libutil/PosixMessageQueue.cpp
-===
 a/src/libutil/PosixMessageQueue.cpp(revision 2705)
-+++ b/src/libutil/PosixMessageQueue.cpp(revision 2706)
-@@ -30,6 +30,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #define MQ_INVALID_ID ((mqd_t) -1)
- // one second
-
-

diff --git a/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch 
b/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch
deleted file mode 100644
index

[gentoo-commits] repo/gentoo:master commit in: media-libs/libffado/, media-libs/libffado/files/

2018-01-11 Thread Andreas Sturmlechner 
commit: 087ba48a1b12b4ca931ee1e3bbb6e1fc332dca33
Author: Hector Martin  marcan  st>
AuthorDate: Thu Jan 11 04:11:52 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan 11 23:57:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=087ba48a

media-libs/libffado: bump to 2.4.0 and switch to qt5

Bug: https://bugs.gentoo.org/642530
Closes: https://github.com/gentoo/gentoo/pull/6826

 media-libs/libffado/Manifest   |   1 +
 .../libffado-2.4.0-additional-py3-fixes.patch  |  96 ++
 .../files/libffado-2.4.0-crossbar-router-fix.patch |  11 ++
 .../files/libffado-2.4.0-py3-pyqt5-fixes.patch | 197 +
 .../libffado-2.4.0-pyqt5-dbus-detection.patch  |  30 
 .../files/libffado-2.4.0-rme-bigendian-fix.patch   |  50 ++
 media-libs/libffado/libffado-2.4.0.ebuild  | 119 +
 7 files changed, 504 insertions(+)

diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index db5966e713e..16c3238487b 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1 +1,2 @@
 DIST libffado-2.3.0.tgz 1239253 BLAKE2B 
cb470a590df8018975f40f56cde50468a2b51c9504b719b70ce5941406829f25452a96b8ac897aba1ed6c8d4cafa712e7872430e7bb2ebec0822f7b4720084c5
 SHA512 
24a8853281a17b04623e41dc590f7a9b8f4aebe4dfaece2e3b8fe28457a6ff011586e817712b4913d1fca660b701dddc70576c12d8c56470cf991eb17b4297c4
+DIST libffado-2.4.0.tgz 1228916 BLAKE2B 
21a3a2a96377f698e7c1a43912c761624aabe5401f0e147fee4fa203c4534166494de8867320b4b6bc3ff200b65c77bb62ab2c4e98948ed0ee74e6171d162deb
 SHA512 
7df37584925cc908cc284dba344609928d39e006f71ae4ede62e4531b2628271ebd0db00407418e943fb569b5b8b919a76c90aaeed03005cefbd3c1c16ee1627

diff --git 
a/media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch 
b/media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch
new file mode 100644
index 000..fd5d2f44bab
--- /dev/null
+++ b/media-libs/libffado/files/libffado-2.4.0-additional-py3-fixes.patch
@@ -0,0 +1,96 @@
+--- a/support/mixer-qt4/ffado/panelmanager.py  2018-01-11 12:27:20.518923209 
+0900
 a/support/mixer-qt4/ffado/panelmanager.py  2018-01-11 12:31:03.956299962 
+0900
+@@ -38,6 +38,7 @@
+ 
+ import sys
+ import time
++import importlib
+ 
+ import logging
+ log = logging.getLogger('panelmanager')
+@@ -302,20 +303,15 @@
+ #
+ # Specific (or dummy) mixer widgets get loaded in the following
+ #
++found = False
+ if 'mixer' in dev and dev['mixer'] != None:
+ mixerapp = dev['mixer']
+-global mixerwidget
+-exec( """
+-try:
+-import ffado.mixer.%s
+-globals()["mixerwidget"] = ffado.mixer.%s.%s( w )
+-found = True
+-except ImportError:
+-log.debug("bypassdbus set, %s module not available: ignored")
+-found = False
+-""" % (mixerapp.lower(), mixerapp.lower(), mixerapp, mixerapp.lower()) )
+-else:
+-found = False
++try:
++mixer_module = importlib.import_module("ffado.mixer.%s" % 
mixerapp.lower())
++mixerwidget = getattr(mixer_module, mixerapp)(w)
++found = True
++except ImportError:
++log.debug("bypassdbus set, %s module not available: ignored" 
% mixerapp.lower())
+ 
+ if not found:
+ mixerwidget = Dummy( w )
+--- a/support/mixer-qt4/ffado/widgets/crossbarrouter.py2018-01-11 
12:34:10.200777889 +0900
 b/support/mixer-qt4/ffado/widgets/crossbarrouter.py2018-01-11 
12:45:13.278911705 +0900
+@@ -194,7 +194,7 @@
+ #log.debug("Got %i peaks" % len(peakvalues))
+ for peak in peakvalues:
+ #log.debug("peak = [%s,%s]" % (str(peak[0]),str(peak[1])))
+-if peak[0] >= 0:
++if peak[1] >= 0:
+ self.switchers[peak[0]].peakValue(peak[1])
+ 
+ def updateMixerRouting(self):
+--- a/support/mixer-qt4/ffado/widgets/matrixmixer.py   2018-01-11 
12:54:27.545361864 +0900
 b/support/mixer-qt4/ffado/widgets/matrixmixer.py   2018-01-11 
12:56:36.899124318 +0900
+@@ -512,7 +512,7 @@
+ self.rowHeaders[j].lbl.setText(row_name)
+ 
+ def updateValues(self, n):
+-nbitems = len(n)/3
++nbitems = len(n) // 3
+ for i in range(nbitems):
+ n_0 = n[3*i]
+ n_1 = n[3*i+1]   
+@@ -951,7 +951,7 @@
+ return self.interface.setValue(In, Out, val)
+ 
+ def updateValues(self, n):
+-nbitems = len(n)/3
++nbitems = len(n) // 3
+ for j in range(nbitems):
+ n_0 = n[3*j]
+ n_1 = n[3*j+1]   
+@@ -1406,7 +1406,7 @@
+ def matrixControlChanged(self, n):
+ # Update value needed for "per Out" view
+ #log.debug("Update per Output( %s )" % str(n))
+-nbitems = len(n)/3
++nbitems = len(n) // 3
+ if (self.rule ==

[gentoo-commits] repo/gentoo:master commit in: media-libs/libffado/, media-libs/libffado/files/

2017-06-25 Thread Alexis Ballier 
commit: 0e4e3a0c73b44a7a2506cdc2aaa698d57c39b99e
Author: Hector Martin  marcan  st>
AuthorDate: Fri Jun 23 12:33:04 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sun Jun 25 19:40:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e4e3a0c

media-libs/libffado: New package.

FFADO is a userspace driver for IEEE1394 (FireWire) audio interfaces.

>From audio-overlay: https://github.com/gentoo-audio/audio-overlay
(Previously from the proaudio overlay)

Gentoo-Bug: https://bugs.gentoo.org/622520
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-libs/libffado/Manifest   |   1 +
 .../libffado/files/libffado-2.3.0-gcc6.patch   |  26 +
 .../files/libffado-2.3.0-modelname-strip.patch |  45 +
 media-libs/libffado/libffado-2.3.0.ebuild  | 106 +
 media-libs/libffado/metadata.xml   |  20 
 5 files changed, 198 insertions(+)

diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
new file mode 100644
index 000..dd5225ee1b8
--- /dev/null
+++ b/media-libs/libffado/Manifest
@@ -0,0 +1 @@
+DIST libffado-2.3.0.tgz 1239253 SHA256 
18e3c7e610b7cee58b837c921ebb985e324cb2171f8d130f79de02a3fc435f88 SHA512 
24a8853281a17b04623e41dc590f7a9b8f4aebe4dfaece2e3b8fe28457a6ff011586e817712b4913d1fca660b701dddc70576c12d8c56470cf991eb17b4297c4
 WHIRLPOOL 
8eb1c3f6372b25b173d230500cfad7ef7207d730ec8e048bdb84cd7436e196e5429d85afcea0f626a411c1f792f20f1ab59f0c0b0f5a97b114f646c4a7423053

diff --git a/media-libs/libffado/files/libffado-2.3.0-gcc6.patch 
b/media-libs/libffado/files/libffado-2.3.0-gcc6.patch
new file mode 100644
index 000..2a73ee1cf8c
--- /dev/null
+++ b/media-libs/libffado/files/libffado-2.3.0-gcc6.patch
@@ -0,0 +1,26 @@
+
+r2629 | jwoithe | 2016-10-09 13:00:28 +0900 (Sun, 09 Oct 2016) | 1 line
+
+TimestampedBuffer.cpp: move the include of math.h to the top of the file which 
is where most people would expect it to be.  The patch comes from a Fedora RPM 
source package via Simon Lewis, who suggested that without it gcc6 had trouble 
with the file (the nature of the problem is not known by the FFADO project at 
this time).  Earlier versions of gcc (for example, 4.8.2) had no trouble 
compiling this file without any math.h include, so the issue that some have 
seen with gcc6 must be due to math.h being removed from some other system-level 
include file at some point.
+
+Index: src/libutil/TimestampedBuffer.cpp
+===
+--- a/src/libutil/TimestampedBuffer.cpp(revision 2628)
 b/src/libutil/TimestampedBuffer.cpp(revision 2629)
+@@ -32,6 +32,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ #define DLL_PI(3.141592653589793238)
+ #define DLL_SQRT2 (1.414213562373095049)
+@@ -179,8 +180,6 @@
+ m_wrap_at=w;
+ return true;
+ }
+-#include 
+-
+ /**
+  * \brief return the effective rate
+  *

diff --git a/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch 
b/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch
new file mode 100644
index 000..8f28b6ac0f7
--- /dev/null
+++ b/media-libs/libffado/files/libffado-2.3.0-modelname-strip.patch
@@ -0,0 +1,45 @@
+
+r2677 | jwoithe | 2017-03-22 07:43:24 +0900 (Wed, 22 Mar 2017) | 1 line
+
+configrom: there is no obvious reason why a space should be added to the end 
of the vendor and model strings returned from the interface.  Retain the 
explicit null termination of these strings to cover for the case where an 
interface may not return any null bytes.  Also fix indentation associated with 
the null termination code.  The issue with the trailing space was noticed and 
reported by Nils Philippsen: its presence broke a test in the saffire_dice 
mixer python code.
+
+Index: src/libieee1394/configrom.cpp
+===
+--- a/src/libieee1394/configrom.cpp(revision 2676)
 b/src/libieee1394/configrom.cpp(revision 2677)
+@@ -176,13 +176,11 @@
+ ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_vendorNameKv 
),
+ len );
+ 
+-while ((buf + len - 1) == '\0') {
+-len--;
++while (*(buf + len - 1) == '\0') {
++len--;
+ }
+-// \todo XXX seems a bit strage to do this but the nodemgr.c code does
+-// it. try to figure out why this is needed (or not)
+-buf[len++] = ' ';
+-buf[len] = '\0';
++// Ensure vendor string is null terminated
++buf[len] = '\0';
+ 
+ 
+ debugOutput( DEBUG_LEVEL_VERBOSE, "Vendor name: '%s'\n", buf );
+@@ -195,13 +193,11 @@