[SCM] lives/master: Re-introduce 11-weed_headers.patch

[alessio at users.alioth.debian.org]

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

    Re-introduce 11-weed_headers.patch

diff --git a/debian/patches/11-weed_headers.patch b/debian/patches/11-weed_headers.patch
index 3b1041d..cdae1bd 100644
--- a/debian/patches/11-weed_headers.patch
+++ b/debian/patches/11-weed_headers.patch
@@ -1,16 +1,15 @@
 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
+Author: Alessio Treglia <alessio at debian.org>
+Bug:
+ https://sf.net/tracker/index.php?func=detail&aid=3460799&group_id=64341&atid=507139
+Forwarded: yes
 ---
- 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-plugins/plugins/decoders/mkv_decoder.c |    4 ++++
+ 1 file changed, 4 insertions(+)
 
---- 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
+--- lives.orig/lives-plugins/plugins/decoders/mkv_decoder.c
++++ lives/lives-plugins/plugins/decoders/mkv_decoder.c
+@@ -48,6 +48,10 @@ const char *plugin_version="LiVES mkv de
  #undef HAVE_AV_CONFIG_H
  #endif
  
@@ -21,53 +20,3 @@ Applied-Upstream:
  #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 49d2bbf..c0db087 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
 11-weed_headers.patch
+11-weed_headers.patch

-- 
lives packaging