Date: Fri, 9 Nov 2018 15:32:15 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484515 - in head: audio/pulseaudio audio/pulseaudio/files net/xrdp Message-ID: <201811091532.wA9FWFet035110@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Fri Nov 9 15:32:15 2018 New Revision: 484515 URL: https://svnweb.freebsd.org/changeset/ports/484515 Log: audio/pulseaudio: Update to 12.2 PR: 229192 Submitted by: lightside <lightside@gmx.com> Added: head/audio/pulseaudio/files/patch-src_utils_padsp.c (contents, props changed) Deleted: head/audio/pulseaudio/files/patch-src_Makefile.in Modified: head/audio/pulseaudio/Makefile (contents, props changed) head/audio/pulseaudio/distinfo (contents, props changed) head/audio/pulseaudio/files/patch-src_modules_module-detect.c (contents, props changed) head/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c (contents, props changed) head/audio/pulseaudio/pkg-plist (contents, props changed) head/net/xrdp/Makefile (contents, props changed) Modified: head/audio/pulseaudio/Makefile ============================================================================== --- head/audio/pulseaudio/Makefile Fri Nov 9 14:44:36 2018 (r484514) +++ head/audio/pulseaudio/Makefile Fri Nov 9 15:32:15 2018 (r484515) @@ -5,8 +5,7 @@ # PORTREVISION bumps of depending ports. PORTNAME= pulseaudio -PORTVERSION= 11.1 -PORTREVISION= 2 +PORTVERSION= 12.2 CATEGORIES= audio MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/ @@ -23,11 +22,12 @@ LIB_DEPENDS= libsndfile.so:audio/libsndfile \ libltdl.so:devel/libltdl \ libck-connector.so:sysutils/consolekit2 +USES= compiler:c11 cpe gettext gmake gnome iconv libtool \ + pathfix pkgconfig python:run shebangfix ssl tar:xz + USE_GNOME= glib20 intltool USE_XORG= ice sm x11 xcb xtst USE_LDCONFIG= yes -USES= compiler:c11 cpe gettext gmake gnome iconv libtool \ - pathfix pkgconfig python:run shebangfix ssl tar:xz GNU_CONFIGURE= yes CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" \ OPENSSL_CFLAGS="-I${OPENSSLINC}" \ @@ -57,12 +57,14 @@ USERS= pulse GROUPS= pulse pulse-access pulse-rt OPTIONS_SUB= yes -OPTIONS_DEFINE= AVAHI GCONF SIMD +OPTIONS_DEFINE= AVAHI GCONF GSETTINGS SIMD OPTIONS_DEFAULT=AVAHI SIMD SIMPLE SOXR SPEEX WEBRTC_AEC AVAHI_CONFIGURE_ENABLE= avahi AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app GCONF_CONFIGURE_ENABLE= gconf GCONF_USE= GNOME=gconf2 +GSETTINGS_DESC= GSettings configuration backend support +GSETTINGS_CONFIGURE_ENABLE= gsettings SIMD_CONFIGURE_ENABLE= orc SIMD_LIB_DEPENDS= liborc-0.4.so:devel/orc @@ -112,6 +114,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/src/${ii} \ ${STAGEDIR}${PREFIX}/etc/pulse/${ii}.sample .endfor +# Delete ${STAGEDIR}${PREFIX}/libexec/pulse directory, if it's empty + @(cd ${STAGEDIR}${PREFIX}/libexec && \ + ${FIND} * -maxdepth 0 -type d -empty -name pulse -delete) post-install-BASH-off: @${RM} -r ${STAGEDIR}${PREFIX}/share/bash-completion Modified: head/audio/pulseaudio/distinfo ============================================================================== --- head/audio/pulseaudio/distinfo Fri Nov 9 14:44:36 2018 (r484514) +++ head/audio/pulseaudio/distinfo Fri Nov 9 15:32:15 2018 (r484515) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505745938 -SHA256 (pulseaudio-11.1.tar.xz) = f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e -SIZE (pulseaudio-11.1.tar.xz) = 1648924 +TIMESTAMP = 1531753054 +SHA256 (pulseaudio-12.2.tar.xz) = 809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055 +SIZE (pulseaudio-12.2.tar.xz) = 1665092 Modified: head/audio/pulseaudio/files/patch-src_modules_module-detect.c ============================================================================== --- head/audio/pulseaudio/files/patch-src_modules_module-detect.c Fri Nov 9 14:44:36 2018 (r484514) +++ head/audio/pulseaudio/files/patch-src_modules_module-detect.c Fri Nov 9 15:32:15 2018 (r484515) @@ -1,20 +1,18 @@ ---- src/modules/module-detect.c.orig 2017-09-03 11:41:12 UTC +--- src/modules/module-detect.c.orig 2018-05-11 11:43:30 UTC +++ src/modules/module-detect.c -@@ -160,11 +160,41 @@ static int detect_oss(pa_core *c, int ju +@@ -160,11 +160,40 @@ static int detect_oss(pa_core *c, int ju continue; } else if (sscanf(line, "pcm%u: ", &device) == 1) { - /* FreeBSD support, the devices are named /dev/dsp0.0, dsp0.1 and so on */ - pa_snprintf(args, sizeof(args), "device=/dev/dsp%u.0", device); + pa_snprintf(args, sizeof(args), "device=/dev/dsp%u", device); -+ pa_module *m = pa_module_load(c, "module-oss", args); -- if (!pa_module_load(c, "module-oss", args)) -+ if (!m) -+ continue; + if (pa_module_load(&m, c, "module-oss", args) < 0) + continue; + + if (!pa_endswith(line, "default")) - continue; ++ continue; + + const char *p = strrchr(line, '('); + Modified: head/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c ============================================================================== --- head/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c Fri Nov 9 14:44:36 2018 (r484514) +++ head/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c Fri Nov 9 15:32:15 2018 (r484515) @@ -1,6 +1,6 @@ ---- src/modules/oss/module-oss.c.orig 2015-09-10 04:51:41 UTC +--- src/modules/oss/module-oss.c.orig 2018-05-07 14:30:52 UTC +++ src/modules/oss/module-oss.c -@@ -1227,10 +1227,14 @@ int pa__init(pa_module*m) { +@@ -1235,10 +1235,14 @@ int pa__init(pa_module*m) { use_mmap = false; } Added: head/audio/pulseaudio/files/patch-src_utils_padsp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/pulseaudio/files/patch-src_utils_padsp.c Fri Nov 9 15:32:15 2018 (r484515) @@ -0,0 +1,14 @@ +# Revert some changes after following commit: +# https://github.com/pulseaudio/pulseaudio/commit/66885ad633db0f371693475c72133e91f1e09ee5 + +--- src/utils/padsp.c.orig 2018-05-11 11:43:31 UTC ++++ src/utils/padsp.c +@@ -2394,7 +2394,7 @@ fail: + return ret; + } + +-#ifndef __GLIBC__ ++#ifdef sun + int ioctl(int fd, int request, ...) { + #else + int ioctl(int fd, unsigned long request, ...) { Modified: head/audio/pulseaudio/pkg-plist ============================================================================== --- head/audio/pulseaudio/pkg-plist Fri Nov 9 14:44:36 2018 (r484514) +++ head/audio/pulseaudio/pkg-plist Fri Nov 9 15:32:15 2018 (r484515) @@ -69,7 +69,7 @@ lib/libpulse-simple.so.0 lib/libpulse-simple.so.0.1.1 lib/libpulse.so lib/libpulse.so.0 -lib/libpulse.so.0.20.2 +lib/libpulse.so.0.20.3 %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so lib/pulse-%%PULSE_VERSION%%/modules/module-allow-passthrough.so lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so @@ -88,6 +88,7 @@ lib/pulse-%%PULSE_VERSION%%/modules/librtp.so %%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-sink.so %%ALSA%%lib/pulse-%%PULSE_VERSION%%/modules/module-alsa-source.so lib/pulse-%%PULSE_VERSION%%/modules/module-always-sink.so +lib/pulse-%%PULSE_VERSION%%/modules/module-always-source.so lib/pulse-%%PULSE_VERSION%%/modules/module-augment-properties.so lib/pulse-%%PULSE_VERSION%%/modules/module-card-restore.so lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.so @@ -110,6 +111,7 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink lib/pulse-%%PULSE_VERSION%%/modules/module-filter-apply.so lib/pulse-%%PULSE_VERSION%%/modules/module-filter-heuristics.so %%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.so +%%GSETTINGS%%lib/pulse-%%PULSE_VERSION%%/modules/module-gsettings.so lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.so lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.so lib/pulse-%%PULSE_VERSION%%/modules/module-intended-roles.so @@ -167,6 +169,7 @@ libdata/pkgconfig/libpulse-mainloop-glib.pc libdata/pkgconfig/libpulse-simple.pc libdata/pkgconfig/libpulse.pc %%GCONF%%libexec/pulse/gconf-helper +%%GSETTINGS%%libexec/pulse/gsettings-helper man/man1/esdcompat.1.gz man/man1/pacat.1.gz man/man1/pacmd.1.gz @@ -184,6 +187,8 @@ man/man5/default.pa.5.gz man/man5/pulse-cli-syntax.5.gz man/man5/pulse-client.conf.5.gz man/man5/pulse-daemon.conf.5.gz +%%GSETTINGS%%share/GConf/gsettings/pulseaudio.convert +%%GSETTINGS%%share/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-aux.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-dock-mic.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/analog-input-fm.conf @@ -217,8 +222,13 @@ man/man5/pulse-daemon.conf.5.gz %%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-5.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-6.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/hdmi-output-7.conf +%%ALSA%%share/pulseaudio/alsa-mixer/paths/iec958-stereo-input.conf %%ALSA%%share/pulseaudio/alsa-mixer/paths/iec958-stereo-output.conf +%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-input.conf +%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-output-mono.conf +%%ALSA%%share/pulseaudio/alsa-mixer/paths/steelseries-arctis-output-stereo.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/default.conf +%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/dell-dock-tb16-usb-audio.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/force-speaker-and-int-mic.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/force-speaker.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/kinect-audio.conf @@ -231,6 +241,7 @@ man/man5/pulse-daemon.conf.5.gz %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktor-audio6.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/native-instruments-traktorkontrol-s4.conf %%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/sb-omni-surround-5.1.conf +%%ALSA%%share/pulseaudio/alsa-mixer/profile-sets/steelseries-arctis-usb-audio.conf %%ZSH%%share/zsh/site-functions/_pulseaudio share/locale/as/LC_MESSAGES/pulseaudio.mo share/locale/be/LC_MESSAGES/pulseaudio.mo Modified: head/net/xrdp/Makefile ============================================================================== --- head/net/xrdp/Makefile Fri Nov 9 14:44:36 2018 (r484514) +++ head/net/xrdp/Makefile Fri Nov 9 15:32:15 2018 (r484515) @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:devel/nasm RUN_DEPENDS= ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp \ - ${LOCALBASE}/lib/pulse-11.1/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp + ${LOCALBASE}/lib/pulse-12.2/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp USES= autoreconf:build jpeg localbase libtool pkgconfig ssl USE_XORG= ice pixman sm x11 xfixes xrandr
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811091532.wA9FWFet035110>