--- audio/gnome-media/Makefile +++ audio/gnome-media/Makefile @@ -4,7 +4,7 @@ PORTNAME= gnome-media PORTVERSION= 2.32.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 --- audio/gstreamer-plugins-pulse/Makefile +++ audio/gstreamer-plugins-pulse/Makefile @@ -1,7 +1,7 @@ # Created by: Michael Johnson # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio COMMENT= GStreamer plugin for pulseaudio --- audio/gstreamer1-plugins-pulse/Makefile +++ audio/gstreamer1-plugins-pulse/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= audio COMMENT= GStreamer pulseaudio plugin --- audio/gtick/Makefile +++ audio/gtick/Makefile @@ -3,6 +3,7 @@ PORTNAME= gtick PORTVERSION= 0.5.4 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://www.antcom.de/gtick/download/ --- audio/paman/Makefile +++ audio/paman/Makefile @@ -3,7 +3,7 @@ PORTNAME= paman PORTVERSION= 0.9.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/ --- audio/paprefs/Makefile +++ audio/paprefs/Makefile @@ -3,6 +3,7 @@ PORTNAME= paprefs PORTVERSION= 0.9.10 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://freedesktop.org/software/pulseaudio/${PORTNAME}/ --- audio/pavucontrol/Makefile +++ audio/pavucontrol/Makefile @@ -3,6 +3,7 @@ PORTNAME= pavucontrol PORTVERSION= 3.0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://freedesktop.org/software/pulseaudio/${PORTNAME}/ --- audio/pavumeter/Makefile +++ audio/pavumeter/Makefile @@ -3,7 +3,7 @@ PORTNAME= pavumeter PORTVERSION= 0.9.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/ --- audio/pulseaudio/Makefile +++ audio/pulseaudio/Makefile @@ -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,28 +16,24 @@ 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 \ + localbase 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 -LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip SHEBANG_FILES= shell-completion/bash/pulseaudio @@ -45,53 +41,76 @@ 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= 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 --- audio/pulseaudio/distinfo +++ audio/pulseaudio/distinfo @@ -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 --- audio/pulseaudio/files/patch-src_Makefile.in +++ audio/pulseaudio/files/patch-src_Makefile.in @@ -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 \ --- audio/pulseaudio/files/patch-src_daemon_default.pa.in +++ /dev/null @@ -1,26 +0,0 @@ ---- src/daemon/default.pa.in.orig 2016-01-18 10:14:20 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 --- audio/pulseaudio/files/patch-src_modules_module-detect.c +++ audio/pulseaudio/files/patch-src_modules_module-detect.c @@ -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="); -+#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) { --- audio/pulseaudio/files/patch-src_pulsecore_shm.c +++ audio/pulseaudio/files/patch-src_pulsecore_shm.c @@ -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) { --- audio/pulseaudio/pkg-plist +++ audio/pulseaudio/pkg-plist @@ -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 --- audio/xfce4-pulseaudio-plugin/Makefile +++ audio/xfce4-pulseaudio-plugin/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-pulseaudio-plugin PORTVERSION= 0.2.4 +PORTREVISION= 1 CATEGORIES= audio xfce MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 --- comms/deforaos-phone/Makefile +++ comms/deforaos-phone/Makefile @@ -3,7 +3,7 @@ PORTNAME= phone PORTVERSION= 0.3.12 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms MASTER_SITES= http://www.defora.org/os/download/download/4296/ PKGNAMEPREFIX= deforaos- --- comms/gqrx/Makefile +++ comms/gqrx/Makefile @@ -4,6 +4,7 @@ PORTNAME= gqrx PORTVERSION= 2.5.3 DISTVERSIONPREFIX= v +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= comms hamradio --- comms/qsstv/Makefile +++ comms/qsstv/Makefile @@ -2,6 +2,7 @@ PORTNAME= qsstv PORTVERSION= 9.1.5 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= http://users.telenet.be/on4qz/qsstv/downloads/ \ LOCAL/shurd --- comms/quisk/Makefile +++ comms/quisk/Makefile @@ -3,6 +3,7 @@ PORTNAME= quisk PORTVERSION= 4.0.5 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= http://james.ahlstrom.name/quisk/ \ LOCAL/shurd --- comms/twpsk/Makefile +++ comms/twpsk/Makefile @@ -2,6 +2,7 @@ PORTNAME= twpsk PORTVERSION= 4.1 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= http://wa0eir.bcts.info/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src --- deskutils/xfce4-volumed-pulse/Makefile +++ deskutils/xfce4-volumed-pulse/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-volumed-pulse PORTVERSION= 0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils xfce MASTER_SITES= https://launchpadlibrarian.net/133628016/ \ https://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ --- games/retroarch/Makefile +++ games/retroarch/Makefile @@ -4,6 +4,7 @@ PORTNAME= RetroArch PORTVERSION= 1.3.4 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= games MAINTAINER= yuri@rawbw.com --- lang/squeak/Makefile +++ lang/squeak/Makefile @@ -3,7 +3,7 @@ PORTNAME= squeak PORTVERSION= 4.10.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang MASTER_SITES= http://www.squeakvm.org/unix/release/:vmsrc \ http://ftp.squeak.org/${IMAGE_VERSION}/:src \ --- multimedia/aegisub/Makefile +++ multimedia/aegisub/Makefile @@ -3,7 +3,7 @@ PORTNAME= aegisub PORTVERSION= 3.2.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= http://ftp.aegisub.org/pub/archives/releases/source/ \ ftp://ftp.aegisub.org/pub/archives/releases/source/ \ --- multimedia/gmerlin/Makefile +++ multimedia/gmerlin/Makefile @@ -3,7 +3,7 @@ PORTNAME= gmerlin PORTVERSION= 1.2.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= multimedia MASTER_SITES= SF --- multimedia/lives/Makefile +++ multimedia/lives/Makefile @@ -3,6 +3,7 @@ PORTNAME= lives PORTVERSION= 2.6.3 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF --- multimedia/obs-studio/Makefile +++ multimedia/obs-studio/Makefile @@ -2,7 +2,7 @@ PORTNAME= obs-studio PORTVERSION= 0.14.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= ports@FreeBSD.org --- multimedia/qmmp-qt5/Makefile +++ multimedia/qmmp-qt5/Makefile @@ -2,6 +2,7 @@ PORTNAME= qmmp PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/ \ SF/qmmp-dev/${PORTNAME}/ --- multimedia/qmmp/Makefile +++ multimedia/qmmp/Makefile @@ -2,6 +2,7 @@ PORTNAME= qmmp PORTVERSION= 0.10.0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/ \ SF/qmmp-dev/${PORTNAME}/ --- multimedia/qt4-mobility/Makefile +++ multimedia/qt4-mobility/Makefile @@ -3,7 +3,7 @@ PORTNAME= mobility PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://dev.gentoo.org/~pesa/distfiles/ \ LOCAL/vg --- net-im/empathy/Makefile +++ net-im/empathy/Makefile @@ -3,7 +3,7 @@ PORTNAME= empathy PORTVERSION= 3.12.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im gnome MASTER_SITES= GNOME --- net-im/ring-daemon/Makefile +++ net-im/ring-daemon/Makefile @@ -4,6 +4,7 @@ PORTNAME= ring-daemon PORTVERSION= 0.160516 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= net-im net-p2p MAINTAINER= yuri@rawbw.com --- net-p2p/gnunet/Makefile +++ net-p2p/gnunet/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnunet PORTVERSION= 0.10.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-p2p ipv6 security MASTER_SITES= GNU --- net/gtk-vnc/Makefile +++ net/gtk-vnc/Makefile @@ -3,7 +3,7 @@ PORTNAME= gtk-vnc PORTVERSION= 0.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net gnome MASTER_SITES= GNOME --- sysutils/cinnamon-control-center/Makefile +++ sysutils/cinnamon-control-center/Makefile @@ -3,7 +3,7 @@ PORTNAME= cinnamon-control-center PORTVERSION= 2.4.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils gnome MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/9363a4a1e121344ae98f22b55fb28623cf0f6038/panels/datetime/data/:tzpng DISTFILES= ${DISTNAME}${EXTRACT_SUFX} --- sysutils/cinnamon-settings-daemon/Makefile +++ sysutils/cinnamon-settings-daemon/Makefile @@ -3,7 +3,7 @@ PORTNAME= cinnamon-settings-daemon PORTVERSION= 2.4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils gnome DIST_SUBDIR= gnome3 --- sysutils/gnome-settings-daemon/Makefile +++ sysutils/gnome-settings-daemon/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnome-settings-daemon PORTVERSION= 3.18.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 --- x11/cinnamon/Makefile +++ x11/cinnamon/Makefile @@ -3,7 +3,7 @@ PORTNAME= cinnamon PORTVERSION= 2.4.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 gnome DIST_SUBDIR= gnome3 --- x11/gnome-shell/Makefile +++ x11/gnome-shell/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnome-shell PORTVERSION= 3.18.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3