- Update from version 7.0.3 to 7.1 - Update of rootfile - Changelog 7.1 (18 October 2023) * Language . new generic definition commands, @defblock, @defline and @deftypeline, for definitions without automatic index entries . new @linemacro facility eases use of generic definition commands . new command @link creates plain links (supported output formats only) . @cartouche takes an argument to specify the cartouche title . you can use the new commands @nodedescription and @nodedescriptionblock to give text to be used in menu descriptions in Info and HTML output * texi2any . @itemx at the beginning of a @table is now an error, not a warning . better validity checking of deeply nested commands . check that @set and @clear only appear at the start of a line . warn about missing menu entries even if CHECK_NORMAL_MENU_STRUCTURE is not set. you can turn this off by setting CHECK_MISSING_MENU_ENTRY to 0. . no longer use --enable-encoding and --disable-encoding to determine whether to output encoded characters (instead of entities or commands) for HTML, XML, DocBook and LaTeX; instead, use the value of the OUTPUT_CHARACTERS customization variable. . stricter checks on input encoding, in particular more warnings and errors with malformed UTF-8 . support any input file encoding if support exists in the operating system, not just a selected list of encodings . resolve an alias referring to another alias at definition time . internally, use "source marks" to keep all Texinfo source information that is not in the final tree (location of macros, values and included files expansion, @if* blocks, DEL comment, and @ protecting end of line on @def* lines) . HTML output: . format @subentry and index entries with @seealso or @seeentry in a more similar way to printed output . output @shortcontents before @contents by default . omit colons after index entries by default. this can still be configured with INDEX_ENTRY_COLON. . add @example syntax highlighting as a texi2any extension . no more capitalization of @sc argument in HTML Cross-references . change @point expansion to U+22C6 in HTML Cross-references . if a @node is not associated with a sectioning command but is followed by a heading command not usually associated to nodes such as @heading and this command appears before other formatted content, the heading command is assumed to supply the node heading. you can customize this with USE_NEXT_HEADING_FOR_LONE_NODE. . Info output: . new variable ASCII_DASHES_AND_QUOTES, on by default, outputs ASCII characters for literal quote or hyphen characters in source, rather than UTF-8. this makes it easier to search Info files. . new ASCII_GLYPH variable for using ASCII renditions for glyph commands (like @bullet) . ASCII_PUNCTUATION still includes the effect of these new variables. . new variables AUTO_MENU_DESCRIPTION_ALIGN_COLUMN and AUTO_MENU_MAX_WIDTH control the format of descriptions in generated menus . XML output: . place menu leading text and menu separators in elements instead of attributes * texi2dvi . macro expansion with texi2any requires at least version 5.0 (only happens with --expand option or with very old texinfo.tex) * texinfo.tex . in @code, ` and ' output by default with backtick and undirected single quote glyphs in the typewriter font. you can still configure this using the @codequoteundirected/@codequotebacktick commands. . do not insert a space for @ def line continuation, matching the behavior of texi2any . align section titles in table of contents when more than 10 sections . microtype is off by default, for speed . page headings generation is no longer linked to the @titlepage command * info . when going Up, position cursor on menu entry for current node . allow mouse scrolling support regardless of termcap entries. this supports some more xterm configurations. . do not use "/index" as a possible file extension for Info files * Distribution . autoconf 2.71, automake 1.16.5, gettext 0.21
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/texinfo | 78 ++++++++++++++++++++++++++++++++- lfs/texinfo | 4 +- 2 files changed, 79 insertions(+), 3 deletions(-)
diff --git a/config/rootfiles/common/texinfo b/config/rootfiles/common/texinfo index 76ff08310..0b5b6a35d 100644 --- a/config/rootfiles/common/texinfo +++ b/config/rootfiles/common/texinfo @@ -80,6 +80,7 @@ #usr/share/texinfo/Texinfo/XSLoader.pm #usr/share/texinfo/ext #usr/share/texinfo/ext/epub3.pm +#usr/share/texinfo/ext/highlight_syntax.pm #usr/share/texinfo/ext/latex2html.pm #usr/share/texinfo/ext/tex4ht.pm #usr/share/texinfo/htmlxref.cnf @@ -87,7 +88,6 @@ #usr/share/texinfo/init/book.pm #usr/share/texinfo/init/chm.pm #usr/share/texinfo/init/documentation_examples.pm -#usr/share/texinfo/init/highlight_syntax.pm #usr/share/texinfo/init/html32.pm #usr/share/texinfo/js #usr/share/texinfo/js/info.css @@ -107,6 +107,7 @@ #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x05.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x06.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x07.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x08.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x09.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x0a.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x0b.pm @@ -123,6 +124,11 @@ #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x16.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x17.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x18.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x19.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x1a.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x1b.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x1c.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x1d.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x1e.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x1f.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x20.pm @@ -134,12 +140,42 @@ #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x26.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x27.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x28.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x29.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x2a.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x2b.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x2c.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x2d.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x2e.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x2f.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x30.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x31.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x32.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x33.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x34.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x35.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x36.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x37.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x38.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x39.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x3a.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x3b.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x3c.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x3d.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x3e.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x3f.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x40.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x41.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x42.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x43.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x44.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x45.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x46.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x47.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x48.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x49.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x4a.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x4b.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x4c.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x4d.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x4e.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x4f.pm @@ -228,6 +264,13 @@ #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa2.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa3.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa4.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa5.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa6.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa7.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa8.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa9.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xaa.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xab.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xac.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xad.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xae.pm @@ -272,6 +315,39 @@ #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd5.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd6.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd7.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd8.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd9.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xda.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xdb.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xdc.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xdd.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xde.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xdf.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe0.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe1.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe2.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe3.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe4.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe5.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe6.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe7.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe8.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe9.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xea.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xeb.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xec.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xed.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xee.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xef.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf0.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf1.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf2.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf3.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf4.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf5.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf6.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf7.pm +#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf8.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf9.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xfa.pm #usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xfb.pm diff --git a/lfs/texinfo b/lfs/texinfo index 6cd0e1f28..4210ea89e 100644 --- a/lfs/texinfo +++ b/lfs/texinfo @@ -24,7 +24,7 @@
include Config
-VER = 7.0.3 +VER = 7.1
THISAPP = texinfo-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 38710faba2f717f7990228d58924901ea7d7378cc02e2059a437b5127f9e2dc67f732584e3f45fc34e8ef6d7671a546fe66871dadbd29e772f3417768622a650 +$(DL_FILE)_BLAKE2 = 4385ca6250daeaa4f6bfedd9ab41f25993613031bcb8da55360365701213f4f3cf786d958749c59dc1c9dda328eca42f028aa051a7062313142aa92f55a96ecd
install : $(TARGET)
- 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 --- config/rootfiles/packages/ffmpeg | 56 -------------------------------- lfs/ffmpeg | 5 +-- 2 files changed, 3 insertions(+), 58 deletions(-)
diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg index 89c48bc0a..31097eaac 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 836c4dd37..0118f75f2 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
-
Adolf Belka