Page MenuHomeFreeBSD
Files F140999005

D20830.diff
No OneTemporary
Actions

D20830.diff
View Options

diff --git a/Mk/Uses/canberra.mk b/Mk/Uses/canberra.mk
new file mode 100644
--- /dev/null
+++ b/Mk/Uses/canberra.mk
@@ -0,0 +1,89 @@
+# $FreeBSD$
+#
+# Handle dependency on libcanberra.
+#
+# Feature: canberra
+# Usage: USES=canberra[:arg,...]
+# Valid ARGS: build, run, lib, gtk2, gtk3, gstreamer, pulse
+#
+# MAINTAINER: desktop@FreeBSD.org
+
+.if ! defined(_INCLUDE_USES_CANBERRA_MK)
+_INCLUDE_USES_CANBERRA_MK= yes
+
+_valid_ARGS= build run lib gtk2 gtk3 gstreamer pulse
+
+.if empty(canberra_ARGS)
+canberra_ARGS= lib
+.endif
+
+CANBERRA_VERSION= 0.30
+
+_CANBERRA_COMPONENTS= lib gtk2 gtk3 gstreamer pulse alsa
+_CANBERRA_SUPPORTED= selfbuild ${_CANBERRA_COMPONENTS}
+
+_CANBERRA_MODULE_DIR_REL= lib/libcanberra-${CANBERRA_VERSION}
+_CANBERRA_MODULE_DIR= ${PREFIX}/${_CANBERRA_MODULE_DIR_REL}
+
+. if ${canberra_ARGS:Mselfbuild}
+_CANBERRA_SELF_BUILD= yes
+. endif
+
+canberra-lib_LIB= libcanberra.so
+canberra-lib_PORT= audio/libcanberra
+
+canberra-gtk2_LIB= libcanberra-gtk.so
+canberra-gtk2_PORT= audio/libcanberra-gtk2
+
+canberra-gtk3_LIB= libcanberra-gtk3.so
+canberra-gtk3_PORT= audio/libcanberra-gtk3
+
+canberra-gstreamer_PATH= ${_CANBERRA_MODULE_DIR}/libcanberra-gstreamer.so
+canberra-gstreamer_PORT= audio/libcanberra-gstreamer
+
+canberra-pulse_PATH= ${_CANBERRA_MODULE_DIR}/libcanberra-pulse.so
+canberra-pulse_PORT= audio/libcanberra-pulse
+
+PLIST_SUB+= CANBERRA_VERSION=${CANBERRA_VERSION} \
+ CANBERRA_MODULE_DIR=${_CANBERRA_MODULE_DIR_REL}
+
+_USES_POST+= canberra
+.endif
+
+.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_CANBERRA_MK_POST) && !defined(_CANBERRA_SELF_BUILD)
+_INCLUDE_USES_CANBERRA_MK_POST= yes
+
+_USE_CANBERRA= ${canberra_ARGS:Nselfbuild}
+. for component in ${_USE_CANBERRA:O:u:C/_(build|run)$//}
+. if ${_CANBERRA_COMPONENTS:M${component}} != ""
+. if defined(canberra-${component}_PORT) && (defined(canberra-${component}_LIB) || defined(canberra-${component}_PATH))
+. if ${canberra_ARGS:M${component}_*} != "" && ${_USE_CANBERRA:M${component}} == ""
+canberra-${component}_TYPE= # empty
+. if ${_USE_CANBERRA:M${component}_build} != ""
+canberra--${component}_TYPE+= build
+. endif
+. if ${_USE_CANBERRA:M${component}_run} != ""
+canberra-${component}_TYPE+= run
+. endif
+. endif
+. if !defined(canberra-${component}_TYPE)
+canberra-${component}_TYPE= build run
+. endif
+. if defined(canberra-${component}_LIB) && ${canberra-${component}_TYPE:Mbuild} && ${canberra-${component}_TYPE:Mrun}
+LIB_DEPENDS+= ${canberra-${component}_LIB}:${canberra-${component}_PORT}
+. else
+canberra-${component}_PATH?= ${LOCALBASE}/lib/${canberra-${component}_LIB}
+canberra-${component}_DEPENDS= ${canberra-${component}_PATH}:${canberra-${component}_PORT}
+. if ${canberra-${component}_TYPE:Mbuild} != ""
+BUILD_DEPENDS+= ${canberra-${component}_DEPENDS}
+. endif
+. if ${canberra-${component}_TYPE:Mrun} != ""
+RUN_DEPENDS+= ${canberra-${component}_DEPENDS}
+. endif
+. endif
+. endif
+. else
+IGNORE= cannot be installed: unknown canberra component '${component}'
+. endif
+. endfor
+.endif
diff --git a/audio/Makefile b/audio/Makefile
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -361,7 +361,10 @@
SUBDIR += libbpm
SUBDIR += libbs2b
SUBDIR += libcanberra
+ SUBDIR += libcanberra-gstreamer
+ SUBDIR += libcanberra-gtk2
SUBDIR += libcanberra-gtk3
+ SUBDIR += libcanberra-pulse
SUBDIR += libcdaudio
SUBDIR += libcddb
SUBDIR += libcddb-doc
diff --git a/audio/gsound/Makefile b/audio/gsound/Makefile
--- a/audio/gsound/Makefile
+++ b/audio/gsound/Makefile
@@ -9,9 +9,8 @@
COMMENT= GObject library for playing system sounds
BUILD_DEPENDS= vala:lang/vala
-LIB_DEPENDS= libcanberra.so:audio/libcanberra
-USES= gnome meson pathfix pkgconfig tar:xz
+USES= canberra gnome meson pathfix pkgconfig tar:xz
USE_GNOME= glib20 introspection:build
.include <bsd.port.mk>
diff --git a/audio/kmix/Makefile b/audio/kmix/Makefile
--- a/audio/kmix/Makefile
+++ b/audio/kmix/Makefile
@@ -27,9 +27,8 @@
# ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
# ALSA_EXTRA_PATCHES_OFF= ${FILESDIR}/extrapatch-no_alsa
-PULSEAUDIO_LIB_DEPENDS= libcanberra.so:audio/libcanberra \
- libpulse.so:audio/pulseaudio
-PULSEAUDIO_USES= gnome
+PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
+PULSEAUDIO_USES= canberra gnome
PULSEAUDIO_USE= GNOME=glib20
PULSEAUDIO_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Canberra \
CMAKE_DISABLE_FIND_PACKAGE_PulseAudio
diff --git a/audio/libcanberra-gstreamer/Makefile b/audio/libcanberra-gstreamer/Makefile
new file mode 100644
--- /dev/null
+++ b/audio/libcanberra-gstreamer/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+CATEGORIES= audio devel
+PKGNAMESUFFIX= -gstreamer
+PORTREVISION= 0
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Implementation of the Freedesktop sound theme spec (gstreamer backend)
+
+MASTERDIR= ${.CURDIR}/../../audio/libcanberra
+PLIST= ${.CURDIR}/pkg-plist
+
+do-build:
+ cd ${BUILD_WRKSRC}/src && ${GMAKE} libcanberra${PKGNAMESUFFIX}.la
+
+do-install:
+ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}-${PORTVERSION} && \
+ ${INSTALL_LIB} ${BUILD_WRKSRC}/src/.libs/libcanberra${PKGNAMESUFFIX}.so \
+ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}-${PORTVERSION}/
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/libcanberra-gstreamer/pkg-plist b/audio/libcanberra-gstreamer/pkg-plist
new file mode 100644
--- /dev/null
+++ b/audio/libcanberra-gstreamer/pkg-plist
@@ -0,0 +1 @@
+lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.so
diff --git a/audio/libcanberra-gtk2/Makefile b/audio/libcanberra-gtk2/Makefile
new file mode 100644
--- /dev/null
+++ b/audio/libcanberra-gtk2/Makefile
@@ -0,0 +1,31 @@
+# $FreeBSD$
+
+CATEGORIES= audio devel
+PKGNAMESUFFIX= -gtk2
+PORTREVISION= 0
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Implementation of the Freedesktop sound theme spec (GTK2 bindings)
+
+MASTERDIR= ${.CURDIR}/../../audio/libcanberra
+PLIST= ${.CURDIR}/pkg-plist
+
+do-build:
+ cd ${BUILD_WRKSRC} && ${MAKE_ENV} ${GMAKE} libcanberra-gtk.pc
+ cd ${BUILD_WRKSRC}/src \
+ && ${MAKE_ENV} ${GMAKE} \
+ libcanberra-gtk.la \
+ libcanberra-gtk-module.la
+
+do-install:
+ ${INSTALL_DATA} ${INSTALL_WRKSRC}/libcanberra-gtk.pc \
+ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
+.for i in .so .so.0 .so.0.1.9
+ ${INSTALL_LIB} ${INSTALL_WRKSRC}/src/.libs/libcanberra-gtk${i} \
+ ${STAGEDIR}${PREFIX}/lib/
+.endfor
+ cd ${INSTALL_WRKSRC}/src && env DESTDIR=${STAGEDIR} ${GMAKE} install-gtkmoduleLTLIBRARIES
+ ${LN} -sf libcanberra-gtk-module.so \
+ ${STAGEDIR}${PREFIX}/lib/gtk-2.0/modules/libcanberra-gtk-module.so
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/libcanberra-gtk2/pkg-plist b/audio/libcanberra-gtk2/pkg-plist
new file mode 100644
--- /dev/null
+++ b/audio/libcanberra-gtk2/pkg-plist
@@ -0,0 +1,5 @@
+lib/gtk-2.0/modules/libcanberra-gtk-module.so
+lib/libcanberra-gtk.so
+lib/libcanberra-gtk.so.0
+lib/libcanberra-gtk.so.0.1.9
+libdata/pkgconfig/libcanberra-gtk.pc
diff --git a/audio/libcanberra-gtk3/Makefile b/audio/libcanberra-gtk3/Makefile
--- a/audio/libcanberra-gtk3/Makefile
+++ b/audio/libcanberra-gtk3/Makefile
@@ -12,9 +12,12 @@
PLIST= ${.CURDIR}/pkg-plist
do-build:
- cd ${WRKSRC} && ${GMAKE} libcanberra-gtk3.pc
- cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3.la
- cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3-module.la
+ cd ${BUILD_WRKSRC} && ${MAKE_ENV} ${GMAKE} libcanberra-gtk.pc
+ cd ${BUILD_WRKSRC}/src \
+ && ${MAKE_ENV} ${GMAKE} \
+ libcanberra-gtk.la \
+ libcanberra-gtk-module.la \
+ canberra-gtk-play
do-install:
${INSTALL_DATA} ${WRKSRC}/libcanberra-gtk3.pc \
@@ -23,7 +26,10 @@
${INSTALL_LIB} ${WRKSRC}/src/.libs/libcanberra-gtk3${i} \
${STAGEDIR}${PREFIX}/lib/
.endfor
+ ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/src/.libs/canberra-gtk-play \
+ ${STAGEDIR}${PREFIX}/bin/
cd ${WRKSRC}/src && env DESTDIR=${STAGEDIR} ${GMAKE} install-gtk3moduleLTLIBRARIES
+ cd ${INSTALL_WRKSRC}/src && env DESTDIR=${STAGEDIR} ${GMAKE} install-dist_gsdgtkmodulesDATA
${LN} -sf libcanberra-gtk3-module.so \
${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules/libcanberra-gtk-module.so
diff --git a/audio/libcanberra-gtk3/pkg-plist b/audio/libcanberra-gtk3/pkg-plist
--- a/audio/libcanberra-gtk3/pkg-plist
+++ b/audio/libcanberra-gtk3/pkg-plist
@@ -1,3 +1,5 @@
+bin/canberra-gtk-play
+lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
lib/gtk-3.0/modules/libcanberra-gtk-module.so
lib/gtk-3.0/modules/libcanberra-gtk3-module.so
lib/libcanberra-gtk3.so
diff --git a/audio/libcanberra-pulse/Makefile b/audio/libcanberra-pulse/Makefile
new file mode 100644
--- /dev/null
+++ b/audio/libcanberra-pulse/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+CATEGORIES= audio devel
+PKGNAMESUFFIX= -pulse
+PORTREVISION= 0
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Implementation of the Freedesktop sound theme spec (pulse backend)
+
+MASTERDIR= ${.CURDIR}/../../audio/libcanberra
+PLIST= ${.CURDIR}/pkg-plist
+
+do-build:
+ cd ${BUILD_WRKSRC}/src && ${GMAKE} libcanberra${PKGNAMESUFFIX}.la
+
+do-install:
+ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}-${PORTVERSION} && \
+ ${INSTALL_LIB} ${BUILD_WRKSRC}/src/.libs/libcanberra${PKGNAMESUFFIX}.so \
+ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}-${PORTVERSION}/
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/libcanberra-pulse/pkg-plist b/audio/libcanberra-pulse/pkg-plist
new file mode 100644
--- /dev/null
+++ b/audio/libcanberra-pulse/pkg-plist
@@ -0,0 +1 @@
+lib/libcanberra-%%VERSION%%/libcanberra-pulse.so
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -2,8 +2,8 @@
# $MCom: ports/trunk/audio/libcanberra/Makefile 20031 2014-11-02 21:47:55Z kwm $
PORTNAME= libcanberra
-PORTVERSION= 0.30
-PORTREVISION= 5
+DISTVERSION= ${CANBERRA_VERSION}
+PORTREVISION?= 6
CATEGORIES= audio devel
MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ \
http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-0.30.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/
@@ -17,47 +17,52 @@
LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \
libltdl.so:devel/libltdl
-USES= gmake gnome libtool pathfix pkgconfig tar:xz
-USE_GNOME= gnomeprefix gtk20
+USES= gmake gnome libtool localbase:ldflags pathfix pkgconfig tar:xz
+USE_GNOME= gnomeprefix
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-lynx --disable-tdb --disable-alsa
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ARGS= --disable-lynx --disable-tdb --disable-alsa --disable-udev
INSTALL_TARGET= install-strip
-.if defined(SLAVEPORT)
-OPTIONS_DEFINE= PULSEAUDIO GSTREAMER
-.endif
-
PLIST_SUB= VERSION=${PORTVERSION}
-.include <bsd.port.options.mk>
+.if defined(PKGNAMESUFFIX) # Backends and toolkit integrations
+USES+= canberra:lib
+CONFIGURE_ARGS+= --disable-null --disable-oss
-.if defined(SLAVEPORT)
-USE_GNOME+= gtk30
-LIB_DEPENDS+= libcanberra.so:audio/libcanberra
-CONFIGURE_ARGS+=--enable-gtk3
-.else
-CONFIGURE_ARGS+=--disable-gtk3
+. if ${PKGNAMESUFFIX:M-gtk2}
+USE_GNOME+= cairo gdkpixbuf2 gtk20
+USE_XORG+= x11
+CONFIGURE_ARGS+= --enable-gtk \
+ --disable-gtk3 --disable-pulse --disable-gstreamer --enable-null
+. endif
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+= libpulse.so:audio/pulseaudio
-PLIST_SUB+= PULSE=""
-.else
-CONFIGURE_ARGS+=--disable-pulse
-PLIST_SUB+= PULSE="@comment "
-.endif
+. if ${PKGNAMESUFFIX:M-gtk3}
+USE_GNOME+= cairo gdkpixbuf2 gtk30
+USE_XORG+= x11
+CONFIGURE_ARGS+= --enable-gtk3 \
+ --disable-gtk --disable-pulse --disable-gstreamer --enable-null
+. endif
-.if ${PORT_OPTIONS:MGSTREAMER}
+. if ${PKGNAMESUFFIX:M-pulse}
+LIB_DEPENDS+= libpulse.so:audio/pulseaudio
+CONFIGURE_ARGS+= --enable-pulse \
+ --disable-gtk --disable-gtk3 --disable-gstreamer
+. endif
+
+. if ${PKGNAMESUFFIX:M-gstreamer}
USE_GSTREAMER1= yes
-PLIST_SUB+= GSTREAMER=""
-.else
-CONFIGURE_ARGS+=--disable-gstreamer
-PLIST_SUB+= GSTREAMER="@comment "
-.endif
+CONFIGURE_ARGS+= --enable-gstreamer \
+ --disable-gtk --disable-gtk3 --disable-pulse
+. endif
-.endif # end slaveport
+.else # Main port
+USES+= canberra:selfbuild
+USE_GNOME+= cairo gdkpixbuf2 gtk30
+USE_XORG+= x11
+CONFIGURE_ARGS+= --enable-gtk3 \
+ --disable-gtk --disable-pulse --disable-gstreamer
+.endif
post-patch:
@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
diff --git a/audio/libcanberra/files/patch-dont-assume-x11 b/audio/libcanberra/files/patch-dont-assume-x11
--- a/audio/libcanberra/files/patch-dont-assume-x11
+++ b/audio/libcanberra/files/patch-dont-assume-x11
@@ -1,9 +1,9 @@
gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland
Obtained from: upstream (c0620e432650e81062c1967cc669829dbd29b310)
---- src/canberra-gtk-module.c.orig
+--- src/canberra-gtk-module.c.orig 2012-05-15 10:23:57 UTC
+++ src/canberra-gtk-module.c
-@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
+@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindo
guchar *data = NULL;
gint ret = -1;
@@ -27,21 +27,21 @@
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)),
gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type_return,
-@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
+@@ -364,6 +374,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWin
+ guchar *data = NULL;
gboolean ret = FALSE;
Atom xembed;
-
++
+#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d))
+ return FALSE;
+#endif
-+
+
/* Gnome Panel applets are XEMBED windows. We need to make sure we
* ignore them */
-
---- src/canberra-gtk.c.orig
+--- src/canberra-gtk.c.orig 2010-09-28 13:55:03 UTC
+++ src/canberra-gtk.c
-@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) {
+@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindo
guchar *data = NULL;
gint ret = -1;
diff --git a/audio/libcanberra/files/patch-src_driver-order.c b/audio/libcanberra/files/patch-src_driver-order.c
new file mode 100644
--- /dev/null
+++ b/audio/libcanberra/files/patch-src_driver-order.c
@@ -0,0 +1,24 @@
+We build the main port without pulse/gstreamer deps,
+but we do want them to be loaded if installed
+
+--- src/driver-order.c.orig 2020-12-05 16:02:56 UTC
++++ src/driver-order.c
+@@ -30,18 +30,14 @@
+ #include "driver-order.h"
+
+ const char* const ca_driver_order[] = {
+-#ifdef HAVE_PULSE
+ "pulse",
+-#endif
+ #ifdef HAVE_ALSA
+ "alsa",
+ #endif
+ #ifdef HAVE_OSS
+ "oss",
+ #endif
+-#ifdef HAVE_GSTREAMER
+ "gstreamer",
+-#endif
+ /* ... */
+ NULL
+ };
diff --git a/audio/libcanberra/pkg-plist b/audio/libcanberra/pkg-plist
--- a/audio/libcanberra/pkg-plist
+++ b/audio/libcanberra/pkg-plist
@@ -1,20 +1,19 @@
-bin/canberra-gtk-play
-include/canberra-gtk.h
+@comment bin/canberra-gtk-play
include/canberra.h
-lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
-lib/gtk-2.0/modules/libcanberra-gtk-module.so
-lib/libcanberra-gtk.so
-lib/libcanberra-gtk.so.0
-lib/libcanberra-gtk.so.0.1.9
+include/canberra-gtk.h
+%%CANBERRA_MODULE_DIR%%/libcanberra-multi.so
+%%CANBERRA_MODULE_DIR%%/libcanberra-null.so
+%%CANBERRA_MODULE_DIR%%/libcanberra-oss.so
+@comment lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
+@comment lib/gtk-3.0/modules/libcanberra-gtk-module.so
+@comment lib/gtk-3.0/modules/libcanberra-gtk3-module.so
+@comment lib/libcanberra-gtk3.so
+@comment lib/libcanberra-gtk3.so.0
+@comment lib/libcanberra-gtk3.so.0.1.9
lib/libcanberra.so
lib/libcanberra.so.0
lib/libcanberra.so.0.2.5
-%%GSTREAMER%%lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.so
-lib/libcanberra-%%VERSION%%/libcanberra-multi.so
-lib/libcanberra-%%VERSION%%/libcanberra-null.so
-lib/libcanberra-%%VERSION%%/libcanberra-oss.so
-%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.so
-libdata/pkgconfig/libcanberra-gtk.pc
+@comment libdata/pkgconfig/libcanberra-gtk3.pc
libdata/pkgconfig/libcanberra.pc
%%DOCSDIR%%/README
%%DOCSDIR%%/ch01.html
@@ -28,8 +27,8 @@
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
-share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
-share/gnome/autostart/libcanberra-login-sound.desktop
-share/gnome/shutdown/libcanberra-logout-sound.sh
-share/vala/vapi/libcanberra-gtk.vapi
+@comment share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
+@comment share/gnome/autostart/libcanberra-login-sound.desktop
+@comment share/gnome/shutdown/libcanberra-logout-sound.sh
share/vala/vapi/libcanberra.vapi
+share/vala/vapi/libcanberra-gtk.vapi
diff --git a/audio/mate-media/Makefile b/audio/mate-media/Makefile
--- a/audio/mate-media/Makefile
+++ b/audio/mate-media/Makefile
@@ -13,16 +13,14 @@
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= itstool:textproc/itstool
-LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libfontconfig.so:x11-fonts/fontconfig \
+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libstartup-notification-1.so:x11/startup-notification \
libunique-3.0.so:x11-toolkits/libunique3
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool localbase mate pathfix \
+USES= canberra:gtk3 gettext gmake gnome libtool localbase mate pathfix \
pkgconfig tar:xz xorg
USE_MATE= desktop mixer panel
USE_GNOME= cairo glib20 gtk30 intlhack libxml2
diff --git a/audio/pavucontrol/Makefile b/audio/pavucontrol/Makefile
--- a/audio/pavucontrol/Makefile
+++ b/audio/pavucontrol/Makefile
@@ -11,11 +11,10 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libjson-glib-1.0.so:devel/json-glib \
+LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \
libpulse.so:audio/pulseaudio
-USES= compiler:c++11-lang gettext gmake gnome pkgconfig tar:xz
+USES= canberra:gtk3 compiler:c++11-lang gettext gmake gnome pkgconfig tar:xz
USE_GNOME= glibmm gtkmm30 intltool libsigc++20
USE_CXXSTD= c++11
diff --git a/audio/plasma5-plasma-pa/Makefile b/audio/plasma5-plasma-pa/Makefile
--- a/audio/plasma5-plasma-pa/Makefile
+++ b/audio/plasma5-plasma-pa/Makefile
@@ -5,10 +5,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma5 Plasma pulse audio mixer
-LIB_DEPENDS= libcanberra.so:audio/libcanberra \
- libpulse.so:audio/pulseaudio
+LIB_DEPENDS= libpulse.so:audio/pulseaudio
-USES= cmake compiler:c++11-lib gettext gnome kde:5 pkgconfig qt:5 \
+USES= canberra:pulse cmake compiler:c++11-lib gettext gnome kde:5 pkgconfig qt:5 \
shebangfix tar:xz
USE_GNOME= gconf2
USE_KDE= config configwidgets coreaddons ecm globalaccel i18n \
diff --git a/audio/pulseaudio-qt/Makefile b/audio/pulseaudio-qt/Makefile
--- a/audio/pulseaudio-qt/Makefile
+++ b/audio/pulseaudio-qt/Makefile
@@ -6,10 +6,9 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Pulseaudio bindings for Qt
-LIB_DEPENDS= libcanberra.so:audio/libcanberra \
- libpulse.so:audio/pulseaudio
+LIB_DEPENDS= libpulse.so:audio/pulseaudio
-USES= cmake compiler:c++11-lib gettext kde:5 \
+USES= canberra cmake compiler:c++11-lib gettext kde:5 \
pkgconfig qt:5 shebangfix tar:xz
USE_KDE= ecm_build
USE_QT= core dbus gui \
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -19,12 +19,11 @@
libdiscid.so:audio/libdiscid \
libtag.so:audio/taglib \
libdbus-glib-1.so:devel/dbus-glib \
- libbrasero-media3.so:sysutils/brasero \
- libcanberra-gtk3.so:audio/libcanberra-gtk3
+ libbrasero-media3.so:sysutils/brasero
PORTSCOUT= limitw:1,even
-USES= compiler:c11 desktop-file-utils gettext gnome meson \
+USES= canberra:gtk3 compiler:c11 desktop-file-utils gettext gnome meson \
pkgconfig tar:xz
USE_GSTREAMER1= cdparanoia flac good vorbis
USE_GNOME= gtk30
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -25,13 +25,11 @@
libjson-glib-1.0.so:devel/json-glib \
libp11-kit.so:security/p11-kit \
libnspr4.so:devel/nspr \
- libsecret-1.so:security/libsecret \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libcanberra.so:audio/libcanberra
+ libsecret-1.so:security/libsecret
PORTSCOUT= limitw:1,even
-USES= bdb:5 cmake compiler:c++11-lib cpe gettext gnome gperf \
+USES= bdb:5 canberra:gtk3 cmake compiler:c++11-lib cpe gettext gnome gperf \
iconv:wchar_t localbase pathfix pkgconfig python:3.6+,build\
sqlite tar:xz xorg
USE_CXXSTD= gnu++11
diff --git a/deskutils/gnome-screenshot/Makefile b/deskutils/gnome-screenshot/Makefile
--- a/deskutils/gnome-screenshot/Makefile
+++ b/deskutils/gnome-screenshot/Makefile
@@ -16,15 +16,13 @@
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= appstream-builder:devel/appstream-glib
-LIB_DEPENDS= libcanberra.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libhandy-1.so:x11-toolkits/libhandy
+LIB_DEPENDS= libhandy-1.so:x11-toolkits/libhandy
CONFLICTS= gnome-utils-2.[0-9]*
PORTSCOUT= limitw:1,even
-USES= compiler:c11 gettext gnome meson pkgconfig python:3.4+,build \
- shebangfix tar:xz xorg
+USES= canberra:gtk3 compiler:c11 gettext gnome meson pkgconfig \
+ python:3.4+,build shebangfix tar:xz xorg
USE_GNOME= cairo gdkpixbuf2 gtk30
USE_XORG= x11 xext
SHEBANG_FILES= build-aux/postinstall.py
diff --git a/deskutils/mate-notification-daemon/Makefile b/deskutils/mate-notification-daemon/Makefile
--- a/deskutils/mate-notification-daemon/Makefile
+++ b/deskutils/mate-notification-daemon/Makefile
@@ -13,9 +13,7 @@
LICENSE_COMB= multi
LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
-LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libcanberra.so:audio/libcanberra \
- libdbus-1.so:devel/dbus \
+LIB_DEPENDS= libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
libmate-desktop-2.so:x11/mate-desktop \
libmate-panel-applet-4.so:x11/mate-panel \
@@ -23,8 +21,8 @@
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool localbase pathfix pkgconfig tar:xz \
- xorg
+USES= canberra:gtk3 gettext gmake gnome libtool localbase pathfix pkgconfig \
+ tar:xz xorg
USE_XORG= x11
USE_GNOME= cairo glib20 gtk30 intlhack librsvg2 libwnck3
GNU_CONFIGURE= yes
diff --git a/deskutils/mate-utils/Makefile b/deskutils/mate-utils/Makefile
--- a/deskutils/mate-utils/Makefile
+++ b/deskutils/mate-utils/Makefile
@@ -17,13 +17,11 @@
BUILD_DEPENDS= itstool:textproc/itstool
-LIB_DEPENDS= libgtop-2.0.so:devel/libgtop \
- libcanberra-gtk.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3
+LIB_DEPENDS= libgtop-2.0.so:devel/libgtop
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool localbase mate pathfix \
+USES= canberra:gtk3 gettext gmake gnome libtool localbase mate pathfix \
pkgconfig tar:xz xorg
USE_MATE= panel
USE_XORG= ice sm x11 xext
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -12,10 +12,9 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libdbus-1.so:devel/dbus
+LIB_DEPENDS= libdbus-1.so:devel/dbus
-USES= gettext gmake gnome localbase pathfix pkgconfig tar:xz xorg
+USES= canberra:gtk3 gettext gmake gnome localbase pathfix pkgconfig tar:xz xorg
USE_GNOME= cairo gnomeprefix gtk30
USE_XORG= x11
GNU_CONFIGURE= yes
diff --git a/devel/kf5-knotifications/Makefile b/devel/kf5-knotifications/Makefile
--- a/devel/kf5-knotifications/Makefile
+++ b/devel/kf5-knotifications/Makefile
@@ -5,22 +5,25 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 abstraction for system notifications
-LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt \
- libcanberra.so:audio/libcanberra
+LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt
USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz xorg
USE_KDE= codecs config coreaddons windowsystem \
ecm_build
-USE_QT= core dbus declarative gui linguisttools network phonon4 widgets x11extras \
+USE_QT= core dbus declarative gui linguisttools network widgets x11extras \
buildtools_build qmake_build
USE_XORG= x11 xtst
-OPTIONS_DEFINE= AUDIO
-OPTIONS_DEFAULT= AUDIO
+OPTIONS_DEFINE= CANBERRA SPEECH
+OPTIONS_DEFAULT= CANBERRA SPEECH
-AUDIO_DESC= Audio notifications/text-to-speech support
-AUDIO_LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3
-AUDIO_USE= QT=speech
-AUDIO_USES= pkgconfig
+CANBERRA_DESC= Use canberra instead of phonon4 for audio notifications
+CANBERRA_USES= canberra
+CANBERRA_USE_OFF= QT=phonon4
+CANBERRA_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Canberra
+
+SPEECH_DESC= Text-to-speech support
+SPEECH_USE= QT=speech
+SPEECH_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech
.include <bsd.port.mk>
diff --git a/devel/kf5-knotifyconfig/Makefile b/devel/kf5-knotifyconfig/Makefile
--- a/devel/kf5-knotifyconfig/Makefile
+++ b/devel/kf5-knotifyconfig/Makefile
@@ -5,19 +5,23 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 configuration system for KNotify
-LIB_DEPENDS= libcanberra.so:audio/libcanberra
-
USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= completion config coreaddons i18n jobwidgets kio \
service widgetsaddons windowsystem \
ecm_build
-USE_QT= concurrent core dbus gui network phonon4 widgets \
+USE_QT= concurrent core dbus gui network widgets \
buildtools_build qmake_build
-OPTIONS_DEFINE= AUDIO
-OPTIONS_DEFAULT= AUDIO
+OPTIONS_DEFINE= CANBERRA SPEECH
+OPTIONS_DEFAULT= CANBERRA SPEECH
-AUDIO_DESC= Audio notifications/text-to-speech support
-AUDIO_USE= QT=speech
+CANBERRA_DESC= Use canberra instead of phonon4 for audio notifications
+CANBERRA_USES= canberra
+CANBERRA_USE_OFF= QT=phonon4
+CANBERRA_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Canberra
+
+SPEECH_DESC= Text-to-speech support
+SPEECH_USE= QT=speech
+SPEECH_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech
.include <bsd.port.mk>
diff --git a/games/aisleriot/Makefile b/games/aisleriot/Makefile
--- a/games/aisleriot/Makefile
+++ b/games/aisleriot/Makefile
@@ -17,14 +17,12 @@
BUILD_DEPENDS= itstool:textproc/itstool \
bash:shells/bash
LIB_DEPENDS= libguile-2.2.so:lang/guile2 \
- libcanberra.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libgc-threaded.so:devel/boehm-gc-threaded
CONFLICTS_INSTALL= sol
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext meson gnome pkgconfig \
+USES= canberra:gtk3 desktop-file-utils gettext meson gnome pkgconfig \
python:build,3.6+ shebangfix xorg
USE_GNOME= cairo gtk30 intlhack librsvg2 libxml2:build
USE_XORG= x11
diff --git a/games/four-in-a-row/Makefile b/games/four-in-a-row/Makefile
--- a/games/four-in-a-row/Makefile
+++ b/games/four-in-a-row/Makefile
@@ -16,12 +16,11 @@
BUILD_DEPENDS= itstool:textproc/itstool \
vala:lang/vala \
appstream-util:devel/appstream-glib
-LIB_DEPENDS= libcanberra.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome localbase meson pathfix pkgconfig tar:xz xorg
+USES= canberra:gtk3 gettext gmake gnome localbase meson pathfix \
+ pkgconfig tar:xz xorg
USE_GNOME= cairo gtk30 intlhack librsvg2 libxml2:build gsound
USE_XORG= x11
diff --git a/games/gnome-nibbles/Makefile b/games/gnome-nibbles/Makefile
--- a/games/gnome-nibbles/Makefile
+++ b/games/gnome-nibbles/Makefile
@@ -16,9 +16,7 @@
BUILD_DEPENDS= vala:lang/vala \
itstool:textproc/itstool \
appstream-util:devel/appstream-glib
-LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libcanberra.so:audio/libcanberra \
- libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+LIB_DEPENDS= libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
libclutter-1.0.so:graphics/clutter \
libcogl.so:graphics/cogl \
libjson-glib-1.0.so:devel/json-glib \
diff --git a/games/gnome-robots/Makefile b/games/gnome-robots/Makefile
--- a/games/gnome-robots/Makefile
+++ b/games/gnome-robots/Makefile
@@ -15,9 +15,7 @@
BUILD_DEPENDS= appstream-util:devel/appstream-glib \
itstool:textproc/itstool \
vala>0:lang/vala
-LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libcanberra.so:audio/libcanberra \
- libgee-0.8.so:devel/libgee \
+LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libgnome-games-support-1.so:games/libgnome-games-support
PORTSCOUT= limitw:1,even
diff --git a/games/gnome-taquin/Makefile b/games/gnome-taquin/Makefile
--- a/games/gnome-taquin/Makefile
+++ b/games/gnome-taquin/Makefile
@@ -15,8 +15,6 @@
BUILD_DEPENDS= vala:lang/vala \
itstool:textproc/itstool
-LIB_DEPENDS= libcanberra.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3
PORTSCOUT= limitw:1,even
diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile
--- a/games/gnubg/Makefile
+++ b/games/gnubg/Makefile
@@ -15,13 +15,12 @@
RUN_DEPENDS= sqlite3:databases/sqlite3
LIB_DEPENDS= libpng.so:graphics/png \
libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
- libcanberra-gtk.so:audio/libcanberra \
libgmp.so:math/gmp \
libcurl.so:ftp/curl \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= bison gl gmake gnome libtool pathfix shebangfix python \
+USES= bison canberra:gtk2 gl gmake gnome libtool pathfix shebangfix python \
pkgconfig compiler:c++11-lang readline xorg
USE_GNOME= glib20 gtk20 cairo pangox-compat
USE_XORG+= xmu xt sm ice x11
diff --git a/games/iagno/Makefile b/games/iagno/Makefile
--- a/games/iagno/Makefile
+++ b/games/iagno/Makefile
@@ -17,9 +17,6 @@
itstool:textproc/itstool \
appstream-util:devel/appstream-glib
-LIB_DEPENDS= libcanberra.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3
-
PORTSCOUT= limitw:1,even
USES= gettext gmake gnome localbase meson \
diff --git a/games/quadrapassel/Makefile b/games/quadrapassel/Makefile
--- a/games/quadrapassel/Makefile
+++ b/games/quadrapassel/Makefile
@@ -15,16 +15,14 @@
BUILD_DEPENDS= appstream-util:devel/appstream-glib \
itstool:textproc/itstool \
vala:lang/vala
-LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libcanberra.so:audio/libcanberra \
- libclutter-1.0.so:graphics/clutter \
+LIB_DEPENDS= libclutter-1.0.so:graphics/clutter \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
libcogl.so:graphics/cogl \
libjson-glib-1.0.so:devel/json-glib
PORTSCOUT= limitw:1,even
-USES= gettext gl gnome localbase meson pathfix pkgconfig tar:xz xorg
+USES= canberra:gtk3 gettext gl gnome localbase meson pathfix pkgconfig tar:xz xorg
USE_GNOME= cairo gsound gtk30 intlhack librsvg2 libxml2:build
USE_GL= egl gl
USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr
diff --git a/graphics/art/Makefile b/graphics/art/Makefile
--- a/graphics/art/Makefile
+++ b/graphics/art/Makefile
@@ -16,9 +16,7 @@
EXTRACT_DEPENDS= gtar:archivers/gtar # bsdtar(1) complains about hard links to itself
BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3
-LIB_DEPENDS= libcanberra.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libexiv2.so:graphics/exiv2 \
+LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libexpat.so:textproc/expat2 \
libfftw3f.so:math/fftw3-float \
libharfbuzz.so:print/harfbuzz \
@@ -27,7 +25,7 @@
libpng.so:graphics/png \
libtiff.so:graphics/tiff
-USES= cmake compiler:c++11-lang desktop-file-utils gnome jpeg pkgconfig tar:xz xorg
+USES= canberra:gtk3 cmake compiler:c++11-lang desktop-file-utils gnome jpeg pkgconfig tar:xz xorg
USE_GNOME= atk atkmm cairo cairomm glibmm gtkmm30 librsvg2
USE_XORG= x11
diff --git a/graphics/gnome-color-manager/Makefile b/graphics/gnome-color-manager/Makefile
--- a/graphics/gnome-color-manager/Makefile
+++ b/graphics/gnome-color-manager/Makefile
@@ -7,6 +7,10 @@
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
+# https://gitlab.gnome.org/GNOME/gnome-color-manager/-/issues/10
+PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/commit/
+PATCHFILES= 66aea36411477f284fa8a379b3bde282385d281c.patch:-p1
+
MAINTAINER= gnome@FreeBSD.org
COMMENT= Session framework for the GNOME desktop to manage color profiles
@@ -19,8 +23,6 @@
LIB_DEPENDS= liblcms2.so:graphics/lcms2 \
libcolord.so:graphics/colord \
libcolord-gtk.so:graphics/colord-gtk \
- libcanberra.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libtiff.so:graphics/tiff \
libexif.so:graphics/libexif
diff --git a/graphics/gnome-color-manager/distinfo b/graphics/gnome-color-manager/distinfo
--- a/graphics/gnome-color-manager/distinfo
+++ b/graphics/gnome-color-manager/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1601154861
+TIMESTAMP = 1607174617
SHA256 (gnome/gnome-color-manager-3.36.0.tar.xz) = 9ddb9e6b6472e119801381f90905332ec1d4258981721bba831ca246ceb3ad3b
SIZE (gnome/gnome-color-manager-3.36.0.tar.xz) = 2175016
+SHA256 (gnome/66aea36411477f284fa8a379b3bde282385d281c.patch) = a94bf832e926e0d8ec1275447d03e1c0045afd9e65e72553294dbf4feb856913
+SIZE (gnome/66aea36411477f284fa8a379b3bde282385d281c.patch) = 556
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -14,8 +14,6 @@
LIB_DEPENDS= \
liblensfun.so:graphics/lensfun \
- libcanberra-gtk.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libexpat.so:textproc/expat2 \
libfftw3.so:math/fftw3 \
libfftw3f.so:math/fftw3-float \
@@ -27,7 +25,7 @@
libsigc-2.0.so:devel/libsigc++20 \
libtiff.so:graphics/tiff
-USES= cmake desktop-file-utils compiler:gcc-c++11-lib gnome \
+USES= canberra:gtk3 cmake desktop-file-utils compiler:gcc-c++11-lib gnome \
jpeg localbase:ldflags pkgconfig tar:xz
# Binutils required for LTO (base ar/nm/ld/ranlib don't work)
diff --git a/irc/hexchat/Makefile b/irc/hexchat/Makefile
--- a/irc/hexchat/Makefile
+++ b/irc/hexchat/Makefile
@@ -50,7 +50,7 @@
SYSINFO_DESC= Sysinfo plugin
CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-CANBERRA_LIB_DEPENDS= libcanberra.so:audio/libcanberra
+CANBERRA_USES= canberra:gtk2
CANBERRA_MESON_ON= -Dlibcanberra=enabled
CANBERRA_MESON_OFF= -Dlibcanberra=disabled
DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -15,13 +15,12 @@
yelp-tools>=0:textproc/yelp-tools
LIB_DEPENDS= libpcre.so:devel/pcre \
libesmtp.so:mail/libesmtp \
- libgmime-2.6.so:mail/gmime26 \
- libcanberra-gtk3.so:audio/libcanberra-gtk3
+ libgmime-2.6.so:mail/gmime26
RUN_DEPENDS= gnome-keyring:security/gnome-keyring
# Depends on gtkhtml4 (which is being abandonend). When our webkitgtk3
# in ports gets updated to > 1.10.x, balsa should depend on it.
-USES= cpe desktop-file-utils gettext gmake gnome iconv pathfix perl5 \
+USES= canberra:gtk3 cpe desktop-file-utils gettext gmake gnome iconv pathfix perl5 \
pkgconfig ssl tar:bzip2
USE_GNOME= gnomeprefix gtkhtml4 intlhack libxslt
CPE_VENDOR= gnome
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -5,8 +5,8 @@
COMMENT= New mail notification plugin for Claws Mail
-LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \
- libnotify.so:devel/libnotify
+LIB_DEPENDS= libnotify.so:devel/libnotify
+USES= canberra:gtk2
CLAWS_PLUGINS_BUILD= ${PORTNAME}
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -113,8 +113,7 @@
BOGOFILTER_RUN_DEPENDS= bogofilter:mail/bogofilter
CANBERRA_DESC= Canberra theme audio plugin
-CANBERRA_LIB_DEPENDS= libcanberra.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3
+CANBERRA_USES= canberra:gtk3
CANBERRA_CMAKE_BOOL= ENABLE_CANBERRA
PST_DESC= Outlook .pst importer
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -16,9 +16,7 @@
gnome-video-effects>=0:graphics/gnome-video-effects \
vala>=0.14.0:lang/vala \
itstool:textproc/itstool
-LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libcanberra.so:audio/libcanberra \
- libclutter-1.0.so:graphics/clutter \
+LIB_DEPENDS= libclutter-1.0.so:graphics/clutter \
libcogl.so:graphics/cogl \
libjson-glib-1.0.so:devel/json-glib \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
@@ -27,7 +25,7 @@
PORTSCOUT= limitw:1,even
-USES= gettext gl gnome localbase:ldflags pkgconfig meson tar:xz xorg
+USES= canberra:gtk3 gettext gl gnome localbase:ldflags pkgconfig meson tar:xz xorg
USE_GNOME= cairo librsvg2 gnomedesktop3 libxml2:build introspection:build
USE_GL= egl
USE_XORG= xi xext xdamage xfixes xcomposite xrandr xxf86vm x11
diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp-gtk/Makefile
--- a/net-p2p/eiskaltdcpp-gtk/Makefile
+++ b/net-p2p/eiskaltdcpp-gtk/Makefile
@@ -35,7 +35,7 @@
NOSOUND_CMAKE_ON= -DUSE_LIBGNOME2:BOOL=OFF -DUSE_LIBCANBERRA:BOOL=OFF
-LIBCANBERRA_LIB_DEPENDS=libcanberra-gtk.so:audio/libcanberra
+LIBCANBERRA_USES= canberra:gtk2,gtk3
LIBCANBERRA_CMAKE_ON= -DUSE_LIBGNOME2:BOOL=OFF -DUSE_LIBCANBERRA:BOOL=ON
LIBNOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -11,12 +11,11 @@
BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libnotify.so:devel/libnotify \
- libtotem-plparser.so:multimedia/totem-pl-parser \
- libcanberra-gtk3.so:audio/libcanberra-gtk3
+ libtotem-plparser.so:multimedia/totem-pl-parser
RUN_DEPENDS= growisofs:sysutils/dvd+rw-tools \
cdrdao:sysutils/cdrdao
-USES= desktop-file-utils gettext gmake gnome libtool pathfix \
+USES= canberra:gtk3 desktop-file-utils gettext gmake gnome libtool pathfix \
pkgconfig shared-mime-info tar:xz xorg
USE_GNOME= cairo gdkpixbuf2 gnomeprefix gtk30 intlhack \
introspection:build libxml2
diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile
--- a/sysutils/cinnamon-settings-daemon/Makefile
+++ b/sysutils/cinnamon-settings-daemon/Makefile
@@ -16,9 +16,7 @@
BUILD_DEPENDS= cinnamon-session:x11/cinnamon-session \
xf86-input-wacom>0:x11-drivers/xf86-input-wacom \
gln:sysutils/coreutils
-LIB_DEPENDS= libcanberra.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libpolkit-gobject-1.so:sysutils/polkit \
+LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit \
libgudev-1.0.so:devel/libgudev \
libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
@@ -35,7 +33,7 @@
libharfbuzz.so:print/harfbuzz
RUN_DEPENDS= cinnamon-session:x11/cinnamon-session
-USES= compiler:c11 gettext-tools gnome localbase meson pkgconfig \
+USES= canberra:gtk3 compiler:c11 gettext-tools gnome localbase meson pkgconfig \
python:3.5+,build shebangfix xorg
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool libgnomekbd librsvg2
USE_XORG= x11 xext xfixes xi xtst
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -18,9 +18,7 @@
BUILD_DEPENDS= gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas #\
# docbook-xsl>=0:textproc/docbook-xsl
-LIB_DEPENDS= libcanberra.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libcups.so:print/cups \
+LIB_DEPENDS= libcups.so:print/cups \
libpulse.so:audio/pulseaudio \
libfontconfig.so:x11-fonts/fontconfig \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -15,9 +15,7 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libcanberra.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libpolkit-gobject-1.so:sysutils/polkit \
+LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit \
libfontconfig.so:x11-fonts/fontconfig \
libcolord.so:graphics/colord \
liblcms2.so:graphics/lcms2 \
@@ -35,7 +33,7 @@
USE_XORG= x11 xext xi xtst
USE_GNOME= cairo gnomedesktop3 gtk30
-USES= gettext gnome localbase:ldflags meson perl5 \
+USES= canberra:gtk3 gettext gnome localbase:ldflags meson perl5 \
pkgconfig python:3.6+,build tar:xz xorg
USE_PERL5= build
# -Dnssdb_dir=${LOCALBASE}/share/certs/ca-root-nss.crt
diff --git a/sysutils/mate-control-center/Makefile b/sysutils/mate-control-center/Makefile
--- a/sysutils/mate-control-center/Makefile
+++ b/sysutils/mate-control-center/Makefile
@@ -14,9 +14,7 @@
LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
BUILD_DEPENDS= itstool:textproc/itstool
-LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libdbus-1.so:devel/dbus \
+LIB_DEPENDS= libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
libxklavier.so:x11/libxklavier \
libfontconfig.so:x11-fonts/fontconfig \
@@ -28,7 +26,7 @@
PORTSCOUT= limitw:1,even
-USES= desktop-file-utils gettext gmake gnome libtool localbase mate \
+USES= canberra:gtk3 desktop-file-utils gettext gmake gnome libtool localbase mate \
pathfix pkgconfig shared-mime-info tar:xz xorg
USE_CSTD= c99
USE_MATE= desktop libmatekbd marco menus settingsdaemon
diff --git a/sysutils/mate-power-manager/Makefile b/sysutils/mate-power-manager/Makefile
--- a/sysutils/mate-power-manager/Makefile
+++ b/sysutils/mate-power-manager/Makefile
@@ -13,9 +13,7 @@
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= itstool:textproc/itstool
-LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libdbus-1.so:devel/dbus \
+LIB_DEPENDS= libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
@@ -27,7 +25,7 @@
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool localbase mate pathfix pkgconfig \
+USES= canberra:gtk3 gettext gmake gnome libtool localbase mate pathfix pkgconfig \
tar:xz xorg
USE_MATE= panel
USE_XORG= x11 xext xorgproto xrandr xrender
diff --git a/sysutils/mate-settings-daemon/Makefile b/sysutils/mate-settings-daemon/Makefile
--- a/sysutils/mate-settings-daemon/Makefile
+++ b/sysutils/mate-settings-daemon/Makefile
@@ -20,15 +20,13 @@
libfontconfig.so:x11-fonts/fontconfig \
libpolkit-gobject-1.so:sysutils/polkit \
libstartup-notification-1.so:x11/startup-notification \
- libcanberra-gtk.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libnspr4.so:devel/nspr \
libnotify.so:devel/libnotify
RUN_DEPENDS= xrdb:x11/xrdb
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool localbase mate pathfix \
+USES= canberra:gtk3 gettext gmake gnome libtool localbase mate pathfix \
pkgconfig tar:xz xorg
USE_MATE= desktop libmatekbd mixer
USE_XORG= ice sm x11 xext xi
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -14,12 +14,11 @@
BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libavahi-client.so:net/avahi-app \
libnotify.so:devel/libnotify \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libunique-1.0.so:x11-toolkits/unique
RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_dnssd>=0:www/mod_dnssd \
console-kit-daemon:sysutils/consolekit2
-USES= apache:2.2+ gettext gmake gnome libtool pkgconfig tar:xz xorg
+USES= apache:2.2+ canberra:gtk3 gettext gmake gnome libtool pkgconfig tar:xz xorg
USE_XORG= sm
USE_GNOME= gnomeprefix gtk30 intlhack nautilus3
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile
--- a/x11-toolkits/gnocl/Makefile
+++ b/x11-toolkits/gnocl/Makefile
@@ -14,11 +14,10 @@
LICENSE_FILE= ${WRKSRC}/license.terms
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LIB_DEPENDS= libcanberra.so:audio/libcanberra \
- libnotify.so:devel/libnotify \
+LIB_DEPENDS= libnotify.so:devel/libnotify \
libgtkimageview.so:x11-toolkits/gtkimageview
-USES= gmake gnome pkgconfig tar:bzip2 tcl
+USES= canberra gmake gnome pkgconfig tar:bzip2 tcl
USE_GNOME= gtk20 libglade2
USE_LDCONFIG= yes
CFLAGS+= -I${TCL_INCLUDEDIR} -L${TCL_LIBDIR}
diff --git a/x11-wm/marco/Makefile b/x11-wm/marco/Makefile
--- a/x11-wm/marco/Makefile
+++ b/x11-wm/marco/Makefile
@@ -15,14 +15,12 @@
BUILD_DEPENDS= itstool:textproc/itstool \
zenity>=3.0.0:x11/zenity
LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
- libcanberra.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libgtop-2.0.so:devel/libgtop
RUN_DEPENDS= zenity>=3.0.0:x11/zenity
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome libtool localbase pathfix pkgconfig \
+USES= canberra:gtk3 gettext gmake gnome libtool localbase pathfix pkgconfig \
tar:xz xorg
USE_XORG= ice sm x11 xcomposite xcursor xdamage xext xfixes \
xinerama xrandr xrender
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -14,15 +14,14 @@
BUILD_DEPENDS= gsettings-desktop-schemas>=3.3.0:devel/gsettings-desktop-schemas \
itstool:textproc/itstool \
zenity>=3.0.0:x11/zenity
-LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libgtop-2.0.so:devel/libgtop \
+LIB_DEPENDS= libgtop-2.0.so:devel/libgtop \
libstartup-notification-1.so:x11/startup-notification
RUN_DEPENDS= gsettings-desktop-schemas>=3.3.0:devel/gsettings-desktop-schemas \
zenity>=3.0.0:x11/zenity
PORTSCOUT= limitw:1,even
-USES= compiler:c11 gettext gmake gnome libtool localbase pathfix \
+USES= canberra:gtk3 compiler:c11 gettext gmake gnome libtool localbase pathfix \
pkgconfig tar:xz xorg
GNU_CONFIGURE= yes
USE_XORG= x11 xcomposite xcursor xdamage xext xinerama xpresent xrandr \
diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -17,9 +17,7 @@
gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas \
gtkdocize:textproc/gtk-doc \
xkeyboard-config>0:x11/xkeyboard-config
-LIB_DEPENDS= libcanberra.so:audio/libcanberra \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libcinnamon-desktop.so:x11/cinnamon-desktop \
+LIB_DEPENDS= libcinnamon-desktop.so:x11/cinnamon-desktop \
libdrm.so:graphics/libdrm \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
@@ -31,7 +29,7 @@
RUN_DEPENDS= zenity>=3.0.0:x11/zenity \
xkeyboard-config>0:x11/xkeyboard-config
-USES= autoreconf:build compiler:c11 gettext-tools gl gmake gnome \
+USES= autoreconf:build canberra:gtk3 compiler:c11 gettext-tools gl gmake gnome \
libtool localbase pathfix pkgconfig xorg
USE_GITHUB= yes
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -17,9 +17,7 @@
gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas \
xkeyboard-config>=0:x11/xkeyboard-config \
zenity>=3.0.0:x11/zenity
-LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libcanberra.so:audio/libcanberra \
- libdrm.so:graphics/libdrm \
+LIB_DEPENDS= libdrm.so:graphics/libdrm \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libfribidi.so:converters/fribidi \
@@ -37,7 +35,7 @@
PORTSCOUT= limitw:1,even
-USES= compiler:c++0x gettext gl gnome localbase meson pkgconfig \
+USES= canberra:gtk3 compiler:c++0x gettext gl gnome localbase meson pkgconfig \
tar:xz xorg
USE_GL= egl gbm
USE_GNOME= cairo gdkpixbuf2 gnomedesktop3 introspection
diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile
--- a/x11/cinnamon-session/Makefile
+++ b/x11/cinnamon-session/Makefile
@@ -13,11 +13,10 @@
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib \
- libxapp.so:x11/xapp \
- libcanberra.so:audio/libcanberra
+ libxapp.so:x11/xapp
RUN_DEPENDS= console-kit-daemon:sysutils/consolekit2
-USES= gl gnome meson pkgconfig python:3.5+,build shebangfix xorg
+USES= canberra gl gnome meson pkgconfig python:3.5+,build shebangfix xorg
USE_GITHUB= yes
GH_ACCOUNT= linuxmint
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -16,8 +16,6 @@
itstool:textproc/itstool \
zenity>=3.0.0:x11/zenity
LIB_DEPENDS= libaccountsservice.so:sysutils/accountsservice \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libcanberra.so:audio/libcanberra \
libck-connector.so:sysutils/consolekit2 \
libfribidi.so:converters/fribidi
RUN_DEPENDS= at-spi2-core>=0:accessibility/at-spi2-core \
@@ -41,7 +39,7 @@
PORTSCOUT= limitw:1,even
-USES= cpe gettext gnome libtool localbase:ldflags meson pathfix \
+USES= canberra:gtk3 cpe gettext gnome libtool localbase:ldflags meson pathfix \
pkgconfig tar:xz xorg
CPE_VENDOR= gnome
CPE_PRODUCT= gnome_display_manager
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -21,8 +21,6 @@
gnome-control-center:sysutils/gnome-control-center \
sassc:textproc/sassc
LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \
- libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libcanberra.so:audio/libcanberra \
libcroco-0.6.so:textproc/libcroco \
libdrm.so:graphics/libdrm \
libgcr-base-3.so:security/gcr \
@@ -45,7 +43,7 @@
PORTSCOUT= limitw:1,even
-USES= compiler:c11 cpe gettext gl gnome libtool localbase meson \
+USES= canberra:gtk3 compiler:c11 cpe gettext gl gnome libtool localbase meson \
pathfix perl5 pkgconfig python:3.4+ shebangfix tar:xz \
webplugin:native xorg
USE_GNOME= cairo evolutiondataserver3 gdkpixbuf2 gnomedesktop3 gtk40 \
diff --git a/x11/slick-greeter/Makefile b/x11/slick-greeter/Makefile
--- a/x11/slick-greeter/Makefile
+++ b/x11/slick-greeter/Makefile
@@ -11,15 +11,13 @@
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
- libcanberra.so:audio/libcanberra \
- libfreetype.so:print/freetype2 \
+LIB_DEPENDS= libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz \
liblightdm-gobject-1.so:x11/lightdm
BUILD_DEPENDS= valac:lang/vala
RUN_DEPENDS= numlockx>=0:x11/numlockx
-USES= autoreconf gettext gmake gnome localbase pkgconfig python:run shebangfix xorg
+USES= autoreconf canberra:gtk3 gettext gmake gnome localbase pkgconfig python:run shebangfix xorg
USE_GNOME= cairo dconf gdkpixbuf2 gtk30 intltool pygobject3
USE_XORG= pixman x11 xext

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 31, 2:20 PM (10 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27385000
Default Alt Text
D20830.diff (50 KB)

Event Timeline