Merge pull request #851 from opensensor/stable

Fix Smart NVR build size and use latest version

Author: themactep

buildroot

@@ -8,6 +8,7 @@ BR2_LINUX_KERNEL_EXT_THINGINO_KOPT_DTS=y
 BR2_LINUX_KERNEL_EXT_THINGINO_KOPT_DTS_A1_SMART_NVR=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_FSCK=y
+BR2_PACKAGE_HOST_GO_TARGET_CGO=y
 BR2_PACKAGE_GO2RTC=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_LIGHTNVR=y

configs/cameras/smart_nvr_a1n_eth/smart_nvr_a1n_eth_defconfig

@@ -7,7 +7,7 @@ ifeq ($(BR2_PACKAGE_GO2RTC_MINI),y)
 else
 	GO2RTC_SITE = https://github.com/AlexxIT/go2rtc
 	GO2RTC_SITE_BRANCH = master
-	GO2RTC_VERSION = d99bf122eae07eccec159e6496f0aea4295597db
+	GO2RTC_VERSION = be80eb1ac98dd4d11dcf171cbb33e1fdd4974285
 	# $(shell git ls-remote $(GO2RTC_SITE) $(GO2RTC_SITE_BRANCH) | head -1 | cut -f1)
 endif
 
@@ -17,8 +17,15 @@ GO2RTC_LICENSE_FILES = LICENSE
 GO2RTC_INSTALL_TARGET = YES
 
 GO2RTC_DEPENDENCIES = host-upx
-GO2RTC_GO_ENV = GOARCH=mipsle
-GO2RTC_LDFLAGS = -s -w" -gcflags=all="-l -B
+
+# Disable CGO to avoid V4L2/ALSA C dependencies on MIPS
+GO2RTC_GO_ENV = CGO_ENABLED=0 GOARCH=mipsle
+
+# Strip debug symbols (-s -w) for smaller binary
+GO2RTC_LDFLAGS = -s -w
+
+# Disable inlining and bounds checking for smaller binary
+GO2RTC_BUILD_OPTS = -gcflags=all="-l -B"
 
 define GO2RTC_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0644 $(GO2RTC_PKGDIR)/files/go2rtc.yaml \

package/go2rtc/go2rtc.mk

@@ -1,15 +1,15 @@
 LIGHTNVR_SITE_METHOD = git
 LIGHTNVR_SITE = https://github.com/opensensor/lightNVR
 LIGHTNVR_SITE_BRANCH = main
-LIGHTNVR_VERSION = 6e209ff87757c8f4c70a8258b7452a8d950bfabd
+LIGHTNVR_VERSION = $(LIGHTNVR_SITE_BRANCH)
 
 LIGHTNVR_LICENSE = MIT
 LIGHTNVR_LICENSE_FILES = COPYING
 
 LIGHTNVR_INSTALL_STAGING = YES
 
 # Dependencies
-LIGHTNVR_DEPENDENCIES = thingino-ffmpeg thingino-libcurl sqlite
+LIGHTNVR_DEPENDENCIES = thingino-ffmpeg thingino-libcurl sqlite host-nodejs
 
 ifeq ($(BR2_PACKAGE_MBEDTLS),y)
 LIGHTNVR_DEPENDENCIES += mbedtls
@@ -28,6 +28,18 @@ LIGHTNVR_CONF_OPTS = \
 	-DGO2RTC_CONFIG_DIR=/etc/lightnvr/go2rtc \
 	-DGO2RTC_API_PORT=1984
 
+# Build web assets before CMake configuration
+# Web assets are no longer checked into git, so we build them here
+define LIGHTNVR_BUILD_WEB_ASSETS
+	@echo "Building LightNVR web assets..."
+	cd $(@D)/web && \
+		npm ci --production=false && \
+		npm run build
+	@echo "Web assets built successfully"
+endef
+
+LIGHTNVR_PRE_BUILD_HOOKS += LIGHTNVR_BUILD_WEB_ASSETS
+
 # Main application files installation
 define LIGHTNVR_INSTALL_APP_FILES
 	$(INSTALL) -d $(TARGET_DIR)/var/nvr