Attachment 155328 Details for Bug 198567 – Olivier's patch with 24 bit samples support

[patch] Olivier's patch with 24 bit samples support

puseaudio-24.diff (text/plain), 7.90 KB, created by Romain Tartière on 2015-04-08 03:02:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Romain Tartière

Created: 2015-04-08 03:02:40 UTC

Size: 7.90 KB

patch

obsolete

>diff -Nur /usr/ports/audio/pulseaudio/Makefile ./Makefile
>--- /usr/ports/audio/pulseaudio/Makefile	2015-03-25 22:37:39.000000000 +0100
>+++ ./Makefile	2015-04-08 04:47:42.700497734 +0200
>@@ -6,16 +6,14 @@
> # PORTREVISION bumps of depending ports.
> 
> PORTNAME=	pulseaudio
>-PORTVERSION=	5.0
>-PORTREVISION=	3
>+PORTVERSION=	6.0
> CATEGORIES=	audio
> MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
> 
> MAINTAINER=	gnome@FreeBSD.org
> COMMENT=	Sound server for UNIX
> 
>-LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
>-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
>+LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
> 		libspeexdsp.so:${PORTSDIR}/audio/speexdsp \
> 		libfftw3.so:${PORTSDIR}/math/fftw3 \
> 		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
>@@ -28,7 +26,8 @@
> USE_GNOME=	glib20 intltool
> USE_XORG=	x11 sm xtst ice
> USE_LDCONFIG=	yes
>-USES=		execinfo gettext gmake libtool pathfix pkgconfig tar:xz
>+USES=		execinfo gettext gmake libtool pathfix shebangfix \
>+		pkgconfig tar:xz
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread" \
> 		OPENSSL_CFLAGS="-I/usr/include" \
>@@ -39,9 +38,14 @@
> LDFLAGS+=	-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
> 
>+SHEBANG_FILES=	shell-completion/bash/pulseaudio
>+SHEBANG_LANG=	bash
>+bash_CMD=	${SETENV} bash
>+
> CONFIGURE_ARGS=	--localstatedir=/var \
> 		--with-database=simple \
> 		--without-caps \
>+		--without-zsh-completion-dir \
> 		--disable-udev \
> 		--disable-gtk3 \
> 		--disable-systemd \
>diff -Nur /usr/ports/audio/pulseaudio/distinfo ./distinfo
>--- /usr/ports/audio/pulseaudio/distinfo	2014-11-19 12:49:04.000000000 +0100
>+++ ./distinfo	2015-04-08 04:47:42.700497734 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (pulseaudio-5.0.tar.xz) = 99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939
>-SIZE (pulseaudio-5.0.tar.xz) = 1455428
>+SHA256 (pulseaudio-6.0.tar.xz) = b50640e0b80b1607600accfad2e45aabb79d379bf6354c9671efa2065477f6f6
>+SIZE (pulseaudio-6.0.tar.xz) = 1469248
>diff -Nur /usr/ports/audio/pulseaudio/files/patch-src_daemon_default.pa.in ./files/patch-src_daemon_default.pa.in
>--- /usr/ports/audio/pulseaudio/files/patch-src_daemon_default.pa.in	2014-11-19 12:49:04.000000000 +0100
>+++ ./files/patch-src_daemon_default.pa.in	2015-04-08 04:47:42.701497239 +0200
>@@ -1,17 +1,26 @@
>---- src/daemon/default.pa.in.orig	2011-10-21 15:14:14.000000000 +0200
>-+++ src/daemon/default.pa.in	2011-10-21 15:15:21.000000000 +0200
>-@@ -27,10 +27,10 @@
>+--- 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/gtk-events/activate.wav
>--#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
>--#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
>--#load-sample-lazy pulse-access /usr/share/sounds/generic.wav
>-+#load-sample-lazy x11-bell %%LOCALBASE%%/share/sounds/gtk-events/activate.wav
>-+#load-sample-lazy pulse-hotplug %%LOCALBASE%%/share/sounds/startup3.wav
>-+#load-sample-lazy pulse-coldplug %%LOCALBASE%%/share/sounds/startup3.wav
>-+#load-sample-lazy pulse-access %%LOCALBASE/share/sounds/generic.wav
>+-#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 -Nur /usr/ports/audio/pulseaudio/files/patch-src_modules_oss_oss-util.c ./files/patch-src_modules_oss_oss-util.c
>--- /usr/ports/audio/pulseaudio/files/patch-src_modules_oss_oss-util.c	2014-01-22 18:40:44.000000000 +0100
>+++ ./files/patch-src_modules_oss_oss-util.c	2015-04-08 04:48:53.068491694 +0200
>@@ -1,6 +1,9 @@
>---- src/modules/oss/oss-util.c.orig	2007-11-08 21:45:25.000000000 -0500
>-+++ src/modules/oss/oss-util.c	2008-01-09 17:00:45.000000000 -0500
>-@@ -44,6 +44,22 @@
>+
>+$FreeBSD$
>+
>+--- src/modules/oss/oss-util.c.orig
>++++ src/modules/oss/oss-util.c
>+@@ -39,6 +39,22 @@
>  
>  #include "oss-util.h"
>  
>@@ -23,3 +26,14 @@
>  int pa_oss_open(const char *device, int *mode, int* pcaps) {
>      int fd = -1;
>      int caps;
>+@@ -164,8 +180,8 @@
>+         [PA_SAMPLE_FLOAT32BE] = AFMT_QUERY, /* not supported */
>+         [PA_SAMPLE_S32LE] = AFMT_QUERY, /* not supported */
>+         [PA_SAMPLE_S32BE] = AFMT_QUERY, /* not supported */
>+-        [PA_SAMPLE_S24LE] = AFMT_QUERY, /* not supported */
>+-        [PA_SAMPLE_S24BE] = AFMT_QUERY, /* not supported */
>++        [PA_SAMPLE_S24LE] = AFMT_S24_LE,
>++        [PA_SAMPLE_S24BE] = AFMT_S24_BE,
>+         [PA_SAMPLE_S24_32LE] = AFMT_QUERY, /* not supported */
>+         [PA_SAMPLE_S24_32BE] = AFMT_QUERY, /* not supported */
>+     };
>diff -Nur /usr/ports/audio/pulseaudio/pkg-plist ./pkg-plist
>--- /usr/ports/audio/pulseaudio/pkg-plist	2014-11-19 12:49:04.000000000 +0100
>+++ ./pkg-plist	2015-04-08 04:47:42.712935369 +0200
>@@ -11,20 +11,27 @@
> bin/pax11publish
> bin/pulseaudio
> bin/qpaeq
>-bin/start-pulseaudio-kde
> bin/start-pulseaudio-x11
>-etc/bash_completion.d/pulseaudio-bash-completion.sh
>+etc/bash_completion.d/pacat
>+etc/bash_completion.d/pacmd
>+etc/bash_completion.d/pactl
>+etc/bash_completion.d/padsp
>+etc/bash_completion.d/paplay
>+etc/bash_completion.d/parec
>+etc/bash_completion.d/parecord
>+etc/bash_completion.d/pasuspender
>+etc/bash_completion.d/pulseaudio
> etc/dbus-1/system.d/pulseaudio-system.conf
> @sample etc/pulse/client.conf.sample
> @sample etc/pulse/daemon.conf.sample
> @sample etc/pulse/default.pa.sample
> @sample etc/pulse/system.pa.sample
> etc/xdg/autostart/pulseaudio.desktop
>-etc/xdg/autostart/pulseaudio-kde.desktop
> include/pulse/cdecl.h
> include/pulse/channelmap.h
> include/pulse/context.h
> include/pulse/def.h
>+include/pulse/direction.h
> include/pulse/error.h
> include/pulse/ext-device-manager.h
> include/pulse/ext-device-restore.h
>@@ -62,7 +69,7 @@
> lib/libpulse-simple.so.0.1.0
> lib/libpulse.so
> lib/libpulse.so.0
>-lib/libpulse.so.0.17.3
>+lib/libpulse.so.0.18.0
> lib/libpulsecore-%%PULSE_VERSION%%.so
> %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
> lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so
>@@ -167,7 +174,6 @@
> man/man1/pasuspender.1.gz
> man/man1/pax11publish.1.gz
> man/man1/pulseaudio.1.gz
>-man/man1/start-pulseaudio-kde.1.gz
> man/man1/start-pulseaudio-x11.1.gz
> man/man5/default.pa.5.gz
> man/man5/pulse-cli-syntax.5.gz
>@@ -244,15 +250,19 @@
> share/locale/pt/LC_MESSAGES/pulseaudio.mo
> share/locale/pt_BR/LC_MESSAGES/pulseaudio.mo
> share/locale/ru/LC_MESSAGES/pulseaudio.mo
>+share/locale/sk/LC_MESSAGES/pulseaudio.mo
> share/locale/sr/LC_MESSAGES/pulseaudio.mo
> share/locale/sr@latin/LC_MESSAGES/pulseaudio.mo
> share/locale/sv/LC_MESSAGES/pulseaudio.mo
> share/locale/ta/LC_MESSAGES/pulseaudio.mo
> share/locale/te/LC_MESSAGES/pulseaudio.mo
>+share/locale/tr/LC_MESSAGES/pulseaudio.mo
> share/locale/uk/LC_MESSAGES/pulseaudio.mo
> share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo
> share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo
> share/vala/vapi/libpulse-mainloop-glib.deps
> share/vala/vapi/libpulse-mainloop-glib.vapi
>+share/vala/vapi/libpulse-simple.deps
>+share/vala/vapi/libpulse-simple.vapi
> share/vala/vapi/libpulse.deps
> share/vala/vapi/libpulse.vapi

Actions: View | Diff

Attachments on bug 198567: 154274 | 154290 | 154838 | 155041 | 155328