Переглянути джерело

package/webkitgtk: fix gstreamer-gl dependency

The gstreamer1 opengl plugin was moved from gst1-plugins-bad to
gst1-plugins-base so we need to update webkitgtk to depend on the
correct package.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Reviewed-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
James Hilliard 6 роки тому
батько
коміт
b70e999e84
2 змінених файлів з 1 додано та 3 видалено
  1. 1 2
      package/webkitgtk/Config.in
  2. 0 1
      package/webkitgtk/webkitgtk.mk

+ 1 - 2
package/webkitgtk/Config.in

@@ -108,8 +108,7 @@ if BR2_PACKAGE_WEBKITGTK_MULTIMEDIA
 config BR2_PACKAGE_WEBKITGTK_USE_GSTREAMER_GL
 config BR2_PACKAGE_WEBKITGTK_USE_GSTREAMER_GL
 	bool "use gstreamer-gl"
 	bool "use gstreamer-gl"
 	default y
 	default y
-	depends on BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL
-	select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL
+	depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL
 	help
 	help
 	  Use the GStreamer GL elements for handling video content.
 	  Use the GStreamer GL elements for handling video content.
 	  This is recommended as it improves performance of video
 	  This is recommended as it improves performance of video

+ 0 - 1
package/webkitgtk/webkitgtk.mk

@@ -100,7 +100,6 @@ endif
 
 
 ifeq ($(BR2_PACKAGE_WEBKITGTK_USE_GSTREAMER_GL),y)
 ifeq ($(BR2_PACKAGE_WEBKITGTK_USE_GSTREAMER_GL),y)
 WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=ON
 WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=ON
-WEBKITGTK_DEPENDENCIES += gst1-plugins-bad
 else
 else
 WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF
 WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF
 endif
 endif