cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to pulseaudio-2.0.

Browse Source 
ok robert@ (maintainer)
This commit is contained in:
ajacoutot 2012-05-14 17:45:16 +00:00
parent 3c75a73982
commit 7482052466
8 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio/pulseaudio/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.18 2012/04/28 10:52:08 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.19 2012/05/14 17:45:16 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= cross-platform networked sound server
VERSION= 1.1
VERSION= 2.0
DISTNAME= pulseaudio-${VERSION}
REVISION= 2
SHARED_LIBS += pulse 1.0 # .13.4
SHARED_LIBS += pulse 1.1 # .14.2
SHARED_LIBS += pulse-simple 0.0 # .0.3
SHARED_LIBS += pulse-mainloop-glib 0.0 # .0.4
@ -26,7 +25,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += c crypto execinfo gdbm glib-2.0 json ltdl m ossaudio
WANTLIB += pcre pthread sndfile speexdsp ssl
WANTLIB += pcre pthread sndfile speexdsp ssl stdc++
MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/
TAR= ${LOCALBASE}/bin/gtar
@ -67,14 +66,17 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-oss-output \
--disable-oss-wrapper \
--disable-x11 \
--disable-adrian-aec \
--disable-alsa \
--disable-asyncns \
--disable-bluez \
--disable-dbus \
--disable-esound \
--disable-gtk2 \
--disable-jack \
--disable-hal \
--disable-hal-compat \
--disable-systemd \
--disable-udev \
--disable-lirc \
--disable-samplerate \

10
audio/pulseaudio/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pulseaudio-1.1.tar.gz) = G3aTLKfEsqqZKUHkHtRZSw==
RMD160 (pulseaudio-1.1.tar.gz) = Sx8kaQsLQw8gywa1JN+y7XqRxcY=
SHA1 (pulseaudio-1.1.tar.gz) = rP2GtA+VdOQZ0z8duu9+FyprYBE=
SHA256 (pulseaudio-1.1.tar.gz) = m0gLu4wz/v/spzQ/5Wv5ctR7mI1cbiCyjrdCGGsL/Ec=
SIZE (pulseaudio-1.1.tar.gz) = 2221090
MD5 (pulseaudio-2.0.tar.gz) = FAZkXRXma+D1MSNXYO3qMg==
RMD160 (pulseaudio-2.0.tar.gz) = 9R7RRFs/VqoBlByrcRLZ9OxKYE4=
SHA1 (pulseaudio-2.0.tar.gz) = YPzIepcxLShi4v0eBoshWB+SlN0=
SHA256 (pulseaudio-2.0.tar.gz) = shOx5CmD7JOmpHIbZqNOwNO8b9NFhcegpiJIbnK9ymg=
SIZE (pulseaudio-2.0.tar.gz) = 2351890

