Hi,
On 25.01.2015 18:53, Michael Niedermayer wrote:
On Sun, Jan 25, 2015 at 05:29:08PM +0100, Hendrik Leppkes wrote:
On Sun, Jan 25, 2015 at 5:15 PM, Reimar Döffinger <reimar.doeffin...@gmx.de>
wrote:
I vote for just removing the build date.
[...]
Remove it for all I care, the important part is the revision info and the
compiler used.
+1
OK, if that's preferred. New patch attached.
The ffmpeg_program_string function in t2h.pm is just the
_default_program_string function from texinfo [1] without the timestamp.
Best regards,
Andreas
1:
https://anonscm.debian.org/cgit/debian-tex/texinfo.git/tree/tp/Texinfo/Convert/HTML.pm/#n6118
>From 3163612fb5da694a4ebcc39605561558566d85ed Mon Sep 17 00:00:00 2001
From: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
Date: Sun, 25 Jan 2015 21:13:18 +0100
Subject: [PATCH] stop embedding the build date
Theis makes the build binary reproducible.
Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
---
cmdutils.c | 3 +--
doc/Doxyfile | 2 +-
doc/Makefile | 4 ++--
doc/t2h.pm | 17 +++++++++++++++++
ffprobe.c | 2 --
5 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/cmdutils.c b/cmdutils.c
index 53268d8..6c40df9 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -1081,8 +1081,7 @@ static void print_program_info(int flags, int level)
av_log(NULL, level, " Copyright (c) %d-%d the FFmpeg developers",
program_birth_year, CONFIG_THIS_YEAR);
av_log(NULL, level, "\n");
- av_log(NULL, level, "%sbuilt on %s %s with %s\n",
- indent, __DATE__, __TIME__, CC_IDENT);
+ av_log(NULL, level, "%sbuilt with %s\n", indent, CC_IDENT);
av_log(NULL, level, "%sconfiguration: " FFMPEG_CONFIGURATION "\n", indent);
}
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 8697e6c..5d18b10 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -839,7 +839,7 @@ HTML_COLORSTYLE_GAMMA = 80
# page will contain the date and time when the page was generated. Setting
# this to NO can help when comparing the output of multiple runs.
-HTML_TIMESTAMP = YES
+HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
# documentation will contain sections that can be hidden and shown after the
diff --git a/doc/Makefile b/doc/Makefile
index 2502922..745576c 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -114,9 +114,9 @@ doc/%-all.pod: doc/%.texi $(SRC_PATH)/doc/texi2pod.pl $(GENTEXI)
doc/%.1 doc/%.3: TAG = MAN
doc/%.1: doc/%.pod $(GENTEXI)
- $(M)pod2man --section=1 --center=" " --release=" " $< > $@
+ $(M)pod2man --section=1 --center=" " --release=" " --date=" " $< > $@
doc/%.3: doc/%.pod $(GENTEXI)
- $(M)pod2man --section=3 --center=" " --release=" " $< > $@
+ $(M)pod2man --section=3 --center=" " --release=" " --date=" " $< > $@
$(DOCS) doc/doxy/html: | doc/
$(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples
diff --git a/doc/t2h.pm b/doc/t2h.pm
index ca77842..5efb2da 100644
--- a/doc/t2h.pm
+++ b/doc/t2h.pm
@@ -186,6 +186,23 @@ EOT
}
texinfo_register_formatting_function('begin_file', \&ffmpeg_begin_file);
+sub ffmpeg_program_string($)
+{
+ my $self = shift;
+ if (defined($self->get_conf('PROGRAM'))
+ and $self->get_conf('PROGRAM') ne ''
+ and defined($self->get_conf('PACKAGE_URL'))) {
+ return $self->convert_tree(
+ $self->gdt('This document was generated using @uref{{program_homepage}, @emph{{program}}}.',
+ { 'program_homepage' => $self->get_conf('PACKAGE_URL'),
+ 'program' => $self->get_conf('PROGRAM') }));
+ } else {
+ return $self->convert_tree(
+ $self->gdt('This document was generated automatically.'));
+ }
+}
+texinfo_register_formatting_function('program_string', \&ffmpeg_program_string);
+
# Customized file ending
sub ffmpeg_end_file($)
{
diff --git a/ffprobe.c b/ffprobe.c
index 38879f1..d352bb6 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -2562,8 +2562,6 @@ static void ffprobe_show_program_version(WriterContext *w)
print_str("version", FFMPEG_VERSION);
print_fmt("copyright", "Copyright (c) %d-%d the FFmpeg developers",
program_birth_year, CONFIG_THIS_YEAR);
- print_str("build_date", __DATE__);
- print_str("build_time", __TIME__);
print_str("compiler_ident", CC_IDENT);
print_str("configuration", FFMPEG_CONFIGURATION);
writer_print_section_footer(w);
--
2.1.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
