From 4284ce939aa0bdbfe0bad53cc9be4d7b5aef0743 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 10 Sep 2025 23:32:16 +0200 Subject: [PATCH] package/libcanberra: remove optional dependency on libgtk2 As we're about to drop libgtk2, let's remove the optional dependency of libcanberra to libgtk2. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- package/libcanberra/libcanberra.mk | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/package/libcanberra/libcanberra.mk b/package/libcanberra/libcanberra.mk index 2505e58eb0..456d08563b 100644 --- a/package/libcanberra/libcanberra.mk +++ b/package/libcanberra/libcanberra.mk @@ -12,7 +12,12 @@ LIBCANBERRA_LICENSE_FILES = LGPL LIBCANBERRA_INSTALL_STAGING = YES LIBCANBERRA_DEPENDENCIES = host-pkgconf libtool libvorbis -LIBCANBERRA_CONF_OPTS = --disable-oss --disable-null --disable-tdb --disable-lynx +LIBCANBERRA_CONF_OPTS = \ + --disable-oss \ + --disable-null \ + --disable-tdb \ + --disable-lynx \ + --disable-gtk ifeq ($(BR2_PACKAGE_HAS_UDEV),y) LIBCANBERRA_CONF_OPTS += --enable-udev @@ -42,13 +47,6 @@ else LIBCANBERRA_CONF_OPTS += --disable-gstreamer endif -ifeq ($(BR2_PACKAGE_LIBGTK2),y) -LIBCANBERRA_CONF_OPTS += --enable-gtk -LIBCANBERRA_DEPENDENCIES += libgtk2 -else -LIBCANBERRA_CONF_OPTS += --disable-gtk -endif - ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) LIBCANBERRA_CONF_OPTS += --enable-gtk3 LIBCANBERRA_DEPENDENCIES += libgtk3