20
audio/pulseaudio/patches/patch-configure_ac
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-configure_ac,v 1.4 2011/12/07 20:25:35 robert Exp $
$OpenBSD: patch-configure_ac,v 1.5 2012/05/14 17:45:16 ajacoutot Exp $
- Fix path to soundcard.h
- Fix path to DBus machine-id
- Use /var/db instead of /var/lib
--- configure.ac.orig Thu Oct 20 15:12:05 2011
+++ configure.ac Wed Dec 7 21:15:20 2011
@@ -151,7 +151,7 @@ esac
--- configure.ac.orig Fri May 11 13:43:03 2012
+++ configure.ac Mon May 14 16:18:28 2012
@@ -161,7 +161,7 @@ esac
#### Compiler flags ####
AX_APPEND_COMPILE_FLAGS(
@ -14,8 +14,8 @@ $OpenBSD: patch-configure_ac,v 1.4 2011/12/07 20:25:35 robert Exp $
+ [-Wall -W -Wextra -pipe -Wno-long-long -Wvla -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option],
[], [-pedantic -Werror])
@@ -679,7 +679,7 @@ AC_ARG_ENABLE([oss-wrapper],
# Only enable fastpath asserts when doing a debug build, e.g. from bootstrap.sh.
@@ -687,7 +687,7 @@ AC_ARG_ENABLE([oss-wrapper],
AS_HELP_STRING([--disable-oss-wrapper],[Disable optional OSS wrapper support]))
AS_IF([test "x$enable_oss_output" != "xno" -o "x$enable_oss_wrapper" != "xno"],
@ -24,16 +24,16 @@ $OpenBSD: patch-configure_ac,v 1.4 2011/12/07 20:25:35 robert Exp $
HAVE_OSS=0)
AS_IF([test "x$enable_oss_output" = "xyes" -o "x$enable_oss_wrapper" = "xyes" && test "x$HAVE_OSS" = "x0"],
@@ -930,7 +930,7 @@ AC_SUBST(HAVE_DBUS)
@@ -945,7 +945,7 @@ AC_SUBST(HAVE_DBUS)
AM_CONDITIONAL([HAVE_DBUS], [test "x$HAVE_DBUS" = x1])
AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.]))
-PA_MACHINE_ID="${localstatedir}/lib/dbus/machine-id"
+PA_MACHINE_ID="${localstatedir}/db/dbus/machine-id"
AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
#### HAL support (optional), dependant on D-Bus ####
@@ -1097,9 +1097,9 @@ fi
PA_MACHINE_ID_FALLBACK="${sysconfdir}/machine-id"
AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
@@ -1174,9 +1174,9 @@ fi
PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"
AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir])

16
audio/pulseaudio/patches/patch-src_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2011/12/07 20:25:35 robert Exp $
--- src/Makefile.in.orig Wed Dec 7 21:15:43 2011
+++ src/Makefile.in Wed Dec 7 21:17:10 2011
@@ -3116,7 +3116,7 @@ libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS
$OpenBSD: patch-src_Makefile_in,v 1.4 2012/05/14 17:45:16 ajacoutot Exp $
--- src/Makefile.in.orig Fri May 11 15:31:10 2012
+++ src/Makefile.in Mon May 14 16:19:22 2012
@@ -3308,7 +3308,7 @@ libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS
libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) \
-avoid-version $(am__append_18)
libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) \
@ -10,7 +10,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.3 2011/12/07 20:25:35 robert Exp $
$(LIBSNDFILE_LIBS) $(am__append_24) $(am__append_28)
###################################
@@ -3635,7 +3635,7 @@ module_x11_cork_request_la_LIBADD = $(MODULE_LIBADD) $
@@ -3821,7 +3821,7 @@ module_x11_cork_request_la_LIBADD = $(MODULE_LIBADD) $
# OSS
liboss_util_la_SOURCES = modules/oss/oss-util.c modules/oss/oss-util.h
liboss_util_la_LDFLAGS = -avoid-version
@ -19,13 +19,13 @@ $OpenBSD: patch-src_Makefile_in,v 1.3 2011/12/07 20:25:35 robert Exp $
module_oss_la_SOURCES = modules/oss/module-oss.c
module_oss_la_LDFLAGS = $(MODULE_LDFLAGS)
module_oss_la_LIBADD = $(MODULE_LIBADD) liboss-util.la
@@ -8628,8 +8628,7 @@ info: info-am
@@ -8620,8 +8620,7 @@ info: info-am
info-am:
-install-data-am: install-dbuspolicyDATA install-dist_alsapathsDATA \
- install-dist_alsaprofilesetsDATA install-dist_udevrulesDATA \
+install-data-am: install-dbuspolicyDATA \
install-pulseconfDATA install-pulseincludeHEADERS \
install-xdgautostartDATA
install-padsplibLTLIBRARIES install-pulseconfDATA \
install-pulseincludeHEADERS install-xdgautostartDATA

