ソースを参照

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 <thomas.petazzoni@bootlin.com>
Signed-off-by: Arnout Vandecappelle <arnout@rnout.be>
Thomas Petazzoni 4 ヶ月 前
コミット
4284ce939a
1 ファイル変更6 行追加8 行削除
  1. 6 8
      package/libcanberra/libcanberra.mk

+ 6 - 8
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