packages/python-alsa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix PyTuple_SET_ITEM() usage no return value

Browse Source
This commit is contained in:
zhouwenpei 2022-06-27 17:04:50 +08:00
parent cd9a7b3522
commit 3d380ebf1b
2 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0001-Fix-PyTuple_SET_ITEM-usage-no-return-value.patch Normal file
View File

@ -0,0 +1,46 @@
From 5ea2f8709b4d091700750661231f8a3ddce0fc7c Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 10 Dec 2020 16:00:50 +0100
Subject: [PATCH] Fix PyTuple_SET_ITEM() usage - no return value
As noted in bpo-30459 (link bellow) the PyTuple_SET_ITEM() macro
has not a return value. Let's make code compatible with python 3.10.
Link: https://bugs.python.org/issue30459
BugLink: https://github.com/alsa-project/alsa-python/issues/2
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
pyalsa/alsahcontrol.c | 4 ++--
pyalsa/alsamixer.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pyalsa/alsahcontrol.c b/pyalsa/alsahcontrol.c
index ebee1b7..7c9321f 100644
--- a/pyalsa/alsahcontrol.c
+++ b/pyalsa/alsahcontrol.c
@@ -1543,8 +1543,8 @@ static int element_callback(snd_hctl_elem_t *elem, unsigned int mask)
t = PyTuple_New(2);
if (t) {
- if (PyTuple_SET_ITEM(t, 0, (PyObject *)pyhelem))
- Py_INCREF(pyhelem);
+ PyTuple_SET_ITEM(t, 0, (PyObject *)pyhelem);
+ Py_INCREF(pyhelem);
PyTuple_SET_ITEM(t, 1, PyInt_FromLong(mask));
r = PyObject_CallObject(o, t);
Py_DECREF(t);
diff --git a/pyalsa/alsamixer.c b/pyalsa/alsamixer.c
index 39d7387..91fe198 100644
--- a/pyalsa/alsamixer.c
+++ b/pyalsa/alsamixer.c
@@ -1348,8 +1348,8 @@ static int element_callback(snd_mixer_elem_t *elem, unsigned int mask)
t = PyTuple_New(2);
if (t) {
- if (PyTuple_SET_ITEM(t, 0, (PyObject *)pyelem))
- Py_INCREF(pyelem);
+ PyTuple_SET_ITEM(t, 0, (PyObject *)pyelem);
+ Py_INCREF(pyelem);
PyTuple_SET_ITEM(t, 1, PyInt_FromLong(mask));
r = PyObject_CallObject(o, t);
Py_DECREF(t);

8
python-alsa.spec
View File

@ -1,11 +1,12 @@
Name: python-alsa
Version: 1.1.6
Release: 3
Release: 4
Summary: Python binding for the ALSA library
License: LGPLv2+
URL: http://www.alsa-project.org/
Source0: ftp://ftp.alsa-project.org/pub/pyalsa/pyalsa-%{version}.tar.bz2
Patch1: 0001-Fix-PyTuple_SET_ITEM-usage-no-return-value.patch
BuildRequires: alsa-lib-devel >= %{version} gcc
%description
@ -21,7 +22,7 @@ Requires: python3
Python3 bindings for the ALSA library.
%prep
%autosetup -n pyalsa-%{version}
%autosetup -n pyalsa-%{version} -p1
%build
%py3_build
@ -33,6 +34,9 @@ Python3 bindings for the ALSA library.
%{python3_sitearch}/*
%changelog
* Mon Jun 27 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 1.1.6-4
- Fix PyTuple_SET_ITEM() usage no return value
* Thu Sep 16 2021 caodongxia <caodongxia@huawei.com> - 1.1.6-3
- Remove redundant provides python-webob