This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/xawtv3.git tree:

Subject: xawtv3: fix build with ld --as-needed --no-copy-dt-needed
Author:  Julian Taylor <[email protected]>
Date:    Sun Aug 7 00:23:18 2011 +0200

xawtv fails to build with more restrictive linking flags used in
ubuntu and debian
and some plugins are missing explicit links against needed libraries see:
https://bugs.launchpad.net/debian/+source/xawtv/+bug/821916
This patch is a squash of patch 102 and 103 of ubuntu:
http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/oneiric/xawtv/oneiric/files/head:/debian/patches/

Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 console/Subdir.mk       |   10 +++++-----
 libng/plugins/Subdir.mk |    3 +++
 x11/Subdir.mk           |    6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

---

http://git.linuxtv.org/xawtv3.git?a=commitdiff;h=35f4298d08f4b295475925e20925d77152b7eeb5

diff --git a/console/Subdir.mk b/console/Subdir.mk
index d17666e..0386912 100644
--- a/console/Subdir.mk
+++ b/console/Subdir.mk
@@ -73,11 +73,11 @@ console/v4l-conf: console/v4l-conf.o
 # libraries to link
 console/fbtv     : LDLIBS  += \
        $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \
-       $(FS_LIBS) -ljpeg -lm
-console/ttv      : LDLIBS  += $(THREAD_LIBS) $(AA_LIBS) -ljpeg -lm
-console/scantv   : LDLIBS  += $(THREAD_LIBS) $(VBI_LIBS) -ljpeg
-console/streamer : LDLIBS  += $(THREAD_LIBS) -ljpeg -lm
-console/webcam   : LDLIBS  += $(THREAD_LIBS) -ljpeg -lm
+       $(FS_LIBS) -ljpeg -lm -ldl
+console/ttv      : LDLIBS  += $(THREAD_LIBS) $(AA_LIBS) -ljpeg -lm -ldl
+console/scantv   : LDLIBS  += $(THREAD_LIBS) $(VBI_LIBS) -ljpeg -ldl
+console/streamer : LDLIBS  += $(THREAD_LIBS) -ljpeg -lm -ldl
+console/webcam   : LDLIBS  += $(THREAD_LIBS) -ljpeg -lm -ldl
 console/radio    : LDLIBS  += $(CURSES_LIBS)
 console/record   : LDLIBS  += $(CURSES_LIBS)
 console/v4l-conf : LDLIBS  += $(ATHENA_LIBS)
diff --git a/libng/plugins/Subdir.mk b/libng/plugins/Subdir.mk
index 9c47955..c729045 100644
--- a/libng/plugins/Subdir.mk
+++ b/libng/plugins/Subdir.mk
@@ -49,6 +49,9 @@ libng/plugins/drv0-v4l2.so: LDLIBS := -lv4l2 -lexplain
 else
 libng/plugins/drv0-libv4l.so: LDLIBS := -lv4l2
 endif
+libng/plugins/flt-disor.so: LDLIBS := -lm
+libng/plugins/flt-gamma.so: LDLIBS := -lm
+libng/plugins/conv-mjpeg.so: LDLIBS := -ljpeg
 
 # global targets
 all:: $(TARGETS-plugins)
diff --git a/x11/Subdir.mk b/x11/Subdir.mk
index 2602b95..aea7441 100644
--- a/x11/Subdir.mk
+++ b/x11/Subdir.mk
@@ -98,13 +98,13 @@ x11/propwatch:    x11/propwatch.o
 # libraries to link
 x11/xawtv        : LDLIBS  += \
        $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \
-       $(ATHENA_LIBS) $(VBI_LIBS) $(GL_LIBS) -ljpeg -lm
+       $(ATHENA_LIBS) $(VBI_LIBS) $(GL_LIBS) -ljpeg -lm -ldl -lfontconfig
 x11/motv         : LDLIBS  += \
        $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \
        $(MOTIF_LIBS) $(VBI_LIBS) $(GL_LIBS) -ljpeg -lm
 x11/mtt          : LDLIBS  += $(THREAD_LIBS) $(MOTIF_LIBS) $(VBI_LIBS) -ljpeg
-x11/v4lctl       : LDLIBS  += $(THREAD_LIBS) $(ATHENA_LIBS) -ljpeg -lm
-x11/pia          : LDLIBS  += $(ATHENA_LIBS) $(GL_LIBS) -ljpeg -lm
+x11/v4lctl       : LDLIBS  += $(THREAD_LIBS) $(ATHENA_LIBS) -ljpeg -lm -ldl
+x11/pia          : LDLIBS  += $(ATHENA_LIBS) $(GL_LIBS) -ljpeg -lm -ldl
 x11/rootv        : LDLIBS  += $(ATHENA_LIBS)
 x11/xawtv-remote : LDLIBS  += $(ATHENA_LIBS)
 x11/propwatch    : LDLIBS  += $(ATHENA_LIBS)

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to