FreeBSD Bugzilla – Attachment 172743 Details for
Bug 210548
audio/pulseaudio: Update to 9.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch (since 412344 revision)
pulseaudio_8.0-9.0.diff (text/plain), 13.07 KB, created by
lightside
on 2016-07-20 04:32:40 UTC
(
hide
)
Description:
Proposed patch (since 412344 revision)
Filename:
MIME Type:
Creator:
lightside
Created:
2016-07-20 04:32:40 UTC
Size:
13.07 KB
patch
obsolete
>diff -ruN pulseaudio.orig/Makefile pulseaudio/Makefile >--- pulseaudio.orig/Makefile 2016-04-01 17:29:15.000000000 +0400 >+++ pulseaudio/Makefile 2016-06-26 02:54:48.279436000 +0400 >@@ -5,7 +5,7 @@ > # PORTREVISION bumps of depending ports. > > PORTNAME= pulseaudio >-PORTVERSION= 8.0 >+PORTVERSION= 9.0 > CATEGORIES= audio > MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/ > >@@ -16,19 +16,17 @@ > LICENSE_FILE= ${WRKSRC}/LGPL > > LIB_DEPENDS= libsndfile.so:audio/libsndfile \ >- libspeexdsp.so:audio/speexdsp \ > libfftw3.so:math/fftw3 \ > libfftw3f.so:math/fftw3-float \ >- liborc-0.4.so:devel/orc \ > libjson-c.so:devel/json-c \ > libdbus-1.so:devel/dbus \ > libltdl.so:devel/libltdl \ > libck-connector.so:sysutils/consolekit > > USE_GNOME= glib20 intltool >-USE_XORG= x11 sm xtst ice >+USE_XORG= ice sm x11 xcb xtst > USE_LDCONFIG= yes >-USES= cpe compiler:c11 execinfo gettext gmake gnome libtool \ >+USES= compiler:c11 cpe execinfo gettext gmake gnome iconv libtool \ > pathfix pkgconfig shebangfix tar:xz > GNU_CONFIGURE= yes > CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" \ >@@ -45,53 +43,76 @@ > SUB_FILES= pkg-message > > CONFIGURE_ARGS= --localstatedir=/var \ >- --with-database=simple \ > --without-caps \ > --disable-udev \ > --disable-gtk3 \ >- --disable-systemd \ >+ --disable-systemd-daemon \ >+ --disable-systemd-journal \ >+ --disable-systemd-login \ > --disable-neon-opt \ > --disable-xen \ > --disable-lirc # untested > >-#FIXME --with-database=auto|tdb|gdbm|simple >- > USERS= pulse > GROUPS= pulse pulse-access pulse-rt > > OPTIONS_SUB= yes >-OPTIONS_DEFINE= JACK AVAHI GCONF ALSA SIMD BASH ZSH >-OPTIONS_DEFAULT=AVAHI SIMD >-JACK_CONFIGURE_ENABLE= jack >-JACK_LIB_DEPENDS= libjack.so:audio/jack >+OPTIONS_DEFINE= AVAHI GCONF SIMD >+OPTIONS_DEFAULT=AVAHI SIMD SIMPLE SOXR SPEEX > AVAHI_CONFIGURE_ENABLE= avahi > AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app > GCONF_CONFIGURE_ENABLE= gconf > GCONF_USE= GNOME=gconf2 >-ALSA_CONFIGURE_ENABLE= alsa >-ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib > SIMD_CONFIGURE_ENABLE= orc > SIMD_LIB_DEPENDS= liborc-0.4.so:devel/orc >+ >+OPTIONS_GROUP= AUDIO COMPLETIONS >+OPTIONS_GROUP_AUDIO= ALSA JACK SOXR SPEEX >+OPTIONS_GROUP_COMPLETIONS= BASH ZSH >+AUDIO_DESC= Supported audio >+COMPLETIONS_DESC= Programmable completions >+ALSA_CONFIGURE_ENABLE= alsa >+ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib >+JACK_CONFIGURE_ENABLE= jack >+JACK_LIB_DEPENDS= libjack.so:audio/jack >+SOXR_DESC= SoX resampler support >+SOXR_CONFIGURE_WITH= soxr >+SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr >+SPEEX_DESC= Speex resampler and AEC support >+SPEEX_CONFIGURE_WITH= speex >+SPEEX_LIB_DEPENDS= libspeexdsp.so:audio/speexdsp > ZSH_CONFIGURE_OFF= --without-zsh-completion-dir > >+OPTIONS_SINGLE= DATABASE >+OPTIONS_SINGLE_DATABASE= TDB GDBM SIMPLE >+DATABASE_DESC= Supported database >+GDBM_DESC= GNU database manager support >+GDBM_CONFIGURE_ON= --with-database=gdbm >+GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm >+SIMPLE_DESC= Simple database support >+SIMPLE_CONFIGURE_ON= --with-database=simple >+TDB_DESC= Trivial database support >+TDB_CONFIGURE_ON= --with-database=tdb >+TDB_LIB_DEPENDS= libtdb.so:databases/tdb >+ > PULSE_VERSION= ${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} > PLIST_SUB= PULSE_VERSION=${PULSE_VERSION} > > post-patch: >- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ >+ @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \ > ${WRKSRC}/src/daemon/default.pa.in > @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ > -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \ > ${WRKSRC}/configure > > post-install: >- ${MKDIR} ${STAGEDIR}${PREFIX}/etc/pulse >+ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/pulse > .for ii in default.pa daemon.conf client.conf system.pa > ${INSTALL_DATA} ${WRKSRC}/src/${ii} \ > ${STAGEDIR}${PREFIX}/etc/pulse/${ii}.sample > .endfor > > post-install-BASH-off: >- @${RM} -rf ${STAGEDIR}${PREFIX}/share/bash-completion >+ @${RM} -r ${STAGEDIR}${PREFIX}/share/bash-completion > > .include <bsd.port.mk> >diff -ruN pulseaudio.orig/distinfo pulseaudio/distinfo >--- pulseaudio.orig/distinfo 2016-02-14 22:57:53.000000000 +0400 >+++ pulseaudio/distinfo 2016-07-20 07:26:21.589834000 +0400 >@@ -1,2 +1,3 @@ >-SHA256 (pulseaudio-8.0.tar.xz) = 690eefe28633466cfd1ab9d85ebfa9376f6b622deec6bfee5091ac9737cd1989 >-SIZE (pulseaudio-8.0.tar.xz) = 1517656 >+TIMESTAMP = 1466578411 >+SHA256 (pulseaudio-9.0.tar.xz) = c3d3d66b827f18fbe903fe3df647013f09fc1e2191c035be1ee2d82a9e404686 >+SIZE (pulseaudio-9.0.tar.xz) = 1537568 >diff -ruN pulseaudio.orig/files/patch-src_Makefile.in pulseaudio/files/patch-src_Makefile.in >--- pulseaudio.orig/files/patch-src_Makefile.in 2016-02-14 22:57:53.000000000 +0400 >+++ pulseaudio/files/patch-src_Makefile.in 2016-06-25 03:00:59.211017000 +0400 >@@ -1,6 +1,6 @@ >---- src/Makefile.in.orig 2016-02-01 11:20:44.952568000 +0100 >-+++ src/Makefile.in 2016-02-01 11:22:08.462998000 +0100 >-@@ -11042,7 +11042,7 @@ >+--- src/Makefile.in.orig 2016-06-24 23:00:54 UTC >++++ src/Makefile.in >+@@ -11092,7 +11092,7 @@ info-am: > > install-data-am: install-commonlibLTLIBRARIES install-dbuspolicyDATA \ > install-dist_alsapathsDATA install-dist_alsaprofilesetsDATA \ >diff -ruN pulseaudio.orig/files/patch-src_daemon_default.pa.in pulseaudio/files/patch-src_daemon_default.pa.in >--- pulseaudio.orig/files/patch-src_daemon_default.pa.in 2015-04-16 01:41:25.000000000 +0400 >+++ pulseaudio/files/patch-src_daemon_default.pa.in 1970-01-01 03:00:00.000000000 +0300 >@@ -1,26 +0,0 @@ >---- src/daemon/default.pa.in.orig 2015-02-12 14:10:35 UTC >-+++ src/daemon/default.pa.in >-@@ -26,10 +26,10 @@ ifelse(@OS_IS_WIN32@, 1, [dnl >- load-sample x11-bell %WINDIR%\Media\ding.wav >- load-sample-dir-lazy %WINDIR%\Media\*.wav >- ], [dnl >--#load-sample-lazy x11-bell /usr/share/sounds/freedesktop/stereo/bell.oga >--#load-sample-lazy pulse-hotplug /usr/share/sounds/freedesktop/stereo/device-added.oga >--#load-sample-lazy pulse-coldplug /usr/share/sounds/freedesktop/stereo/device-added.oga >--#load-sample-lazy pulse-access /usr/share/sounds/freedesktop/stereo/message.oga >-+#load-sample-lazy x11-bell %%LOCALBASE%%/share/sounds/freedesktop/stereo/bell.oga >-+#load-sample-lazy pulse-hotplug %%LOCALBASE%%/share/sounds/freedesktop/stereo/device-added.oga >-+#load-sample-lazy pulse-coldplug %%LOCALBASE%%/share/sounds/freedesktop/stereo/device-added.oga >-+#load-sample-lazy pulse-access %%LOCALBASE%%/share/sounds/freedesktop/stereo/message.oga >- ])dnl >- >- .fail >-@@ -40,7 +40,7 @@ load-module module-stream-restore >- load-module module-card-restore >- >- ### Automatically augment property information from .desktop files >--### stored in /usr/share/application >-+### stored in %%LOCALBASE%%/share/application >- load-module module-augment-properties >- >- ### Should be after module-*-restore but before module-*-detect >diff -ruN pulseaudio.orig/files/patch-src_modules_module-detect.c pulseaudio/files/patch-src_modules_module-detect.c >--- pulseaudio.orig/files/patch-src_modules_module-detect.c 2014-11-19 15:49:04.000000000 +0400 >+++ pulseaudio/files/patch-src_modules_module-detect.c 2016-06-25 03:00:59.215959000 +0400 >@@ -1,16 +1,6 @@ >---- src/modules/module-detect.c.orig 2010-11-26 01:45:43.000000000 +0100 >-+++ src/modules/module-detect.c 2011-03-03 00:35:10.000000000 +0100 >-@@ -50,7 +50,9 @@ PA_MODULE_DESCRIPTION("Detect available >- PA_MODULE_VERSION(PACKAGE_VERSION); >- PA_MODULE_LOAD_ONCE(TRUE); >- PA_MODULE_USAGE("just-one=<boolean>"); >-+#ifdef __linux__ >- PA_MODULE_DEPRECATED("Please use module-udev-detect instead of module-detect!"); >-+#endif >- >- static const char* const valid_modargs[] = { >- "just-one", >-@@ -161,8 +163,7 @@ static int detect_oss(pa_core *c, int ju >+--- src/modules/module-detect.c.orig 2016-05-10 12:28:04 UTC >++++ src/modules/module-detect.c >+@@ -160,8 +160,7 @@ static int detect_oss(pa_core *c, int ju > continue; > > } else if (sscanf(line, "pcm%u: ", &device) == 1) { >diff -ruN pulseaudio.orig/files/patch-src_modules_oss_module-oss.c pulseaudio/files/patch-src_modules_oss_module-oss.c >--- pulseaudio.orig/files/patch-src_modules_oss_module-oss.c 2016-02-14 22:57:53.000000000 +0400 >+++ pulseaudio/files/patch-src_modules_oss_module-oss.c 2016-06-25 03:00:59.220890000 +0400 >@@ -1,6 +1,6 @@ >---- src/modules/oss/module-oss.c.orig 2015-08-06 11:39:12.000000000 +0200 >-+++ src/modules/oss/module-oss.c 2015-09-03 13:13:37.953255000 +0200 >-@@ -1227,10 +1227,14 @@ >+--- src/modules/oss/module-oss.c.orig 2016-05-03 06:17:39 UTC >++++ src/modules/oss/module-oss.c >+@@ -1227,10 +1227,14 @@ int pa__init(pa_module*m) { > use_mmap = false; > } > >diff -ruN pulseaudio.orig/files/patch-src_modules_oss_oss-util.c pulseaudio/files/patch-src_modules_oss_oss-util.c >--- pulseaudio.orig/files/patch-src_modules_oss_oss-util.c 2015-04-16 01:41:25.000000000 +0400 >+++ pulseaudio/files/patch-src_modules_oss_oss-util.c 2016-06-25 03:00:59.226178000 +0400 >@@ -1,8 +1,8 @@ > Support 24bit audio see Comment 6 of > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198567 > >---- src/modules/oss/oss-util.c.orig 2015-02-12 15:10:35.000000000 +0100 >-+++ src/modules/oss/oss-util.c 2015-04-15 14:41:41.512557000 +0200 >+--- src/modules/oss/oss-util.c.orig 2016-05-03 06:17:39 UTC >++++ src/modules/oss/oss-util.c > @@ -39,6 +39,22 @@ > > #include "oss-util.h" >@@ -26,7 +26,7 @@ > int pa_oss_open(const char *device, int *mode, int* pcaps) { > int fd = -1; > int caps; >-@@ -164,8 +180,8 @@ >+@@ -164,8 +180,8 @@ int pa_oss_auto_format(int fd, pa_sample > [PA_SAMPLE_FLOAT32BE] = AFMT_QUERY, /* not supported */ > [PA_SAMPLE_S32LE] = AFMT_QUERY, /* not supported */ > [PA_SAMPLE_S32BE] = AFMT_QUERY, /* not supported */ >diff -ruN pulseaudio.orig/files/patch-src_pulse_introspect.c pulseaudio/files/patch-src_pulse_introspect.c >--- pulseaudio.orig/files/patch-src_pulse_introspect.c 2014-01-22 21:40:44.000000000 +0400 >+++ pulseaudio/files/patch-src_pulse_introspect.c 2016-06-25 03:00:59.231077000 +0400 >@@ -1,11 +1,11 @@ >---- src/pulse/introspect.c.orig 2008-01-03 20:01:31.000000000 -0500 >-+++ src/pulse/introspect.c 2008-01-03 20:01:39.000000000 -0500 >-@@ -26,6 +26,8 @@ >+--- src/pulse/introspect.c.orig 2016-05-03 06:17:39 UTC >++++ src/pulse/introspect.c >+@@ -22,6 +22,8 @@ > #include <config.h> > #endif > > +#include <string.h> > + > #include <pulse/context.h> >- >- #include <pulsecore/gccmacro.h> >+ #include <pulse/direction.h> >+ #include <pulse/xmalloc.h> >diff -ruN pulseaudio.orig/files/patch-src_pulse_util.c pulseaudio/files/patch-src_pulse_util.c >--- pulseaudio.orig/files/patch-src_pulse_util.c 2015-06-14 01:32:14.000000000 +0400 >+++ pulseaudio/files/patch-src_pulse_util.c 2016-06-25 03:00:59.235860000 +0400 >@@ -1,5 +1,5 @@ >---- src/pulse/util.c.orig 2015-02-12 09:10:35.000000000 -0500 >-+++ src/pulse/util.c 2015-06-13 17:15:14.603153000 -0400 >+--- src/pulse/util.c.orig 2016-05-03 06:17:39 UTC >++++ src/pulse/util.c > @@ -30,6 +30,10 @@ > #include <time.h> > #include <unistd.h> >@@ -25,15 +25,14 @@ > #ifdef __FreeBSD__ > { > - char *rp; >-- >++ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()}; >++ struct kinfo_proc kp; >++ size_t sz = sizeof(kp); >+ > - if ((rp = pa_readlink("/proc/curproc/file"))) { > - pa_strlcpy(s, pa_path_get_filename(rp), l); > - pa_xfree(rp); > - return s; >-+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()}; >-+ struct kinfo_proc kp; >-+ size_t sz = sizeof(kp); >-+ > + if (sysctl(mib, 4, &kp, &sz, NULL, 0) == 0) > + { > + pa_strlcpy(s, kp.ki_comm, l); >diff -ruN pulseaudio.orig/files/patch-src_pulsecore_atomic.h pulseaudio/files/patch-src_pulsecore_atomic.h >--- pulseaudio.orig/files/patch-src_pulsecore_atomic.h 2015-04-16 01:41:25.000000000 +0400 >+++ pulseaudio/files/patch-src_pulsecore_atomic.h 2016-06-25 03:00:59.241112000 +0400 >@@ -1,6 +1,6 @@ >---- src/pulsecore/atomic.h.orig 2015-02-12 15:10:35.000000000 +0100 >-+++ src/pulsecore/atomic.h 2015-03-29 15:54:11.161110000 +0200 >-@@ -185,39 +185,6 @@ >+--- src/pulsecore/atomic.h.orig 2016-06-01 10:50:54 UTC >++++ src/pulsecore/atomic.h >+@@ -185,39 +185,6 @@ static inline bool pa_atomic_ptr_cmpxchg > #include <sys/param.h> > #include <machine/atomic.h> > >diff -ruN pulseaudio.orig/files/patch-src_pulsecore_shm.c pulseaudio/files/patch-src_pulsecore_shm.c >--- pulseaudio.orig/files/patch-src_pulsecore_shm.c 2014-11-19 15:49:04.000000000 +0400 >+++ pulseaudio/files/patch-src_pulsecore_shm.c 2016-06-25 03:00:59.246166000 +0400 >@@ -1,6 +1,6 @@ >---- src/pulsecore/shm.c.orig 2013-04-14 06:42:35.000000000 +0200 >-+++ src/pulsecore/shm.c 2013-06-24 17:25:58.000000000 +0200 >-@@ -97,7 +97,7 @@ struct shm_marker { >+--- src/pulsecore/shm.c.orig 2016-06-21 10:58:21 UTC >++++ src/pulsecore/shm.c >+@@ -102,7 +102,7 @@ static inline size_t shm_marker_size(pa_ > > #ifdef HAVE_SHM_OPEN > static char *segment_name(char *fn, size_t l, unsigned id) { >diff -ruN pulseaudio.orig/pkg-plist pulseaudio/pkg-plist >--- pulseaudio.orig/pkg-plist 2016-02-14 22:57:53.000000000 +0400 >+++ pulseaudio/pkg-plist 2016-06-25 03:10:41.239761000 +0400 >@@ -69,7 +69,7 @@ > lib/libpulse-simple.so.0.1.0 > lib/libpulse.so > lib/libpulse.so.0 >-lib/libpulse.so.0.19.0 >+lib/libpulse.so.0.20.0 > %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so > lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so > %%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/libalsa-util.so
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=172743">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 210548
:
171770
|
171771
|
171772
|
171773
|
171774
|
171775
|
171803
|
171805
|
171807
|
172447
|
172743
|
172765
|
173016
|
173025
|
173073
|
173914
|
175353
|
176132