浏览代码

package/vlc: skins2 depends on qt5base

Fixes

configure: error: The skins2 module depends on the Qt interface. Without
it you will not be able to open any dialog box from the interface, which
makes the skins2 interface rather useless. Install the Qt development
package or alternatively you can also configure with: --disable-qt
--disable-skins2.

http://autobuild.buildroot.net/results/ddb/ddb1ab48adb9705c44ed3d6d800b6d01ad52ac8c/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Bernd Kuhls 7 年之前
父节点
当前提交
9f68d99a82
共有 1 个文件被更改,包括 7 次插入8 次删除
  1. 7 8
      package/vlc/vlc.mk

+ 7 - 8
package/vlc/vlc.mk

@@ -473,8 +473,14 @@ endif
 ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS)$(BR2_PACKAGE_QT5SVG),yy)
 VLC_CONF_OPTS += --enable-qt
 VLC_DEPENDENCIES += qt5base qt5svg
+ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT)$(BR2_PACKAGE_XLIB_LIBXINERAMA)$(BR2_PACKAGE_XLIB_LIBXPM),yyy)
+VLC_CONF_OPTS += --enable-skins2
+VLC_DEPENDENCIES += xlib_libXext xlib_libXinerama xlib_libXpm
 else
-VLC_CONF_OPTS += --disable-qt
+VLC_CONF_OPTS += --disable-skins2
+endif
+else
+VLC_CONF_OPTS += --disable-qt --disable-skins2
 endif
 
 ifeq ($(BR2_PACKAGE_SDL_IMAGE),y)
@@ -551,13 +557,6 @@ else
 VLC_CONF_OPTS += --without-x
 endif
 
-ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT)$(BR2_PACKAGE_XLIB_LIBXINERAMA)$(BR2_PACKAGE_XLIB_LIBXPM),yyy)
-VLC_CONF_OPTS += --enable-skins2
-VLC_DEPENDENCIES += xlib_libXext xlib_libXinerama xlib_libXpm
-else
-VLC_CONF_OPTS += --disable-skins2
-endif
-
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 VLC_DEPENDENCIES += zlib
 endif