diff --git a/cross/libaom/Makefile b/cross/libaom/Makefile
index 9636839f1f22..5e3289935f38 100644
--- a/cross/libaom/Makefile
+++ b/cross/libaom/Makefile
@@ -27,6 +27,13 @@ include ../../mk/spksrc.cross-cmake.mk
 # libaom specific cmake options
 CMAKE_ARGS += -DCONFIG_AV1_ENCODER=1
 
+ifeq ($(call version_ge, ${TCVERSION}, 7.0),1)
+CMAKE_ARGS += -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_C99_MATH
+ifeq ($(findstring $(ARCH),$(ARMv7_ARCHS) $(ARMv7L_ARCHS)),$(ARCH))
+CMAKE_ARGS += -DENABLE_NEON=OFF
+endif
+endif
+
 ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
 CMAKE_ARGS += -DAOM_TARGET_CPU=arm
 endif
@@ -52,5 +59,3 @@ endif
 ifeq ($(findstring $(ARCH),$(i686_ARCHS)),$(ARCH))
 CMAKE_ARGS += -DAOM_TARGET_CPU=x86
 endif
-
-ENV += CXXFLAGS=-D_GLIBCXX_USE_C99_MATH
diff --git a/cross/tvheadend/Makefile b/cross/tvheadend/Makefile
index b22f73d831b6..35a3c8c8bc51 100644
--- a/cross/tvheadend/Makefile
+++ b/cross/tvheadend/Makefile
@@ -4,7 +4,7 @@ PKG_EXT = tar.gz
 PKG_GIT_HASH = 9ed76c0a176b055a57b6e8bd2e0b6e29409269a9
 PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/tvheadend/tvheadend/archive
-PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_GIT_HASH)
 
 DEPENDS = cross/openssl cross/uriparser cross/pcre2 cross/libiconv
diff --git a/cross/tvheadend/digests b/cross/tvheadend/digests
index b4dbc2cc78fa..a554a3d22ad4 100644
--- a/cross/tvheadend/digests
+++ b/cross/tvheadend/digests
@@ -1,3 +1,3 @@
-tvheadend-4.3.tar.gz SHA1 6d8f86a1f4a9318537b06d55a9aea76245c961c0
-tvheadend-4.3.tar.gz SHA256 d9ea0d1d1596efc5d6fed1595391a7cb2fc2442aa292fe0b57b9ab6910b32046
-tvheadend-4.3.tar.gz MD5 ff0b7102c72be18146f3f44051d2270e
+tvheadend-git9ed76c0a176b055a57b6e8bd2e0b6e29409269a9.tar.gz SHA1 6d8f86a1f4a9318537b06d55a9aea76245c961c0
+tvheadend-git9ed76c0a176b055a57b6e8bd2e0b6e29409269a9.tar.gz SHA256 d9ea0d1d1596efc5d6fed1595391a7cb2fc2442aa292fe0b57b9ab6910b32046
+tvheadend-git9ed76c0a176b055a57b6e8bd2e0b6e29409269a9.tar.gz MD5 ff0b7102c72be18146f3f44051d2270e