ports/186719: [patch] audio/pulseaudio: USES=iconv, libtool and staging

Tijl Coosemans tijl at FreeBSD.org
Thu Feb 13 11:30:00 UTC 2014 

>Number:         186719
>Category:       ports
>Synopsis:       [patch] audio/pulseaudio: USES=iconv,libtool and staging
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 13 11:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Tijl Coosemans
>Release:        FreeBSD 11.0-CURRENT i386
>Organization:
>Environment:
>Description:
- Add missing iconv dependency.
- Convert to USES=libtool.
  The configure script disables static libraries by default so the attached
  patch removes them from pkg-plist.  They could be enabled again with
  --enable-static but at least for the modules (which are dlopened) it makes
  sense to only have shared libraries.
- Use option helpers.
- Staging.
>How-To-Repeat:
>Fix:

--- pulseaudio.patch begins here ---
Index: audio/pulseaudio/Makefile
===================================================================
--- audio/pulseaudio/Makefile	(revision 344044)
+++ audio/pulseaudio/Makefile	(working copy)
@@ -9,7 +9,7 @@
 
 PORTNAME=	pulseaudio
 PORTVERSION=	0.9.23
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
 
@@ -24,13 +24,12 @@ LIB_DEPENDS=	libsamplerate.so:${PORTSDIR
 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
 		libck-connector.so:${PORTSDIR}/sysutils/consolekit
 
-USE_GNOME=	gnomehack glib20 intltool ltverhack
-NO_STAGE=	yes
+USE_GNOME=	gnomehack glib20 intltool
 USE_XORG=	x11 sm xtst ice
 USE_LDCONFIG=	yes
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake iconv libtool pkgconfig
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libltdl libtool
+USE_AUTOTOOLS=	libltdl
 MAKE_JOBS_UNSAFE=yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
@@ -57,48 +56,22 @@ USERS=		pulse
 GROUPS=		pulse pulse-access pulse-rt
 
 OPTIONS_DEFINE=	JACK AVAHI HAL GCONF
-OPTIONS_DEFAULT=	AVAHI HAL GCONF
+OPTIONS_DEFAULT=AVAHI HAL GCONF
+OPTIONS_SUB=	yes
+
+AVAHI_CONFIGURE_ENABLE=	avahi
+AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+GCONF_CONFIGURE_ENABLE=	gconf
+GCONF_USE=		GNOME=gconf2
+HAL_CONFIGURE_ENABLE=	hal
+HAL_LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
+JACK_CONFIGURE_ENABLE=	jack
+JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 
 PULSE_VERSION=	${PORTVERSION}
 PLIST_SUB=	PULSE_VERSION=${PULSE_VERSION}
 
-MAN1=		esdcompat.1 pabrowse.1 pacat.1 pacmd.1 pactl.1 padsp.1 \
-		paplay.1 pasuspender.1 pax11publish.1 pulseaudio.1
-MAN5=		default.pa.5 pulse-client.conf.5 pulse-daemon.conf.5
-
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
-PLIST_SUB+=	JACK=""
-.else
-PLIST_SUB+=	JACK="@comment "
-CONFIGURE_ARGS+=--disable-jack
-.endif
-
-.if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
-PLIST_SUB+=	AVAHI=""
-.else
-CONFIGURE_ARGS+=--disable-avahi
-PLIST_SUB+=	AVAHI="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MHAL}
-LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
-PLIST_SUB+=	HAL=""
-.else
-CONFIGURE_ARGS+=--disable-hal
-PLIST_SUB+=	HAL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGCONF}
-USE_GNOME+=	gconf2
-PLIST_SUB+=	GCONF=""
-.else
-CONFIGURE_ARGS+=--disable-gconf
-PLIST_SUB+=	GCONF="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 .if ((${OSVERSION} >= 800000) && (${OSVERSION} < 802504)) || \
 	((${OSVERSION} >= 900000) && (${OSVERSION} < 900037))
@@ -112,14 +85,10 @@ post-patch:
 		${WRKSRC}/configure
 
 post-install:
-	${MKDIR} ${PREFIX}/etc/pulse
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/pulse
 .for ii in default.pa daemon.conf client.conf system.pa
 	${INSTALL_DATA} ${WRKSRC}/src/${ii} \
-		${PREFIX}/etc/pulse/${ii}-dist
-. if !exists(${PREFIX}/etc/pulse/${II})
-	${INSTALL_DATA} ${WRKSRC}/src/${ii} \
-		${PREFIX}/etc/pulse/${ii}
-. endif
+		${STAGEDIR}${PREFIX}/etc/pulse/${ii}-dist
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: audio/pulseaudio/pkg-plist
===================================================================
--- audio/pulseaudio/pkg-plist	(revision 344044)
+++ audio/pulseaudio/pkg-plist	(working copy)
@@ -58,173 +58,114 @@ include/pulse/util.h
 include/pulse/version.h
 include/pulse/volume.h
 include/pulse/xmalloc.h
