summaryrefslogtreecommitdiffstats
path: root/multimedia/LiVES/patches
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/LiVES/patches')
-rw-r--r--multimedia/LiVES/patches/drop_py3_multiencoder.patch29
-rw-r--r--multimedia/LiVES/patches/weed_palettes.patch14
2 files changed, 43 insertions, 0 deletions
diff --git a/multimedia/LiVES/patches/drop_py3_multiencoder.patch b/multimedia/LiVES/patches/drop_py3_multiencoder.patch
new file mode 100644
index 0000000000..9a01a71905
--- /dev/null
+++ b/multimedia/LiVES/patches/drop_py3_multiencoder.patch
@@ -0,0 +1,29 @@
+Description: Drop Python3 version of multiencoder plugin.
+Author: Alessio Treglia <alessio@debian.org>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/632833
+Forwarded: not-needed
+---
+ lives-plugins/plugins/encoders/Makefile.am | 1 -
+ lives-plugins/plugins/encoders/Makefile.in | 1 -
+ 2 files changed, 2 deletions(-)
+
+--- lives.orig/lives-plugins/plugins/encoders/Makefile.am
++++ lives/lives-plugins/plugins/encoders/Makefile.am
+@@ -8,7 +8,6 @@ ffmpeg_encoder \
+ mencoder_encoder \
+ mjpegtools_encoder \
+ multi_encoder \
+-multi_encoder3 \
+ qtutils_encoder \
+ sswf_encoder \
+ transcode_encoder \
+--- lives.orig/lives-plugins/plugins/encoders/Makefile.in
++++ lives/lives-plugins/plugins/encoders/Makefile.in
+@@ -333,7 +333,6 @@ ffmpeg_encoder \
+ mencoder_encoder \
+ mjpegtools_encoder \
+ multi_encoder \
+-multi_encoder3 \
+ qtutils_encoder \
+ sswf_encoder \
+ transcode_encoder \
diff --git a/multimedia/LiVES/patches/weed_palettes.patch b/multimedia/LiVES/patches/weed_palettes.patch
new file mode 100644
index 0000000000..cbbe55222f
--- /dev/null
+++ b/multimedia/LiVES/patches/weed_palettes.patch
@@ -0,0 +1,14 @@
+diff -Naur lives-1.4.9.orig/lives-plugins/plugins/decoders/mkv_decoder.c lives-1.4.9/lives-plugins/plugins/decoders/mkv_decoder.c
+--- lives-1.4.9.orig/lives-plugins/plugins/decoders/mkv_decoder.c 2011-12-08 06:33:19.000000000 +0100
++++ lives-1.4.9/lives-plugins/plugins/decoders/mkv_decoder.c 2011-12-23 13:12:12.772897712 +0100
+@@ -50,6 +50,10 @@
+
+ #define HAVE_AVCODEC
+
++#ifndef HAVE_SYSTEM_WEED
++#include "../../../libweed/weed-palettes.h"
++#endif
++
+ #ifdef HAVE_SYSTEM_WEED_COMPAT
+ #include "weed/weed-compat.h"
+ #else