gentoo auto-resync : 06:07:2024 - 08:06:15

4 files changed, 87 insertions, 5 deletions

diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index 9e2362e99866..34fcf2a7a4ff 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,4 +1,5 @@
-AUX libffado-2.4.7-fix-config-load-crash.patch 728 BLAKE2B 066910a52b054d423abfc2656e5b9499be7b03499a74bd8df97b99b83d7c14c68e5728a4608b5082a53bd0f6d174ef645c461139018d0110cdfc2f8ad6111214 SHA512 7fedd5157bd3fae9cb70de02b5883a69caea0c0a2b80a3d86fe66d57743e127c281922afdfdfcb8cc14e492dafcf814a230d70dad8601168c615d9daf719cdd0
+AUX libffado-2.4.7-fix-config-load-crash.patch 555 BLAKE2B bac518fa7d80dece2c5fa728e05910096d0da458afda9618b0b174521899e686ba060c9a9edec138506d279f1e799ad0c5bdd9925cb91129ca35d55cd632a15c SHA512 28c95fb7a5701c387066db7356aad52b3b33e9e5cad948b9ea578f3826e999d1552b0c1baa0c3f63748828e927137f4143c1dbd0d28db480aadb92446a0288db
+AUX libffado-2.4.8-python3.12.patch 2722 BLAKE2B b9d65ea9dd9026d968e732454e4c90ed5bce577b3d262c501e24e38a8957eec7fb6541afb7edcbda1e381096b0686a0f1592e29478d8134c0f74ede775e8f5b4 SHA512 a1ac171048531573de77388dbf3a4cea4babeca71e30e77bba5ebdfeb6e45852af5376bc91bbbc5dfc69fe06f50cf0a25233e21ea6a7fb54a96e5473503f6bab
 DIST libffado-2.4.8.tgz 1237955 BLAKE2B 14b83d55fc9a7b33c888b893c808f8419292fefaa2c2239b4b51c2b84070a584ea72821c8469bb8d965a9a5e6473b6fcfb5e85f4eecd2d424e3167322f8abb81 SHA512 fbbcd30640c55315f2e65fc6c07afc71a77dd2c9d1b6127ee55cd17e76511ad5f0563135e52397dbf113fb0d5925021a38780f231409bdd920da52e6c1ce3acc
-EBUILD libffado-2.4.8.ebuild 2936 BLAKE2B aabd28bba092188f7bc98d5e979dc587b8c76c434b7f6961d536ca95dc76bb0feb25713f6337e159311ac3c7b29185cda77c87f1ae4cd5ea03368052556e152e SHA512 6318efe5372488eb2fcb19adf7a00fb6865029ef17e3ede59ca7c0f6c736a3066f005fcc6ec0d9f75ab25f383ec30d8461df7578d80aea8abe1db6eedbf73934
+EBUILD libffado-2.4.8.ebuild 2983 BLAKE2B a5cab924afdc3d6f9471fe44aab4df478f94c0addb615546e9ad2017ef380a9ce0274be4c56d6ad0ed651a0e1ff6ff96d907d49c9c491873ec1ee50a0045e5cd SHA512 9c98f9a814109026ae2ea72364d9ddb1c59c80666319779c37172125aec762027dddd2de4a402626642f499e0fa9dbb48e0e7af45f83b0bc3b650cbf75f6e632
 MISC metadata.xml 344 BLAKE2B a7d2c27caa7e9fa72716534c406145b94bd8a13eadf57d06ea8e3148339857311bd7e8f0434edbf8a70a5e7bfec1726425e1d16734841b056caeee7754471666 SHA512 30d31f76c73ff218fa34e5f9d442e2366082bf4697038c804c093cac0e22720341691b732bf653466f8e5fc7e734c11b08a02cef7dd2a4bd93635968e2c29447
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 000000000000..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 <http://www.gnu.org/licenses/>.
+ #
+ 
+-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 <http://www.gnu.org/licenses/>.
+ #
+ 
+-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 <http://www.gnu.org/licenses/>.
+ #
+ 
+-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=( python3_{9..12} )
 
 inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
 
@@ -48,6 +48,7 @@ RDEPEND="${CDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/libffado-2.4.7-fix-config-load-crash.patch"
+	"${FILESDIR}/libffado-2.4.8-python3.12.patch"
 )
 
 myescons() {