From 5d7ab88b25c839e76707018fe7f380435f8930f3 Mon Sep 17 00:00:00 2001
From: viktorxda <35473052+viktorxda@users.noreply.github.com>
Date: Thu, 19 Oct 2023 18:20:01 +0200
Subject: [PATCH] Package: build vdec-openipc from source (#1065)

---
 .github/workflows/build.yml                   |  2 ++
 .../configs/hi3536dv100_fpv_defconfig         | 31 +++++++++----------
 general/package/vdec-openipc/vdec-openipc.mk  | 16 ++++++----
 general/package/venc-openipc/venc-openipc.mk  |  4 +--
 4 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 67843bb6..6cfccacc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -81,6 +81,8 @@ jobs:
             release: lte
           - platform: hi3516ev300
             release: lte
+          - platform: hi3536dv100
+            release: fpv
           - platform: gk7205v200
             release: lte
           - platform: gk7205v300
diff --git a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig
index d2a8df98..7d5da288 100644
--- a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig
@@ -14,19 +14,12 @@ BR2_GCC_VERSION_12_X=y
 # BR2_TOOLCHAIN_USES_UCLIBC is not set
 # BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set
 # BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"
-# BR2_TOOLCHAIN_USES_MUSL is not set
-# BR2_TOOLCHAIN_BUILDROOT_MUSL is not set
-# BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
-BR2_TOOLCHAIN_USES_GLIBC=y
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc"
-BR2_PACKAGE_GLIBC_UTILS=y
+BR2_TOOLCHAIN_USES_MUSL=y
+BR2_TOOLCHAIN_BUILDROOT_MUSL=y
+BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-# BR2_TOOLCHAIN_BUILDROOT_LOCALE is not set
+BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
-BR2_PIC_PIE=y
-BR2_GCC_ENABLE_LTO=y
-BR2_INSTALL_LIBSTDCPP=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
@@ -119,10 +112,9 @@ BR2_PACKAGE_MAVLINK_ROUTER=y
 # BR2_PACKAGE_MAVFWD is not set
 BR2_PACKAGE_RCJOYSTICK=y
 
-#FFMPEG
+# FFMPEG
 BR2_PACKAGE_FFMPEG_OPENIPC=y
 
-
 # ZEROTIER
 BR2_PACKAGE_ZEROTIER_ONE=y
 
@@ -144,7 +136,12 @@ BR2_CCACHE_DIR="$(HOME)/.ccache"
 # Compression
 BR2_PACKAGE_ZLIB=y
 
-# SDL2
-# BR2_PACKAGE_SDL2 is not set
-# BR2_PACKAGE_SDL2_IMAGE is not set
-# BR2_PACKAGE_SDL2_TTF is not set
+# External
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-musleabi"
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
+BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz"
diff --git a/general/package/vdec-openipc/vdec-openipc.mk b/general/package/vdec-openipc/vdec-openipc.mk
index 2770339f..71587b0a 100644
--- a/general/package/vdec-openipc/vdec-openipc.mk
+++ b/general/package/vdec-openipc/vdec-openipc.mk
@@ -4,16 +4,20 @@
 #
 ################################################################################
 
-VDEC_OPENIPC_SITE = https://github.com/OpenIPC/silicon_research/releases/download/latest/vdec
-
+VDEC_OPENIPC_SITE = https://github.com/openipc/silicon_research/archive
+VDEC_OPENIPC_SOURCE = master.tar.gz
 VDEC_OPENIPC_LICENSE = MIT
 
-define VDEC_OPENIPC_INSTALL_TARGET_CMDS
-	curl -k -L -o $(@D)/vdec $(VDEC_OPENIPC_SITE)
-	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/vdec
+define VDEC_OPENIPC_BUILD_CMDS
+	$(MAKE) CC=$(TARGET_CC) DRV=$(HISILICON_OSDRV_HI3536DV100_PKGDIR)/files/lib -C $(@D)/vdec
+endef
 
+define VDEC_OPENIPC_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
-	cp $(VDEC_OPENIPC_PKGDIR)/files/S98vdec $(TARGET_DIR)/etc/init.d/S98vdec
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(VDEC_OPENIPC_PKGDIR)/files/S98vdec
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/vdec/vdec
 endef
 
 $(eval $(generic-package))
diff --git a/general/package/venc-openipc/venc-openipc.mk b/general/package/venc-openipc/venc-openipc.mk
index 0b36bf1a..a97ddd30 100644
--- a/general/package/venc-openipc/venc-openipc.mk
+++ b/general/package/venc-openipc/venc-openipc.mk
@@ -17,7 +17,7 @@ else
 endif
 
 define VENC_OPENIPC_BUILD_CMDS
-	$(MAKE) CC=$(TARGET_CC) DRV=$(VENC_OPENIPC_OSDRV) TARGET=$(VENC_OPENIPC_TARGET) FILE=venc -C $(@D)
+	$(MAKE) CC=$(TARGET_CC) DRV=$(VENC_OPENIPC_OSDRV) $(VENC_OPENIPC_TARGET) -C $(@D)/venc
 endef
 
 define VENC_OPENIPC_INSTALL_TARGET_CMDS
@@ -25,7 +25,7 @@ define VENC_OPENIPC_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(VENC_OPENIPC_PKGDIR)/files/S98venc
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/output/venc
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/venc/venc
 endef
 
 $(eval $(generic-package))