svn commit: r353022 - in head: audio/ezstream audio/gstreamer-plugins-shout2 audio/gstreamer1-plugins-shout2 audio/icecast2 audio/icegenerator audio/ices audio/libshout audio/libshout/files audio/m...

Sunpoet Po-Chuan Hsieh sunpoet at FreeBSD.org
Mon May 5 14:51:10 UTC 2014 

Author: sunpoet
Date: Mon May  5 14:51:06 2014
New Revision: 353022
URL: http://svnweb.freebsd.org/changeset/ports/353022
QAT: https://qat.redports.org/buildarchive/r353022/

Log:
  - 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]

Deleted:
  head/audio/libshout/files/
Modified:
  head/audio/ezstream/Makefile
  head/audio/gstreamer-plugins-shout2/Makefile
  head/audio/gstreamer1-plugins-shout2/Makefile
  head/audio/icecast2/Makefile
  head/audio/icegenerator/Makefile
  head/audio/ices/Makefile
  head/audio/libshout/Makefile
  head/audio/libshout/distinfo
  head/audio/libshout/pkg-plist
  head/audio/mixxx/Makefile
  head/audio/musicpd/Makefile
  head/audio/p5-Shout/Makefile
  head/audio/py-shout/Makefile
  head/audio/rubygem-shout/Makefile
  head/audio/xmms2/Makefile
  head/multimedia/gstreamer-plugins/Makefile.common
  head/multimedia/gstreamer1-plugins/Makefile.common
  head/multimedia/vlc/Makefile

Modified: head/audio/ezstream/Makefile
==============================================================================
--- head/audio/ezstream/Makefile	Mon May  5 14:50:03 2014	(r353021)
+++ head/audio/ezstream/Makefile	Mon May  5 14:51:06 2014	(r353022)
@@ -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/
 MAINTAINER=	ayu at 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

Modified: head/audio/gstreamer-plugins-shout2/Makefile
==============================================================================
--- head/audio/gstreamer-plugins-shout2/Makefile	Mon May  5 14:50:03 2014	(r353021)
+++ head/audio/gstreamer-plugins-shout2/Makefile	Mon May  5 14:51:06 2014	(r353022)
@@ -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

Modified: head/audio/gstreamer1-plugins-shout2/Makefile
==============================================================================
--- head/audio/gstreamer1-plugins-shout2/Makefile	Mon May  5 14:50:03 2014	(r353021)
+++ head/audio/gstreamer1-plugins-shout2/Makefile	Mon May  5 14:51:06 2014	(r353022)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer icecast plugin

Modified: head/audio/icecast2/Makefile
==============================================================================
--- head/audio/icecast2/Makefile	Mon May  5 14:50:03 2014	(r353021)
+++ head/audio/icecast2/Makefile	Mon May  5 14:51:06 2014	(r353022)
@@ -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 
 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 \

Modified: head/audio/icegenerator/Makefile
==============================================================================
--- head/audio/icegenerator/Makefile	Mon May  5 14:50:03 2014	(r353021)
+++ head/audio/icegenerator/Makefile	Mon May  5 14:51:06 2014	(r353022)
@@ -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 at 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

Modified: head/audio/ices/Makefile
==============================================================================
--- head/audio/ices/Makefile	Mon May  5 14:50:03 2014	(r353021)
+++ head/audio/ices/Makefile	Mon May  5 14:51:06 2014	(r353022)
@@ -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}/ \

Modified: head/audio/libshout/Makefile
==============================================================================
--- head/audio/libshout/Makefile	Mon May  5 14:50:03 2014	(r353021)
+++ head/audio/libshout/Makefile	Mon May  5 14:51:06 2014	(r353022)
@@ -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 at 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 <bsd.port.mk>

Modified: head/audio/libshout/distinfo
==============================================================================
--- head/audio/libshout/distinfo	Mon May  5 14:50:03 2014	(r353021)
+++ head/audio/libshout/distinfo	Mon May  5 14:51:06 2014	(r353022)
@@ -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

Modified: head/audio/libshout/pkg-plist
==============================================================================
--- head/audio/libshout/pkg-plist	Mon May  5 14:50:03 2014	(r353021)
+++ head/audio/libshout/pkg-plist	Mon May  5 14:51:06 2014	(r353022)
@@ -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
- at dirrm %%EXAMPLESDIR%%
- at 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

Modified: head/audio/mixxx/Makefile
==============================================================================
--- head/audio/mixxx/Makefile	Mon May  5 14:50:03 2014	(r353021)
+++ head/audio/mixxx/Makefile	Mon May  5 14:51:06 2014	(r353022)
@@ -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:$
 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

Modified: head/audio/musicpd/Makefile
==============================================================================
--- head/audio/musicpd/Makefile	Mon May  5 14:50:03 2014	(r353021)
+++ head/audio/musicpd/Makefile	Mon May  5 14:51:06 2014	(r353022)
@@ -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

Modified: head/audio/p5-Shout/Makefile
==============================================================================
--- head/audio/p5-Shout/Makefile	Mon May  5 14:50:03 2014	(r353021)
+++ head/audio/p5-Shout/Makefile	Mon May  5 14:51:06 2014	(r353022)
@@ -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 at 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

Modified: head/audio/py-shout/Makefile
==============================================================================
--- head/audio/py-shout/Makefile	Mon May  5 14:50:03 2014	(r353021)
+++ head/audio/py-shout/Makefile	Mon May  5 14:51:06 2014	(r353022)
@@ -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}
 

Modified: head/audio/rubygem-shout/Makefile
==============================================================================
--- head/audio/rubygem-shout/Makefile	Mon May  5 14:50:03 2014	(r353021)
+++ head/audio/rubygem-shout/Makefile	Mon May  5 14:51:06 2014	(r353022)
@@ -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 at 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

Modified: head/audio/xmms2/Makefile
==============================================================================
--- head/audio/xmms2/Makefile	Mon May  5 14:50:03 2014	(r353021)
+++ head/audio/xmms2/Makefile	Mon May  5 14:51:06 2014	(r353022)
@@ -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"

Modified: head/multimedia/gstreamer-plugins/Makefile.common
==============================================================================
--- head/multimedia/gstreamer-plugins/Makefile.common	Mon May  5 14:50:03 2014	(r353021)
+++ head/multimedia/gstreamer-plugins/Makefile.common	Mon May  5 14:51:06 2014	(r353022)
@@ -467,7 +467,7 @@ gst_sdl_PLIST_FILES=	${GST_LIB_DIR}/libg
 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
 

Modified: head/multimedia/gstreamer1-plugins/Makefile.common
==============================================================================
--- head/multimedia/gstreamer1-plugins/Makefile.common	Mon May  5 14:50:03 2014	(r353021)
+++ head/multimedia/gstreamer1-plugins/Makefile.common	Mon May  5 14:51:06 2014	(r353022)
@@ -343,8 +343,7 @@ gst_resindvd_RUN_DEPENDS=	libdvdnav>=4.1
 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

Modified: head/multimedia/vlc/Makefile
==============================================================================
--- head/multimedia/vlc/Makefile	Mon May  5 14:50:03 2014	(r353021)
+++ head/multimedia/vlc/Makefile	Mon May  5 14:51:06 2014	(r353022)
@@ -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:${PO
 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

More information about the svn-ports-head mailing list