From 3b6518640e25cb163e1347ecaf043641af681a9a Mon Sep 17 00:00:00 2001
From: danielk117 <36566093+danielk117@users.noreply.github.com>
Date: Sun, 28 Jan 2024 14:11:16 +0100
Subject: [PATCH 1/3] fix build error blue-alsa

---
 packages/blue-alsa/package.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/blue-alsa/package.mk b/packages/blue-alsa/package.mk
index eb3bccc..50b55ca 100644
--- a/packages/blue-alsa/package.mk
+++ b/packages/blue-alsa/package.mk
@@ -28,8 +28,9 @@ configure_package() {
 	   --enable-aac \
 	   --enable-ldac \
 	   --enable-ofono \
-	   --enable-aptx --enable-aptx-hd \
 	   --with-sysroot="${STAGING_DIR}"
+
+	   #--enable-aptx --enable-aptx-hd \ # aptx codec throws build error
 }
 
 premake_package() {

From 88c014e3a1e9b156923bb7ff8a25cf9b5122638d Mon Sep 17 00:00:00 2001
From: danielk117 <36566093+danielk117@users.noreply.github.com>
Date: Sun, 28 Jan 2024 14:15:55 +0100
Subject: [PATCH 2/3] fix python build error

---
 packages/python3/package.mk | 84 +++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/packages/python3/package.mk b/packages/python3/package.mk
index 8b3f110..cf9137a 100644
--- a/packages/python3/package.mk
+++ b/packages/python3/package.mk
@@ -1,68 +1,72 @@
 PACKAGE_NAME="python3"
-PACKAGE_VERSION="3.9.1"
+PACKAGE_VERSION="3.9.18"
 PACKAGE_SRC="https://www.python.org/ftp/python/${PACKAGE_VERSION}/Python-${PACKAGE_VERSION}.tar.xz"
 PACKAGE_DEPENDS="glibc ncurses"
 
 preconfigure_package() {
-	# build on self host
-	mkdir -p build-host
-	cp -a * build-host/
-	cd build-host
+        # build on self host
+        mkdir -p build-host
+        cp -a * build-host/
+        cd build-host
 
-	./configure
-	make -j${MAKE_JOBS} python Parser/pgen
-	make install
+        ./configure
+        make -j${MAKE_JOBS} python Parser/pgen
+        make install
 
-	if [ $? -gt 0 ]; then
-		return 1
-	fi
+        if [ $? -gt 0 ]; then
+                return 1
+        fi
 
-	cd ..
+        cd ..
 }
 
 configure_package() {
-        CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" \
-           CXX="${BUILD_CXX}" CXXFLAGS="${BUILD_CFLAGS}" CPPFLAGS="${BUILD_CFLAGS}" \
-           PKG_CONFIG_LIBDIR="${BUILD_PKG_CONFIG_LIBDIR}" PKG_CONFIG_SYSROOT_DIR="${BUILD_PKG_CONFIG_SYSROOT_DIR}" \
-           ./configure --build=${MACHTYPE} --host=${BUILD_TARGET} --target=${BUILD_TARGET} \
-           --prefix=${INSTALL_PREFIX} \
-           ac_cv_file__dev_ptmx=no \
-           ac_cv_file__dev_ptc=no \
-           ac_cv_have_long_long_format=yes \
-           --enable-optimizations \
-           --with-lto \
-           --enable-shared \
+	CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}" \
+	   CXX="${BUILD_CXX}" CXXFLAGS="${BUILD_CFLAGS}" CPPFLAGS="${BUILD_CFLAGS}" \
+	   PKG_CONFIG_LIBDIR="${BUILD_PKG_CONFIG_LIBDIR}" PKG_CONFIG_SYSROOT_DIR="${BUILD_PKG_CONFIG_SYSROOT_DIR}" \
+	   ./configure --build=${MACHTYPE} --host=${BUILD_TARGET} --target=${BUILD_TARGET} \
+	   --prefix=${INSTALL_PREFIX} \
+	   ac_cv_file__dev_ptmx=no \
+	   ac_cv_file__dev_ptc=no \
+	   ac_cv_have_long_long_format=yes \
+	   --enable-optimizations \
+	   --with-lto \
+	   --enable-shared \
            --disable-ipv6 \
            --disable-test-modules \
            --without-doc-strings \
-           --with-ensurepip=no
+           --with-ensurepip=install
 }
 
 make_package() {
-	make -j${MAKE_JOBS} \
-		HOSTPYTHON=${PACKAGE_SRC_DIR}/build-host/python \
-		HOSTPGEN=${PACKAGE_SRC_DIR}/build-host/Parser/pgen \
-		CROSS_COMPILE_TARGET=yes \
-		LDFLAGS="${BUILD_LDFLAGS} -static" LINKFORSHARED=" "
+        make -j${MAKE_JOBS} \
+                HOSTPYTHON=${PACKAGE_SRC_DIR}/build-host/python \
+                HOSTPGEN=${PACKAGE_SRC_DIR}/build-host/Parser/pgen \
+                CROSS_COMPILE_TARGET=yes \
+                LDFLAGS="${BUILD_LDFLAGS}" LINKFORSHARED=" "
 }
 
 install_package() {
 	make DESTDIR=${STAGING_DIR} install
 
 	# optimize size
-        rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/pydoc_data
-        rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/ensurepip
+	rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/pydoc_data
+	rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/ensurepip
 
-        rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/asyncio/windows_*.py
-        rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/_osx_support.py
+	rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/asyncio/windows_*.py
+	rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/_osx_support.py
 
-        rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/test
-        rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/**/test
+	rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/test
+	rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/*/test
+	rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/*/*/test
 
-        rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/unittest
-        rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/*/idle_test
-        rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/*/tests
+	rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/unittest
+	rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/*/idle_test
+	rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/*/tests
+
+	rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/__pycache__
+	rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/*/__pycache__
+	rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/*/*/__pycache__
+	rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/*/*/*/__pycache__
 
-        rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/__pycache__
-        rm -rvf /xiaoai/build-packages/staging/armv7/usr/lib/python3.*/**/__pycache__
 }

From 092281565031aa010f30f928804e5707198b1d35 Mon Sep 17 00:00:00 2001
From: danielk117 <36566093+danielk117@users.noreply.github.com>
Date: Sun, 28 Jan 2024 14:16:38 +0100
Subject: [PATCH 3/3] add satellite package

---
 packages.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages.sh b/packages.sh
index 522e5e7..7ad8f08 100755
--- a/packages.sh
+++ b/packages.sh
@@ -696,7 +696,7 @@ mkdir -p ${STAGING_TO_TARGET_DIR}
 write_build_config
 [[ ! $? -eq 0 ]] && exit 1
 
-PACKAGES_TO_BUILD="update-libs update-binaries support services music python3 aec-cmdline screen improv getevent"
+PACKAGES_TO_BUILD="update-libs update-binaries support services music python3 aec-cmdline satellite screen improv getevent"
 
 for PKGN in $PACKAGES_TO_BUILD; do 
   process_package $PKGN