Date: Tue, 18 Mar 2014 22:19:16 GMT From: Bertram Scharpf <software@bertram-scharpf.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/187713: multimedia/xawtv doesn't compile / has no mtt Message-ID: <201403182219.s2IMJG0b081282@cgiserv.freebsd.org> Resent-Message-ID: <201403182220.s2IMK0b5001577@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187713 >Category: ports >Synopsis: multimedia/xawtv doesn't compile / has no mtt >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Mar 18 22:20:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Bertram Scharpf >Release: 10.0 >Organization: >Environment: Not relevant >Description: I have WITHOUT_ICONV=1 in /etc/src.conf because mail/exim needs it. First, make bails out because ld doesn't find libiconv. Second, mtt will not be built. >How-To-Repeat: >Fix: commit 305c9eff8c108686da16d455ca0b0a1c426812fa Author: Bertram Scharpf <software@bertram-scharpf.de> Date: 2014-03-18 15:02:26 +0100 Bugfix xawtv diff --git a/multimedia/xawtv/files/patch-console::Subdir.mk b/multimedia/xawtv/files/patch-console::Subdir.mk new file mode 100644 index 0000000..e8156a1 --- /dev/null +++ b/multimedia/xawtv/files/patch-console::Subdir.mk @@ -0,0 +1,11 @@ +--- console/Subdir.mk.orig 2013-04-02 15:19:10.000000000 +0200 ++++ console/Subdir.mk 2014-03-18 14:48:44.000000000 +0100 +@@ -78,7 +78,7 @@ + $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \ + $(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/scantv : LDLIBS += $(THREAD_LIBS) $(VBI_LIBS) -ljpeg -ldl -liconv + console/streamer : LDLIBS += $(THREAD_LIBS) -ljpeg -lm -ldl + console/webcam : LDLIBS += $(THREAD_LIBS) -ljpeg -lm -ldl + console/radio : LDLIBS += $(CURSES_LIBS) $(ALSA_LIBS) $(THREAD_LIBS) -lm diff --git a/multimedia/xawtv/files/patch-vbistuff::Subdir.mk b/multimedia/xawtv/files/patch-vbistuff::Subdir.mk new file mode 100644 index 0000000..6764a12 --- /dev/null +++ b/multimedia/xawtv/files/patch-vbistuff::Subdir.mk @@ -0,0 +1,11 @@ +--- vbistuff/Subdir.mk.orig 2014-03-18 14:31:59.000000000 +0100 ++++ vbistuff/Subdir.mk 2014-03-18 14:23:19.000000000 +0100 +@@ -25,7 +25,7 @@ + vbistuff/ntsc-cc: vbistuff/ntsc-cc.o + + # libraries to link +-vbistuff/alevtd : LDLIBS += $(VBI_LIBS) ++vbistuff/alevtd : LDLIBS += $(VBI_LIBS) -liconv + vbistuff/ntsc-cc : LDLIBS += $(ATHENA_LIBS) + + # global targets diff --git a/multimedia/xawtv/files/patch-x11::Subdir.mk b/multimedia/xawtv/files/patch-x11::Subdir.mk index 3b528ce..62c053f 100644 --- a/multimedia/xawtv/files/patch-x11::Subdir.mk +++ b/multimedia/xawtv/files/patch-x11::Subdir.mk @@ -1,6 +1,34 @@ ---- x11/Subdir.mk.orig Mon Jan 12 18:56:17 2004 -+++ x11/Subdir.mk Mon Feb 9 18:49:10 2004 -@@ -116,8 +116,8 @@ +--- x11/Subdir.mk.orig 2014-03-18 18:51:42.000000000 +0100 ++++ x11/Subdir.mk 2013-04-02 15:19:10.000000000 +0200 +@@ -15,7 +15,7 @@ + TARGETS-x11 += \ + x11/motv + endif +-ifeq ($(FOUND_OS)$(FOUND_MOTIF)$(FOUND_ZVBI),linuxyesyes) ++ifeq ($(FOUND_MOTIF)$(FOUND_ZVBI),yesyes) + TARGETS-x11 += \ + x11/mtt + endif +@@ -98,13 +98,13 @@ + # libraries to link + x11/xawtv : LDLIBS += \ + $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \ +- $(ATHENA_LIBS) $(VBI_LIBS) $(GL_LIBS) -ljpeg -lm -ldl -lfontconfig ++ $(ATHENA_LIBS) $(VBI_LIBS) $(GL_LIBS) -ljpeg -lm -ldl -lfontconfig -liconv + x11/motv : LDLIBS += \ + $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \ +- $(MOTIF_LIBS) $(VBI_LIBS) $(GL_LIBS) -ljpeg -lm -ldl +-x11/mtt : LDLIBS += $(THREAD_LIBS) $(MOTIF_LIBS) $(VBI_LIBS) -ljpeg -ldl +-x11/v4lctl : LDLIBS += $(THREAD_LIBS) $(ATHENA_LIBS) -ljpeg -lm -ldl +-x11/pia : LDLIBS += $(ATHENA_LIBS) $(GL_LIBS) -ljpeg -lm -ldl ++ $(MOTIF_LIBS) $(VBI_LIBS) $(GL_LIBS) -ljpeg -lm -ldl -liconv ++x11/mtt : LDLIBS += $(THREAD_LIBS) $(MOTIF_LIBS) $(VBI_LIBS) -ljpeg -ldl -liconv ++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) +@@ -117,8 +117,8 @@ x11/pia : LDFLAGS := $(DLFLAGS) # compile flags @@ -11,7 +39,7 @@ # i18n -@@ -128,12 +128,12 @@ +@@ -129,12 +129,12 @@ # local targets x11/complete-xaw.o: x11/complete.c @$(echo_compile_c) >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403182219.s2IMJG0b081282>