From a26a7c64e7a9c73198b8f6c5c5f5fd03a62d9caf Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Mon, 5 May 2014 14:51:06 +0000 Subject: [PATCH] - Update to 2.3.1 (from audio/libshout2) - Use USES=libtool - Strip shared library - Bump PORTREVISION for audio/libshout shlib change and dependency change from audio/libshout2 to audio/libshout [1] Approved by: portmgr (bapt) [1] --- audio/ezstream/Makefile | 4 +-- audio/gstreamer-plugins-shout2/Makefile | 2 +- audio/gstreamer1-plugins-shout2/Makefile | 2 +- audio/icecast2/Makefile | 4 +-- audio/icegenerator/Makefile | 4 +-- audio/ices/Makefile | 2 +- audio/libshout/Makefile | 29 +++++++++++---- audio/libshout/distinfo | 4 +-- audio/libshout/files/patch-aa | 16 --------- audio/libshout/files/patch-ab | 11 ------ audio/libshout/pkg-plist | 36 +++---------------- audio/mixxx/Makefile | 4 +-- audio/musicpd/Makefile | 4 +-- audio/p5-Shout/Makefile | 3 +- audio/py-shout/Makefile | 3 +- audio/rubygem-shout/Makefile | 3 +- audio/xmms2/Makefile | 4 +-- multimedia/gstreamer-plugins/Makefile.common | 2 +- multimedia/gstreamer1-plugins/Makefile.common | 3 +- multimedia/vlc/Makefile | 4 +-- 20 files changed, 54 insertions(+), 90 deletions(-) delete mode 100644 audio/libshout/files/patch-aa delete mode 100644 audio/libshout/files/patch-ab diff --git a/audio/ezstream/Makefile b/audio/ezstream/Makefile index 23dd25874988..d4cc7ac25abd 100644 --- a/audio/ezstream/Makefile +++ b/audio/ezstream/Makefile @@ -3,7 +3,7 @@ PORTNAME= ezstream PORTVERSION= 0.5.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/ezstream/ \ http://svn.xiph.org/releases/ezstream/ @@ -11,7 +11,7 @@ MASTER_SITES= http://downloads.xiph.org/releases/ezstream/ \ MAINTAINER= ayu@commun.jp COMMENT= Command line utility for streaming to icecast servers -LIB_DEPENDS= libshout.so.5:${PORTSDIR}/audio/libshout2 \ +LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout \ libvorbis.so:${PORTSDIR}/audio/libvorbis OPTIONS_DEFINE= TAGLIB DOCS EXAMPLES diff --git a/audio/gstreamer-plugins-shout2/Makefile b/audio/gstreamer-plugins-shout2/Makefile index f6b6d09765f4..015651179ef7 100644 --- a/audio/gstreamer-plugins-shout2/Makefile +++ b/audio/gstreamer-plugins-shout2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # $MCom: ports/audio/gstreamer-plugins-shout2/Makefile,v 1.3 2008/03/19 14:05:31 ahze Exp $ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio COMMENT= Gstreamer icecast plugin diff --git a/audio/gstreamer1-plugins-shout2/Makefile b/audio/gstreamer1-plugins-shout2/Makefile index bbd80d4c11e3..48a04b3d9bd1 100644 --- a/audio/gstreamer1-plugins-shout2/Makefile +++ b/audio/gstreamer1-plugins-shout2/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= audio COMMENT= Gstreamer icecast plugin diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile index ef14613283b3..f29f25477a55 100644 --- a/audio/icecast2/Makefile +++ b/audio/icecast2/Makefile @@ -3,7 +3,7 @@ PORTNAME= icecast2 PORTVERSION= 2.3.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= audio net ipv6 MASTER_SITES= http://downloads.xiph.org/releases/icecast/:source \ @@ -21,7 +21,7 @@ COMMENT= Streaming mp3/ogg-vorbis audio server LICENSE= GPLv2 LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ - libshout.so:${PORTSDIR}/audio/libshout2 \ + libshout.so:${PORTSDIR}/audio/libshout \ libspeex.so:${PORTSDIR}/audio/speex \ libtheora.so:${PORTSDIR}/multimedia/libtheora \ libvorbis.so:${PORTSDIR}/audio/libvorbis \ diff --git a/audio/icegenerator/Makefile b/audio/icegenerator/Makefile index e9fe1dc2b9f8..ce47c87a23df 100644 --- a/audio/icegenerator/Makefile +++ b/audio/icegenerator/Makefile @@ -3,14 +3,14 @@ PORTNAME= icegenerator DISTVERSION= 0.5.5-pre2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.5.5-pre2 MAINTAINER= funkblaster@mail.ru COMMENT= Direct streaming generator for Icecast/Shoutcast -LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout2 +LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout GNU_CONFIGURE= yes USES= gmake pkgconfig diff --git a/audio/ices/Makefile b/audio/ices/Makefile index e380217b4392..6b181a0b27d5 100644 --- a/audio/ices/Makefile +++ b/audio/ices/Makefile @@ -3,7 +3,7 @@ PORTNAME= ices PORTVERSION= 2.0.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= audio net MASTER_SITES= http://downloads.xiph.org/releases/${PORTNAME}/ \ diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile index aeb888a4e7b2..6af38ef09d77 100644 --- a/audio/libshout/Makefile +++ b/audio/libshout/Makefile @@ -2,22 +2,37 @@ # $FreeBSD$ PORTNAME= libshout -PORTVERSION= 1.0.7 +PORTVERSION= 2.3.1 CATEGORIES= audio net -#MASTER_SITES= http://downloads.xiph.org/releases/libshout/ +MASTER_SITES= http://downloads.xiph.org/releases/${PORTNAME}/ \ + LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Connect and transmit data to an Icecast media streaming server -CONFLICTS= libshout2-* +LICENSE= LGPL20 -USE_AUTOTOOLS= libtool +LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex \ + libtheora.so:${PORTSDIR}/multimedia/libtheora \ + libvorbis.so:${PORTSDIR}/audio/libvorbis + +CONFLICTS= libshout2-[0-9]* + +CFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes +LDFLAGS+= -L${LOCALBASE}/lib -pthread USE_LDCONFIG= yes -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}-${PORTVERSION} +USES= gmake libtool pathfix pkgconfig + +PORTDOCS= * post-patch: - @${REINPLACE_CMD} -e 's|-O20||' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-ffast-math||g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|^Requires: |Requires.private: |' ${WRKSRC}/shout.pc.in + @${REINPLACE_CMD} -e '/^AM_CPPFLAGS = / s|^\(.*\) \(@XIPH_CPPFLAGS@\) \(.*\)$$|\1 \3 \2|' ${WRKSRC}/examples/Makefile.in + @${REINPLACE_CMD} -e 's|#ifdef IPV6_V6ONLY|#if defined(__BSD_VISIBLE) \&\& defined(IPV6_V6ONLY)|' ${WRKSRC}/src/net/sock.c + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libshout.so.3.2.0 .include diff --git a/audio/libshout/distinfo b/audio/libshout/distinfo index 617e47a0ab23..a9d2d97caa3f 100644 --- a/audio/libshout/distinfo +++ b/audio/libshout/distinfo @@ -1,2 +1,2 @@ -SHA256 (libshout-1.0.7.tar.gz) = 5babdb9dffdc96a8094d2d61edf992f49b5deaa3845ce55c08d3572a22e047ca -SIZE (libshout-1.0.7.tar.gz) = 130197 +SHA256 (libshout-2.3.1.tar.gz) = cf3c5f6b4a5e3fcfbe09fb7024aa88ad4099a9945f7cb037ec06bcee7a23926e +SIZE (libshout-2.3.1.tar.gz) = 464229 diff --git a/audio/libshout/files/patch-aa b/audio/libshout/files/patch-aa deleted file mode 100644 index 7787a49dec2f..000000000000 --- a/audio/libshout/files/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.in.orig Wed Aug 1 17:56:09 2001 -+++ Makefile.in Tue Dec 11 08:50:30 2001 -@@ -507,9 +507,10 @@ - - install-data-local: - mkdir -p $(DESTDIR)$(includedir)/shout -- mkdir -p $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)/example -- $(INSTALL) -m 0644 $(top_srcdir)/README $(top_srcdir)/AUTHORS $(top_srcdir)/COPYING $(top_srcdir)/CHANGES $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION) -- $(INSTALL) -m 0644 $(top_srcdir)/example/Makefile $(top_srcdir)/example/example.c $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)/example -+ mkdir -p $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION) -+ mkdir -p $(DESTDIR)$(prefix)/share/examples/$(PACKAGE)-$(VERSION) -+ $(INSTALL) -m 0644 $(top_srcdir)/README $(top_srcdir)/AUTHORS $(top_srcdir)/COPYING $(top_srcdir)/CHANGES $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION) -+ $(INSTALL) -m 0644 $(top_srcdir)/example/Makefile $(top_srcdir)/example/example.c $(DESTDIR)$(prefix)/share/examples/$(PACKAGE)-$(VERSION) - $(INSTALL) -m 0644 $(top_srcdir)/shout.h $(DESTDIR)$(includedir)/shout - - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/audio/libshout/files/patch-ab b/audio/libshout/files/patch-ab deleted file mode 100644 index 65112e1f5765..000000000000 --- a/audio/libshout/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/Makefile.in.orig Tue Dec 11 09:28:01 2001 -+++ doc/Makefile.in Tue Dec 11 09:28:08 2001 -@@ -76,7 +76,7 @@ - - AUTOMAKE_OPTIONS = foreign - --docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION) -+docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION) - - doc_DATA = index.html overview.html initialization.html connection.html datastreaming.html metadata.html datastructures.html shout_conn_t.html shout_connect.html shout_disconnect.html shout_sleep.html shout_init_connection.html shout_send_data.html shout_update_metadata.html style.css example.html example_c.html reference.html errorhandling.html shout_strerror.html - diff --git a/audio/libshout/pkg-plist b/audio/libshout/pkg-plist index 46752a8d7b77..36d7c0fccb1c 100644 --- a/audio/libshout/pkg-plist +++ b/audio/libshout/pkg-plist @@ -1,34 +1,8 @@ include/shout/shout.h -lib/libshout.so.2 -lib/libshout.so -lib/libshout.la lib/libshout.a -%%DOCSDIR%%/index.html -%%DOCSDIR%%/overview.html -%%DOCSDIR%%/initialization.html -%%DOCSDIR%%/connection.html -%%DOCSDIR%%/datastreaming.html -%%DOCSDIR%%/metadata.html -%%DOCSDIR%%/datastructures.html -%%DOCSDIR%%/shout_conn_t.html -%%DOCSDIR%%/shout_connect.html -%%DOCSDIR%%/shout_disconnect.html -%%DOCSDIR%%/shout_sleep.html -%%DOCSDIR%%/shout_init_connection.html -%%DOCSDIR%%/shout_send_data.html -%%DOCSDIR%%/shout_update_metadata.html -%%DOCSDIR%%/style.css -%%DOCSDIR%%/example.html -%%DOCSDIR%%/example_c.html -%%DOCSDIR%%/reference.html -%%DOCSDIR%%/errorhandling.html -%%DOCSDIR%%/shout_strerror.html -%%DOCSDIR%%/README -%%DOCSDIR%%/AUTHORS -%%DOCSDIR%%/COPYING -%%DOCSDIR%%/CHANGES -%%EXAMPLESDIR%%/Makefile -%%EXAMPLESDIR%%/example.c -@dirrm %%EXAMPLESDIR%% -@dirrm %%DOCSDIR%% +lib/libshout.so +lib/libshout.so.3 +lib/libshout.so.3.2.0 +libdata/pkgconfig/shout.pc +share/aclocal/shout.m4 @dirrm include/shout diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile index 2b5220a6eb25..3f7147cd956e 100644 --- a/audio/mixxx/Makefile +++ b/audio/mixxx/Makefile @@ -4,7 +4,7 @@ PORTNAME= mixxx PORTVERSION= 1.11.0 DISTVERSIONSUFFIX= -src -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= http://downloads.mixxx.org/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION} @@ -45,7 +45,7 @@ GPERFTOOLS_LIB_DEPENDS= libtcmalloc.so:${PORTSDIR}/devel/google-perftools GPERFTOOLS_MAKE_ARGS= perftools=1 GPERFTOOLS_MAKE_ARGS_OFF= perftools=0 LAME_RUN_DEPENDS= lame:${PORTSDIR}/audio/lame -SHOUTCAST_LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout2 +SHOUTCAST_LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout SHOUTCAST_MAKE_ARGS= shoutcast=1 SHOUTCAST_MAKE_ARGS_OFF= shoutcast=0 WAVPACK_LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index 1a838bd1ce9e..2d5559162429 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -2,7 +2,7 @@ PORTNAME= musicpd PORTVERSION= 0.18.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio ipv6 MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} @@ -184,7 +184,7 @@ CONFIGURE_ARGS+=--with-zeroconf=no . if ${PORT_OPTIONS:MTREMOR} IGNORE= shoutcast and tremor do not coexist; use vorbis instead . endif -LIB_DEPENDS+= libshout.so:${PORTSDIR}/audio/libshout2 +LIB_DEPENDS+= libshout.so:${PORTSDIR}/audio/libshout CONFIGURE_ARGS+=--enable-vorbis-encoder \ --enable-shout .else diff --git a/audio/p5-Shout/Makefile b/audio/p5-Shout/Makefile index 9aede331e5e8..346648e8e752 100644 --- a/audio/p5-Shout/Makefile +++ b/audio/p5-Shout/Makefile @@ -3,6 +3,7 @@ PORTNAME= Shout PORTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= audio perl5 MASTER_SITES= http://downloads.us.xiph.org/releases/libshout/ PKGNAMEPREFIX= p5- @@ -10,7 +11,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Perl glue for libshout MP3 streaming source library -LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout2 +LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout USES= perl5 pkgconfig shebangfix USE_PERL5= configure diff --git a/audio/py-shout/Makefile b/audio/py-shout/Makefile index 31482c7d9d7e..8664e8e8eb3d 100644 --- a/audio/py-shout/Makefile +++ b/audio/py-shout/Makefile @@ -3,6 +3,7 @@ PORTNAME= shout PORTVERSION= 0.2.1 +PORTREVISION= 1 CATEGORIES= audio python MASTER_SITES= http://downloads.us.xiph.org/releases/libshout/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,7 +14,7 @@ COMMENT= Python bindings for libshout2 LICENSE= LGPL20 -LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout2 +LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} diff --git a/audio/rubygem-shout/Makefile b/audio/rubygem-shout/Makefile index bc0127e7d783..8ea8fa86b3f0 100644 --- a/audio/rubygem-shout/Makefile +++ b/audio/rubygem-shout/Makefile @@ -3,6 +3,7 @@ PORTNAME= shout PORTVERSION= 2.2.1 +PORTREVISION= 1 CATEGORIES= audio rubygems MASTER_SITES= RG DISTNAME= ruby-${PORTNAME}-${PORTVERSION} @@ -10,7 +11,7 @@ DISTNAME= ruby-${PORTNAME}-${PORTVERSION} MAINTAINER= ruby@FreeBSD.org COMMENT= A Ruby binding to the libshout library -LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout2 +LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout USE_RUBY= yes USE_RUBYGEMS= yes diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile index c0a66dd9b5ac..fdcfdb56ba6c 100644 --- a/audio/xmms2/Makefile +++ b/audio/xmms2/Makefile @@ -4,7 +4,7 @@ PORTNAME?= xmms2 PORTVERSION= 0.8 DISTVERSIONSUFFIX=DrO_o -PORTREVISION?= 6 +PORTREVISION?= 7 CATEGORIES?= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX} @@ -172,7 +172,7 @@ PLIST_SUB+= GVFS="@comment " .endif .if ${PORT_OPTIONS:MICES} -LIB_DEPENDS+= libshout.so:${PORTSDIR}/audio/libshout2 +LIB_DEPENDS+= libshout.so:${PORTSDIR}/audio/libshout PLIST_SUB+= ICES="" .else EXCLUDE+= --without-plugins="ices" diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common index df17d302a2df..c1677ccaafc0 100644 --- a/multimedia/gstreamer-plugins/Makefile.common +++ b/multimedia/gstreamer-plugins/Makefile.common @@ -467,7 +467,7 @@ gst_sdl_PLIST_FILES= ${GST_LIB_DIR}/libgstsdl.la \ gst_sdl_DIST= bad # shout2 -gst_shout2_LIB_DEPENDS+= libshout.so.5:${PORTSDIR}/audio/libshout2 +gst_shout2_LIB_DEPENDS+= libshout.so:${PORTSDIR}/audio/libshout gst_shout2_PLIST_FILES= ${GST_LIB_DIR}/libgstshout2.la \ ${GST_LIB_DIR}/libgstshout2.so diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common index dee89b3614e3..fd4500faffe8 100644 --- a/multimedia/gstreamer1-plugins/Makefile.common +++ b/multimedia/gstreamer1-plugins/Makefile.common @@ -343,8 +343,7 @@ gst_resindvd_RUN_DEPENDS= libdvdnav>=4.1.2:${PORTSDIR}/multimedia/libdvdnav gst_rtmp_LIB_DEPENDS= librtmp.so.0:${PORTSDIR}/multimedia/librtmp # shout2 -# keep the version to tell de difference between libshout and libshout2 -gst_shout2_LIB_DEPENDS= libshout.so.5:${PORTSDIR}/audio/libshout2 +gst_shout2_LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout # sidplay gst_sidplay_LIB_DEPENDS= libsidplay.so:${PORTSDIR}/audio/libsidplay diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index f580d7e2f572..6b3d52308496 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.1.4 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ @@ -209,7 +209,7 @@ SIDPLAY_LIB_DEPENDS= libsidplay2.so:${PORTSDIR}/audio/libsidplay2 SIDPLAY_LDFLAGS= -L${LOCALBASE}/lib/sidplay/builders SIDPLAY_CONFIGURE_ENABLE= sid -SHOUTCAST_LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout2 +SHOUTCAST_LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout SHOUTCAST_CONFIGURE_ENABLE= shout STREAM_CONFIGURE_ENABLE= sout