From: Adolf Belka <adolf.belka@ipfire.org>
Date: Fri, 10 Nov 2023 11:00:53 +0000 (+0100)
Subject: ffmpeg: Fix build problem from updated texinfo
X-Git-Tag: v2.27-core182~16^2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b9433f306b580ce457278ad0a58aabf71b8a523;p=ipfire-2.x.git

ffmpeg: Fix build problem from updated texinfo

- With the 7.1 version of texinfo function names have changed which caused ffmpeg to fail
   to build. There were some unofficial patches to fix ffmpeg to work with the new texinfo
   but the simplest solution was to stop the docs being built in the configure command.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---

diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg
index 89c48bc0ae..31097eaacf 100644
--- a/config/rootfiles/packages/ffmpeg
+++ b/config/rootfiles/packages/ffmpeg
@@ -179,40 +179,6 @@ usr/lib/libswscale.so.7.1.100
 #usr/lib/pkgconfig/libpostproc.pc
 #usr/lib/pkgconfig/libswresample.pc
 #usr/lib/pkgconfig/libswscale.pc
-#usr/share/doc/ffmpeg
-#usr/share/doc/ffmpeg/bootstrap.min.css
-#usr/share/doc/ffmpeg/default.css
-#usr/share/doc/ffmpeg/developer.html
-#usr/share/doc/ffmpeg/faq.html
-#usr/share/doc/ffmpeg/fate.html
-#usr/share/doc/ffmpeg/ffmpeg-all.html
-#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html
-#usr/share/doc/ffmpeg/ffmpeg-codecs.html
-#usr/share/doc/ffmpeg/ffmpeg-devices.html
-#usr/share/doc/ffmpeg/ffmpeg-filters.html
-#usr/share/doc/ffmpeg/ffmpeg-formats.html
-#usr/share/doc/ffmpeg/ffmpeg-protocols.html
-#usr/share/doc/ffmpeg/ffmpeg-resampler.html
-#usr/share/doc/ffmpeg/ffmpeg-scaler.html
-#usr/share/doc/ffmpeg/ffmpeg-utils.html
-#usr/share/doc/ffmpeg/ffmpeg.html
-#usr/share/doc/ffmpeg/ffplay-all.html
-#usr/share/doc/ffmpeg/ffplay.html
-#usr/share/doc/ffmpeg/ffprobe-all.html
-#usr/share/doc/ffmpeg/ffprobe.html
-#usr/share/doc/ffmpeg/general.html
-#usr/share/doc/ffmpeg/git-howto.html
-#usr/share/doc/ffmpeg/libavcodec.html
-#usr/share/doc/ffmpeg/libavdevice.html
-#usr/share/doc/ffmpeg/libavfilter.html
-#usr/share/doc/ffmpeg/libavformat.html
-#usr/share/doc/ffmpeg/libavutil.html
-#usr/share/doc/ffmpeg/libswresample.html
-#usr/share/doc/ffmpeg/libswscale.html
-#usr/share/doc/ffmpeg/mailing-list-faq.html
-#usr/share/doc/ffmpeg/nut.html
-#usr/share/doc/ffmpeg/platform.html
-#usr/share/doc/ffmpeg/style.min.css
 #usr/share/ffmpeg
 #usr/share/ffmpeg/examples
 #usr/share/ffmpeg/examples/Makefile
@@ -247,25 +213,3 @@ usr/lib/libswscale.so.7.1.100
 #usr/share/ffmpeg/libvpx-360p.ffpreset
 #usr/share/ffmpeg/libvpx-720p.ffpreset
 #usr/share/ffmpeg/libvpx-720p50_60.ffpreset
-#usr/share/man/man1/ffmpeg-all.1
-#usr/share/man/man1/ffmpeg-bitstream-filters.1
-#usr/share/man/man1/ffmpeg-codecs.1
-#usr/share/man/man1/ffmpeg-devices.1
-#usr/share/man/man1/ffmpeg-filters.1
-#usr/share/man/man1/ffmpeg-formats.1
-#usr/share/man/man1/ffmpeg-protocols.1
-#usr/share/man/man1/ffmpeg-resampler.1
-#usr/share/man/man1/ffmpeg-scaler.1
-#usr/share/man/man1/ffmpeg-utils.1
-#usr/share/man/man1/ffmpeg.1
-#usr/share/man/man1/ffplay-all.1
-#usr/share/man/man1/ffplay.1
-#usr/share/man/man1/ffprobe-all.1
-#usr/share/man/man1/ffprobe.1
-#usr/share/man/man3/libavcodec.3
-#usr/share/man/man3/libavdevice.3
-#usr/share/man/man3/libavfilter.3
-#usr/share/man/man3/libavformat.3
-#usr/share/man/man3/libavutil.3
-#usr/share/man/man3/libswresample.3
-#usr/share/man/man3/libswscale.3
diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 836c4dd370..0118f75f24 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
-PAK_VER    = 15
+PAK_VER    = 16
 
 DEPS       = sdl2 lame libvorbis xvid
 
@@ -95,7 +95,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--disable-static \
 		--enable-gpl \
 		--enable-version3 \
-		--enable-avfilter
+		--enable-avfilter \
+		--disable-doc
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install