Date: Sun, 31 Jul 2016 14:48:50 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419385 - in head/audio/raop_play: . files Message-ID: <201607311448.u6VEmofs004482@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sun Jul 31 14:48:49 2016 New Revision: 419385 URL: https://svnweb.freebsd.org/changeset/ports/419385 Log: Fix build, using getline(3) from libc Reported by: pkg-fallout Deleted: head/audio/raop_play/files/getline.c head/audio/raop_play/files/getline.h head/audio/raop_play/files/patch-aexcl_aexcl__play.cxx Modified: head/audio/raop_play/Makefile head/audio/raop_play/files/patch-aexcl_Makefile.in head/audio/raop_play/files/patch-raop__play_Makefile.in head/audio/raop_play/files/patch-rendezvous_Client.c head/audio/raop_play/files/patch-rendezvous_Makefile.in Modified: head/audio/raop_play/Makefile ============================================================================== --- head/audio/raop_play/Makefile Sun Jul 31 14:40:58 2016 (r419384) +++ head/audio/raop_play/Makefile Sun Jul 31 14:48:49 2016 (r419385) @@ -22,6 +22,7 @@ RUN_DEPENDS= mpg321:audio/mpg321 \ flac:audio/flac GNU_CONFIGURE= yes +CFLAGS+= -D_WITH_GETLINE LDFLAGS+= `fltk-config --ldflags` USES= gmake USE_GNOME= glib20 @@ -30,7 +31,4 @@ post-patch: @${REINPLACE_CMD} 's/-lssl/-lcrypto/' \ ${WRKSRC}/configure ${WRKSRC}/raop_play/Makefile.in -pre-build: - ${CP} ${FILESDIR}/getline.c ${FILESDIR}/getline.h ${WRKSRC}/rendezvous/ - .include <bsd.port.mk> Modified: head/audio/raop_play/files/patch-aexcl_Makefile.in ============================================================================== --- head/audio/raop_play/files/patch-aexcl_Makefile.in Sun Jul 31 14:40:58 2016 (r419384) +++ head/audio/raop_play/files/patch-aexcl_Makefile.in Sun Jul 31 14:48:49 2016 (r419385) @@ -25,13 +25,11 @@ ifdef GLIB_SUBST GLIB_SUBST_OBJ = ipod/glibsubst.o -@@ -29,8 +29,8 @@ endif - +@@ -30,7 +30,7 @@ endif all: $(TARGET) --$(TARGET): aexcl_gui.o aexcl_play.o ipod_browser.o ../raop_play/aexcl_lib.o ipod/itunesdb.o $(GLIB_SUBST_OBJ) + $(TARGET): aexcl_gui.o aexcl_play.o ipod_browser.o ../raop_play/aexcl_lib.o ipod/itunesdb.o $(GLIB_SUBST_OBJ) - $(CXX) -o $@ $^ -lfltk $(GLIB_LINK) -+$(TARGET): aexcl_gui.o aexcl_play.o ipod_browser.o ../raop_play/aexcl_lib.o ipod/itunesdb.o ../rendezvous/getline.o $(GLIB_SUBST_OBJ) + $(CXX) $(LDFLAGS) -o $@ $^ -lfltk $(GLIB_LINK) install: Modified: head/audio/raop_play/files/patch-raop__play_Makefile.in ============================================================================== --- head/audio/raop_play/files/patch-raop__play_Makefile.in Sun Jul 31 14:40:58 2016 (r419384) +++ head/audio/raop_play/files/patch-raop__play_Makefile.in Sun Jul 31 14:48:49 2016 (r419385) @@ -8,7 +8,7 @@ LIBS = @LIBS@ prefix = @prefix@ exec_prefix = @exec_prefix@ -@@ -12,15 +13,15 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m +@@ -12,7 +13,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m TARGET=raop_play DESTDIR = @@ -16,9 +16,8 @@ +CFLAGS=-Wall -I$(prefix)/include/ OBJS := raop_play.o raop_client.o rtsp_client.o aexcl_lib.o base64.o aes.o m4a_stream.o \ audio_stream.o wav_stream.o mp3_stream.o flac_stream.o ogg_stream.o aac_stream.o pls_stream.o \ --pcm_stream.o flac_stream.o -+pcm_stream.o flac_stream.o ../rendezvous/getline.o - + pcm_stream.o flac_stream.o +@@ -20,7 +21,7 @@ pcm_stream.o flac_stream.o all: $(TARGET) raop_play: $(OBJS) Modified: head/audio/raop_play/files/patch-rendezvous_Client.c ============================================================================== --- head/audio/raop_play/files/patch-rendezvous_Client.c Sun Jul 31 14:40:58 2016 (r419384) +++ head/audio/raop_play/files/patch-rendezvous_Client.c Sun Jul 31 14:48:49 2016 (r419385) @@ -1,13 +1,11 @@ --- rendezvous/Client.c.orig 2005-12-16 14:17:02 UTC +++ rendezvous/Client.c -@@ -83,8 +83,9 @@ +@@ -83,7 +83,7 @@ #include <string.h> #include <unistd.h> #include <stdlib.h> -#include <asm/types.h> +#include <sys/types.h> -+#include "getline.h" #include "mDNSClientAPI.h"// Defines the interface to the mDNS core code #include "mDNSPosix.h" // Defines the specific types needed to run mDNS on this platform - #include "ExampleClientApp.h" Modified: head/audio/raop_play/files/patch-rendezvous_Makefile.in ============================================================================== --- head/audio/raop_play/files/patch-rendezvous_Makefile.in Sun Jul 31 14:40:58 2016 (r419384) +++ head/audio/raop_play/files/patch-rendezvous_Makefile.in Sun Jul 31 14:48:49 2016 (r419385) @@ -17,14 +17,12 @@ TARGET = mDNSClient DESTDIR = -@@ -17,8 +18,8 @@ DESTDIR = - all: $(TARGET) +@@ -18,7 +19,7 @@ all: $(TARGET) --mDNSClient: mDNSPosix.o mDNSUNP.o ExampleClientApp.o mDNS.o Client.o + mDNSClient: mDNSPosix.o mDNSUNP.o ExampleClientApp.o mDNS.o Client.o - $(CC) $(LFLAGS) $^ -o $@ -+mDNSClient: mDNSPosix.o mDNSUNP.o ExampleClientApp.o mDNS.o Client.o getline.o -+ $(CC) $(LDFLAGS) mDNSPosix.o mDNSUNP.o ExampleClientApp.o mDNS.o Client.o getline.o -o $@ ++ $(CC) $(LDFLAGS) mDNSPosix.o mDNSUNP.o ExampleClientApp.o mDNS.o Client.o -o $@ install: $(mkinstalldirs) $(DESTDIR)$(bindir)/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607311448.u6VEmofs004482>