[SCM] lives/master: Refresh patchset

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d3e24ff91c70d17bcec642e2e67012e3f9d9756b
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Sep 4 17:01:19 2016 +0100

    Refresh patchset

diff --git a/debian/patches/02-drop_py3_multiencoder.patch b/debian/patches/02-drop_py3_multiencoder.patch
index 63c0971..680c0a1 100644
--- a/debian/patches/02-drop_py3_multiencoder.patch
+++ b/debian/patches/02-drop_py3_multiencoder.patch
@@ -19,7 +19,7 @@ Forwarded: not-needed
  sswf_encoder \
 --- lives.orig/lives-plugins/plugins/encoders/Makefile.in
 +++ lives/lives-plugins/plugins/encoders/Makefile.in
-@@ -424,7 +424,6 @@ encoder_DATA = encodedv_encoder \
+@@ -442,7 +442,6 @@ encoder_DATA = encodedv_encoder \
  ffmpeg_encoder \
  mencoder_encoder \
  mjpegtools_encoder \
diff --git a/debian/patches/04-underlinking.patch b/debian/patches/04-underlinking.patch
index 33782db..cf07448 100644
--- a/debian/patches/04-underlinking.patch
+++ b/debian/patches/04-underlinking.patch
@@ -2,9 +2,15 @@ Description: Fix underlinking
 Author: Sebastian Ramacher <sramacher at debian.org>
 Last-Update: 2016-01-17
 
---- a/lives-plugins/weed-plugins/Makefile.am
-+++ b/lives-plugins/weed-plugins/Makefile.am
-@@ -100,6 +100,7 @@
+---
+ lives-plugins/plugins/decoders/Makefile.am |    6 +++---
+ lives-plugins/weed-plugins/Makefile.am     |   12 ++++++++++++
+ lives-plugins/weed-plugins/gdk/Makefile.am |    1 +
+ 3 files changed, 16 insertions(+), 3 deletions(-)
+
+--- lives.orig/lives-plugins/weed-plugins/Makefile.am
++++ lives/lives-plugins/weed-plugins/Makefile.am
+@@ -105,6 +105,7 @@ audio_fft_la_LDFLAGS = $(FFTW3F_LIBS) $(
  audio_fft_la_CFLAGS = $(FFTW3F_CFLAGS) $(AM_CFLAGS)
  beat_detector_la_LDFLAGS = $(FFTW3F_LIBS) $(AM_LDFLAGS)
  beat_detector_la_CFLAGS = $(FFTW3F_CFLAGS) $(AM_CFLAGS)
@@ -12,7 +18,7 @@ Last-Update: 2016-01-17
  audio_fftlibdir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
  audio_fftlib_LTLIBRARIES = $(audio_fft_libs)
  endif
-@@ -187,6 +188,17 @@
+@@ -194,6 +195,17 @@ fxpluginslib_LTLIBRARIES = RGBdelay.la \
  	warpTV.la \
  	xeffect.la
  
@@ -30,10 +36,10 @@ Last-Update: 2016-01-17
  EXTRA_DIST=data icons syna.h weed-utils-code.c weed-plugin-utils.c
  
  install-data-local:
---- a/lives-plugins/plugins/decoders/Makefile.am
-+++ b/lives-plugins/plugins/decoders/Makefile.am
-@@ -99,7 +99,7 @@
- endif
+--- lives.orig/lives-plugins/plugins/decoders/Makefile.am
++++ lives/lives-plugins/plugins/decoders/Makefile.am
+@@ -117,7 +117,7 @@ endif
+ 
  
  flv_libs = flv_decoder.la
 -FLVDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@
@@ -41,7 +47,7 @@ Last-Update: 2016-01-17
  FLVDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations
  flv_decoder_la_SOURCES = flv_decoder.c flv_decoder.h dec_helper.c
  flv_decoder_la_CFLAGS = $(libav_cflags) $(shared_cflags) $(weed_cflags) $(FLVDEC_CFLAGS)
-@@ -107,7 +107,7 @@
+@@ -125,7 +125,7 @@ flv_decoder_la_LDFLAGS = $(shared_ldflag
  
  
  asf_libs = asf_decoder.la
@@ -50,7 +56,7 @@ Last-Update: 2016-01-17
  ASFDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations
  asf_decoder_la_SOURCES = asf_decoder.c asf_decoder.h dec_helper.c
  asf_decoder_la_CFLAGS = $(libav_cflags) $(shared_cflags) $(weed_cflags) $(ASFDEC_CFLAGS)
-@@ -135,7 +135,7 @@
+@@ -153,7 +153,7 @@ mpegts_decoder_la_LDFLAGS = $(shared_ldf
  
  
  zzavformat_libs = zzavformat_decoder.la
@@ -59,9 +65,9 @@ Last-Update: 2016-01-17
  AVIDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations
  zzavformat_decoder_la_SOURCES = avformat_decoder.c avformat_decoder.h
  zzavformat_decoder_la_CFLAGS = $(libav_cflags) $(shared_cflags) $(weed_cflags) $(AVIDEC_CFLAGS)
---- a/lives-plugins/weed-plugins/gdk/Makefile.am
-+++ b/lives-plugins/weed-plugins/gdk/Makefile.am
-@@ -54,6 +54,7 @@
+--- lives.orig/lives-plugins/weed-plugins/gdk/Makefile.am
++++ lives/lives-plugins/weed-plugins/gdk/Makefile.am
+@@ -54,6 +54,7 @@ fxpluginslib_LTLIBRARIES = gdk_fast_resi
  	haar_analyser.la \
  	$(vjack_libs) 
  
diff --git a/debian/patches/series b/debian/patches/series
index 89f5e9a..d63c229 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 02-drop_py3_multiencoder.patch
 parallel-build.patch
 04-underlinking.patch
-ffmpeg3.0.patch

-- 
lives packaging