From e81da4ce1a3dc89eeb6970124c5559fd5b3acd89 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Mon, 4 Sep 2023 09:47:36 +0000
Subject: [PATCH 1/6] Revert "setuptools: drop package"

This reverts commit 4b135d8d834da775fe9e64703b4ab6d36064cbd9.
---
 packages/python/devel/setuptools/package.mk | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 packages/python/devel/setuptools/package.mk

diff --git a/packages/python/devel/setuptools/package.mk b/packages/python/devel/setuptools/package.mk
new file mode 100644
index 0000000000..f91679b31c
--- /dev/null
+++ b/packages/python/devel/setuptools/package.mk
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="setuptools"
+PKG_VERSION="52.0.0"
+PKG_SHA256="ff0c74d1b905a224d647f99c6135eacbec2620219992186b81aa20012bc7f882"
+PKG_LICENSE="OSS"
+PKG_SITE="https://pypi.org/project/setuptools"
+PKG_URL="https://github.com/pypa/setuptools/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_HOST="Python3:host"
+PKG_LONGDESC="Replaces Setuptools as the standard method for working with Python module distributions."
+PKG_TOOLCHAIN="manual"
+
+make_host() {
+  python3 bootstrap.py
+}
+
+makeinstall_host() {
+  exec_thread_safe python3 setup.py install --prefix=${TOOLCHAIN}
+}

From b44df32fb9f301ed537d7ebd498159d2df6344ae Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Mon, 4 Sep 2023 09:47:57 +0000
Subject: [PATCH 2/6] Revert "setuptools: is now included in Python3 drop the
 dependancy on external package"

This reverts commit 629ff9eab897fc7de96416d2b22807d34895647d.
---
 packages/python/devel/Jinja2/package.mk         | 2 +-
 packages/python/devel/Mako/package.mk           | 2 +-
 packages/python/devel/MarkupSafe/package.mk     | 2 +-
 packages/python/devel/distutilscross/package.mk | 2 +-
 packages/python/devel/meson/package.mk          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/python/devel/Jinja2/package.mk b/packages/python/devel/Jinja2/package.mk
index d3a47c7ade..dff7e4f050 100644
--- a/packages/python/devel/Jinja2/package.mk
+++ b/packages/python/devel/Jinja2/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"
 PKG_LICENSE="BSD"
 PKG_SITE="https://pypi.org/project/Jinja2/"
 PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="Python3:host MarkupSafe:host"
+PKG_DEPENDS_HOST="Python3:host setuptools:host MarkupSafe:host"
 PKG_LONGDESC="Jinja is a fast, expressive, extensible templating engine."
 PKG_TOOLCHAIN="manual"
 
diff --git a/packages/python/devel/Mako/package.mk b/packages/python/devel/Mako/package.mk
index b322931282..a8bd28bcc6 100644
--- a/packages/python/devel/Mako/package.mk
+++ b/packages/python/devel/Mako/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="d60a3903dc3bb01a18ad6a89cdbe2e4eadc69c0bc8ef1e3773ba53d44c3f7a34"
 PKG_LICENSE="GPL"
 PKG_SITE="https://pypi.org/project/Mako"
 PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="Python3:host MarkupSafe:host"
+PKG_DEPENDS_HOST="Python3:host setuptools:host MarkupSafe:host"
 PKG_LONGDESC="Mako is a super-fast templating language that borrows the best ideas from the existing templating languages."
 PKG_TOOLCHAIN="manual"
 
diff --git a/packages/python/devel/MarkupSafe/package.mk b/packages/python/devel/MarkupSafe/package.mk
index 5137f15bab..22cc466671 100644
--- a/packages/python/devel/MarkupSafe/package.mk
+++ b/packages/python/devel/MarkupSafe/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"
 PKG_LICENSE="GPL"
 PKG_SITE="https://pypi.org/project/MarkupSafe/"
 PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="Python3:host"