-%%AVAHI%%lib/libpulse-browse.a
 %%AVAHI%%lib/libpulse-browse.la
 %%AVAHI%%lib/libpulse-browse.so
 %%AVAHI%%lib/libpulse-browse.so.0
-lib/libpulse-mainloop-glib.a
+%%AVAHI%%lib/libpulse-browse.so.0.1.1
 lib/libpulse-mainloop-glib.la
 lib/libpulse-mainloop-glib.so
 lib/libpulse-mainloop-glib.so.0
-lib/libpulse-simple.a
+lib/libpulse-mainloop-glib.so.0.0.4
 lib/libpulse-simple.la
 lib/libpulse-simple.so
 lib/libpulse-simple.so.0
-lib/libpulse.a
+lib/libpulse-simple.so.0.0.3
 lib/libpulse.la
 lib/libpulse.so
 lib/libpulse.so.0
-lib/libpulsecommon-%%PULSE_VERSION%%.a
+lib/libpulse.so.0.12.4
 lib/libpulsecommon-%%PULSE_VERSION%%.la
 lib/libpulsecommon-%%PULSE_VERSION%%.so
-lib/libpulsecore-%%PULSE_VERSION%%.a
 lib/libpulsecore-%%PULSE_VERSION%%.la
 lib/libpulsecore-%%PULSE_VERSION%%.so
-lib/libpulsedsp.a
 lib/libpulsedsp.so
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.a
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so
-lib/pulse-%%PULSE_VERSION%%/modules/libcli.a
 lib/pulse-%%PULSE_VERSION%%/modules/libcli.so
-lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.a
 lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.a
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-esound.a
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-esound.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-http.a
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-http.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.a
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.so
-lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.a
 lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.so
-lib/pulse-%%PULSE_VERSION%%/modules/libraop.a
 lib/pulse-%%PULSE_VERSION%%/modules/libraop.so
-lib/pulse-%%PULSE_VERSION%%/modules/librtp.a
 lib/pulse-%%PULSE_VERSION%%/modules/librtp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-always-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-always-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-augment-properties.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-augment-properties.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-card-restore.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-card-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cli.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-cli.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-combine.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-combine.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-console-kit.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-console-kit.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-cork-music-on-phone.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-cork-music-on-phone.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-default-device-restore.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-default-device-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-detect.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-detect.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-device-restore.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-device-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-echo-cancel.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-echo-cancel.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-tcp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-unix.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink.so
-%%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.a
 %%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.so
-%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/module-hal-detect.a
 %%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/module-hal-detect.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-intended-roles.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-intended-roles.so
-%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.a
 %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.so
-%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.a
 %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-ladspa-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-ladspa-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-loopback.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-loopback.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-match.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-match.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-oss.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-oss.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-position-event-sounds.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-position-event-sounds.so
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-raop-discover.a
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-raop-discover.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-raop-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-raop-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-remap-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-remap-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-rygel-media-server.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-rygel-media-server.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-sine.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-sine.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-sine-source.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-sine-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-stream-restore.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-stream-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-cork-request.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-cork-request.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-x11-xsmp.a
 lib/pulse-%%PULSE_VERSION%%/modules/module-x11-xsmp.so
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-discover.a
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-discover.so
-%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.a
 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.so
 %%AVAHI%%libdata/pkgconfig/libpulse-browse.pc
 libdata/pkgconfig/libpulse-mainloop-glib.pc
 libdata/pkgconfig/libpulse-simple.pc
 libdata/pkgconfig/libpulse.pc
 %%GCONF%%libexec/pulse/gconf-helper
+man/man1/esdcompat.1.gz
+man/man1/pabrowse.1.gz 
+man/man1/pacat.1.gz 
+man/man1/pacmd.1.gz 
+man/man1/pactl.1.gz 
+man/man1/padsp.1.gz 
+man/man1/paplay.1.gz 
+man/man1/pasuspender.1.gz 
+man/man1/pax11publish.1.gz 
+man/man1/pulseaudio.1.gz 
+man/man5/default.pa.5.gz
+man/man5/pulse-client.conf.5.gz
+man/man5/pulse-daemon.conf.5.gz
 share/locale/as/LC_MESSAGES/pulseaudio.mo
 share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo
 share/locale/ca/LC_MESSAGES/pulseaudio.mo
--- pulseaudio.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list