From 34242c881fe192aaeec647c13cd2de14c1069d37 Mon Sep 17 00:00:00 2001
From: "Igor Zalatov (from Citadel PC)" <flyrouter@gmail.com>
Date: Thu, 19 Oct 2023 20:02:54 +0300
Subject: [PATCH] Sync with faceter project

---
 building.sh                                   | 19 ++++++++++-
 packages/faceter-camera/Config.in             |  5 +++
 packages/faceter-camera/faceter-camera.mk     | 33 +++++++++++++++++++
 .../configs/t31_lite_faceter_defconfig        | 13 ++++----
 4 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100644 packages/faceter-camera/Config.in
 create mode 100644 packages/faceter-camera/faceter-camera.mk

diff --git a/building.sh b/building.sh
index dcd5d0d..89ccb93 100755
--- a/building.sh
+++ b/building.sh
@@ -69,6 +69,21 @@ select_project() {
     fi
 }
 
+copy_extra_packages() {
+    extra_packages=${COMPOSER_DIR}/packages
+    firmware_packages=${FIRMWARE_DIR}/general/package
+    cp -afv $extra_packages/* $firmware_packages
+    packages_list_file=$firmware_packages/Config.in
+    for f in "$extra_packages"/*
+    do
+        package_name=$(basename $f)
+        if ! grep -Fq "$package_name" $packages_list_file
+        then
+            printf 'source "$BR2_EXTERNAL_GENERAL_PATH/package/%s/Config.in"\n' $package_name >> $packages_list_file
+        fi
+    done
+}
+
 echo_c 37 "COMPOSER - custom OpenIPC firmware builder"
 echo_c 30 "https://openipc.org/"
 echo_c 30 "Version: ${VERSION}"
@@ -96,7 +111,9 @@ else
 fi
 
 echo_c 33 "\nCopying extra packages"
-cp -afv ${COMPOSER_DIR}/packages/* ${FIRMWARE_DIR}/general/package
+# cp -afv ${COMPOSER_DIR}/packages/* ${FIRMWARE_DIR}/general/package
+copy_extra_packages
+
 
 echo_c 33 "\nCopying project files"
 cp -afv ${COMPOSER_DIR}/projects/${PROJECT}/*  ${FIRMWARE_DIR}
diff --git a/packages/faceter-camera/Config.in b/packages/faceter-camera/Config.in
new file mode 100644
index 0000000..0e73331
--- /dev/null
+++ b/packages/faceter-camera/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_FACETER_CAMERA
+	bool "faceter-camera"
+	default n
+	help
+	  Faceter camera application
diff --git a/packages/faceter-camera/faceter-camera.mk b/packages/faceter-camera/faceter-camera.mk
new file mode 100644
index 0000000..5b192c2
--- /dev/null
+++ b/packages/faceter-camera/faceter-camera.mk
@@ -0,0 +1,33 @@
+################################################################################
+#
+# faceter-camera
+#
+################################################################################
+
+FACETER_CAMERA_VERSION = 1.0.0
+FACETER_CAMERA_SITE = https://github.com/openipc/faceter/archive
+FACETER_CAMERA_SOURCE = master.tar.gz
+
+FACETER_CAMERA_LICENSE = PROPRIETARY
+FACETER_CAMERA_LICENSE_FILES = LICENSE
+
+FACETER_CAMERA_PLACE = mips_ingenic_t31
+
+FACETER_CAMERA_DEPENDENCIES = \
+	json-c-openipc libcurl-openipc libyaml
+	
+define FACETER_CAMERA_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(@D)/$(FACETER_CAMERA_PLACE)/configs/faceter-client-settings.json
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(@D)/$(FACETER_CAMERA_PLACE)/configs//S96faceter-camera
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/$(FACETER_CAMERA_PLACE)/faceter-camera
+	
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/opt/faceter-camera
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/opt/faceter-camera $(@D)/$(FACETER_CAMERA_PLACE)/audio/*.pcm
+endef
+
+$(eval $(generic-package))
\ No newline at end of file
diff --git a/projects/t31_lite_faceter/br-ext-chip-ingenic/configs/t31_lite_faceter_defconfig b/projects/t31_lite_faceter/br-ext-chip-ingenic/configs/t31_lite_faceter_defconfig
index c2f5ea8..9e7c9ab 100644
--- a/projects/t31_lite_faceter/br-ext-chip-ingenic/configs/t31_lite_faceter_defconfig
+++ b/projects/t31_lite_faceter/br-ext-chip-ingenic/configs/t31_lite_faceter_defconfig
@@ -65,13 +65,13 @@ BR2_PACKAGE_INGENIC_OSDRV_T31=y
 BR2_PACKAGE_HASERL=y
 BR2_PACKAGE_IPCTOOL=y
 BR2_PACKAGE_JSON_C=y
-BR2_PACKAGE_JSONFILTER=y
+# BR2_PACKAGE_JSONFILTER is not set
 BR2_PACKAGE_LIBCURL_OPENIPC=y
-BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y
+# BR2_PACKAGE_LIBCURL_OPENIPC_CURL is not set
 # BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set
 # BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set
 # BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set
-# BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set
+BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES=y
 BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y
 BR2_PACKAGE_LIBEVENT_OPENIPC=y
 BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y
@@ -85,13 +85,14 @@ BR2_PACKAGE_MBEDTLS_OPENIPC=y
 BR2_PACKAGE_MICROBE_WEB=y
 # BR2_PACKAGE_MINI_SNMPD is not set
 # BR2_PACKAGE_MOTORS is not set
-BR2_PACKAGE_OPUS_OPENIPC=y
-BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
+# BR2_PACKAGE_OPUS_OPENIPC is not set
+# BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT is not set
 # BR2_PACKAGE_SSHPASS is not set
 # BR2_PACKAGE_UACME_OPENIPC is not set
-BR2_PACKAGE_VTUND_OPENIPC=y
+# BR2_PACKAGE_VTUND_OPENIPC is not set
 BR2_PACKAGE_YAML_CLI=y
 BR2_PACKAGE_QUIRC_OPENIPC=y
+BR2_PACKAGE_FACETER_CAMERA=y
 # BR2_PACKAGE_AUTONIGHT is not set
 
 # WiFi