[SCM] libav/experimental: Disable doxygen patch for now
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Mon Nov 12 18:33:49 UTC 2012
The following commit has been merged in the experimental branch:
commit 85a5da4c5259b3e0c10fd41b2f13b081c827bbef
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sun Nov 11 17:30:21 2012 +0100
Disable doxygen patch for now
can be reenabled on next upstream version. currently it is annoying
diff --git a/debian/patches/01-Tweak-doxygen-config.patch b/debian/patches/01-Tweak-doxygen-config.patch
index e738550..050f0f0 100644
--- a/debian/patches/01-Tweak-doxygen-config.patch
+++ b/debian/patches/01-Tweak-doxygen-config.patch
@@ -7,8 +7,8 @@ exclude some directories we use for packaging from doxygen documentation
Doxyfile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---- a/Doxyfile
-+++ b/Doxyfile
+--- a/doc/Doxyfile
++++ b/doc/Doxyfile
@@ -616,7 +616,7 @@ RECURSIVE = YES
# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
diff --git a/debian/patches/post-9beta2/0204-mss2-prevent-potential-uninitialized-reads.patch b/debian/patches/post-9beta2/0204-mss2-prevent-potential-uninitialized-reads.patch
index ac693da..f859084 100644
--- a/debian/patches/post-9beta2/0204-mss2-prevent-potential-uninitialized-reads.patch
+++ b/debian/patches/post-9beta2/0204-mss2-prevent-potential-uninitialized-reads.patch
@@ -12,11 +12,9 @@ Signed-off-by: Kostya Shishkov <kostya.shishkov at gmail.com>
libavcodec/mss2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c
-index 5f99b7a..bec3f45 100644
--- a/libavcodec/mss2.c
+++ b/libavcodec/mss2.c
-@@ -839,8 +839,8 @@ static av_cold int mss2_decode_init(AVCodecContext *avctx)
+@@ -839,8 +839,8 @@ static av_cold int mss2_decode_init(AVCo
if (ret = ff_mss12_decode_init(c, 1, &ctx->sc[0], &ctx->sc[1]))
return ret;
c->pal_stride = c->mask_stride;
@@ -27,6 +25,14 @@ index 5f99b7a..bec3f45 100644
if (!c->pal_pic || !c->last_pal_pic) {
mss2_decode_end(avctx);
return AVERROR(ENOMEM);
---
-1.7.9.5
-
+--- a/doc/Doxyfile
++++ b/doc/Doxyfile
+@@ -616,7 +616,7 @@ RECURSIVE = YES
+ # excluded from the INPUT source files. This way you can easily exclude a
+ # subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+-EXCLUDE =
++EXCLUDE = debian debian-shared debian-static debian-cmov .pc .git
+
+ # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+ # directories that are symbolic links (a Unix filesystem feature) are excluded
diff --git a/debian/patches/series b/debian/patches/series
index 70e61dc..7b4cff0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01-Tweak-doxygen-config.patch
03-disable-configuration-warnings.patch
# post-9beta2 patches to sync ot current master
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list