Update to pulseaudio-10.0.

ok robert@ (maintainer)
This commit is contained in:
ajacoutot 2017-01-19 19:32:06 +00:00
parent e99a32b781
commit 0a3d0909e0
7 changed files with 45 additions and 43 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.78 2016/06/28 08:47:18 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.79 2017/01/19 19:32:06 ajacoutot Exp $
# XXX
# sndio: what to do with (channel) map
@ -7,11 +7,11 @@
COMMENT= cross-platform networked sound server
VERSION= 9.0
VERSION= 10.0
DISTNAME= pulseaudio-${VERSION}
EXTRACT_SUFX= .tar.xz
SHARED_LIBS += pulse 6.0 # .19.0
SHARED_LIBS += pulse 6.1 # .20.1
SHARED_LIBS += pulse-simple 1.0 # .1.0
SHARED_LIBS += pulse-mainloop-glib 1.0 # .0.5
@ -26,9 +26,8 @@ HOMEPAGE= http://www.pulseaudio.org/
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += FLAC ICE SM X11 X11-xcb Xext Xi Xtst c crypto dbus-1
WANTLIB += execinfo gdbm glib-2.0 iconv intl json-c ltdl m ogg
WANTLIB += pcre pthread sndfile sndio speexdsp ssl vorbis vorbisenc
WANTLIB += xcb
WANTLIB += execinfo gdbm glib-2.0 iconv intl ltdl m ogg pcre pthread
WANTLIB += sndfile sndio speexdsp ssl vorbis vorbisenc xcb
MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/
@ -55,7 +54,6 @@ LIB_DEPENDS= audio/libsndfile \
audio/speex \
databases/gdbm \
devel/glib2 \
devel/json-c \
devel/libexecinfo \
devel/libtool,-ltdl \
x11/dbus

View File

