[FFmpeg-cvslog] [ffmpeg-web] branch master updated. beccedc web: Add generate-doc.sh to generate makeinfo-based ffmpeg docs

[gitolite]

The branch, master has been updated
       via  beccedc88c4df38f233984e62c85283f9b48bb77 (commit)
       via  88e2d5e52f85bc61a000e50270414dcda0e62f34 (commit)
       via  68fe7a2ae2b630a24f8a444e57947a4324f7f5aa (commit)
      from  237d4160182e6795d93591f107a21fb781b5f718 (commit)


- Log -----------------------------------------------------------------
commit beccedc88c4df38f233984e62c85283f9b48bb77
Author:     Timothy Gu <timothygu99 at gmail.com>
AuthorDate: Sun Aug 31 19:53:31 2014 -0700
Commit:     Michael Niedermayer <michaelni at gmx.at>
CommitDate: Mon Sep 1 12:29:48 2014 +0200

    web: Add generate-doc.sh to generate makeinfo-based ffmpeg docs
    
    Signed-off-by: Timothy Gu <timothygu99 at gmail.com>

diff --git a/README b/README
index 2276820..ca70560 100644
--- a/README
+++ b/README
@@ -15,17 +15,7 @@ GENERATE THE DOCUMENTATION
 
 /!\ None of the generated versions of the website contain the documentation.
 
-To generate the documentation pages:
-- Add the HTML wrappers to your environment:
-  $ export FFMPEG_HEADER1="$(cat src/template_head1 src/template_doctitle src/template_head_prod)"
-  $ export FFMPEG_HEADER2="$(cat src/template_head2 src/template_doctitle src/template_head3)"
-  $ export FFMPEG_FOOTER="$(cat src/template_footer1 src/template_footer_prod src/template_footer2)"
-- Get the main ffmpeg repo:
-  $ git clone git://source.ffmpeg.org/ffmpeg.git
-- Compile the documentation using the ffmpeg main repo Makefile:
-  $ make doc
-- Copy the generated HTML files inside the website:
-  $ cp /path/to/ffmpeg/doc/*.html /path/to/ffmpeg-web/htdocs/
+To generate the documentation pages, just `./generate-doc.sh <ffmpeg-src>`.
 
 In case of a major CSS update, please also update the `style.min.css` file in
 the main FFmpeg repo:
diff --git a/generate-doc.sh b/generate-doc.sh
new file mode 100755
index 0000000..f953a9a
--- /dev/null
+++ b/generate-doc.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# Copyright (c) 2014 Tiancheng "Timothy" Gu.
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+die() {
+    echo $1
+    exit 1
+}
+
+if [ $# != 1 ]; then
+    die "Usage: $0 <ffmpeg-source>"
+fi
+
+src=$1
+current_dir=$(pwd)
+
+export FFMPEG_HEADER1="$(cat src/template_head1)"
+export FFMPEG_HEADER2="$(cat src/template_head_prod src/template_head2)"
+export FFMPEG_HEADER3="$(cat src/template_head3)"
+export FFMPEG_FOOTER="$(cat src/template_footer1 src/template_footer_prod src/template_footer2)"
+
+rm -rf build-doc
+mkdir build-doc && cd build-doc
+$src/configure --enable-gpl --disable-yasm || die "configure failed"
+make doc || die "doc not made"
+cp doc/*.html ../htdocs/ || die "copy failed"
+
+cd ..
+rm -rf build-doc
\ No newline at end of file

commit 88e2d5e52f85bc61a000e50270414dcda0e62f34
Author:     Timothy Gu <timothygu99 at gmail.com>
AuthorDate: Sun Aug 31 19:53:30 2014 -0700
Commit:     Michael Niedermayer <michaelni at gmx.at>
CommitDate: Mon Sep 1 12:12:17 2014 +0200

    style: add "warning" style similar to .info but has a red border
    
    Signed-off-by: Timothy Gu <timothygu99 at gmail.com>

diff --git a/src/less/style.less b/src/less/style.less
index 6a26684..0c9ea03 100644
--- a/src/less/style.less
+++ b/src/less/style.less
@@ -15,6 +15,7 @@
 @Cseconddarkdark: darken(@Cseconddark, 10%);
 @Csecondlight: lighten(@Csecond, 15%);
 @Csecondlightlight: lighten(@Csecondlight, 20%);
+ at Cwarning: #ae4c4c;
 
 // ************************************************************************* //
 // SIZES
@@ -180,17 +181,24 @@ a.well {
     }
 }
 
-.info {
+.info, .warning {
     margin: 10px;
     padding: 10px;
     background-color: @Cmainlight;
-    border-left: 10px @Csecond solid;
     color: @Cinvert;
     code {
 	background-color: @Cmain;
     }
 }
 
+.info {
+    border-left: 10px @Csecond solid;
+}
+
+.warning {
+    border-left: 10px @Cwarning solid;
+}
+
 .with-icon {
     padding: 30px;
     .pull-left {

commit 68fe7a2ae2b630a24f8a444e57947a4324f7f5aa
Author:     Michael Niedermayer <michaelni at gmx.at>
AuthorDate: Sat Aug 30 23:36:15 2014 +0200
Commit:     Michael Niedermayer <michaelni at gmx.at>
CommitDate: Sat Aug 30 23:37:06 2014 +0200

    web/security: put 5865d599c38850b2a1fd33fe197eb8fcc6c970a4 under () as the encoder lacked alpha support back then

diff --git a/src/security b/src/security
index da94f25..f521cca 100644
--- a/src/security
+++ b/src/security
@@ -276,7 +276,7 @@ Fixes following vulnerabilities:
 </p>
 <pre>
 CVE-2014-5272, 5865d599c38850b2a1fd33fe197eb8fcc6c970a4 / 3539d6c63a16e1b2874bb037a86f317449c58770
-CVE-2014-5271, 11a61dd0e2b51bdb610a80e322667c3284f6d761 / 52b81ff4635c077b2bc8b8d3637d933b6629d803
+(CVE-2014-5271, 11a61dd0e2b51bdb610a80e322667c3284f6d761 / 52b81ff4635c077b2bc8b8d3637d933b6629d803)
 </pre>
 
 <h3>1.1.12</h3>

-----------------------------------------------------------------------

Summary of changes:
 README              |   12 +-----------
 generate-doc.sh     |   41 +++++++++++++++++++++++++++++++++++++++++
 src/less/style.less |   12 ++++++++++--
 src/security        |    2 +-
 4 files changed, 53 insertions(+), 14 deletions(-)
 create mode 100755 generate-doc.sh


hooks/post-receive
--