diff --git a/srcpkgs/libffado/patches/cross-build.patch b/srcpkgs/libffado/patches/cross-build.patch index 8ef2dead867..5eda54b4db4 100644 --- a/srcpkgs/libffado/patches/cross-build.patch +++ b/srcpkgs/libffado/patches/cross-build.patch @@ -1,5 +1,44 @@ ---- a/libffado/support/tools/SConscript -+++ b/libffado/support/tools/SConscript +--- a/SConstruct ++++ b/SConstruct +@@ -253,13 +253,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.") +@@ -413,12 +406,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 True: + env['BUILD_MIXER'] = 'true' + elif not env.GetOption('clean'): + if env['BUILD_MIXER'] == 'auto': +@@ -551,7 +539,7 @@ + env.Alias( "install", env['includedir'] ) + env.Alias( "install", env['datadir'] ) + 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': +--- a/support/tools/SConscript ++++ b/support/tools/SConscript @@ -40,12 +40,12 @@ else: e.PrependUnique( LIBS=["expat"] ) @@ -15,46 +54,3 @@ if env['ENABLE_DICE']: e.Program( target = "ffado-set-nickname", source = "ffado-set-nickname.cpp" ) ---- a/libffado/SConstruct -+++ b/libffado/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.") ---- a/libffado/SConstruct -+++ b/libffado/SConstruct -@@ -532,7 +532,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': ---- a/libffado/SConstruct -+++ b/libffado/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/musl-sigval_t.patch b/srcpkgs/libffado/patches/musl-sigval_t.patch deleted file mode 100644 index a2cc7e77e37..00000000000 --- a/srcpkgs/libffado/patches/musl-sigval_t.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git src/libutil/PosixMessageQueue.h src/libutil/PosixMessageQueue.h -index 05da300..c331c70 100644 ---- a/libffado/src/libutil/PosixMessageQueue.h -+++ b/libffado/src/libutil/PosixMessageQueue.h -@@ -115,7 +115,7 @@ public: - - private: - bool doOpen(enum eDirection t, int, enum eBlocking); -- static void notifyCallbackStatic(sigval_t t) { -+ static void notifyCallbackStatic(union sigval t) { - PosixMessageQueue *obj; - obj = static_cast(t.sival_ptr); - obj->notifyCallback(); - diff --git a/srcpkgs/libffado/patches/musl-stdint_h.patch b/srcpkgs/libffado/patches/musl-stdint_h.patch index 8c27e60fbcf..62a707164ee 100644 --- a/srcpkgs/libffado/patches/musl-stdint_h.patch +++ b/srcpkgs/libffado/patches/musl-stdint_h.patch @@ -1,7 +1,7 @@ Need to explicitly include stdint.h for musl libc. ---- a/libffado/libffado/ffado.h.in 2016-10-03 18:42:35.335302853 +0200 -+++ b/libffado/libffado/ffado.h.in 2016-10-03 18:43:56.999358778 +0200 +--- a/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 @@ -31,6 +31,7 @@ #define FFADO_MAX_NAME_LEN 256 diff --git a/srcpkgs/libffado/patches/python3.12.patch b/srcpkgs/libffado/patches/python3.12.patch deleted file mode 100644 index cac47091e02..00000000000 --- a/srcpkgs/libffado/patches/python3.12.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- ./libffado/admin/pyuic.py.orig 2023-09-29 14:33:38.623993612 -0400 -+++ ./libffado/admin/pyuic.py 2023-09-29 14:33:53.283081474 -0400 -@@ -21,8 +21,6 @@ - # along with this program. If not, see . - # - --import imp -- - def pyuic_action( target, source, env ): - env.Execute( "pyuic " + str( source[0] ) + " > " + str( target[0] ) ) - return 0 -@@ -34,6 +32,7 @@ - context.Message( "Checking for pyuic (by checking for the python module pyqtconfig) " ) - ret = True - try: -+ import imp - imp.find_module( "pyqtconfig" ) - except ImportError: - ret = False ---- ./libffado/admin/pyuic4.py.orig 2023-09-29 14:33:53.292081527 -0400 -+++ ./libffado/admin/pyuic4.py 2023-09-29 14:34:01.776132375 -0400 -@@ -21,8 +21,6 @@ - # along with this program. If not, see . - # - --import imp -- - def pyuic4_action( target, source, env ): - env.Execute( "pyuic4 " + str( source[0] ) + " > " + str( target[0] ) ) - return 0 -@@ -34,6 +32,7 @@ - context.Message( "Checking for pyuic4 (by checking for the python module pyqtconfig) " ) - ret = True - try: -+ import imp - imp.find_module( "pyqtconfig" ) - except ImportError: - ret = False ---- ./libffado/admin/pyuic5.py.orig 2023-09-29 14:34:01.796132496 -0400 -+++ ./libffado/admin/pyuic5.py 2023-09-29 14:34:09.431178259 -0400 -@@ -22,8 +22,6 @@ - # along with this program. If not, see . - # - --import imp -- - def pyuic5_action( target, source, env ): - env.Execute( "pyuic5 " + str( source[0] ) + " > " + str( target[0] ) ) - return 0 -@@ -35,6 +33,7 @@ - context.Message( "Checking for pyuic5 (by checking for the python module pyqtconfig) " ) - ret = True - try: -+ import imp - imp.find_module( "pyqtconfig" ) - except ImportError: - ret = False diff --git a/srcpkgs/libffado/template b/srcpkgs/libffado/template index be2e800270e..9574c1d53f0 100644 --- a/srcpkgs/libffado/template +++ b/srcpkgs/libffado/template @@ -1,8 +1,7 @@ # Template file for 'libffado' pkgname=libffado -version=2.4.8 +version=2.4.9 revision=1 -build_wrksrc=libffado build_style=scons scons_use_destdir=yes make_build_args="PREFIX=/usr MANDIR=/usr/share/man @@ -10,7 +9,7 @@ make_build_args="PREFIX=/usr MANDIR=/usr/share/man ENABLE_OPTIMIZATIONS=0 DEBUG=0 PYTHON_INTERPRETER=/usr/bin/python3 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" +make_install_args="$make_build_args" hostmakedepends="pkg-config xdg-utils python3-setuptools python3-PyQt5-devel-tools which" makedepends="libxml++-devel libdbus-c++-devel libsigc++-devel libconfig++-devel jack-devel libavc1394-devel libiec61883-devel libraw1394-devel alsa-lib-devel @@ -21,7 +20,7 @@ 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=7f4c79eb57a12b0eae312ae2d11662a7ebf524766e862c6dcb09743d553f378e +checksum=c442c52fad11cafd5513bb4e846c851f101c8484f891aac545ed190e8fd4d10f case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone" ;; @@ -36,11 +35,6 @@ pre_configure() { esac } -post_install() { - vinstall support/xdg/ffado.org-ffadomixer.desktop 644 usr/share/applications ffadomixer.desktop - vinstall support/xdg/hi64-apps-ffado.png 644 usr/share/pixmaps ffado.png -} - libffado-python_package() { depends="python3-PyQt5-dbus python3-dbus" short_desc+=" - python3 bindings"