[oe] [PATCH] Update for setuptools_build_meta renamed to python_setuptools_build_meta
Signed-off-by: Ross Burton
---
meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb | 2 +-
meta-python/recipes-devtools/python/python3-aiohttp_3.8.1.bb| 2 +-
meta-python/recipes-devtools/python/python3-ansi2html_1.7.0.bb | 2 +-
.../recipes-devtools/python/python3-antlr4-runtime_4.9.2.bb | 2 +-
meta-python/recipes-devtools/python/python3-asttokens_2.0.5.bb | 2 +-
.../recipes-devtools/python/python3-async-timeout_4.0.2.bb | 2 +-
meta-python/recipes-devtools/python/python3-bidict_0.21.4.bb| 2 +-
meta-python/recipes-devtools/python/python3-cachetools_4.2.4.bb | 2 +-
meta-python/recipes-devtools/python/python3-cbor2_5.4.2.bb | 2 +-
meta-python/recipes-devtools/python/python3-dateutil_2.8.2.bb | 2 +-
meta-python/recipes-devtools/python/python3-engineio_4.3.1.bb | 2 +-
meta-python/recipes-devtools/python/python3-fasteners_0.17.3.bb | 2 +-
.../recipes-devtools/python/python3-flask-migrate_3.1.0.bb | 2 +-
.../recipes-devtools/python/python3-flask-socketio_5.1.1.bb | 2 +-
meta-python/recipes-devtools/python/python3-frozenlist_1.3.0.bb | 2 +-
meta-python/recipes-devtools/python/python3-httplib2_0.20.4.bb | 2 +-
meta-python/recipes-devtools/python/python3-humanize_4.0.0.bb | 2 +-
meta-python/recipes-devtools/python/python3-hyperlink_21.0.0.bb | 2 +-
meta-python/recipes-devtools/python/python3-icu_2.8.1.bb| 2 +-
meta-python/recipes-devtools/python/python3-iso3166_2.0.2.bb| 2 +-
meta-python/recipes-devtools/python/python3-kiwisolver_1.4.0.bb | 2 +-
.../python/python3-license-expression_21.6.14.bb| 2 +-
meta-python/recipes-devtools/python/python3-luma-core_2.3.1.bb | 2 +-
meta-python/recipes-devtools/python/python3-lz4_4.0.0.bb| 2 +-
meta-python/recipes-devtools/python/python3-mypy_0.910.bb | 2 +-
meta-python/recipes-devtools/python/python3-path_16.4.0.bb | 2 +-
meta-python/recipes-devtools/python/python3-pint_0.18.bb| 2 +-
meta-python/recipes-devtools/python/python3-pyhamcrest_2.0.3.bb | 2 +-
meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb | 2 +-
meta-python/recipes-devtools/python/python3-pyscaffold_4.1.5.bb | 2 +-
.../recipes-devtools/python/python3-pytest-forked_1.4.0.bb | 2 +-
.../python/python3-pytest-helpers-namespace_2021.4.29.bb| 2 +-
.../recipes-devtools/python/python3-pytest-html_3.1.1.bb| 2 +-
.../recipes-devtools/python/python3-pytest-xdist_2.5.0.bb | 2 +-
.../python/python3-pytz-deprecation-shim_0.1.0.post0.bb | 2 +-
meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb | 2 +-
meta-python/recipes-devtools/python/python3-qface_2.0.6.bb | 2 +-
.../recipes-devtools/python/python3-simpleeval_0.9.12.bb| 2 +-
meta-python/recipes-devtools/python/python3-socketio_5.5.2.bb | 2 +-
meta-python/recipes-devtools/python/python3-soupsieve_2.3.1.bb | 2 +-
meta-python/recipes-devtools/python/python3-tqdm_4.63.0.bb | 2 +-
meta-python/recipes-devtools/python/python3-traitlets_5.1.1.bb | 2 +-
meta-python/recipes-devtools/python/python3-twine_3.8.0.bb | 2 +-
meta-python/recipes-devtools/python/python3-twisted_22.2.0.bb | 2 +-
meta-python/recipes-devtools/python/python3-typeguard_2.13.3.bb | 2 +-
meta-python/recipes-devtools/python/python3-tzlocal_4.1.bb | 2 +-
meta-python/recipes-devtools/python/python3-waitress_2.1.0.bb | 2 +-
meta-python/recipes-devtools/python/python3-yamlloader_1.1.0.bb | 2 +-
meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb| 2 +-
49 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb
b/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb
index a7bc16716f..1508273009 100644
--- a/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb
+++ b/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb
@@ -16,4 +16,4 @@ DEPENDS += "cups"
# See https://pypi.org/project/pycups/ for data
SRC_URI[sha256sum] =
"57434ce5f62548eb12949ca8217f066f4eeb21a5d6ab8b13471dce350e380c90"
-inherit pypi setuptools_build_meta
+inherit pypi python_setuptools_build_meta
diff --git a/meta-python/recipes-devtools/python/python3-aiohttp_3.8.1.bb
b/meta-python/recipes-devtools/python/python3-aiohttp_3.8.1.bb
index 3a4c510144..f2b8d52a72 100644
--- a/meta-python/recipes-devtools/python/python3-aiohttp_3.8.1.bb
+++ b/meta-python/recipes-devtools/python/python3-aiohttp_3.8.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE.txt;md5=8074d6c6e217873b2a018a4522243ea3"
SRC_URI[sha256sum] =
"fc5471e1a54de15ef71c1bc6ebe80d4dc681ea600e68bfd1cbce40427f0b7578"
PYPI_PACKAGE = "aiohttp"
-inherit setuptools_build_meta pypi
+inherit python_setuptools_build_meta pypi
RDEPENDS:${PN} = "\
${PYTHON_PN}-async-timeout \
diff --git a/meta-python/recipes-devtools/python/python3-ansi2html_1.7.0.bb
b/meta-python/recipes-devtools/python/python3-ansi2html_1.7.0.bb
index 9a6e0f7a3a..0f1804de88 100644
--- a/m
[oe] [PATCH] python3-lz4: add ptest
Signed-off-by: Ross Burton
---
.../recipes-devtools/python/python3-lz4/run-ptest| 3 +++
.../recipes-devtools/python/python3-lz4_4.0.0.bb | 12 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 meta-python/recipes-devtools/python/python3-lz4/run-ptest
diff --git a/meta-python/recipes-devtools/python/python3-lz4/run-ptest
b/meta-python/recipes-devtools/python/python3-lz4/run-ptest
new file mode 100644
index 00..1b245bcd8f
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-lz4/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+pytest -v
diff --git a/meta-python/recipes-devtools/python/python3-lz4_4.0.0.bb
b/meta-python/recipes-devtools/python/python3-lz4_4.0.0.bb
index 5e6741c680..e7a0de2767 100644
--- a/meta-python/recipes-devtools/python/python3-lz4_4.0.0.bb
+++ b/meta-python/recipes-devtools/python/python3-lz4_4.0.0.bb
@@ -9,8 +9,18 @@ DEPENDS += " \
${PYTHON_PN}-pkgconfig-native \
"
+SRC_URI += "file://run-ptest"
+
SRC_URI[sha256sum] =
"57c5dfd3b7dae833b0d2b2c1aafd7f9d0dfcab40683d183d010c67c9fd1beca3"
-inherit pkgconfig pypi setuptools_build_meta
+inherit pkgconfig pypi setuptools_build_meta ptest
+
+RDEPENDS:${PN}-ptest += "${PYTHON_PN}-pytest ${PYTHON_PN}-multiprocessing
${PYTHON_PN}-psutil"
+
+do_install_ptest() {
+cp -rf ${S}/tests/ ${D}${PTEST_PATH}/
+# The stream API is experimental and not enabled yet, so don't ship the
test suite
+rm -rf ${D}${PTEST_PATH}/tests/stream
+}
BBCLASSEXTEND = "native nativesdk"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#96058):
https://lists.openembedded.org/g/openembedded-devel/message/96058
Mute This Topic: https://lists.openembedded.org/mt/89866391/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-multimedia][PATCH] libopenmpt: Upgrade to version 0.6.2
* libopenmpt-modplug got removed and now exists as a separate project.
* SDL1 is no longer supported.
Signed-off-by: Carlos Rafael Giani
---
...bopenmpt_0.3.10.bb => libopenmpt_0.6.2.bb} | 31 +--
1 file changed, 7 insertions(+), 24 deletions(-)
rename meta-multimedia/recipes-multimedia/libopenmpt/{libopenmpt_0.3.10.bb =>
libopenmpt_0.6.2.bb} (68%)
diff --git a/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.3.10.bb
b/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.6.2.bb
similarity index 68%
rename from meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.3.10.bb
rename to meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.6.2.bb
index b1634732c..a7b6b0007 100644
--- a/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.3.10.bb
+++ b/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.6.2.bb
@@ -1,41 +1,33 @@
SUMMARY = "C and C++ cross-platform library for decoding tracked music files
(modules)"
DESCRIPTION = "libopenmpt is a cross-platform C++ and C library to decode
tracked \
music files (modules) into a raw PCM audio stream. It also comes with
openmpt123, a \
-cross-platform command-line or terminal based module file player, and
libopenmpt_modplug, \
-a wrapper around libopenmpt that provides an interface that is ABI compatile
with \
-libmodplug. libopenmpt is based on the player code of the OpenMPT project."
+cross-platform command-line or terminal based module file player. libopenmpt
is based \
+on the player code of the OpenMPT project."
HOMEPAGE = "https://lib.openmpt.org/libopenmpt/";
SECTION = "libs"
LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e804150573f149befef6c07e173f20c3"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ae09d6164bdecb499183479fd32b66fb"
DEPENDS = "virtual/libiconv"
SRC_URI =
"https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${PV}+release.autotools.tar.gz
\
file://run-ptest \
"
-SRC_URI[md5sum] = "66bbc6fbb5f27a554cb145d805e9ef9d"
-SRC_URI[sha256sum] =
"14a137b8d1a20e1b6a5e67cbc9467ab7e5e4e67d5aa38a247afc825685c53939"
+SRC_URI[md5sum] = "d21fb799695cbe10a1e9aeaea23ed708"
+SRC_URI[sha256sum] =
"50c0d62ff2d9afefa36cce9f29042cb1fb8d4f0b386b81a0fc7734f35e21e6b6"
S = "${WORKDIR}/libopenmpt-${PV}+release.autotools"
inherit autotools pkgconfig ptest
PACKAGECONFIG ??= " \
-libopenmpt-modplug openmpt123 \
+openmpt123 \
${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
flac mpg123 ogg sndfile vorbis vorbisfile zlib \
${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \
"
-# libopenmpt_modplug is a library that wraps libopenmpt calls into
-# functions that are ABI compatible with libmodplug. This allows for
-# using modplug headers and linking against libopenmpt_modplug
-# instead of against the original libmodplug library.
-# NOTE: The wrapper is compatible to the ABI from libmodplug version
-# 0.8.8 and newer.
-PACKAGECONFIG[libopenmpt-modplug] =
"--enable-libopenmpt_modplug,--disable-libopenmpt_modplug"
PACKAGECONFIG[openmpt123] = "--enable-openmpt123,--disable-openmpt123"
PACKAGECONFIG[tests] = "--enable-tests,--disable-tests"
@@ -45,22 +37,15 @@ PACKAGECONFIG[mpg123] =
"--with-mpg123,--without-mpg123,mpg123"
PACKAGECONFIG[ogg]= "--with-ogg,--without-ogg,libogg"
PACKAGECONFIG[portaudio] =
"--with-portaudio,--without-portaudio,portaudio-v19"
PACKAGECONFIG[pulseaudio] =
"--with-pulseaudio,--without-pulseaudio,pulseaudio"
-PACKAGECONFIG[sdl]= "--with-sdl,--without-sdl,virtual/libsdl"
PACKAGECONFIG[sdl2] =
"--with-sdl2,--without-sdl2,virtual/libsdl2"
PACKAGECONFIG[sndfile]=
"--with-sndfile,--without-sndfile,libsndfile1"
PACKAGECONFIG[vorbis] = "--with-vorbis,--without-vorbis,libvorbis"
PACKAGECONFIG[vorbisfile] =
"--with-vorbisfile,--without-vorbisfile,libvorbis"
PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
-# --disable-libmodplug is necessary, since otherwise we'd
-# have a collision with the libmodplug package, because of the
-# libmodplug.so file. (libmodplug.so from libopenmpt isintended
-# to be used as a drop-in replacement, and according to the
-# documentation, is not complete.)
EXTRA_OECONF += " \
--disable-doxygen-doc \
--disable-examples \
---disable-libmodplug \
--without-portaudiocpp \
"
@@ -85,8 +70,7 @@ python __anonymous() {
bb.error("sdl and sdl2 packageconfigs cannot be both enabled")
}
-PACKAGES =+ "${PN}-modplug ${PN}-openmpt123 ${PN}-openmpt123-doc"
-FILES:${PN}-modplug = "${libdir}/libopenmpt_modplug.so.*"
+PACKAGES =+ "${PN}-openmpt123 ${PN}-openmpt123-doc"
FILES:${PN}-openmpt123 = "${bindir}/openmpt123"
FILES:${PN}-openmpt123-doc = "${mandir}/man1/openmpt123*"
@@ -94,7 +78,6 @@ FILES:${PN}-openmpt123-doc = "${mandir}/man1/openmpt123*"
# The SemVer versioning scheme
