[gentoo-commits] repo/gentoo:master commit in: dev-python/python-rtmidi/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/python-rtmidi/files/

[Marek Szuba]

commit:     a5e56ad57c2db3f6c4903042f8c870611ab6d969
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 10:14:17 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 10:20:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e56ad5

dev-python/python-rtmidi: do not look for libpthread

This is a glibcism, and in any case it's rtmidi and python-rtmidi which
depends on threads.

Closes: https://bugs.gentoo.org/874828
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../files/python-rtmidi-1.4.9-unbundle_rtmidi.patch | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/dev-python/python-rtmidi/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch b/dev-python/python-rtmidi/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch
index ecd9f53b108c..45cece4b2eb9 100644
--- a/dev-python/python-rtmidi/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch
+++ b/dev-python/python-rtmidi/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch
@@ -9,25 +9,24 @@
  elif exists(join(SRC_DIR, "_rtmidi.cpp")):
      cythonize = lambda x: x  # noqa
      sources = [join(SRC_DIR, "_rtmidi.cpp"), join(SRC_DIR, "rtmidi", "RtMidi.cpp")]
-@@ -145,18 +145,18 @@
+@@ -145,18 +145,13 @@
  
  
  if sys.platform.startswith('linux'):
 -    if alsa and find_library('asound'):
 -        define_macros.append(("__LINUX_ALSA__", None))
 -        libraries.append('asound')
--
--    if jack:
--        check_for_jack(define_macros, libraries)
--
-     if not find_library('pthread'):
-         sys.exit("The 'pthread' library is required to build python-rtmidi on"
-                  "Linux. Please install the libc6 development package.")
 +    if not find_library('rtmidi'):
 +        sys.exit("Failed to find librtmidi")
  
-     libraries.append("pthread")
-+
+-    if jack:
+-        check_for_jack(define_macros, libraries)
+-
+-    if not find_library('pthread'):
+-        sys.exit("The 'pthread' library is required to build python-rtmidi on"
+-                 "Linux. Please install the libc6 development package.")
+-
+-    libraries.append("pthread")
 +    res = subprocess.check_output(['pkg-config', '--variable', 'includedir', 'rtmidi'])
 +    rtmidi_include_dir = res.decode().strip()
 +    include_dirs.append(rtmidi_include_dir)
@@ -35,7 +34,7 @@
  elif sys.platform.startswith('darwin'):
      if jack:
          check_for_jack(define_macros, libraries)
-@@ -197,7 +197,7 @@
+@@ -197,7 +192,7 @@
  # Finally, set up our distribution
  setup(
      packages=['rtmidi'],