@ -1,2 +1,2 @@
SHA256 (pulseaudio-9.0.tar.xz) = w9PWa4J/GPvpA/499kcBPwn8HiGRwDW+HuLYKp5ARoY=
SIZE (pulseaudio-9.0.tar.xz) = 1537568
SHA256 (pulseaudio-10.0.tar.xz) = oxhoJN6fDSCV3tXQ0NsEBdxzEzmDwvuzcpFUfjdGL1c=
SIZE (pulseaudio-10.0.tar.xz) = 1608040

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.13 2016/06/28 08:47:18 ajacoutot Exp $
--- configure.ac.orig Wed Jun 22 08:53:09 2016
+++ configure.ac Tue Jun 28 09:57:18 2016
@@ -1041,7 +1041,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DEFINE([HAVE_DBU
$OpenBSD: patch-configure_ac,v 1.14 2017/01/19 19:32:06 ajacoutot Exp $
--- configure.ac.orig Fri Jan 13 04:02:18 2017
+++ configure.ac Thu Jan 19 09:51:12 2017
@@ -1037,7 +1037,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DEFINE([HAVE_DBU
PA_MACHINE_ID="${sysconfdir}/machine-id"
AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.13 2016/06/28 08:47:18 ajacoutot Exp $
AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
[Fallback machine-id file])
@@ -1364,9 +1364,9 @@ fi
@@ -1336,9 +1336,9 @@ fi
PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"
AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir])

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-src_Makefile_am,v 1.12 2016/06/28 08:47:18 ajacoutot Exp $
--- src/Makefile.am.orig Tue Jun 21 12:58:07 2016
+++ src/Makefile.am Tue Jun 28 09:57:18 2016
@@ -728,7 +728,7 @@ endif
$OpenBSD: patch-src_Makefile_am,v 1.13 2017/01/19 19:32:06 ajacoutot Exp $
--- src/Makefile.am.orig Fri Jan 13 04:02:18 2017
+++ src/Makefile.am Thu Jan 19 09:52:09 2017
@@ -742,7 +742,7 @@ endif
libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS) $(LIBSNDFILE_CFLAGS)
libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) -avoid-version
-libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBJSON_LIBS) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS)
+libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBJSON_LIBS) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS) -lexecinfo
-libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS)
+libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS) -lexecinfo
if HAVE_MEMFD
libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += \
@@ -1265,6 +1265,9 @@ modlibexec_LTLIBRARIES += \
@@ -1280,6 +1280,9 @@ modlibexec_LTLIBRARIES += \
module-oss.la
endif
@ -20,7 +20,7 @@ $OpenBSD: patch-src_Makefile_am,v 1.12 2016/06/28 08:47:18 ajacoutot Exp $
if HAVE_COREAUDIO
modlibexec_LTLIBRARIES += \
module-coreaudio-detect.la \
@@ -1499,6 +1502,7 @@ SYMDEF_FILES = \
@@ -1507,6 +1510,7 @@ SYMDEF_FILES = \
module-x11-xsmp-symdef.h \
module-x11-cork-request-symdef.h \
module-oss-symdef.h \
@ -28,7 +28,7 @@ $OpenBSD: patch-src_Makefile_am,v 1.12 2016/06/28 08:47:18 ajacoutot Exp $
module-alsa-sink-symdef.h \
module-alsa-source-symdef.h \
module-alsa-card-symdef.h \
@@ -1819,6 +1823,12 @@ liboss_util_la_LIBADD = $(MODULE_LIBADD)
@@ -1828,6 +1832,12 @@ liboss_util_la_LIBADD = $(MODULE_LIBADD)
module_oss_la_SOURCES = modules/oss/module-oss.c
module_oss_la_LDFLAGS = $(MODULE_LDFLAGS)
module_oss_la_LIBADD = $(MODULE_LIBADD) liboss-util.la

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_pulsecore_core-util_c,v 1.1 2017/01/19 19:32:06 ajacoutot Exp $
On mips64, macro PAGE_SIZE is not really usable in userspace because
page size varies between systems.
--- src/pulsecore/core-util.c.orig Thu Jan 19 09:53:22 2017
+++ src/pulsecore/core-util.c Thu Jan 19 09:54:21 2017
@@ -3692,6 +3692,10 @@ bool pa_running_in_vm(void) {
return false;
}
+#if defined(__OpenBSD__) && defined(__mips__)
+#undef PAGE_SIZE
+#endif
+
size_t pa_page_size(void) {
#if defined(PAGE_SIZE)
return PAGE_SIZE;

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-src_pulsecore_macro_h,v 1.1 2016/02/09 16:20:15 visa Exp $
On mips64, macro PAGE_SIZE is not really usable in userspace because
page size varies between systems.
--- src/pulsecore/macro.h.orig Fri Feb 5 06:59:36 2016
+++ src/pulsecore/macro.h Fri Feb 5 07:01:05 2016
@@ -44,6 +44,10 @@
#endif
#endif
+#if defined(__OpenBSD__) && defined(__mips__)
+#undef PAGE_SIZE
+#endif
+
#if defined(PAGE_SIZE)
#define PA_PAGE_SIZE ((size_t) PAGE_SIZE)
#elif defined(PAGESIZE)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.22 2016/01/25 06:56:07 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.23 2017/01/19 19:32:06 ajacoutot Exp $
@newgroup _pulse:683
@newgroup _pulse-access:684
@newuser _pulse:683:683:daemon:PulseAudio System Daemon:/var/run/pulse:/sbin/nologin
@ -73,6 +73,7 @@ lib/pulse-${VERSION}/modules/libprotocol-native.so
lib/pulse-${VERSION}/modules/libprotocol-simple.so
lib/pulse-${VERSION}/modules/libraop.so
lib/pulse-${VERSION}/modules/librtp.so
lib/pulse-${VERSION}/modules/module-allow-passthrough.so
lib/pulse-${VERSION}/modules/module-always-sink.so
lib/pulse-${VERSION}/modules/module-augment-properties.so
lib/pulse-${VERSION}/modules/module-card-restore.so
@ -189,6 +190,7 @@ share/examples/pulseaudio/xdg/autostart/
share/examples/pulseaudio/xdg/autostart/pulseaudio.desktop
@sample ${SYSCONFDIR}/xdg/autostart/pulseaudio.desktop
share/locale/as/LC_MESSAGES/pulseaudio.mo
share/locale/be/LC_MESSAGES/pulseaudio.mo
share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo
share/locale/ca/LC_MESSAGES/pulseaudio.mo
share/locale/cs/LC_MESSAGES/pulseaudio.mo
@ -200,6 +202,7 @@ share/locale/el/LC_MESSAGES/pulseaudio.mo
share/locale/es/LC_MESSAGES/pulseaudio.mo
share/locale/fi/LC_MESSAGES/pulseaudio.mo
share/locale/fr/LC_MESSAGES/pulseaudio.mo
share/locale/gl/LC_MESSAGES/pulseaudio.mo
share/locale/gu/LC_MESSAGES/pulseaudio.mo
share/locale/he/LC_MESSAGES/pulseaudio.mo
share/locale/hi/LC_MESSAGES/pulseaudio.mo
@ -209,6 +212,7 @@ share/locale/it/LC_MESSAGES/pulseaudio.mo
share/locale/ja/LC_MESSAGES/pulseaudio.mo
share/locale/kn/LC_MESSAGES/pulseaudio.mo
share/locale/ko/LC_MESSAGES/pulseaudio.mo
share/locale/lt/LC_MESSAGES/pulseaudio.mo
share/locale/ml/LC_MESSAGES/pulseaudio.mo
share/locale/mr/LC_MESSAGES/pulseaudio.mo
share/locale/nl/LC_MESSAGES/pulseaudio.mo