[SCM] lives/master: Drop 11-weed_headers.patch, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Jan 26 09:35:16 UTC 2012


The following commit has been merged in the master branch:
commit 2bf1df56f7290963533a760c51dbd9aec0efd4d6
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jan 26 10:35:04 2012 +0100

    Drop 11-weed_headers.patch, applied upstream.

diff --git a/debian/patches/11-weed_headers.patch b/debian/patches/11-weed_headers.patch
deleted file mode 100644
index cdae1bd..0000000
--- a/debian/patches/11-weed_headers.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Prevent FTBFS when libweed is not available system-wide.
-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/mkv_decoder.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- 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
- 
-+#ifndef HAVE_SYSTEM_WEED
-+#include "../../../libweed/weed-palettes.h"
-+#endif
-+
- #define HAVE_AVCODEC
- 
- #ifdef HAVE_SYSTEM_WEED_COMPAT
diff --git a/debian/patches/series b/debian/patches/series
index 49d2bbf..28e26b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
-11-weed_headers.patch

-- 
lives packaging



More information about the pkg-multimedia-commits mailing list