[meta-python] python3-pocketsphinx: Upgrade to 5.0.3

License-Update: New licenses added for WebRTC json parser, and json escaping

[1] https://github.com/cmusphinx/pocketsphinx/commit/4cb5845898c7d9e53688aba370ea3c00c0ef7db2
[2] https://github.com/cmusphinx/pocketsphinx/commit/6b9a923832a1fd77c5304eba18e63d8b0e2ef0b8

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...1-cython-Use-cythyon3-in-cmake-check.patch | 29 +++++++++++++++++++
 .../python/python3-pocketsphinx_0.1.15.bb     | 14 ---------
 .../python/python3-pocketsphinx_5.0.3.bb      | 20 +++++++++++++
 3 files changed, 49 insertions(+), 14 deletions(-)
 create mode 100644 meta-python/recipes-devtools/python/python3-pocketsphinx/0001-cython-Use-cythyon3-in-cmake-check.patch
 delete mode 100644 meta-python/recipes-devtools/python/python3-pocketsphinx_0.1.15.bb
 create mode 100644 meta-python/recipes-devtools/python/python3-pocketsphinx_5.0.3.bb

Hi Khem

On Mon, 2024-02-19 at 23:29 -0800, Khem Raj wrote:
> License-Update: New licenses added for WebRTC json parser, and json
> escaping
> 
> [1]
> https://github.com/cmusphinx/pocketsphinx/commit/4cb5845898c7d9e53688aba370ea3c00c0ef7db2
> [2]
> https://github.com/cmusphinx/pocketsphinx/commit/6b9a923832a1fd77c5304eba18e63d8b0e2ef0b8
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  ...1-cython-Use-cythyon3-in-cmake-check.patch | 29
> +++++++++++++++++++
>  .../python/python3-pocketsphinx_0.1.15.bb     | 14 ---------
>  .../python/python3-pocketsphinx_5.0.3.bb      | 20 +++++++++++++
>  3 files changed, 49 insertions(+), 14 deletions(-)
>  create mode 100644 meta-python/recipes-devtools/python/python3-
> pocketsphinx/0001-cython-Use-cythyon3-in-cmake-check.patch
>  delete mode 100644 meta-python/recipes-devtools/python/python3-
> pocketsphinx_0.1.15.bb
>  create mode 100644 meta-python/recipes-devtools/python/python3-
> pocketsphinx_5.0.3.bb
> 
> diff --git a/meta-python/recipes-devtools/python/python3-
> pocketsphinx/0001-cython-Use-cythyon3-in-cmake-check.patch b/meta-
> python/recipes-devtools/python/python3-pocketsphinx/0001-cython-Use-
> cythyon3-in-cmake-check.patch
> new file mode 100644
> index 0000000000..40b2544d55
> --- /dev/null
> +++ b/meta-python/recipes-devtools/python/python3-pocketsphinx/0001-
> cython-Use-cythyon3-in-cmake-check.patch
> @@ -0,0 +1,29 @@
> +From 5e6eb640f54a0d716d62ab4db8d96d3b6f3aa7bc Mon Sep 17 00:00:00
> 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Mon, 19 Feb 2024 22:11:41 -0800
> +Subject: [PATCH] cython: Use cythyon3 in cmake check
> +
> +OE does not install cython anymore, it only has cython3
> +therefore point the build system to find cython3
> +
> +Upstream-Status: Inappropriate [ OE-Specific ]
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + cython/CMakeLists.txt | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/cython/CMakeLists.txt b/cython/CMakeLists.txt
> +index daa4f76..93dd030 100644
> +--- a/cython/CMakeLists.txt
> ++++ b/cython/CMakeLists.txt
> +@@ -1,5 +1,5 @@
> + find_package(Python COMPONENTS Interpreter Development.Module
> REQUIRED)
> +-find_program(CYTHON "cython")
> ++find_program(CYTHON "cython3")
> + 
> + if(NOT USE_INSTALLED_POCKETSPHINX)
> +   set_property(TARGET pocketsphinx PROPERTY
> POSITION_INDEPENDENT_CODE on)
> +-- 
> +2.43.2
> +
> diff --git a/meta-python/recipes-devtools/python/python3-
> pocketsphinx_0.1.15.bb b/meta-python/recipes-devtools/python/python3-
> pocketsphinx_0.1.15.bb
> deleted file mode 100644
> index f7ffd9d268..0000000000
> --- a/meta-python/recipes-devtools/python/python3-
> pocketsphinx_0.1.15.bb
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -SUMMARY = "This package provides a python interface to CMU
> Sphinxbase and Pocketsphinx libraries created with SWIG and
> Setuptools."
> -DESCRIPTION = "Python interface to CMU Sphinxbase and Pocketsphinx
> libraries"
> -HOMEPAGE = "https://github.com/bambocher/pocketsphinx-python"
> -SECTION = "devel/python"
> -LICENSE = "BSD-2-Clause"
> -LIC_FILES_CHKSUM =
> "file://LICENSE;md5=826ebda787eb48e78aec2624f9faba72"
> -
> -SRC_URI[md5sum] = "94d008eebea16acb60a9ffe614575dee"
> -SRC_URI[sha256sum] =
> "34d290745c7dbe6fa2cac9815b5c19d10f393e528ecd70e779c21ebc448f9b63"
> -
> -inherit pypi setuptools3 features_check
> -
> -DEPENDS += "swig-native pulseaudio"
> -REQUIRED_DISTRO_FEATURES += "pulseaudio"
> diff --git a/meta-python/recipes-devtools/python/python3-
> pocketsphinx_5.0.3.bb b/meta-python/recipes-devtools/python/python3-
> pocketsphinx_5.0.3.bb
> new file mode 100644
> index 0000000000..fad8f5ba42
> --- /dev/null
> +++ b/meta-python/recipes-devtools/python/python3-
> pocketsphinx_5.0.3.bb
> @@ -0,0 +1,20 @@
> +SUMMARY = "This package provides a python interface to CMU
> Sphinxbase and Pocketsphinx libraries created with SWIG and
> Setuptools."
> +DESCRIPTION = "Python interface to CMU Sphinxbase and Pocketsphinx
> libraries"
> +HOMEPAGE = "https://github.com/bambocher/pocketsphinx-python"

