From d40f5e697ef29fa5932c128ea1a34df8a17535c0 Mon Sep 17 00:00:00 2001 From: Markham Date: Sat, 13 Jul 2024 20:13:12 +0200 Subject: [PATCH] fix ffmpeg --- make/environment-build.mk | 4 ++-- make/ffmpeg.mk | 12 ++++++++++-- make/ffmpeg6.mk | 14 +++++++++++--- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/make/environment-build.mk b/make/environment-build.mk index dba3f56..b390e55 100755 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -125,13 +125,13 @@ else ifeq ($(BOXSERIES), hd2) else ifeq ($(BOXSERIES),$(filter $(BOXSERIES), hd5x hd6x)) CORTEX-STRINGS = -lcortex-strings TARGET = arm-cortex-linux-gnueabihf - TARGET_O_CFLAGS = -O2 + TARGET_O_CFLAGS = -O2 -flto TARGET_ARCH = arm TARGET_CPU = armv7ve TARGET_ABI = -march=$(TARGET_CPU) -mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard TARGET_ENDIAN = little TARGET_EXTRA_CFLAGS = -Wno-implicit-function-declaration - TARGET_EXTRA_LDFLAGS = + TARGET_EXTRA_LDFLAGS = -flto CXX11_ABI = else diff --git a/make/ffmpeg.mk b/make/ffmpeg.mk index 0495f36..b9db5bc 100644 --- a/make/ffmpeg.mk +++ b/make/ffmpeg.mk @@ -524,7 +524,11 @@ ffmpeg-coolstream: $(ARCHIVE)/ffmpeg-$(FFMPEG_VER).tar.xz | $(TARGETPREFIX) echo -e "==> $(TERM_RED)Applying Patch:$(TERM_NORMAL) $$i"; \ patch -p1 < $$i; \ done; \ - $(BUILDENV_NO_LTO) \ + if [ "$(BOXSERIES)" = "hd1" ]; then \ + $(BUILDENV_NO_LTO); \ + else \ + $(BUILDENV); \ + fi; \ ./configure \ $(FFMPEG_CONFIGURE) \ $(FFMPEG_CONF_OPTS); \ @@ -548,7 +552,11 @@ ffmpeg-coolstream-3.3: $(ARCHIVE)/ffmpeg-git-$(FFMPEG_GIT).tar.gz | $(TARGETPREF echo -e "==> $(TERM_RED)Applying Patch:$(TERM_NORMAL) $$i"; \ patch -p1 < $$i; \ done; \ - $(BUILDENV) \ + if [ "$(BOXSERIES)" = "hd1" ]; then \ + $(BUILDENV_NO_LTO); \ + else \ + $(BUILDENV); \ + fi; \ ./configure \ $(FFMPEG_CONFIGURE) \ $(FFMPEG_CONF_OPTS); \ diff --git a/make/ffmpeg6.mk b/make/ffmpeg6.mk index 1ea084c..fb54664 100644 --- a/make/ffmpeg6.mk +++ b/make/ffmpeg6.mk @@ -512,7 +512,7 @@ ffmpeg-armbox: $(ARCHIVE)/ffmpeg-$(FFMPEG_VER).tar.xz | $(TARGETPREFIX) echo -e "==> $(TERM_RED)Applying Patch:$(TERM_NORMAL) $$i"; \ patch -p1 < $$i; \ done; \ - $(BUILDENV_NO_LTO) \ + $(BUILDENV) \ ./configure \ $(FFMPEG_CONFIGURE) \ $(FFMPEG_CONF_OPTS); \ @@ -536,7 +536,11 @@ ffmpeg-coolstream: $(ARCHIVE)/ffmpeg-$(FFMPEG_VER).tar.xz | $(TARGETPREFIX) echo -e "==> $(TERM_RED)Applying Patch:$(TERM_NORMAL) $$i"; \ patch -p1 < $$i; \ done; \ - $(BUILDENV_NO_LTO) \ + if [ "$(BOXSERIES)" = "hd1" ]; then \ + $(BUILDENV_NO_LTO); \ + else \ + $(BUILDENV); \ + fi; \ ./configure \ $(FFMPEG_CONFIGURE) \ $(FFMPEG_CONF_OPTS); \ @@ -560,7 +564,11 @@ ffmpeg-coolstream-3.3: $(ARCHIVE)/ffmpeg-git-$(FFMPEG_GIT).tar.gz | $(TARGETPREF echo -e "==> $(TERM_RED)Applying Patch:$(TERM_NORMAL) $$i"; \ patch -p1 < $$i; \ done; \ - $(BUILDENV) \ + if [ "$(BOXSERIES)" = "hd1" ]; then \ + $(BUILDENV_NO_LTO); \ + else \ + $(BUILDENV); \ + fi; \ ./configure \ $(FFMPEG_CONFIGURE) \ $(FFMPEG_CONF_OPTS); \ -- 2.39.5