Date: Tue, 25 Oct 2016 12:53:23 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424621 - in head/audio/pulseaudio: . files Message-ID: <201610251253.u9PCrNfj074460@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Oct 25 12:53:23 2016 New Revision: 424621 URL: https://svnweb.freebsd.org/changeset/ports/424621 Log: audio/pulseaudio: update to 9.0 - Add xcb to USE_XORG, required by bin/pacat - Add iconv to USES, required by bin/pacat - Add ssl to USES and correct OPENSSL_CFLAGS and OPENSSL_LIBS - Replace --disable-systemd with correct --disable-systemd-* configure arguments - Move ALSA and JACK to AUDIO options group - Move BASH and ZSH to COMPLETIONS options group - Add DATABASE single option to be able to select supported database - Add SIMPLE (database support) to default options - Silence mkdir - Replace files/patch-src_daemon_default.pa.in with sed patch - Adapt pkg-plist Changes: https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/9.0/ ABI: https://abi-laboratory.pro/tracker/timeline/pulseaudio/ PR: 210548 Submitted by: lightside@gmx.com Approved by: maintainer timeout (4 months) Deleted: head/audio/pulseaudio/files/patch-src_daemon_default.pa.in Modified: head/audio/pulseaudio/Makefile (contents, props changed) head/audio/pulseaudio/distinfo (contents, props changed) head/audio/pulseaudio/files/patch-src_Makefile.in (contents, props changed) head/audio/pulseaudio/files/patch-src_modules_module-detect.c (contents, props changed) head/audio/pulseaudio/files/patch-src_pulsecore_shm.c (contents, props changed) head/audio/pulseaudio/pkg-plist (contents, props changed) Modified: head/audio/pulseaudio/Makefile ============================================================================== --- head/audio/pulseaudio/Makefile Tue Oct 25 12:48:42 2016 (r424620) +++ head/audio/pulseaudio/Makefile Tue Oct 25 12:53:23 2016 (r424621) @@ -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,24 +16,22 @@ LICENSE= LGPL21 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 \ - pathfix pkgconfig shebangfix tar:xz +USES= compiler:c11 cpe execinfo gettext gmake gnome iconv libtool \ + pathfix pkgconfig shebangfix ssl tar:xz GNU_CONFIGURE= yes CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" \ - OPENSSL_CFLAGS="-I/usr/include" \ - OPENSSL_LIBS="-lcrypto -lssl" \ + OPENSSL_CFLAGS="-I${OPENSSLINC}" \ + OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \ LIBS="-lm -lintl" \ ac_cv_header_linux_input_h="" CPPFLAGS+= -I${LOCALBASE}/include @@ -45,47 +43,70 @@ bash_CMD= ${SETENV} bash 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= Audio support +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= Database support +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 Modified: head/audio/pulseaudio/distinfo ============================================================================== --- head/audio/pulseaudio/distinfo Tue Oct 25 12:48:42 2016 (r424620) +++ head/audio/pulseaudio/distinfo Tue Oct 25 12:53:23 2016 (r424621) @@ -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 Modified: head/audio/pulseaudio/files/patch-src_Makefile.in ============================================================================== --- head/audio/pulseaudio/files/patch-src_Makefile.in Tue Oct 25 12:48:42 2016 (r424620) +++ head/audio/pulseaudio/files/patch-src_Makefile.in Tue Oct 25 12:53:23 2016 (r424621) @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig 2016-01-22 07:34:26 UTC +--- src/Makefile.in.orig 2016-06-24 23:00:54 UTC +++ src/Makefile.in -@@ -11042,7 +11042,7 @@ info-am: +@@ -11092,7 +11092,7 @@ info-am: install-data-am: install-commonlibLTLIBRARIES install-dbuspolicyDATA \ install-dist_alsapathsDATA install-dist_alsaprofilesetsDATA \ Modified: head/audio/pulseaudio/files/patch-src_modules_module-detect.c ============================================================================== --- head/audio/pulseaudio/files/patch-src_modules_module-detect.c Tue Oct 25 12:48:42 2016 (r424620) +++ head/audio/pulseaudio/files/patch-src_modules_module-detect.c Tue Oct 25 12:53:23 2016 (r424621) @@ -1,16 +1,6 @@ ---- src/modules/module-detect.c.orig 2015-09-10 04:51:41 UTC +--- src/modules/module-detect.c.orig 2016-05-10 12:28:04 UTC +++ src/modules/module-detect.c -@@ -46,7 +46,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", -@@ -157,8 +159,7 @@ static int detect_oss(pa_core *c, int ju +@@ -160,8 +160,7 @@ static int detect_oss(pa_core *c, int ju continue; } else if (sscanf(line, "pcm%u: ", &device) == 1) { Modified: head/audio/pulseaudio/files/patch-src_pulsecore_shm.c ============================================================================== --- head/audio/pulseaudio/files/patch-src_pulsecore_shm.c Tue Oct 25 12:48:42 2016 (r424620) +++ head/audio/pulseaudio/files/patch-src_pulsecore_shm.c Tue Oct 25 12:53:23 2016 (r424621) @@ -1,6 +1,6 @@ ---- src/pulsecore/shm.c.orig 2015-12-31 06:28:35 UTC +--- src/pulsecore/shm.c.orig 2016-06-21 10:58:21 UTC +++ src/pulsecore/shm.c -@@ -95,7 +95,7 @@ struct shm_marker { +@@ -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) { Modified: head/audio/pulseaudio/pkg-plist ============================================================================== --- head/audio/pulseaudio/pkg-plist Tue Oct 25 12:48:42 2016 (r424620) +++ head/audio/pulseaudio/pkg-plist Tue Oct 25 12:53:23 2016 (r424621) @@ -69,7 +69,7 @@ lib/libpulse-simple.so.0 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610251253.u9PCrNfj074460>