libffado: update to 2.4.8.

This commit is contained in:
Duncaen 2024-02-05 14:55:39 +01:00
parent c35c6666d2
commit 999c53a9d6
No known key found for this signature in database
GPG key ID: 335C1D17EC3D6E35
5 changed files with 23 additions and 22 deletions

View file

@ -1,5 +1,5 @@
--- a/support/tools/SConscript --- a/libffado/support/tools/SConscript
+++ b/support/tools/SConscript +++ b/libffado/support/tools/SConscript
@@ -40,12 +40,12 @@ @@ -40,12 +40,12 @@
else: else:
e.PrependUnique( LIBS=["expat"] ) e.PrependUnique( LIBS=["expat"] )
@ -15,8 +15,8 @@
if env['ENABLE_DICE']: if env['ENABLE_DICE']:
e.Program( target = "ffado-set-nickname", source = "ffado-set-nickname.cpp" ) e.Program( target = "ffado-set-nickname", source = "ffado-set-nickname.cpp" )
--- a/SConstruct --- a/libffado/SConstruct
+++ b/SConstruct +++ b/libffado/SConstruct
@@ -254,13 +254,6 @@ @@ -254,13 +254,6 @@
env['REQUIRE_LIBAVC']=0 env['REQUIRE_LIBAVC']=0
@ -31,9 +31,9 @@
# Check for pkg-config before using pkg-config to check for other dependencies. # Check for pkg-config before using pkg-config to check for other dependencies.
if not conf.CheckForPKGConfig(): 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.") 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.")
--- a/SConstruct --- a/libffado/SConstruct
+++ b/SConstruct +++ b/libffado/SConstruct
@@ -537,7 +537,7 @@ @@ -532,7 +532,7 @@
env.Alias( "install", env['libdir'] ) env.Alias( "install", env['libdir'] )
env.Alias( "install", env['includedir'] ) env.Alias( "install", env['includedir'] )
env.Alias( "install", env['sharedir'] ) env.Alias( "install", env['sharedir'] )
@ -42,8 +42,8 @@
env.Alias( "install", env['bindir'] ) env.Alias( "install", env['bindir'] )
env.Alias( "install", env['mandir'] ) env.Alias( "install", env['mandir'] )
if env['BUILD_MIXER'] == 'true': if env['BUILD_MIXER'] == 'true':
--- a/SConstruct --- a/libffado/SConstruct
+++ b/SConstruct +++ b/libffado/SConstruct
@@ -395,12 +395,7 @@ @@ -395,12 +395,7 @@
# PyQT checks # PyQT checks

View file

@ -1,7 +1,7 @@
diff --git src/libutil/PosixMessageQueue.h src/libutil/PosixMessageQueue.h diff --git src/libutil/PosixMessageQueue.h src/libutil/PosixMessageQueue.h
index 05da300..c331c70 100644 index 05da300..c331c70 100644
--- a/src/libutil/PosixMessageQueue.h --- a/libffado/src/libutil/PosixMessageQueue.h
+++ b/src/libutil/PosixMessageQueue.h +++ b/libffado/src/libutil/PosixMessageQueue.h
@@ -115,7 +115,7 @@ public: @@ -115,7 +115,7 @@ public:
private: private:

View file

@ -1,7 +1,7 @@
Need to explicitly include stdint.h for musl libc. Need to explicitly include stdint.h for musl libc.
--- a/libffado/ffado.h.in 2016-10-03 18:42:35.335302853 +0200 --- a/libffado/libffado/ffado.h.in 2016-10-03 18:42:35.335302853 +0200
+++ b/libffado/ffado.h.in 2016-10-03 18:43:56.999358778 +0200 +++ b/libffado/libffado/ffado.h.in 2016-10-03 18:43:56.999358778 +0200
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
#define FFADO_MAX_NAME_LEN 256 #define FFADO_MAX_NAME_LEN 256

View file

@ -1,5 +1,5 @@
--- ./admin/pyuic.py.orig 2023-09-29 14:33:38.623993612 -0400 --- ./libffado/admin/pyuic.py.orig 2023-09-29 14:33:38.623993612 -0400
+++ ./admin/pyuic.py 2023-09-29 14:33:53.283081474 -0400 +++ ./libffado/admin/pyuic.py 2023-09-29 14:33:53.283081474 -0400
@@ -21,8 +21,6 @@ @@ -21,8 +21,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
@ -17,8 +17,8 @@
imp.find_module( "pyqtconfig" ) imp.find_module( "pyqtconfig" )
except ImportError: except ImportError:
ret = False ret = False
--- ./admin/pyuic4.py.orig 2023-09-29 14:33:53.292081527 -0400 --- ./libffado/admin/pyuic4.py.orig 2023-09-29 14:33:53.292081527 -0400
+++ ./admin/pyuic4.py 2023-09-29 14:34:01.776132375 -0400 +++ ./libffado/admin/pyuic4.py 2023-09-29 14:34:01.776132375 -0400
@@ -21,8 +21,6 @@ @@ -21,8 +21,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
@ -36,8 +36,8 @@
imp.find_module( "pyqtconfig" ) imp.find_module( "pyqtconfig" )
except ImportError: except ImportError:
ret = False ret = False
--- ./admin/pyuic5.py.orig 2023-09-29 14:34:01.796132496 -0400 --- ./libffado/admin/pyuic5.py.orig 2023-09-29 14:34:01.796132496 -0400
+++ ./admin/pyuic5.py 2023-09-29 14:34:09.431178259 -0400 +++ ./libffado/admin/pyuic5.py 2023-09-29 14:34:09.431178259 -0400
@@ -22,8 +22,6 @@ @@ -22,8 +22,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #

View file

@ -1,7 +1,8 @@
# Template file for 'libffado' # Template file for 'libffado'
pkgname=libffado pkgname=libffado
version=2.4.7 version=2.4.8
revision=2 revision=1
build_wrksrc=libffado
build_style=scons build_style=scons
scons_use_destdir=yes scons_use_destdir=yes
make_build_args="PREFIX=/usr MANDIR=/usr/share/man make_build_args="PREFIX=/usr MANDIR=/usr/share/man
@ -20,7 +21,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-only, GPL-3.0-only" license="GPL-2.0-only, GPL-3.0-only"
homepage="http://www.ffado.org" homepage="http://www.ffado.org"
distfiles="http://www.ffado.org/files/libffado-${version}.tgz" distfiles="http://www.ffado.org/files/libffado-${version}.tgz"
checksum=7a08c634ce8e74eb5b2c9b19e2df5a6755aadb69d3e104313dc799278a1f566f checksum=7f4c79eb57a12b0eae312ae2d11662a7ebf524766e862c6dcb09743d553f378e
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" argp-standalone" ;; *-musl) makedepends+=" argp-standalone" ;;