* [gentoo-commits] repo/gentoo:master commit in: dev-python/python-rtmidi/, dev-python/python-rtmidi/files/
@ 2023-06-16 21:18 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2023-06-16 21:18 UTC (permalink / raw
To: gentoo-commits
commit: 04429885a2d8b6d95e3e0da0377be05104e9f883
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 16 21:11:37 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 21:18:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04429885
dev-python/python-rtmidi: fix building against newer meson-python
Since 0.13.0, meson-python throws an error if a package is split
between purelib and platlib. Upstream did attempt to use the "pure"
keyword to account for the mixed nature of this module but
unfortunately, they appear to have got it wrong.
Closes: https://bugs.gentoo.org/908457
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../files/python-rtmidi-1.5.1-meson_pure.patch | 29 ++++++++++++++++++++++
.../python-rtmidi/python-rtmidi-1.5.1.ebuild | 4 +++
2 files changed, 33 insertions(+)
diff --git a/dev-python/python-rtmidi/files/python-rtmidi-1.5.1-meson_pure.patch b/dev-python/python-rtmidi/files/python-rtmidi-1.5.1-meson_pure.patch
new file mode 100644
index 000000000000..fba3f395812c
--- /dev/null
+++ b/dev-python/python-rtmidi/files/python-rtmidi-1.5.1-meson_pure.patch
@@ -0,0 +1,29 @@
+--- a/meson.build
++++ b/meson.build
+@@ -6,7 +6,7 @@
+ default_options: [
+ 'warning_level=2'
+ ],
+- meson_version: '>=0.63.0'
++ meson_version: '>=0.64.0'
+ )
+
+ cpp = meson.get_compiler('cpp')
+@@ -69,7 +69,7 @@
+ endif # Platform detection
+
+ pymod = import('python')
+-python = pymod.find_installation(get_option('python'), required: true)
++python = pymod.find_installation(get_option('python'), required: true, pure: false)
+
+ # Generate _rtmidi extension source
+ subdir('src')
+--- a/rtmidi/meson.build
++++ b/rtmidi/meson.build
+@@ -78,6 +78,5 @@
+ python.install_sources(
+ python_sources,
+ version_py,
+- pure: true,
+ subdir: 'rtmidi',
+ )
diff --git a/dev-python/python-rtmidi/python-rtmidi-1.5.1.ebuild b/dev-python/python-rtmidi/python-rtmidi-1.5.1.ebuild
index ed64baccc94b..abefc8615ade 100644
--- a/dev-python/python-rtmidi/python-rtmidi-1.5.1.ebuild
+++ b/dev-python/python-rtmidi/python-rtmidi-1.5.1.ebuild
@@ -4,6 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_EXT=1
DISTUTILS_USE_PEP517=meson-python
PYPI_NO_NORMALIZE=1
@@ -33,6 +34,7 @@ BDEPEND="<dev-python/cython-2.99[${PYTHON_USEDEP}]
PATCHES=(
"${FILESDIR}"/${PN}-1.5.1-build_backend.patch
+ "${FILESDIR}"/${PN}-1.5.1-meson_pure.patch
"${FILESDIR}"/${PN}-1.5.1-unbundle_rtmidi.patch
)
@@ -45,6 +47,8 @@ src_prepare() {
# Just in case
rm -r src/rtmidi || die
rm src/_rtmidi.cpp || die
+
+ DISTUTILS_ARGS=( -Dwheel=true )
}
python_test() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/python-rtmidi/, dev-python/python-rtmidi/files/
@ 2023-06-17 22:18 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2023-06-17 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 5d622214c2a1d6424ab1f4f5d3f7dbe22f881aa8
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 22:17:33 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 22:18:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d622214
dev-python/python-rtmidi: add 1.5.2, drop 1.5.1
Closes: https://bugs.gentoo.org/908657
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
dev-python/python-rtmidi/Manifest | 2 +-
...end.patch => python-rtmidi-1.5.2-build_backend.patch} | 13 ++++++++-----
...on-rtmidi-1.5.1.ebuild => python-rtmidi-1.5.2.ebuild} | 16 +++++++++++-----
3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/dev-python/python-rtmidi/Manifest b/dev-python/python-rtmidi/Manifest
index e26c6e5a7dcb..091c77559be5 100644
--- a/dev-python/python-rtmidi/Manifest
+++ b/dev-python/python-rtmidi/Manifest
@@ -1,2 +1,2 @@
DIST python-rtmidi-1.4.9.tar.gz 251238 BLAKE2B dda4052e893839f88a6756306f8ff4e89ee66ad9716d374efbb7b92a8e9074e98c8d5df0cc82aa3c6e0c77a78fe9b997079623a5147c03eeea9128dfb7605215 SHA512 91c5a0f807549fbe9d87df6e40b8c3db0f9be753616ba51804900195d02120cd972e39c69dd99e60e4ea1b1d9831d0b956b64ce71b2fe03422efc57bccf5cb70
-DIST python-rtmidi-1.5.1.tar.gz 331487 BLAKE2B fafa56132c54c20a702bcdc7dbe87b9eb3384ecf1e53ee76926866ba6f6fb601f55f4525f6b12f477f8659e4da8138940c5037ac0a4f31f472261089f0d25b03 SHA512 656690f397983834a719be6b58db66db066469b356ef00ff8d62666af9b5e3ef572e541cf38e082b2122a31d8895fd52c0392ed6bdec387baf3f5827de411254
+DIST python-rtmidi-1.5.2.tar.gz 332527 BLAKE2B 8779ea9952c4aeb5673ab26b04899ecb6582d29b9da081f726ce3f41ed0b96cc25239cebb69ebb847efc700332c3d47bf00f1eec6a0d092e0244e1cabe84f0b9 SHA512 025b356a2e0aefab53cf84e8d3cb6396058175e01cf2176336121babb4548b767b29bcd2e678fc2389c30df81586ee9395f51ab8acbde82f7f7f589935d65f4c
diff --git a/dev-python/python-rtmidi/files/python-rtmidi-1.5.1-build_backend.patch b/dev-python/python-rtmidi/files/python-rtmidi-1.5.2-build_backend.patch
similarity index 83%
rename from dev-python/python-rtmidi/files/python-rtmidi-1.5.1-build_backend.patch
rename to dev-python/python-rtmidi/files/python-rtmidi-1.5.2-build_backend.patch
index fdb2a14b7c7d..511e86f836df 100644
--- a/dev-python/python-rtmidi/files/python-rtmidi-1.5.1-build_backend.patch
+++ b/dev-python/python-rtmidi/files/python-rtmidi-1.5.2-build_backend.patch
@@ -18,16 +18,19 @@
description = "A Python binding for the RtMidi C++ library implemented using Cython."
authors = [
{ name="Christopher Arndt", email="info@chrisarndt.de" },
-@@ -41,12 +41,6 @@
+@@ -41,11 +41,12 @@
"music",
"rtmidi",
]
-meson-python-option-name = "python"
-meson-options = [
-- "-Dwheel=true",
-- "-Dverbose=true",
++
++[tool.meson-python.args]
++setup = [
+ "-Dwheel=true",
+ "-Dverbose=false",
- "--buildtype=plain"
--]
++ "-Dbuildtype=plain"
+ ]
[project.license]
- file = "LICENSE.md"
diff --git a/dev-python/python-rtmidi/python-rtmidi-1.5.1.ebuild b/dev-python/python-rtmidi/python-rtmidi-1.5.2.ebuild
similarity index 66%
rename from dev-python/python-rtmidi/python-rtmidi-1.5.1.ebuild
rename to dev-python/python-rtmidi/python-rtmidi-1.5.2.ebuild
index abefc8615ade..4185174c3c76 100644
--- a/dev-python/python-rtmidi/python-rtmidi-1.5.1.ebuild
+++ b/dev-python/python-rtmidi/python-rtmidi-1.5.2.ebuild
@@ -3,12 +3,15 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
+DOCS_BUILDER="sphinx"
+DOCS_DEPEND="dev-python/myst-parser"
+DOCS_DIR="docs"
DISTUTILS_EXT=1
DISTUTILS_USE_PEP517=meson-python
PYPI_NO_NORMALIZE=1
-inherit distutils-r1 pypi
+inherit distutils-r1 docs pypi
DESCRIPTION="Python bindings for media-libs/rtmidi implemented using Cython"
HOMEPAGE="
@@ -33,12 +36,11 @@ BDEPEND="<dev-python/cython-2.99[${PYTHON_USEDEP}]
virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${PN}-1.5.1-build_backend.patch
"${FILESDIR}"/${PN}-1.5.1-meson_pure.patch
"${FILESDIR}"/${PN}-1.5.1-unbundle_rtmidi.patch
+ "${FILESDIR}"/${PN}-1.5.2-build_backend.patch
)
-distutils_enable_sphinx docs
distutils_enable_tests unittest
src_prepare() {
@@ -48,7 +50,11 @@ src_prepare() {
rm -r src/rtmidi || die
rm src/_rtmidi.cpp || die
- DISTUTILS_ARGS=( -Dwheel=true )
+ # Needed by USE=doc because documentation generation happens in ${S}
+ # but the version.py generated by Meson end up in respective ${BUILD_DIR}s.
+ # The version put in ${S} should be ignored by everything except Sphinx but
+ # just in case, be consistent and generate it unconditionally.
+ sed -e "s|@VERSION@|${PV}|" < rtmidi/version.py.in > rtmidi/version.py || die
}
python_test() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/python-rtmidi/, dev-python/python-rtmidi/files/
@ 2023-06-27 21:56 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2023-06-27 21:56 UTC (permalink / raw
To: gentoo-commits
commit: af5fe8e1b5a92c916736900927c71f6cf7bd80da
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 21:43:42 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 21:56:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af5fe8e1
dev-python/python-rtmidi: add 1.5.4, drop 1.5.2
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
dev-python/python-rtmidi/Manifest | 2 +-
.../files/python-rtmidi-1.5.1-meson_pure.patch | 29 -----------------
.../files/python-rtmidi-1.5.2-build_backend.patch | 36 ----------------------
...idi-1.5.2.ebuild => python-rtmidi-1.5.4.ebuild} | 3 --
4 files changed, 1 insertion(+), 69 deletions(-)
diff --git a/dev-python/python-rtmidi/Manifest b/dev-python/python-rtmidi/Manifest
index 091c77559be5..56940aca4fc3 100644
--- a/dev-python/python-rtmidi/Manifest
+++ b/dev-python/python-rtmidi/Manifest
@@ -1,2 +1,2 @@
DIST python-rtmidi-1.4.9.tar.gz 251238 BLAKE2B dda4052e893839f88a6756306f8ff4e89ee66ad9716d374efbb7b92a8e9074e98c8d5df0cc82aa3c6e0c77a78fe9b997079623a5147c03eeea9128dfb7605215 SHA512 91c5a0f807549fbe9d87df6e40b8c3db0f9be753616ba51804900195d02120cd972e39c69dd99e60e4ea1b1d9831d0b956b64ce71b2fe03422efc57bccf5cb70
-DIST python-rtmidi-1.5.2.tar.gz 332527 BLAKE2B 8779ea9952c4aeb5673ab26b04899ecb6582d29b9da081f726ce3f41ed0b96cc25239cebb69ebb847efc700332c3d47bf00f1eec6a0d092e0244e1cabe84f0b9 SHA512 025b356a2e0aefab53cf84e8d3cb6396058175e01cf2176336121babb4548b767b29bcd2e678fc2389c30df81586ee9395f51ab8acbde82f7f7f589935d65f4c
+DIST python_rtmidi-1.5.4.tar.gz 327631 BLAKE2B c4bdbca7e011922eddb7995818cf471d0a3a5243c407b6ca82afad666af367beba4eec0a594ee26a2aca513b85f7964b81f9bd9d5ca095a03219382797402525 SHA512 2468ea12fcf6b741eefab7673a7d5d39322fccc853bd6e69ba77e90d6ee3e2681966d9886774386ddb395ee045fd266501c090707894bae5e47cf142c46fd0a4
diff --git a/dev-python/python-rtmidi/files/python-rtmidi-1.5.1-meson_pure.patch b/dev-python/python-rtmidi/files/python-rtmidi-1.5.1-meson_pure.patch
deleted file mode 100644
index fba3f395812c..000000000000
--- a/dev-python/python-rtmidi/files/python-rtmidi-1.5.1-meson_pure.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -6,7 +6,7 @@
- default_options: [
- 'warning_level=2'
- ],
-- meson_version: '>=0.63.0'
-+ meson_version: '>=0.64.0'
- )
-
- cpp = meson.get_compiler('cpp')
-@@ -69,7 +69,7 @@
- endif # Platform detection
-
- pymod = import('python')
--python = pymod.find_installation(get_option('python'), required: true)
-+python = pymod.find_installation(get_option('python'), required: true, pure: false)
-
- # Generate _rtmidi extension source
- subdir('src')
---- a/rtmidi/meson.build
-+++ b/rtmidi/meson.build
-@@ -78,6 +78,5 @@
- python.install_sources(
- python_sources,
- version_py,
-- pure: true,
- subdir: 'rtmidi',
- )
diff --git a/dev-python/python-rtmidi/files/python-rtmidi-1.5.2-build_backend.patch b/dev-python/python-rtmidi/files/python-rtmidi-1.5.2-build_backend.patch
deleted file mode 100644
index 511e86f836df..000000000000
--- a/dev-python/python-rtmidi/files/python-rtmidi-1.5.2-build_backend.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,14 +1,14 @@
- [build-system]
--# https://thiblahute.gitlab.io/mesonpep517/
--build-backend = "mesonpep517.buildapi"
-+build-backend = "mesonpy"
- requires = [
- "cython",
- "wheel",
-- "mesonpep517 @ git+https://gitlab.com/SpotlightKid/mesonpep517.git@rtmidi",
-+ "meson-python",
- "ninja"
- ]
-
- [project]
-+name = "python-rtmidi"
- description = "A Python binding for the RtMidi C++ library implemented using Cython."
- authors = [
- { name="Christopher Arndt", email="info@chrisarndt.de" },
-@@ -41,11 +41,12 @@
- "music",
- "rtmidi",
- ]
--meson-python-option-name = "python"
--meson-options = [
-+
-+[tool.meson-python.args]
-+setup = [
- "-Dwheel=true",
- "-Dverbose=false",
-- "--buildtype=plain"
-+ "-Dbuildtype=plain"
- ]
-
- [project.license]
diff --git a/dev-python/python-rtmidi/python-rtmidi-1.5.2.ebuild b/dev-python/python-rtmidi/python-rtmidi-1.5.4.ebuild
similarity index 93%
rename from dev-python/python-rtmidi/python-rtmidi-1.5.2.ebuild
rename to dev-python/python-rtmidi/python-rtmidi-1.5.4.ebuild
index 4185174c3c76..18e140eddb8a 100644
--- a/dev-python/python-rtmidi/python-rtmidi-1.5.2.ebuild
+++ b/dev-python/python-rtmidi/python-rtmidi-1.5.4.ebuild
@@ -9,7 +9,6 @@ DOCS_DEPEND="dev-python/myst-parser"
DOCS_DIR="docs"
DISTUTILS_EXT=1
DISTUTILS_USE_PEP517=meson-python
-PYPI_NO_NORMALIZE=1
inherit distutils-r1 docs pypi
@@ -36,9 +35,7 @@ BDEPEND="<dev-python/cython-2.99[${PYTHON_USEDEP}]
virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${PN}-1.5.1-meson_pure.patch
"${FILESDIR}"/${PN}-1.5.1-unbundle_rtmidi.patch
- "${FILESDIR}"/${PN}-1.5.2-build_backend.patch
)
distutils_enable_tests unittest
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-27 21:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-17 22:18 [gentoo-commits] repo/gentoo:master commit in: dev-python/python-rtmidi/, dev-python/python-rtmidi/files/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2023-06-27 21:56 Marek Szuba
2023-06-16 21:18 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox