Accepting request 1305580 from devel:languages:python:numeric

- Update to 1.0.6:
  - Updated documentation
  - Fixed stdout overrides (issue #261)
  - Clip MIDI input in midiToHz and MToF, and make NoteinRec doc more acc…
  - Fixed Linseg and Expseg accuracy (issue #264).
  - replace deprecated mock by unittest.mock
  - Fix lo_blob and lo_message types
  - Expr: Added a third argument to let statement to be able to set an in…
  - Use libsnfile to retrieve aiff markers instead of the deprecated aifc…
  - Update manylinux script.
  - Updated libsndfile version in manylinux build.
  - Updated SfMarker objects documentation.
  - Fixed warning in vbap function signature.
  - Removed unused variable in vbap implementation.
- Remove upstreamed patches:
  - 277.patch
  - LICENSE file
- Add rpm_build.patch to remove building errors.
  - rpm_build.patch (gh#belangeo/pyo!313)
  - fix_license.patch (gh#belangeo/pyo!302)

OBS-URL: https://build.opensuse.org/request/show/1305580
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pyo?expand=0&rev=6

277.patch

@@ -1,112 +0,0 @@
-From 59ec82af8dff4f78ea9d8d92be333a829da79744 Mon Sep 17 00:00:00 2001
-From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-Date: Tue, 11 Jun 2024 15:50:26 +0200
-Subject: [PATCH 1/2] Fix signature of multiple callback functions for
- lo_server_add_method()
-
----
- src/engine/osclistenermodule.c | 2 +-
- src/objects/oscmodule.c        | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/engine/osclistenermodule.c b/src/engine/osclistenermodule.c
-index 34c9faa5..79a32873 100644
---- a/src/engine/osclistenermodule.c
-+++ b/src/engine/osclistenermodule.c
-@@ -46,7 +46,7 @@ OscListener_get(OscListener *self)
- }
- 
- int process_osc(const char *path, const char *types, lo_arg **argv, int argc,
--                void *data, void *user_data)
-+                struct lo_message_ *data, void *user_data)
- {
-     OscListener *server = (OscListener *)user_data;
-     PyObject *tup;
-diff --git a/src/objects/oscmodule.c b/src/objects/oscmodule.c
-index f1805289..04639e2d 100644
---- a/src/objects/oscmodule.c
-+++ b/src/objects/oscmodule.c
-@@ -43,7 +43,7 @@ typedef struct
- } OscReceiver;
- 
- int OscReceiver_handler(const char *path, const char *types, lo_arg **argv, int argc,
--                        void *data, void *user_data)
-+                        struct lo_message_ *data, void *user_data)
- {
-     OscReceiver *self = user_data;
-     PyObject *pathObj = PyUnicode_FromString(path);
-@@ -1053,7 +1053,7 @@ typedef struct
- } OscDataReceive;
- 
- int OscDataReceive_handler(const char *path, const char *types, lo_arg **argv, int argc,
--                           void *data, void *user_data)
-+                           struct lo_message_ *data, void *user_data)
- {
-     OscDataReceive *self = user_data;
-     PyObject *tup, *result = NULL;
-@@ -1367,7 +1367,7 @@ typedef struct
- } OscListReceiver;
- 
- int OscListReceiver_handler(const char *path, const char *types, lo_arg **argv, int argc,
--                            void *data, void *user_data)
-+                            struct lo_message_ *data, void *user_data)
- {
-     OscListReceiver *self = user_data;
- 
-@@ -1945,4 +1945,4 @@ PyTypeObject OscListReceiveType =
-     0,      /* tp_init */
-     0,                         /* tp_alloc */
-     OscListReceive_new,                 /* tp_new */
--};
-\ No newline at end of file
-+};
-
-From e927d865eb007891255ec20df86bb3a05bbbb68e Mon Sep 17 00:00:00 2001
-From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-Date: Tue, 11 Jun 2024 15:52:42 +0200
-Subject: [PATCH 2/2] Fix multiple incorrect declarations of lo_blob and
- lo_message
-
----
- src/engine/osclistenermodule.c | 2 +-
- src/objects/oscmodule.c        | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/engine/osclistenermodule.c b/src/engine/osclistenermodule.c
-index 79a32873..e45ae337 100644
---- a/src/engine/osclistenermodule.c
-+++ b/src/engine/osclistenermodule.c
-@@ -50,7 +50,7 @@ int process_osc(const char *path, const char *types, lo_arg **argv, int argc,
- {
-     OscListener *server = (OscListener *)user_data;
-     PyObject *tup;
--    lo_blob *blob = NULL;
-+    lo_blob blob = NULL;
-     char *blobdata = NULL;
-     uint32_t blobsize = 0;
-     PyObject *charlist = NULL;
-diff --git a/src/objects/oscmodule.c b/src/objects/oscmodule.c
-index 04639e2d..657c2ec6 100644
---- a/src/objects/oscmodule.c
-+++ b/src/objects/oscmodule.c
-@@ -787,9 +787,9 @@ OscDataSend_compute_next_data_frame(OscDataSend *self)
-     PyObject *datalist = NULL;
-     char *blobdata = NULL;
-     uint8_t midi[4];
--    lo_blob *blob = NULL;
-+    lo_blob blob = NULL;
-     const char *path = NULL;
--    lo_message *msg;
-+    lo_message msg;
- 
-     while (self->something_to_send)
-     {
-@@ -1057,7 +1057,7 @@ int OscDataReceive_handler(const char *path, const char *types, lo_arg **argv, i
- {
-     OscDataReceive *self = user_data;
-     PyObject *tup, *result = NULL;
--    lo_blob *blob = NULL;
-+    lo_blob blob = NULL;
-     char *blobdata = NULL;
-     uint32_t blobsize = 0;
-     PyObject *charlist = NULL;

LICENSE

@@ -1,165 +0,0 @@
-                GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

fix_license.patch

@@ -0,0 +1,32 @@
+From 0fec2cc45aba7aa085a4eba6d58adb619db023e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
+Date: Tue, 20 May 2025 15:18:54 +0000
+Subject: [PATCH] fix: correct lincese indication per standard
+
+References: https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#license
+---
+ pyproject.toml |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+Index: pyo-1.0.6/pyproject.toml
+===================================================================
+--- pyo-1.0.6.orig/pyproject.toml	2025-03-04 13:41:38.000000000 +0100
++++ pyo-1.0.6/pyproject.toml	2025-09-17 19:50:52.351458283 +0200
+@@ -10,7 +10,7 @@
+ readme = "README.md"
+ requires-python = ">=3.9, <4"
+ keywords = ["audio", "sound", "dsp", "synthesis", "signal-processing", "music"]
+-license = {text = "LGPLv3+"}
++license = "LGPL-3.0-or-later"
+ classifiers = [
+     # How mature is this project? Common values are
+     #   3 - Alpha
+@@ -26,8 +26,6 @@
+     "Operating System :: MacOS :: MacOS X",
+     "Operating System :: Microsoft :: Windows",
+     "Operating System :: POSIX :: Linux",
+-    # Pick your license as you wish (should match "license" above)
+-    "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+     # Topics
+     "Topic :: Multimedia :: Sound/Audio",
+     "Topic :: Multimedia :: Sound/Audio :: Analysis",

pyo-1.0.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e042d947a0b641b400e228f9e21eeca21df8bf4895c6dbd013f87638d7728e31
-size 5249926

pyo-1.0.6.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6433ec2de14177a1938711d161501b00fe90974df06e10e81f46ecfb0707df1f
+size 11091180

python-pyo.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Wed Sep 17 07:06:47 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Update to 1.0.6:
+  - Updated documentation
+  - Fixed stdout overrides (issue #261)
+  - Clip MIDI input in midiToHz and MToF, and make NoteinRec doc more acc…
+  - Fixed Linseg and Expseg accuracy (issue #264).
+  - replace deprecated mock by unittest.mock
+  - Fix lo_blob and lo_message types
+  - Expr: Added a third argument to let statement to be able to set an in…
+  - Use libsnfile to retrieve aiff markers instead of the deprecated aifc…
+  - Update manylinux script.
+  - Updated libsndfile version in manylinux build.
+  - Updated SfMarker objects documentation.
+  - Fixed warning in vbap function signature.
+  - Removed unused variable in vbap implementation.
+- Remove upstreamed patches:
+  - 277.patch
+  - LICENSE file
+- Add rpm_build.patch to remove building errors.
+  - rpm_build.patch (gh#belangeo/pyo!313)
+  - fix_license.patch (gh#belangeo/pyo!302)
+
+-------------------------------------------------------------------
+Wed May 21 07:28:23 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Use libalternatives
+- Add python-standard-aifc for python >= 3.13
+
+-------------------------------------------------------------------
+Tue May 20 14:57:24 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Switch building to use of PEP517 backend.
+
 -------------------------------------------------------------------
 Tue Jun 11 14:14:54 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
 

python-pyo.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-pyo
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,21 +16,32 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%if 0%{?suse_version} > 1500
-%define         skip_python2 1
+%bcond_without libalternatives
+%else
+%bcond_with libalternatives
+%endif
+
 Name:           python-pyo
-Version:        1.0.5
+Version:        1.0.6
 Release:        0
 Summary:        Python digital signal processing module
 License:        LGPL-3.0-or-later
 Group:          Development/Languages/Python
 URL:            http://ajaxsoundstudio.com/software/pyo/
-Source:         https://files.pythonhosted.org/packages/source/p/pyo/pyo-%{version}.tar.gz
+# Source:         https://files.pythonhosted.org/packages/source/p/pyo/pyo-%%{version}.tar.gz
-Source1:        https://raw.githubusercontent.com/belangeo/pyo/master/LICENSE
+Source:         https://github.com/belangeo/pyo/archive/refs/tags/%{version}.tar.gz#/pyo-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM - Fix multiple incorrect declarations and signatures of callback functions
+# PATCH-FIX-UPSTREAM fix_license.patch gh#belangeo/pyo!302 mcepl@suse.com
-Patch:          https://github.com/belangeo/pyo/pull/277.patch
+# correct lincese indication per standard
+# https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#license
+Patch0:         fix_license.patch
+# PATCH-FIX-UPSTREAM rpm_build.patch gh#belangeo/pyo#288 mcepl@suse.com
+# fix building errors, submitted as gh#belangeo/pyo!313
+Patch1:         rpm_build.patch
 BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  pkgconfig
 BuildRequires:  portmidi-devel
@@ -39,6 +50,18 @@ BuildRequires:  pkgconfig(jack)
 BuildRequires:  pkgconfig(liblo)
 BuildRequires:  pkgconfig(portaudiocpp)
 BuildRequires:  pkgconfig(sndfile)
+# Test build requires, aifc is no longer part of python standard lib
+# since python3.13:
+# https://github.com/belangeo/pyo/issues/286
+BuildRequires:  python313-standard-aifc
+Requires:       (python-standard-aifc if python-base >= 3.13)
+%if %{with libalternatives}
+Requires:       alts
+BuildRequires:  alts
+%else
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
+%endif
 %python_subpackages
 
 %description
@@ -46,21 +69,40 @@ PYO is a Python module written in C to help digital signal processing
 script creation.
 
 %prep
-%setup -q -n pyo-%{version}
+%autosetup -p1 -n pyo-%{version}
-%autopatch -p1
-cp %{SOURCE1} .
 
 %build
 export CFLAGS="%{optflags}"
-%python_build --use-jack --use-double
+export PIP_CONFIG_SETTINGS="--build-option=--use-jack --use-double"
+%pyproject_wheel
 
 %install
-%python_install --use-jack --use-double
+%pyproject_install
+
+# Fix non-executable-script editor and examples
+%{python_expand #
+for i in editor examples/algorithmic examples/sequencing examples/matrix examples/fft examples/sampling examples/synthesis
+do
+sed -i "/^#!\s*\/usr\/bin\/env python/d" %{buildroot}%{$python_sitearch}/pyo/$i/*.py
+done
+}
+
 %python_clone -a %{buildroot}%{_bindir}/epyo
 %python_expand %fdupes %{buildroot}%{$python_sitearch}
 
 %check
+# Change directory to avoid importing from source
+mkdir -p test
+pushd test
 # testsuite is broken and can not be run even from github tarball
+%{python_expand #
+PYTHONPATH=%{buildroot}%{$python_sitearch} $python -c "import pyo; print(pyo.PYO_VERSION)"
+}
+popd
+
+%pre
+# If libalternatives is used: Removing old update-alternatives entries.
+%python_libalternatives_reset_alternative epyo
 
 %post
 %python_install_alternative epyo
@@ -72,6 +114,8 @@ export CFLAGS="%{optflags}"
 %doc README.md
 %license LICENSE
 %python_alternative %{_bindir}/epyo
-%{python_sitearch}/*
+%{python_sitearch}/pyo
+%{python_sitearch}/pyo64
+%{python_sitearch}/pyo-%{version}*-info
 
 %changelog