Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/mido/files/
Date: Thu, 29 Sep 2022 00:42:00
Message-Id: 1664412065.645cb4f8e13fab06313ed93fe834a1072a5fe1f6.marecki@gentoo
1 commit: 645cb4f8e13fab06313ed93fe834a1072a5fe1f6
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 29 00:41:05 2022 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 29 00:41:05 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645cb4f8
7
8 dev-python/mido: remove stray patch
9
10 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
11
12 .../python-rtmidi-1.4.9-unbundle_rtmidi.patch | 60 ----------------------
13 1 file changed, 60 deletions(-)
14
15 diff --git a/dev-python/mido/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch b/dev-python/mido/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch
16 deleted file mode 100644
17 index ecd9f53b108c..000000000000
18 --- a/dev-python/mido/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch
19 +++ /dev/null
20 @@ -1,60 +0,0 @@
21 ---- a/setup.py
22 -+++ b/setup.py
23 -@@ -102,7 +102,7 @@
24 -
25 - # Set up options for compiling the _rtmidi Extension
26 - if cythonize:
27 -- sources = [join(SRC_DIR, "_rtmidi.pyx"), join(SRC_DIR, "rtmidi", "RtMidi.cpp")]
28 -+ sources = [join(SRC_DIR, "_rtmidi.pyx")]
29 - elif exists(join(SRC_DIR, "_rtmidi.cpp")):
30 - cythonize = lambda x: x # noqa
31 - sources = [join(SRC_DIR, "_rtmidi.cpp"), join(SRC_DIR, "rtmidi", "RtMidi.cpp")]
32 -@@ -145,18 +145,18 @@
33 -
34 -
35 - if sys.platform.startswith('linux'):
36 -- if alsa and find_library('asound'):
37 -- define_macros.append(("__LINUX_ALSA__", None))
38 -- libraries.append('asound')
39 --
40 -- if jack:
41 -- check_for_jack(define_macros, libraries)
42 --
43 - if not find_library('pthread'):
44 - sys.exit("The 'pthread' library is required to build python-rtmidi on"
45 - "Linux. Please install the libc6 development package.")
46 -+ if not find_library('rtmidi'):
47 -+ sys.exit("Failed to find librtmidi")
48 -
49 - libraries.append("pthread")
50 -+
51 -+ res = subprocess.check_output(['pkg-config', '--variable', 'includedir', 'rtmidi'])
52 -+ rtmidi_include_dir = res.decode().strip()
53 -+ include_dirs.append(rtmidi_include_dir)
54 -+ libraries.append('rtmidi')
55 - elif sys.platform.startswith('darwin'):
56 - if jack:
57 - check_for_jack(define_macros, libraries)
58 -@@ -197,7 +197,7 @@
59 - # Finally, set up our distribution
60 - setup(
61 - packages=['rtmidi'],
62 -- ext_modules=cythonize(extensions),
63 -+ ext_modules=cythonize(extensions, include_path=[ rtmidi_include_dir ]),
64 - tests_require=[], # Test dependencies are handled by tox
65 - # On systems without a RTC (e.g. Raspberry Pi), system time will be the
66 - # Unix epoch when booted without network connection, which makes zip fail,
67 ---- a/tests/test_rtmidi.py
68 -+++ b/tests/test_rtmidi.py
69 -@@ -54,11 +54,6 @@
70 - else:
71 - self.assertEqual(res, rtmidi.API_UNSPECIFIED)
72 -
73 -- def test_get_rtmidi_version(self):
74 -- version = rtmidi.get_rtmidi_version()
75 -- self.assertTrue(isinstance(version, string_types))
76 -- self.assertEqual(version, '4.0.0')
77 --
78 -
79 - class BaseTests:
80 - NOTE_ON = [0x90, 48, 100]