Enable X11 and xdg/autostart support.
This commit is contained in:
ajacoutot
parent
1c609d8677
commit
5000656833
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.34 2012/11/29 16:38:04 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.35 2012/11/30 12:26:15 ajacoutot Exp $
|
||||
|
||||
# XXX
|
||||
# fix autospawn lock (patch-src_daemon_main_c)
|
||||
@ -19,7 +19,7 @@ COMMENT= cross-platform networked sound server
|
||||
|
||||
VERSION= 2.1
|
||||
DISTNAME= pulseaudio-${VERSION}
|
||||
REVISION= 2
|
||||
REVISION= 3
|
||||
|
||||
SHARED_LIBS += pulse 1.1 # .14.2
|
||||
SHARED_LIBS += pulse-simple 0.0 # .0.3
|
||||
@ -38,8 +38,9 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
WANTLIB += c crypto execinfo gdbm glib-2.0 json ltdl m pcre pthread
|
||||
WANTLIB += sndfile sndio speexdsp ssl
|
||||
WANTLIB += ICE SM X11 X11-xcb Xext Xi Xtst c crypto execinfo gdbm
|
||||
WANTLIB += glib-2.0 json ltdl m pcre pthread sndfile sndio speexdsp
|
||||
WANTLIB += ssl xcb
|
||||
|
||||
MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/
|
||||
TAR= ${LOCALBASE}/bin/gtar
|
||||
@ -80,7 +81,6 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
|
||||
--without-caps \
|
||||
--disable-oss-output \
|
||||
--disable-oss-wrapper \
|
||||
--disable-x11 \
|
||||
--disable-adrian-aec \
|
||||
--disable-alsa \
|
||||
--disable-asyncns \
|
||||
@ -107,7 +107,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib \
|
||||
-Wl,-rpath,${TRUEPREFIX}/lib/pulseaudio:${TRUEPREFIX}/lib/pulse-${VERSION}/modules"
|
||||
|
||||
FAKE_FLAGS= pulseconfdir="${PREFIX}/share/examples/pulseaudio/pulse"
|
||||
FAKE_FLAGS= pulseconfdir="${PREFIX}/share/examples/pulseaudio/pulse" \
|
||||
xdgautostartdir="${PREFIX}/share/examples/pulseaudio/xdg/autostart"
|
||||
|
||||
### SNDIO ###
|
||||
CONFIGURE_STYLE= gnu
|
||||
|
||||
22
audio/pulseaudio/patches/patch-src_daemon_main_c
Normal file
22
audio/pulseaudio/patches/patch-src_daemon_main_c
Normal file
@ -0,0 +1,22 @@
|
||||
$OpenBSD: patch-src_daemon_main_c,v 1.5 2012/11/30 12:26:15 ajacoutot Exp $
|
||||
|
||||
XXX deadlock?
|
||||
|
||||
--- src/daemon/main.c.orig Thu Jul 19 13:29:38 2012
|
||||
+++ src/daemon/main.c Fri Nov 30 11:50:26 2012
|
||||
@@ -735,6 +735,7 @@ int main(int argc, char *argv[]) {
|
||||
* first take the autospawn lock to make things
|
||||
* synchronous. */
|
||||
|
||||
+#if 0
|
||||
if ((autospawn_fd = pa_autospawn_lock_init()) < 0) {
|
||||
pa_log("Failed to initialize autospawn lock");
|
||||
goto finish;
|
||||
@@ -746,6 +747,7 @@ int main(int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
autospawn_locked = TRUE;
|
||||
+#endif
|
||||
}
|
||||
|
||||
if (conf->daemonize) {
|
||||
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-src_daemon_pulseaudio_desktop_in,v 1.1 2012/11/30 12:26:15 ajacoutot Exp $
|
||||
|
||||
From 1a6c9dc0a4f695764d48f06ac17ced42b7432499 Mon Sep 17 00:00:00 2001
|
||||
From: Lennart Poettering <lennart@poettering.net>
|
||||
Date: Tue, 15 May 2012 23:06:17 +0000
|
||||
Subject: gnome: start PA early in the gnome session
|
||||
|
||||
--- src/daemon/pulseaudio.desktop.in.orig Thu Jul 19 13:29:38 2012
|
||||
+++ src/daemon/pulseaudio.desktop.in Fri Nov 30 13:13:43 2012
|
||||
@@ -8,3 +8,4 @@ Terminal=false
|
||||
Type=Application
|
||||
Categories=
|
||||
GenericName=
|
||||
+X-GNOME-Autostart-Phase=Initialization
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.11 2012/09/29 09:32:05 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.12 2012/11/30 12:26:15 ajacoutot Exp $
|
||||
@newgroup _pulse:683
|
||||
@newgroup _pulse-access:684
|
||||
@newuser _pulse:683:683:daemon:PulseAudio System Daemon:/var/run/pulse:/sbin/nologin
|
||||
@ -12,7 +12,10 @@ bin/paplay
|
||||
bin/parec
|
||||
bin/parecord
|
||||
@bin bin/pasuspender
|
||||
@bin bin/pax11publish
|
||||
@bin bin/pulseaudio
|
||||
bin/start-pulseaudio-kde
|
||||
bin/start-pulseaudio-x11
|
||||
include/pulse/
|
||||
include/pulse/cdecl.h
|
||||
include/pulse/channelmap.h
|
||||
@ -119,6 +122,10 @@ 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/pulse-${VERSION}/modules/module-x11-bell.so
|
||||
lib/pulse-${VERSION}/modules/module-x11-cork-request.so
|
||||
lib/pulse-${VERSION}/modules/module-x11-publish.so
|
||||
lib/pulse-${VERSION}/modules/module-x11-xsmp.so
|
||||
lib/pulseaudio/
|
||||
lib/pulseaudio/libpulsecommon-${VERSION}.la
|
||||
lib/pulseaudio/libpulsecommon-${VERSION}.so
|
||||
@ -145,6 +152,14 @@ share/examples/pulseaudio/pulse/default.pa
|
||||
@sample ${SYSCONFDIR}/pulse/default.pa
|
||||
share/examples/pulseaudio/pulse/system.pa
|
||||
@sample ${SYSCONFDIR}/pulse/system.pa
|
||||
share/examples/pulseaudio/xdg/
|
||||
@sample ${SYSCONFDIR}/xdg/
|
||||
share/examples/pulseaudio/xdg/autostart/
|
||||
@sample ${SYSCONFDIR}/xdg/autostart/
|
||||
share/examples/pulseaudio/xdg/autostart/pulseaudio-kde.desktop
|
||||
@sample ${SYSCONFDIR}/xdg/autostart/pulseaudio-kde.desktop
|
||||
share/examples/pulseaudio/xdg/autostart/pulseaudio.desktop
|
||||
@sample ${SYSCONFDIR}/xdg/autostart/pulseaudio.desktop
|
||||
share/locale/as/LC_MESSAGES/pulseaudio.mo
|
||||
share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo
|
||||
share/locale/ca/LC_MESSAGES/pulseaudio.mo
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user