8
audio/pulseaudio/patches/patch-src_pulse_context_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_pulse_context_c,v 1.2 2011/10/01 08:37:30 ajacoutot Exp $
$OpenBSD: patch-src_pulse_context_c,v 1.3 2012/05/14 17:45:16 ajacoutot Exp $
- --start doesn't work correctly (yet), so prefer -D.
--- src/pulse/context.c.orig Thu Sep 1 10:36:46 2011
+++ src/pulse/context.c Fri Sep 30 14:50:32 2011
@@ -697,7 +697,7 @@ static int context_autospawn(pa_context *c) {
--- src/pulse/context.c.orig Wed Mar 28 12:53:41 2012
+++ src/pulse/context.c Mon May 14 16:18:28 2012
@@ -701,7 +701,7 @@ static int context_autospawn(pa_context *c) {
/* Setup argv */
argv[n++] = c->conf->daemon_binary;

8
audio/pulseaudio/patches/patch-src_pulsecore_pstream_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_pulsecore_pstream_c,v 1.2 2011/10/01 08:37:31 ajacoutot Exp $
$OpenBSD: patch-src_pulsecore_pstream_c,v 1.3 2012/05/14 17:45:16 ajacoutot Exp $
- Fix a lock-up.
--- src/pulsecore/pstream.c.orig Thu Sep 1 10:28:14 2011
+++ src/pulsecore/pstream.c Fri Sep 30 14:50:32 2011
@@ -174,14 +174,17 @@ static void do_something(pa_pstream *p) {
--- src/pulsecore/pstream.c.orig Thu Mar 1 10:02:19 2012
+++ src/pulsecore/pstream.c Mon May 14 16:18:28 2012
@@ -177,14 +177,17 @@ static void do_something(pa_pstream *p) {
p->mainloop->defer_enable(p->defer_event, 0);
if (!p->dead && pa_iochannel_is_readable(p->io)) {

8
audio/pulseaudio/patches/patch-src_utils_padsp_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_utils_padsp_c,v 1.2 2011/09/25 09:43:36 ajacoutot Exp $
$OpenBSD: patch-src_utils_padsp_c,v 1.3 2012/05/14 17:45:16 ajacoutot Exp $
- Fix path to soundcard.h
- Add another output device
--- src/utils/padsp.c.orig Thu Jun 23 22:18:54 2011
+++ src/utils/padsp.c Sun Sep 25 11:41:10 2011
--- src/utils/padsp.c.orig Wed Apr 4 11:36:44 2012
+++ src/utils/padsp.c Mon May 14 16:18:28 2012
@@ -32,7 +32,7 @@
#define _LARGEFILE64_SOURCE 1
#endif
@ -14,7 +14,7 @@ $OpenBSD: patch-src_utils_padsp_c,v 1.2 2011/09/25 09:43:36 ajacoutot Exp $
#include <sys/ioctl.h>
#include <pthread.h>
#include <unistd.h>
@@ -1517,6 +1517,7 @@ static pa_bool_t is_audio_device_node(const char *path
@@ -1518,6 +1518,7 @@ static pa_bool_t is_audio_device_node(const char *path
pa_streq(path, "/dev/dsp") ||
pa_streq(path, "/dev/adsp") ||
pa_streq(path, "/dev/audio") ||

18
audio/pulseaudio/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2012/01/23 14:39:39 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.9 2012/05/14 17:45:16 ajacoutot Exp $
@newgroup _pulse:683
@newgroup _pulse-access:684
@newuser _pulse:683:683:daemon:PulseAudio System Daemon:/var/run/pulse:/sbin/nologin
@ -55,8 +55,6 @@ lib/libpulse-simple.la
@lib lib/libpulse-simple.so.${LIBpulse-simple_VERSION}
lib/libpulse.la
@lib lib/libpulse.so.${LIBpulse_VERSION}
lib/libpulsecommon-${VERSION}.la
lib/libpulsecommon-${VERSION}.so
lib/libpulsecore-${VERSION}.la
lib/libpulsecore-${VERSION}.so
lib/pkgconfig/libpulse-mainloop-glib.pc
@ -67,7 +65,6 @@ lib/pulse-${VERSION}/modules/
lib/pulse-${VERSION}/modules/libcli.so
lib/pulse-${VERSION}/modules/liboss-util.so
lib/pulse-${VERSION}/modules/libprotocol-cli.so
lib/pulse-${VERSION}/modules/libprotocol-esound.so
lib/pulse-${VERSION}/modules/libprotocol-http.so
lib/pulse-${VERSION}/modules/libprotocol-native.so
lib/pulse-${VERSION}/modules/libprotocol-simple.so
@ -81,17 +78,11 @@ lib/pulse-${VERSION}/modules/module-cli-protocol-unix.so
lib/pulse-${VERSION}/modules/module-cli.so
lib/pulse-${VERSION}/modules/module-combine-sink.so
lib/pulse-${VERSION}/modules/module-combine.so
lib/pulse-${VERSION}/modules/module-cork-music-on-phone.so
lib/pulse-${VERSION}/modules/module-default-device-restore.so
lib/pulse-${VERSION}/modules/module-detect.so
lib/pulse-${VERSION}/modules/module-device-manager.so
lib/pulse-${VERSION}/modules/module-device-restore.so
lib/pulse-${VERSION}/modules/module-echo-cancel.so
lib/pulse-${VERSION}/modules/module-esound-compat-spawnfd.so
lib/pulse-${VERSION}/modules/module-esound-compat-spawnpid.so
lib/pulse-${VERSION}/modules/module-esound-protocol-tcp.so
lib/pulse-${VERSION}/modules/module-esound-protocol-unix.so
lib/pulse-${VERSION}/modules/module-esound-sink.so
lib/pulse-${VERSION}/modules/module-filter-apply.so
lib/pulse-${VERSION}/modules/module-filter-heuristics.so
lib/pulse-${VERSION}/modules/module-http-protocol-tcp.so
@ -112,6 +103,7 @@ lib/pulse-${VERSION}/modules/module-position-event-sounds.so
lib/pulse-${VERSION}/modules/module-raop-sink.so
lib/pulse-${VERSION}/modules/module-remap-sink.so
lib/pulse-${VERSION}/modules/module-rescue-streams.so
lib/pulse-${VERSION}/modules/module-role-cork.so
lib/pulse-${VERSION}/modules/module-rtp-recv.so
lib/pulse-${VERSION}/modules/module-rtp-send.so
lib/pulse-${VERSION}/modules/module-simple-protocol-tcp.so
@ -121,11 +113,16 @@ lib/pulse-${VERSION}/modules/module-sine.so
lib/pulse-${VERSION}/modules/module-stream-restore.so
lib/pulse-${VERSION}/modules/module-suspend-on-idle.so
lib/pulse-${VERSION}/modules/module-switch-on-connect.so
lib/pulse-${VERSION}/modules/module-switch-on-port-available.so
lib/pulse-${VERSION}/modules/module-tunnel-sink.so
lib/pulse-${VERSION}/modules/module-tunnel-source.so
lib/pulse-${VERSION}/modules/module-virtual-sink.so
lib/pulse-${VERSION}/modules/module-virtual-source.so
lib/pulse-${VERSION}/modules/module-virtual-surround-sink.so
lib/pulse-${VERSION}/modules/module-volume-restore.so
lib/pulseaudio/
lib/pulseaudio/libpulsecommon-${VERSION}.la
lib/pulseaudio/libpulsecommon-${VERSION}.so
libexec/pulse/
@man man/man1/esdcompat.1
@man man/man1/pacat.1
@ -136,6 +133,7 @@ libexec/pulse/
@man man/man1/pasuspender.1
@man man/man1/pulseaudio.1
@man man/man5/default.pa.5
@man man/man5/pulse-cli-syntax.5
@man man/man5/pulse-client.conf.5
@man man/man5/pulse-daemon.conf.5
share/examples/pulseaudio/