[SCM] ffmpeg/master: Add patch to make apidoc output independent of SRC_PATH.

[aca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 319d43f4bae1feee001930487fe156fb5336972f
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sun Dec 20 23:11:46 2015 +0100

    Add patch to make apidoc output independent of SRC_PATH.

diff --git a/debian/patches/doc-make-apidoc-output-independent-of-SRC_PATH.patch b/debian/patches/doc-make-apidoc-output-independent-of-SRC_PATH.patch
new file mode 100644
index 0000000..e402cac
--- /dev/null
+++ b/debian/patches/doc-make-apidoc-output-independent-of-SRC_PATH.patch
@@ -0,0 +1,68 @@
+From 1a7fb319f598efb0f67ae1a3a6fa9ac730efa9cb Mon Sep 17 00:00:00 2001
+From: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Date: Sun, 20 Dec 2015 22:20:57 +0100
+Subject: [PATCH] doc: make apidoc output independent of SRC_PATH
+
+Previously it included the SRC_PATH in every title.
+
+Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+---
+ doc/Makefile        |  7 ++++---
+ doc/doxy-wrapper.sh | 11 ++++++-----
+ 2 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/doc/Makefile b/doc/Makefile
+index 3e67c2a..afa7e22 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -124,11 +124,12 @@ $(DOCS) doc/doxy/html: | doc/
+ $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples
+ OBJDIRS += doc/examples
+ 
+-DOXY_INPUT      = $(addprefix $(SRC_PATH)/, $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) $(LIB_EXAMPLES:%$(EXESUF)=%.c))
++DOXY_INPUT      = $(INSTHEADERS) $(DOC_EXAMPLES:%$(EXESUF)=%.c) $(LIB_EXAMPLES:%$(EXESUF)=%.c)
++DOXY_INPUT_DEPS = $(addprefix $(SRC_PATH)/, $(DOXY_INPUT))
+ 
+ doc/doxy/html: TAG = DOXY
+-doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(SRC_PATH)/doc/doxy-wrapper.sh $(DOXY_INPUT)
+-	$(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $< $(DOXYGEN) $(DOXY_INPUT)
++doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(SRC_PATH)/doc/doxy-wrapper.sh $(DOXY_INPUT_DEPS)
++	OUT_DIR=$$PWD/doc/doxy; cd $(SRC_PATH); $(M)./doc/doxy-wrapper.sh $$OUT_DIR $< $(DOXYGEN) $(DOXY_INPUT);
+ 
+ install-doc: install-html install-man
+ 
+diff --git a/doc/doxy-wrapper.sh b/doc/doxy-wrapper.sh
+index 9720e54..0c02777 100755
+--- a/doc/doxy-wrapper.sh
++++ b/doc/doxy-wrapper.sh
+@@ -1,21 +1,22 @@
+ #!/bin/sh
+ 
+-SRC_PATH="${1}"
++OUT_DIR="${1}"
+ DOXYFILE="${2}"
+ DOXYGEN="${3}"
+ 
+ shift 3
+ 
+-if [ -e "$SRC_PATH/VERSION" ]; then
+-    VERSION=`cat "$SRC_PATH/VERSION"`
++if [ -e "VERSION" ]; then
++    VERSION=`cat "VERSION"`
+ else
+-    VERSION=`cd "$SRC_PATH"; git describe`
++    VERSION=`git describe`
+ fi
+ 
+ $DOXYGEN - <<EOF
+ @INCLUDE        = ${DOXYFILE}
+ INPUT           = $@
+-EXAMPLE_PATH    = ${SRC_PATH}/doc/examples
++EXAMPLE_PATH    = doc/examples
+ HTML_TIMESTAMP  = NO
+ PROJECT_NUMBER  = $VERSION
++OUTPUT_DIRECTORY = $OUT_DIR
+ EOF
+-- 
+2.6.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 0783efa..4adb5e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Change-symbol-versioning.patch
+doc-make-apidoc-output-independent-of-SRC_PATH.patch

-- 
ffmpeg packaging