+PKG_DEPENDS_HOST="Python3:host setuptools:host"
 PKG_LONGDESC="MarkupSafe implements a XML/HTML/XHTML Markup safe string for Python"
 PKG_TOOLCHAIN="manual"
 
diff --git a/packages/python/devel/distutilscross/package.mk b/packages/python/devel/distutilscross/package.mk
index 7392a9b522..c13fa89376 100644
--- a/packages/python/devel/distutilscross/package.mk
+++ b/packages/python/devel/distutilscross/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="4ed3fb427708c8a3ed5fe9c599532480f581078a1e0aec0e50f40eb58e9f0015"
 PKG_LICENSE="GPL"
 PKG_SITE="https://pypi.org/project/distutilscross/"
 PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="Python3:host"
+PKG_DEPENDS_HOST="Python3:host setuptools:host"
 PKG_LONGDESC="distutilscross enhances distutils to support Cross Compile of Python extensions"
 PKG_TOOLCHAIN="manual"
 
diff --git a/packages/python/devel/meson/package.mk b/packages/python/devel/meson/package.mk
index 16edd16d7d..cc2a92a75b 100644
--- a/packages/python/devel/meson/package.mk
+++ b/packages/python/devel/meson/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="b1db3a153087549497ee52b1c938d2134e0338214fe14f7efd16fecd57b639f5"
 PKG_LICENSE="Apache"
 PKG_SITE="http://mesonbuild.com"
 PKG_URL="https://github.com/mesonbuild/meson/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="Python3:host"
+PKG_DEPENDS_HOST="Python3:host setuptools:host"
 PKG_LONGDESC="High productivity build system"
 PKG_TOOLCHAIN="manual"
 

From 3484ce7e2bd959ff44366c716f437f6a43ec1e60 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Mon, 4 Sep 2023 09:48:19 +0000
Subject: [PATCH 3/6] Partial revert "Python3: enable pip and included
 setuptools"

This reverts commit 45e3a30dd82369fa96618354f15b2a8192ac8737.
---
 packages/lang/Python3/package.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/lang/Python3/package.mk b/packages/lang/Python3/package.mk
