From: fat-fred <fatfred.iphone@googlemail.com>
Date: Tue, 30 Nov 2021 07:37:09 +0000 (+0100)
Subject: Update Makefile.ffmpeg
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4deae00a11e92e6c19da4fd1bae48ef7f124c67b;p=thirdparty%2Ftvheadend.git

Update Makefile.ffmpeg
---

diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index d725d6644..79fcec205 100644
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -51,17 +51,17 @@ NASM_URL       = https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VER)/$(NASM_T
 NASM_SHA1      = 8a2a60b01d563c32dd216f94a99a20e6e31fd8aa
 NASM_DIFFS     = remove-invalid-pure_func-qualifiers.diff
 
-LIBX264_VER    = db0d417728460c647ed4a847222a535b00d3dbcb
+LIBX264_VER    = d2907f67227cbf38ac957efed84c532b12ce19cc
 LIBX264        = x264-$(LIBX264_VER)
 LIBX264_TB     = $(LIBX264).tar.bz2
 LIBX264_URL    = https://code.videolan.org/videolan/x264/-/archive/$(LIBX264_VER)/$(LIBX264_TB)
-LIBX264_SHA1   = 7b8da6f4283207b8ad77bab8890e3807f32013df
+LIBX264_SHA1   = 6b69f9af34ddfb9bc0bbfedb0b41a0b8b6c2771a
 
-LIBX265_VER    = 3.4
-LIBX265        = x265-$(LIBX265_VER)
-LIBX265_TB     = $(LIBX265_VER).tar.gz
-LIBX265_URL    = https://github.com/videolan/x265/archive/$(LIBX265_TB)
-LIBX265_SHA1   = eef65f2f9518f3396825675aa86bdf82a55aa0d9
+LIBX265_VER    = 3.5
+LIBX265        = x265_$(LIBX265_VER)
+LIBX265_TB     = $(LIBX265).tar.gz
+LIBX265_URL    = https://bitbucket.org/multicoreware/x265_git/downloads/$(LIBX265_TB)
+LIBX265_SHA1   = dc8e70f441991289a9a34fd37e1649d59435bfae
 ifeq ($(CONFIG_PIE),yes)
 LIBX265_DIFFS  = libx265.pie.diff
 else
@@ -90,26 +90,28 @@ LIBVORBIS_TB   = $(LIBVORBIS).tar.gz
 LIBVORBIS_URL  = https://ftp.osuosl.org/pub/xiph/releases/vorbis/$(LIBVORBIS_TB)
 LIBVORBIS_SHA1 = 2b415495f89b103138a23da5017a2a00837c6c94
 
-LIBFDKAAC      = fdk-aac-2.0.1
-LIBFDKAAC_TB   = $(LIBFDKAAC).tar.gz
-LIBFDKAAC_URL  = https://freefr.dl.sourceforge.net/project/opencore-amr/fdk-aac/$(LIBFDKAAC_TB)
-LIBFDKAAC_SHA1 = 575e90e85321c5be44dcf743a40ea57ab0835928
+
+LIBFDKAAC_VER  = 2.0.2
+LIBFDKAAC      = fdk-aac-$(LIBFDKAAC_VER)
+LIBFDKAAC_TB   = v$(LIBFDKAAC_VER).tar.gz
+LIBFDKAAC_URL  = https://github.com/mstorsjo/fdk-aac/archive/refs/tags/$(LIBFDKAAC_TB)
+LIBFDKAAC_SHA1 = 8d711c298d1a562f8e5bedb0ca8dc39365efe93b
 
 LIBOPUS        = opus-1.3.1
 LIBOPUS_TB     = $(LIBOPUS).tar.gz
 LIBOPUS_URL    = https://archive.mozilla.org/pub/opus/$(LIBOPUS_TB)
 LIBOPUS_SHA1   = ed226536537861c9f0f1ef7ca79dffc225bc181b
 
-FFNVCODEC_VER  = 11.0.10.0
+FFNVCODEC_VER  = 11.1.5.0
 FFNVCODEC      = nv-codec-headers-$(FFNVCODEC_VER)
 FFNVCODEC_TB   = $(FFNVCODEC).tar.gz
 FFNVCODEC_URL  = https://github.com/FFmpeg/nv-codec-headers/releases/download/n$(FFNVCODEC_VER)/nv-codec-headers-$(FFNVCODEC_VER).tar.gz
-FFNVCODEC_SHA1 = 08cc33d526cadae82a71382fdb847164e4baa959
+FFNVCODEC_SHA1 = 89bee0d3025b813c513084ad8546b0261623fbb0
 
-FFMPEG         = ffmpeg-4.4
+FFMPEG         = ffmpeg-4.4.1
 FFMPEG_TB      = $(FFMPEG).tar.bz2
 FFMPEG_URL     = https://ffmpeg.org/releases/$(FFMPEG_TB)
-FFMPEG_SHA1    = 9ceaa85da43f582a46b4d92de049418fdc835152
+FFMPEG_SHA1    = 49306f284475014b8e68bff886aaeeaf0723810c
 
 
 # ##############################################################################
@@ -168,6 +170,8 @@ endif
 ECFLAGS   := -I$(EPREFIX)/include $(CFLAGS_PI)
 ELIBS     := -L$(EPREFIX)/lib -ldl
 
+AUTOGEN   := ./autogen.sh
+
 CONFIGURE := FFMPEG_PREFIX=$(EPREFIX) \
              PKG_CONFIG=$(ROOTDIR)/support/pkg-config.ffmpeg \
              ./configure --prefix=/ffmpeg --enable-static --disable-shared
@@ -495,7 +499,7 @@ $(LIB_ROOT)/$(LIBFDKAAC)/.tvh_download:
 
 $(LIB_ROOT)/$(LIBFDKAAC)/.tvh_build: \
 		$(LIB_ROOT)/$(LIBFDKAAC)/.tvh_download
-	cd $(LIB_ROOT)/$(LIBFDKAAC) && CXXFLAGS="-std=c++98 -fPIC" $(CONFIGURE_PI) \
+	cd $(LIB_ROOT)/$(LIBFDKAAC) && $(AUTOGEN) && CXXFLAGS="-std=c++98 -fPIC" $(CONFIGURE_PI) \
 		--libdir=/$(EPREFIX0)/lib
 	DESTDIR=$(EBUILDIR) \
 		$(MAKE) -C $(LIB_ROOT)/$(LIBFDKAAC) install