From 465dfc68effdab6419682bef61ac57a4bfb16b8f Mon Sep 17 00:00:00 2001
From: viktorxda <35473052+viktorxda@users.noreply.github.com>
Date: Sat, 12 Oct 2024 09:28:16 +0200
Subject: [PATCH] [no ci] Package: update msposd/wifibroadcast (#1577)

---
 general/package/msposd/files/Makefile         | 21 -------------------
 general/package/msposd/msposd.mk              |  9 +++++++-
 .../wifibroadcast-ng/wifibroadcast-ng.mk      | 12 +++++------
 .../package/wifibroadcast/wifibroadcast.mk    | 18 ++++++++--------
 4 files changed, 23 insertions(+), 37 deletions(-)
 delete mode 100644 general/package/msposd/files/Makefile

diff --git a/general/package/msposd/files/Makefile b/general/package/msposd/files/Makefile
deleted file mode 100644
index c6f27758..00000000
--- a/general/package/msposd/files/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Get the current date and time in the format YYYYMMDD_HHMMSS
-VERSION_STRING := $(shell date +"%Y%m%d_%H%M%S")
-CFLAGS = -Wno-address-of-packed-member -DVERSION_STRING="\"$(VERSION_STRING)\""
-
-SRCS := compat.c msposd.c bmp/bitmap.c bmp/region.c bmp/lib/schrift.c bmp/text.c osd/net/network.c osd/msp/msp.c osd/msp/msp_displayport.c libpng/lodepng.c
-BUILD = $(CC) $(SRCS) -I $(SDK)/include -L$(DRV) $(CFLAGS) $(LIB) -levent_core -s -o msposd
-
-goke:
-	$(eval SDK = ./sdk/gk7205v300)
-	$(eval LIB = -D__GOKE__ -ldl -ldnvqe -lgk_api -lhi_mpi -lsecurec -lupvqe -lvoice_engine -ldnvqe)
-	$(BUILD)
-
-hisi:
-	$(eval SDK = ./sdk/hi3516ev300)
-	$(eval LIB = -D__GOKE__ -ldnvqe -lmpi -lsecurec -lupvqe -lVoiceEngine)
-	$(BUILD)
-
-star6e:
-	$(eval SDK = ./sdk/infinity6)
-	$(eval LIB = -D__SIGMASTAR__ -D__INFINITY6__ -D__INFINITY6E__ -lcam_os_wrapper -lm -lmi_rgn -lmi_sys -lmi_venc)
-	$(BUILD)
diff --git a/general/package/msposd/msposd.mk b/general/package/msposd/msposd.mk
index 4c2861d8..d1802f2b 100644
--- a/general/package/msposd/msposd.mk
+++ b/general/package/msposd/msposd.mk
@@ -13,18 +13,25 @@ ifeq ($(OPENIPC_SOC_FAMILY),gk7205v200)
 else ifeq ($(OPENIPC_SOC_FAMILY),hi3516ev200)
 	MSPOSD_FAMILY = hisi
 	MSPOSD_OSDRV = $(HISILICON_OSDRV_HI3516EV200_PKGDIR)
+else ifeq ($(OPENIPC_SOC_FAMILY),infinity6b0)
+	MSPOSD_FAMILY = star6b0
+	MSPOSD_OSDRV = $(SIGMASTAR_OSDRV_INFINITY6B0_PKGDIR)
 else
 	MSPOSD_FAMILY = star6e
 	MSPOSD_OSDRV = $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)
 endif
 
 define MSPOSD_BUILD_CMDS
-	$(INSTALL) -m 644 -t $(@D) $(MSPOSD_PKGDIR)/files/Makefile
 	$(MAKE) CC=$(TARGET_CC) DRV=$(MSPOSD_OSDRV)/files/lib $(MSPOSD_FAMILY) -C $(@D)
 endef
 
 define MSPOSD_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/msposd
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/share/fonts
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/fonts $(@D)/fonts/common/font.png
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/fonts $(@D)/fonts/common/font_hd.png
 endef
 
 $(eval $(generic-package))
diff --git a/general/package/wifibroadcast-ng/wifibroadcast-ng.mk b/general/package/wifibroadcast-ng/wifibroadcast-ng.mk
index ce5f2f3e..b6e32a77 100644
--- a/general/package/wifibroadcast-ng/wifibroadcast-ng.mk
+++ b/general/package/wifibroadcast-ng/wifibroadcast-ng.mk
@@ -16,14 +16,14 @@ endef
 
 define WIFIBROADCAST_NG_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
-	$(INSTALL) -m 644 -D $(WIFIBROADCAST_NG_PKGDIR)/files/drone.key $(TARGET_DIR)/etc
-	$(INSTALL) -m 644 -D $(WIFIBROADCAST_NG_PKGDIR)/files/wfb.conf $(TARGET_DIR)/etc
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(WIFIBROADCAST_NG_PKGDIR)/files/drone.key
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(WIFIBROADCAST_NG_PKGDIR)/files/wfb.conf
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 755 -D $(@D)/wfb_rx $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 755 -D $(@D)/wfb_tx $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 755 -D $(@D)/wfb_tun $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 755 -D $(WIFIBROADCAST_NG_PKGDIR)/files/wifibroadcast $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_rx
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_tx
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_tun
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(WIFIBROADCAST_NG_PKGDIR)/files/wifibroadcast
 endef
 
 $(eval $(generic-package))
diff --git a/general/package/wifibroadcast/wifibroadcast.mk b/general/package/wifibroadcast/wifibroadcast.mk
index d05d06f3..f708c201 100644
--- a/general/package/wifibroadcast/wifibroadcast.mk
+++ b/general/package/wifibroadcast/wifibroadcast.mk
@@ -25,17 +25,17 @@ define WIFIBROADCAST_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 -D $(WIFIBROADCAST_PKGDIR)/files/wfb_$(WIFIBROADCAST_UNIT).conf $(TARGET_DIR)/etc/wfb.conf
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/firmware/ath9k_htc
-	$(INSTALL) -m 644 -D $(WIFIBROADCAST_PKGDIR)/files/htc_9271.fw.1 $(TARGET_DIR)/lib/firmware/ath9k_htc
-	$(INSTALL) -m 644 -D $(WIFIBROADCAST_PKGDIR)/files/htc_9271.fw.3 $(TARGET_DIR)/lib/firmware/ath9k_htc
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/firmware/ath9k_htc $(WIFIBROADCAST_PKGDIR)/files/htc_9271.fw.1
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/firmware/ath9k_htc $(WIFIBROADCAST_PKGDIR)/files/htc_9271.fw.3
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 755 -D $(@D)/wfb_rx $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 755 -D $(@D)/wfb_tx $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 755 -D $(@D)/wfb_tx_cmd $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 755 -D $(@D)/wfb_keygen $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 755 -D $(@D)/wfb_tun $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 755 -D $(WIFIBROADCAST_PKGDIR)/files/setmcs $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 755 -D $(WIFIBROADCAST_PKGDIR)/files/wifibroadcast $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_rx
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_tx
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_tx_cmd
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_keygen
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_tun
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(WIFIBROADCAST_PKGDIR)/files/setmcs
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(WIFIBROADCAST_PKGDIR)/files/wifibroadcast
 endef
 
 $(eval $(generic-package))