index f078d5293c..6bafc51f89 100644
--- a/packages/lang/Python3/package.mk
+++ b/packages/lang/Python3/package.mk
@@ -103,9 +103,8 @@ post_make_host() {
 post_makeinstall_host() {
   ln -sf ${PKG_PYTHON_VERSION} ${TOOLCHAIN}/bin/python
 
-  ${TOOLCHAIN}/bin/python -m ensurepip --altinstall
-
   rm -f ${TOOLCHAIN}/bin/smtpd.py*
+  rm -f ${TOOLCHAIN}/bin/pyvenv
   rm -f ${TOOLCHAIN}/bin/pydoc*
 
   rm -fr ${PKG_BUILD}/.${HOST_NAME}/build/temp.*

From 2661d83e0e1e80cd7e6c1b656cb75f33c623784d Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Mon, 4 Sep 2023 09:48:57 +0000
Subject: [PATCH 4/6] Revert "python target modules remove --cross-compile"

This reverts commit f9e11f1f602fcc6e3850bf13ea1ff272c019e740.
---
 packages/python/graphics/Pillow/package.mk       | 2 +-
 packages/python/security/pycryptodome/package.mk | 2 +-
 packages/python/system/simplejson/package.mk     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/python/graphics/Pillow/package.mk b/packages/python/graphics/Pillow/package.mk
index 76c0610755..ee8ba88449 100644
--- a/packages/python/graphics/Pillow/package.mk
+++ b/packages/python/graphics/Pillow/package.mk
@@ -18,7 +18,7 @@ pre_make_target() {
 }
 
 make_target() {
-  python3 setup.py build
+  python3 setup.py build --cross-compile
 }
 
 makeinstall_target() {
diff --git a/packages/python/security/pycryptodome/package.mk b/packages/python/security/pycryptodome/package.mk
index 4af979bc6d..fe6557b194 100644
--- a/packages/python/security/pycryptodome/package.mk
+++ b/packages/python/security/pycryptodome/package.mk
@@ -20,7 +20,7 @@ pre_configure_target() {
 }
 
 make_target() {
-  python3 setup.py build
+  python3 setup.py build --cross-compile
 }
 
 makeinstall_target() {
diff --git a/packages/python/system/simplejson/package.mk b/packages/python/system/simplejson/package.mk
index 84083d141b..9b9a44566f 100644
--- a/packages/python/system/simplejson/package.mk
+++ b/packages/python/system/simplejson/package.mk
@@ -17,7 +17,7 @@ pre_make_target() {
 }
 
 make_target() {
-  python3 setup.py build
+  python3 setup.py build --cross-compile
 }
 
 makeinstall_target() {

From b687f8ac74d3cd2d43afc8188664eac9f3f3b369 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Mon, 4 Sep 2023 09:49:31 +0000
Subject: [PATCH 5/6] Revert "system-tools: python libraries now packaged in
 .egg"

This reverts commit 10af5ec8a6ef9845543a05d95e61542e20b0ede8.
---
 packages/addons/tools/system-tools/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk
index b0134986e9..5a5de5f11b 100644
--- a/packages/addons/tools/system-tools/package.mk
+++ b/packages/addons/tools/system-tools/package.mk
@@ -120,7 +120,7 @@ addon() {
 
     # i2c-tools
     cp -P $(get_install_dir i2c-tools)/usr/sbin/{i2cdetect,i2cdump,i2cget,i2cset} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-    cp -P $(get_install_dir i2c-tools)/usr/lib/${PKG_PYTHON_VERSION}/site-packages/smbus-*.egg ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
+    cp -P $(get_install_dir i2c-tools)/usr/lib/${PKG_PYTHON_VERSION}/site-packages/smbus.so ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
     cp -P $(get_install_dir i2c-tools)/usr/lib/libi2c.so.0.1.1 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/libi2c.so
     cp -P $(get_install_dir i2c-tools)/usr/lib/libi2c.so.0.1.1 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/libi2c.so.0
     cp -P $(get_install_dir i2c-tools)/usr/lib/libi2c.so.0.1.1 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/libi2c.so.0.1.1

From f0328987aa478815310359ab2a6866b074acc2aa Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Mon, 4 Sep 2023 09:49:54 +0000
Subject: [PATCH 6/6] Revert "qemu: update to 8.1.0"

This reverts commit a355e366a6cf144e0dc4e44a0b9d5990a5ef7e77.
---
 packages/tools/qemu/package.mk           |  4 ++--
 packages/tools/qemu/patches/python.patch | 11 -----------
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 packages/tools/qemu/patches/python.patch

diff --git a/packages/tools/qemu/package.mk b/packages/tools/qemu/package.mk
index 2f188c7101..a248d60313 100644
--- a/packages/tools/qemu/package.mk
+++ b/packages/tools/qemu/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="qemu"
-PKG_VERSION="8.1.0"
-PKG_SHA256="710c101198e334d4762eef65f649bc43fa8a5dd75303554b8acfec3eb25f0e55"
+PKG_VERSION="8.0.3"
+PKG_SHA256="ecf4d32cbef9d397bfc8cc50e4d1e92a1b30253bf32e8ee73c7a8dcf9a232b09"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.qemu.org"
 PKG_URL="https://download.qemu.org/qemu-${PKG_VERSION}.tar.xz"
diff --git a/packages/tools/qemu/patches/python.patch b/packages/tools/qemu/patches/python.patch
deleted file mode 100644
index 5f09d08e55..0000000000
--- a/packages/tools/qemu/patches/python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure	2023-07-27 09:58:05.337334830 +0000
-+++ b/configure	2023-07-27 09:57:58.300630393 +0000
-@@ -950,6 +950,8 @@
-     mkvenv_flags="--online"
- fi
- 
-+ln -s ${source_path}/../../toolchain/bin/meson pyvenv/bin/meson
-+
- if ! $mkvenv ensure \
-      $mkvenv_flags \
-      --dir "${source_path}/python/wheels" \