summaryrefslogtreecommitdiffstats
path: root/package/vlc
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2018-08-21 22:32:55 +0200
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-08-21 22:50:55 +0200
commit9f68d99a82384dda6ea7801f3f5ec905231c8fd2 (patch)
treefea32ee4283740208ad071fd2d57f628baf82369 /package/vlc
parentbecaafd056dbfbe58d8578c0f2991ab0de45938f (diff)
downloadbuildroot-9f68d99a82384dda6ea7801f3f5ec905231c8fd2.tar.gz
buildroot-9f68d99a82384dda6ea7801f3f5ec905231c8fd2.zip
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>
Diffstat (limited to 'package/vlc')
-rw-r--r--package/vlc/vlc.mk15
1 files changed, 7 insertions, 8 deletions
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index c77c945a34..b69657d31f 100644
--- a/package/vlc/vlc.mk
+++ b/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
OpenPOWER on IntegriCloud