Thank you for helping with this. I was working on this upgrade as well
but yours seems better except I think this HOMEPAGE and DESCRIPTION
should also change. Perhaps:

SUMMARY = "Python interface to Pocketsphinx libraries."
DESCRIPTION = "Pythonsphinx is an Open source large vocabulary,
speaker-independent continuous speech recognition engines."
HOMEPAGE = "https://github.com/cmusphinx/pocketsphinx"


> +SECTION = "devel/python"
> +LICENSE = "BSD-2-Clause"

Should this be BSD-2-Clause | MIT since one of the links in commit
message points to a MIT license?

> +LIC_FILES_CHKSUM =
> "file://LICENSE;md5=c4d720cdc9c6953091f65e8b01524bb4"
> +
> +SRC_URI += "file://0001-cython-Use-cythyon3-in-cmake-check.patch"
> +SRC_URI[sha256sum] =
> "27f4de0ca2d2bce391ce87eaab84fe6f0bc059b306fd1702d5fe6549b66e1586"
> +
> +inherit cmake pkgconfig pypi python3native
> +
> +DEPENDS += "swig-native python3-cython-native python3-scikit-build-
> native gstreamer1.0 gstreamer1.0-plugins-base"
> +
> +EXTRA_OECMAKE += "-DBUILD_GSTREAMER=ON"
> +
> +PACKAGES += "${PN}-models ${MLPREFIX}gstreamer1.0-pocketsphinx"
> +
> +FILES:${MLPREFIX}gstreamer1.0-pocketsphinx = "${libdir}/gstreamer-
> 1.0/"
> +FILES:${PN}-models = "${datadir}/pocketsphinx/model"
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#108918):
> https://lists.openembedded.org/g/openembedded-devel/message/108918
> Mute This Topic: https://lists.openembedded.org/mt/104463679/3616702
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe:
> https://lists.openembedded.org/g/openembedded-devel/unsub [
> anuj.mittal@intel.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

