[FFmpeg-devel] [PATCH] Use makeinfo instead of texi2html

[Timothy Gu]

From: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>

Texi2html has been deprecated in favor of makeinfo, see:
https://wiki.debian.org/Texi2htmlTransition

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
---

This patch fixes *-all.html generation

---
 configure         | 5 +----
 doc/Makefile      | 4 ++--
 doc/platform.texi | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index c215478..7669aa1 100755
--- a/configure
+++ b/configure
@@ -1667,7 +1667,6 @@ HAVE_LIST="
     sys_un_h
     sys_videoio_h
     termios_h
-    texi2html
     threads
     unistd_h
     usleep
@@ -2447,7 +2446,7 @@ ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
 # documentation
 podpages_deps="perl"
 manpages_deps="perl pod2man"
-htmlpages_deps="perl texi2html"
+htmlpages_deps="perl makeinfo"
 txtpages_deps="perl makeinfo"
 doc_deps_any="manpages htmlpages podpages txtpages"
 
@@ -4582,7 +4581,6 @@ else
 fi
 enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
 
-texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html
 makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
 perl -v            > /dev/null 2>&1 && enable perl      || disable perl
 pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable pod2man
@@ -4997,7 +4995,6 @@ echo "safe bitstream reader     ${safe_bitstream_reader-no}"
 echo "SDL support               ${sdl-no}"
 echo "opencl enabled            ${opencl-no}"
 echo "libzvbi enabled           ${libzvbi-no}"
-echo "texi2html enabled         ${texi2html-no}"
 echo "perl enabled              ${perl-no}"
 echo "pod2man enabled           ${pod2man-no}"
 echo "makeinfo enabled          ${makeinfo-no}"
diff --git a/doc/Makefile b/doc/Makefile
index 44049c4..196626f 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -81,12 +81,12 @@ $(GENTEXI): doc/avoptions_%.texi: doc/print_options$(HOSTEXESUF)
 doc/%.html: TAG = HTML
 doc/%.html: doc/%.texi $(SRC_PATH)/doc/t2h.init $(GENTEXI)
 	$(Q)$(TEXIDEP)
-	$(M)texi2html -I doc -monolithic --D=config-not-all --init-file $(SRC_PATH)/doc/t2h.init --output $@ $<
+	$(M)makeinfo --html -I doc --no-split -D config-not-all --init-file=$(SRC_PATH)/doc/t2h.init --output $@ $<
 
 doc/%-all.html: TAG = HTML
 doc/%-all.html: doc/%.texi $(SRC_PATH)/doc/t2h.init $(GENTEXI)
 	$(Q)$(TEXIDEP)
-	$(M)texi2html -I doc -monolithic --D=config-all --init-file $(SRC_PATH)/doc/t2h.init --output $@ $<
+	$(M)makeinfo --html -I doc --no-split -D config-all --init-file=$(SRC_PATH)/doc/t2h.init --output $@ $<
 
 doc/%.pod: TAG = POD
 doc/%.pod: doc/%.texi $(SRC_PATH)/doc/texi2pod.pl $(GENTEXI)
diff --git a/doc/platform.texi b/doc/platform.texi
index 934a3ae..d707ef3 100644
--- a/doc/platform.texi
+++ b/doc/platform.texi
@@ -263,7 +263,7 @@ llrint() in its C library.
 Install your Cygwin with all the "Base" packages, plus the
 following "Devel" ones:
 @example
-binutils, gcc4-core, make, git, mingw-runtime, texi2html
+binutils, gcc4-core, make, git, mingw-runtime, texinfo
 @end example
 
 In order to run FATE you will also need the following "Utils" packages:
-- 
1.8.3.2