8 files changed, 100 insertions, 43 deletions

diff --git a/meta-oe/recipes-support/touchpademulator/touchpademulator/0001-makefile-Use-CC-instead-of-hardcoding-gcc-calls.patch b/meta-oe/recipes-support/touchpademulator/touchpademulator/0001-makefile-Use-CC-instead-of-hardcoding-gcc-calls.patch
new file mode 100644
index 0000000000..062adc9665
--- /dev/null
+++ b/meta-oe/recipes-support/touchpademulator/touchpademulator/0001-makefile-Use-CC-instead-of-hardcoding-gcc-calls.patch
@@ -0,0 +1,29 @@
+From 37284f7208e43da34cac64b419219c5d4e20b36e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 2 Oct 2025 15:25:50 -0700
+Subject: [PATCH] makefile: Use CC instead of hardcoding gcc calls
+
+This helps to cross-compile it using infrastructure like yocto
+
+Upstream-Status: Submitted [https://gitlab.com/CalcProgrammer1/TouchpadEmulator/-/merge_requests/4]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index adf39a6..4cebaa6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,9 @@
++CC ?= gcc
++
+ default:                       TouchpadEmulator
+ 
+ TouchpadEmulator:      TouchpadEmulator.c
+-                                       gcc -Wall $(shell pkg-config --cflags dbus-1 dbus-glib-1) TouchpadEmulator.c -ldbus-1 -ldbus-glib-1 -lpthread -o TouchpadEmulator
++                                       $(CC) -Wall $(shell pkg-config --cflags dbus-1 dbus-glib-1) TouchpadEmulator.c -ldbus-1 -ldbus-glib-1 -lpthread -o TouchpadEmulator
+ 
+ clean:
+                                        git clean -dfx
diff --git a/meta-oe/recipes-support/touchpademulator/touchpademulator/0002-LaunchTouchpadEmulator.sh-Demand-sh-instead-of-bash.patch b/meta-oe/recipes-support/touchpademulator/touchpademulator/0002-LaunchTouchpadEmulator.sh-Demand-sh-instead-of-bash.patch
new file mode 100644
index 0000000000..999c557d54
--- /dev/null
+++ b/meta-oe/recipes-support/touchpademulator/touchpademulator/0002-LaunchTouchpadEmulator.sh-Demand-sh-instead-of-bash.patch
@@ -0,0 +1,25 @@
+From 5b715a6741a7a2fcd0dc04e31c682a0183a49fa6 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 2 Oct 2025 15:27:09 -0700
+Subject: [PATCH] LaunchTouchpadEmulator.sh: Demand sh instead of bash
+
+This script does not really use any bash specific extentions
+so asking for simple /bin/sh should be good and makes it more
+portable
+
+Upstream-Status: Submitted [https://gitlab.com/CalcProgrammer1/TouchpadEmulator/-/merge_requests/4]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ LaunchTouchpadEmulator.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/LaunchTouchpadEmulator.sh b/LaunchTouchpadEmulator.sh
+index d12fc27..63134cd 100755
+--- a/LaunchTouchpadEmulator.sh
++++ b/LaunchTouchpadEmulator.sh
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#! /bin/sh
+ 
+ if [ "$1" = "--autostart" ] ; then
+     mkdir -p ~/.config/autostart
diff --git a/meta-oe/recipes-support/touchpademulator/touchpademulator_git.bb b/meta-oe/recipes-support/touchpademulator/touchpademulator_git.bb
new file mode 100644
index 0000000000..e7b0387f7e
--- /dev/null
+++ b/meta-oe/recipes-support/touchpademulator/touchpademulator_git.bb
@@ -0,0 +1,34 @@
+SUMMARY = "Emulate a touchpad mouse device using a touchscreen on Linux"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f744a106227710d355bcc787e464ba2d \
+                    file://debian/copyright;md5=7bed05b78c0e4abec501cf82c4b85d9c"
+
+SRC_URI = "git://gitlab.com/CalcProgrammer1/TouchpadEmulator;protocol=https;branch=master \
+           file://0001-makefile-Use-CC-instead-of-hardcoding-gcc-calls.patch \
+           file://0002-LaunchTouchpadEmulator.sh-Demand-sh-instead-of-bash.patch \
+           "
+
+PV = "0.3+git"
+SRCREV = "7800f4c3af4defaf1be1083c93983ed4ff0e3b32"
+
+inherit pkgconfig
+
+DEPENDS += "dbus dbus-glib"
+
+# Fixes:
+# File /usr/bin/TouchpadEmulator in package touchpademulator doesn't have GNU_HASH (didn't pass LDFLAGS?) [ldflags]
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_configure () {
+        :
+}
+
+do_compile () {
+        oe_runmake
+}
+
+do_install () {
+        oe_runmake install 'DESTDIR=${D}'
+}
+
+FILES:${PN} += "${datadir}/icons"
diff --git a/meta-python/recipes-devtools/python/python3-django.inc b/meta-python/recipes-devtools/python/python3-django.inc
index cde32be477..c6475d2079 100644
--- a/meta-python/recipes-devtools/python/python3-django.inc
+++ b/meta-python/recipes-devtools/python/python3-django.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "https://www.djangoproject.com/"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa"
 
-PYPI_PACKAGE = "Django"
+PYPI_PACKAGE = "django"
 UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"
 
 inherit pypi
diff --git a/meta-python/recipes-devtools/python/python3-django/0001-Fixed-35980-Updated-setuptools-to-normalize-package.patch b/meta-python/recipes-devtools/python/python3-django/0001-Fixed-35980-Updated-setuptools-to-normalize-package.patch
deleted file mode 100644
index 4e28f59d8a..0000000000
--- a/meta-python/recipes-devtools/python/python3-django/0001-Fixed-35980-Updated-setuptools-to-normalize-package.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3ae049b26b995c650c41ef918d5f60beed52b4ba Mon Sep 17 00:00:00 2001
-From: Nick Pope <nick@nickpope.me.uk>
-Date: Fri, 6 Dec 2024 18:32:39 +0000
-Subject: [PATCH] Fixed #35980 -- Updated setuptools to normalize package names
- in built artifacts.
-
-Upstream-Status: Backport [https://github.com/django/django/commit/3ae049b26b995c650c41ef918d5f60beed52b4ba]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- pyproject.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index f10d15d20d..b9e82334cd 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,5 +1,5 @@
- [build-system]
--requires = ["setuptools>=61.0.0,<69.3.0"]
-+requires = ["setuptools>=75.8.1"]
- build-backend = "setuptools.build_meta"
- 
- [project]
--- 
-2.34.1
-
diff --git a/meta-python/recipes-devtools/python/python3-django_4.2.20.bb b/meta-python/recipes-devtools/python/python3-django_4.2.24.bb
index 8644b282c6..286d757733 100644
--- a/meta-python/recipes-devtools/python/python3-django_4.2.20.bb
+++ b/meta-python/recipes-devtools/python/python3-django_4.2.24.bb
@@ -1,7 +1,7 @@
 require python3-django.inc
 inherit python_setuptools_build_meta
 
-SRC_URI[sha256sum] = "92bac5b4432a64532abb73b2ac27203f485e40225d2640a7fbef2b62b876e789"
+SRC_URI[sha256sum] = "40cd7d3f53bc6cd1902eadce23c337e97200888df41e4a73b42d682f23e71d80"
 
 RDEPENDS:${PN} += "\
     python3-sqlparse \
@@ -10,5 +10,5 @@ RDEPENDS:${PN} += "\
 
 # Set DEFAULT_PREFERENCE so that the LTS version of django is built by
 # default. To build the 4.x branch, 
-# PREFERRED_VERSION_python3-django = "4.2.20" can be added to local.conf
+# PREFERRED_VERSION_python3-django = "4.2.%" can be added to local.conf
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-python/recipes-devtools/python/python3-django_5.2.6.bb b/meta-python/recipes-devtools/python/python3-django_5.2.6.bb
new file mode 100644
index 0000000000..644d825705
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-django_5.2.6.bb
@@ -0,0 +1,9 @@
+require python3-django.inc
+inherit python_setuptools_build_meta
+
+SRC_URI[sha256sum] = "da5e00372763193d73cecbf71084a3848458cecf4cee36b9a1e8d318d114a87b"
+
+RDEPENDS:${PN} += "\
+    python3-sqlparse \
+    python3-asgiref \
+"
diff --git a/meta-python/recipes-devtools/python/python3-django_5.2.bb b/meta-python/recipes-devtools/python/python3-django_5.2.bb
deleted file mode 100644
index 8a20448e22..0000000000
--- a/meta-python/recipes-devtools/python/python3-django_5.2.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require python3-django.inc
-inherit python_setuptools_build_meta
-
-SRC_URI[sha256sum] = "1a47f7a7a3d43ce64570d350e008d2949abe8c7e21737b351b6a1611277c6d89"
-
-SRC_URI += "\
-           file://0001-Fixed-35980-Updated-setuptools-to-normalize-package.patch \
-"
-
-RDEPENDS:${PN} += "\
-    python3-sqlparse \
-    python3-asgiref \
-"