[SCM] lives/master: Fix various cases of underlinking

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a977142be0082a9cb242c82426a2f709bc9c5428
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Jan 17 17:56:57 2016 +0100

    Fix various cases of underlinking

diff --git a/debian/patches/04-underlinking.patch b/debian/patches/04-underlinking.patch
new file mode 100644
index 0000000..33782db
--- /dev/null
+++ b/debian/patches/04-underlinking.patch
@@ -0,0 +1,71 @@
+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 @@
+ audio_fft_la_CFLAGS = $(FFTW3F_CFLAGS) $(AM_CFLAGS)
+ beat_detector_la_LDFLAGS = $(FFTW3F_LIBS) $(AM_LDFLAGS)
+ beat_detector_la_CFLAGS = $(FFTW3F_CFLAGS) $(AM_CFLAGS)
++beat_detector_la_LIBADD = -lm
+ audio_fftlibdir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
+ audio_fftlib_LTLIBRARIES = $(audio_fft_libs)
+ endif
+@@ -187,6 +188,17 @@
+ 	warpTV.la \
+ 	xeffect.la
+ 
++fourKlives_la_LIBADD = -lm
++vertigo_la_LIBADD = -lm
++fireTV_la_LIBADD = -lm
++warpTV_la_LIBADD = -lm
++plasma_la_LIBADD = -lm
++log_sig_la_LIBADD = -lm
++bump2d_la_LIBADD = -lm
++rotozoom_la_LIBADD = -lm
++kaleidoscope_la_LIBADD = -lm
++
++
+ 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
+ 
+ flv_libs = flv_decoder.la
+-FLVDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@
++FLVDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVUTIL_LIBS@
+ 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 @@
+ 
+ 
+ asf_libs = asf_decoder.la
+-ASFDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@
++ASFDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVUTIL_LIBS@
+ 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 @@
+ 
+ 
+ zzavformat_libs = zzavformat_decoder.la
+-AVIDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@
++AVIDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVUTIL_LIBS@
+ 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 @@
+ 	haar_analyser.la \
+ 	$(vjack_libs) 
+ 
++puretext_la_LIBADD = -lm
+ 
+ EXTRA_DIST=data icons
+ 
diff --git a/debian/patches/series b/debian/patches/series
index bbfc995..d63c229 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 02-drop_py3_multiencoder.patch
 parallel-build.patch
+04-underlinking.patch

-- 
lives packaging