On Tue, Feb 20, 2024 at 12:25 AM Mittal, Anuj <anuj.mittal@intel.com> wrote:
>
> Hi Khem
>
> On Mon, 2024-02-19 at 23:29 -0800, Khem Raj wrote:
> > License-Update: New licenses added for WebRTC json parser, and json
> > escaping
> >
> > [1]
> > https://github.com/cmusphinx/pocketsphinx/commit/4cb5845898c7d9e53688aba370ea3c00c0ef7db2
> > [2]
> > https://github.com/cmusphinx/pocketsphinx/commit/6b9a923832a1fd77c5304eba18e63d8b0e2ef0b8
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  ...1-cython-Use-cythyon3-in-cmake-check.patch | 29
> > +++++++++++++++++++
> >  .../python/python3-pocketsphinx_0.1.15.bb     | 14 ---------
> >  .../python/python3-pocketsphinx_5.0.3.bb      | 20 +++++++++++++
> >  3 files changed, 49 insertions(+), 14 deletions(-)
> >  create mode 100644 meta-python/recipes-devtools/python/python3-
> > pocketsphinx/0001-cython-Use-cythyon3-in-cmake-check.patch
> >  delete mode 100644 meta-python/recipes-devtools/python/python3-
> > pocketsphinx_0.1.15.bb
> >  create mode 100644 meta-python/recipes-devtools/python/python3-
> > pocketsphinx_5.0.3.bb
> >
> > diff --git a/meta-python/recipes-devtools/python/python3-
> > pocketsphinx/0001-cython-Use-cythyon3-in-cmake-check.patch b/meta-
> > python/recipes-devtools/python/python3-pocketsphinx/0001-cython-Use-
> > cythyon3-in-cmake-check.patch
> > new file mode 100644
> > index 0000000000..40b2544d55
> > --- /dev/null
> > +++ b/meta-python/recipes-devtools/python/python3-pocketsphinx/0001-
> > cython-Use-cythyon3-in-cmake-check.patch
> > @@ -0,0 +1,29 @@
> > +From 5e6eb640f54a0d716d62ab4db8d96d3b6f3aa7bc Mon Sep 17 00:00:00
> > 2001
> > +From: Khem Raj <raj.khem@gmail.com>
> > +Date: Mon, 19 Feb 2024 22:11:41 -0800
> > +Subject: [PATCH] cython: Use cythyon3 in cmake check
> > +
> > +OE does not install cython anymore, it only has cython3
> > +therefore point the build system to find cython3
> > +
> > +Upstream-Status: Inappropriate [ OE-Specific ]
> > +
> > +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > +---
> > + cython/CMakeLists.txt | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/cython/CMakeLists.txt b/cython/CMakeLists.txt
> > +index daa4f76..93dd030 100644
> > +--- a/cython/CMakeLists.txt
> > ++++ b/cython/CMakeLists.txt
> > +@@ -1,5 +1,5 @@
> > + find_package(Python COMPONENTS Interpreter Development.Module
> > REQUIRED)
> > +-find_program(CYTHON "cython")
> > ++find_program(CYTHON "cython3")
> > +
> > + if(NOT USE_INSTALLED_POCKETSPHINX)
> > +   set_property(TARGET pocketsphinx PROPERTY
> > POSITION_INDEPENDENT_CODE on)
> > +--
> > +2.43.2
> > +
> > diff --git a/meta-python/recipes-devtools/python/python3-
> > pocketsphinx_0.1.15.bb b/meta-python/recipes-devtools/python/python3-
> > pocketsphinx_0.1.15.bb
> > deleted file mode 100644
> > index f7ffd9d268..0000000000
> > --- a/meta-python/recipes-devtools/python/python3-
> > pocketsphinx_0.1.15.bb
> > +++ /dev/null
> > @@ -1,14 +0,0 @@
> > -SUMMARY = "This package provides a python interface to CMU
> > Sphinxbase and Pocketsphinx libraries created with SWIG and
> > Setuptools."
> > -DESCRIPTION = "Python interface to CMU Sphinxbase and Pocketsphinx
> > libraries"
> > -HOMEPAGE = "https://github.com/bambocher/pocketsphinx-python"
> > -SECTION = "devel/python"
> > -LICENSE = "BSD-2-Clause"
> > -LIC_FILES_CHKSUM =
> > "file://LICENSE;md5=826ebda787eb48e78aec2624f9faba72"
> > -
> > -SRC_URI[md5sum] = "94d008eebea16acb60a9ffe614575dee"
> > -SRC_URI[sha256sum] =
> > "34d290745c7dbe6fa2cac9815b5c19d10f393e528ecd70e779c21ebc448f9b63"
> > -
> > -inherit pypi setuptools3 features_check
> > -
> > -DEPENDS += "swig-native pulseaudio"
> > -REQUIRED_DISTRO_FEATURES += "pulseaudio"
> > diff --git a/meta-python/recipes-devtools/python/python3-
> > pocketsphinx_5.0.3.bb b/meta-python/recipes-devtools/python/python3-
> > pocketsphinx_5.0.3.bb
> > new file mode 100644
> > index 0000000000..fad8f5ba42
> > --- /dev/null
> > +++ b/meta-python/recipes-devtools/python/python3-
> > pocketsphinx_5.0.3.bb
> > @@ -0,0 +1,20 @@
> > +SUMMARY = "This package provides a python interface to CMU
> > Sphinxbase and Pocketsphinx libraries created with SWIG and
> > Setuptools."
> > +DESCRIPTION = "Python interface to CMU Sphinxbase and Pocketsphinx
> > libraries"
> > +HOMEPAGE = "https://github.com/bambocher/pocketsphinx-python"
>
> Thank you for helping with this. I was working on this upgrade as well
> but yours seems better except I think this HOMEPAGE and DESCRIPTION
> should also change. Perhaps:
>
> SUMMARY = "Python interface to Pocketsphinx libraries."
> DESCRIPTION = "Pythonsphinx is an Open source large vocabulary,
> speaker-independent continuous speech recognition engines."
> HOMEPAGE = "https://github.com/cmusphinx/pocketsphinx"
>

