[SCM] lives/master: Revert "Remove 11-weed_headers.patch, applied upstream."

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b60203ed969bdf8e15d1d8b285f575131423c45a
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Dec 16 09:24:35 2011 +0100

    Revert "Remove 11-weed_headers.patch, applied upstream."
    
    This reverts commit 6587e4bdcf017f0be64c9d41a0e0ebea3d1b66e4.

diff --git a/debian/patches/11-weed_headers.patch b/debian/patches/11-weed_headers.patch
new file mode 100644
index 0000000..3b1041d
--- /dev/null
+++ b/debian/patches/11-weed_headers.patch
@@ -0,0 +1,73 @@
+Description: Prevent FTBFS when libweed is not available system-wide.
+Bug: https://sf.net/tracker/?func=detail&atid=507139&aid=3449357&group_id=64341
+Applied-Upstream:
+ http://lives.svn.sourceforge.net/viewvc/lives?view=revision&revision=1110
+---
+ lives-plugins/plugins/decoders/asf_decoder.c |    4 ++++
+ lives-plugins/plugins/decoders/flv_decoder.c |    4 ++++
+ src/colourspace.c                            |   19 +++++++------------
+ 3 files changed, 15 insertions(+), 12 deletions(-)
+
+--- lives.orig/lives-plugins/plugins/decoders/asf_decoder.c
++++ lives/lives-plugins/plugins/decoders/asf_decoder.c
+@@ -20,6 +20,10 @@ const char *plugin_version="LiVES asf/wm
+ #undef HAVE_AV_CONFIG_H
+ #endif
+ 
++#ifndef HAVE_SYSTEM_WEED
++#include "../../../libweed/weed-palettes.h"
++#endif
++
+ #define HAVE_AVCODEC
+ 
+ #ifdef HAVE_SYSTEM_WEED_COMPAT
+--- lives.orig/lives-plugins/plugins/decoders/flv_decoder.c
++++ lives/lives-plugins/plugins/decoders/flv_decoder.c
+@@ -20,6 +20,10 @@ const char *plugin_version="LiVES flv de
+ #undef HAVE_AV_CONFIG_H
+ #endif
+ 
++#ifndef HAVE_SYSTEM_WEED
++#include "../../../libweed/weed-palettes.h"
++#endif
++
+ #define HAVE_AVCODEC
+ 
+ #ifdef HAVE_SYSTEM_WEED_COMPAT
+--- lives.orig/src/colourspace.c
++++ lives/src/colourspace.c
+@@ -45,27 +45,22 @@
+ #include "weed/weed-effects.h"
+ #include "weed/weed-host.h"
+ 
+-#ifdef USE_SWSCALE
+-
+-#ifdef HAVE_SYSTEM_WEED_COMPAT
+-#include "weed/weed-compat.h"
+-#else
+-#include "../libweed/weed-compat.h"
+-#endif // HAVE_SYSTEM_WEED_COMPAT
+-
+-#endif // USE_SWSCALE
+-
+ #else // HAVE_SYSTEM_WEED
+ #include "../libweed/weed.h"
+ #include "../libweed/weed-palettes.h"
+ #include "../libweed/weed-effects.h"
+ #include "../libweed/weed-host.h"
++#endif
+ 
+ #ifdef USE_SWSCALE
++
++#ifdef HAVE_SYSTEM_WEED_COMPAT
++#include "weed/weed-compat.h"
++#else
+ #include "../libweed/weed-compat.h"
+-#endif // USE_SWSCALE
++#endif // HAVE_SYSTEM_WEED_COMPAT
+ 
+-#endif // HAVE_SYSTEM_WEED
++#endif // USE_SWSCALE
+ 
+ #include "support.h"
+ #include "main.h"
diff --git a/debian/patches/series b/debian/patches/series
index 28e26b8..49d2bbf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
+11-weed_headers.patch

-- 
lives packaging