From: Markham <markham001@gmx.de>
Date: Sat, 14 Jan 2023 11:37:31 +0000 (+0100)
Subject: back to ffmpeg-4.4.2 for ARM; no cortex-strings for ARM
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=113b3dff41d41eeea215f42f6528c287c5163503;p=bs-cst-neutrino-hd.git

back to ffmpeg-4.4.2 for ARM; no cortex-strings for ARM
---

diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index 2d24070..73cc975 100755
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -15,7 +15,7 @@ ifeq ($(BOXTYPE), armbox)
 BOOTSTRAP += $(D)/host_mkimage
 BOOTSTRAP += $(D)/host_resize2fs
 BOOTSTRAP += $(D)/host_dosfstools
-BOOTSTRAP += $(D)/cortex-strings
+#BOOTSTRAP += $(D)/cortex-strings
 endif
 ifeq ($(BOXSERIES), hd2)
 BOOTSTRAP += $(D)/cortex-strings
diff --git a/make/environment-build.mk b/make/environment-build.mk
index 7490e25..6039d68 100755
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -115,7 +115,7 @@ else ifeq ($(BOXSERIES), hd2)
   CXX11_ABI              = -D_GLIBCXX_USE_CXX11_ABI=0
 
 else ifeq ($(BOXSERIES),$(filter $(BOXSERIES), hd5x hd6x))
-  CORTEX-STRINGS         = -lcortex-strings
+  CORTEX-STRINGS         =
   TARGET                 = arm-cortex-linux-gnueabihf
   TARGET_O_CFLAGS        = -O2
   TARGET_ARCH			 = arm
diff --git a/make/versions.mk b/make/versions.mk
index b2dbdf7..867ac97 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -74,7 +74,7 @@ FBSHOT_VER = 0.3
 
 # FFMPEG | A complete, cross-platform solution to record, convert and stream audio and video
 ifeq ($(BOXTYPE), armbox)
-FFMPEG_VER = 5.1.2
+FFMPEG_VER = 4.4.2
 else ifeq ($(BOXTYPE), coolstream)
 #FFMPEG_GIT = 2ba896f
 #FFMPEG_VER = 3.3
@@ -208,7 +208,7 @@ NTP_VER=4.2.8p15
 
 # openssl; toolkit for the SSL v2/v3 and TLS v1 protocol
 OPENSSL_VER=1.1.1
-OPENSSL_SUBVER=q
+OPENSSL_SUBVER=s
 
 # OpenVPN -- A Secure tunneling daemon
 OPENVPN_VER = 2.5.8