sounds ok. I have added this locally.
>
> > +SECTION = "devel/python"
> > +LICENSE = "BSD-2-Clause"
>
> Should this be BSD-2-Clause | MIT since one of the links in commit
> message points to a MIT license?

On closer look there is BSD-3 also, so I have added both

>
> > +LIC_FILES_CHKSUM =
> > "file://LICENSE;md5=c4d720cdc9c6953091f65e8b01524bb4"
> > +
> > +SRC_URI += "file://0001-cython-Use-cythyon3-in-cmake-check.patch"
> > +SRC_URI[sha256sum] =
> > "27f4de0ca2d2bce391ce87eaab84fe6f0bc059b306fd1702d5fe6549b66e1586"
> > +
> > +inherit cmake pkgconfig pypi python3native
> > +
> > +DEPENDS += "swig-native python3-cython-native python3-scikit-build-
> > native gstreamer1.0 gstreamer1.0-plugins-base"
> > +
> > +EXTRA_OECMAKE += "-DBUILD_GSTREAMER=ON"
> > +
> > +PACKAGES += "${PN}-models ${MLPREFIX}gstreamer1.0-pocketsphinx"
> > +
> > +FILES:${MLPREFIX}gstreamer1.0-pocketsphinx = "${libdir}/gstreamer-
> > 1.0/"
> > +FILES:${PN}-models = "${datadir}/pocketsphinx/model"
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#108918):
> > https://lists.openembedded.org/g/openembedded-devel/message/108918
> > Mute This Topic: https://lists.openembedded.org/mt/104463679/3616702
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe:
> > https://lists.openembedded.org/g/openembedded-devel/unsub [
> > anuj.mittal@intel.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>