jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/sdl: remove qtopia video driver option

Browse Source 
The qtopia option uses the obsolete qt4 package, which we are about to
remove, to remove the qtopia option as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[Arnout: move the enable-qtopia=no option to the beginning]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Peter Korsgaard 2019-02-06 15:10:46 +01:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 78449f011c
commit 3a56bc5f47
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in.legacy
View File

@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2019.02" comment "Legacy options removed in 2019.02"
config BR2_PACKAGE_SDL_QTOPIA
bool "sdl qtopia video driver option removed"
select BR2_LEGACY
help
The SDL QTopia video driver option was removed.
config BR2_PACKAGE_PYTHON_PYQT config BR2_PACKAGE_PYTHON_PYQT
bool "python-pyqt package removed" bool "python-pyqt package removed"
select BR2_LEGACY select BR2_LEGACY

4
package/sdl/Config.in
View File

@ -17,10 +17,6 @@ config BR2_PACKAGE_SDL_DIRECTFB
bool "SDL DirectFB video driver" bool "SDL DirectFB video driver"
depends on BR2_PACKAGE_DIRECTFB depends on BR2_PACKAGE_DIRECTFB
config BR2_PACKAGE_SDL_QTOPIA
bool "SDL Qtopia video driver"
depends on BR2_PACKAGE_QT
config BR2_PACKAGE_SDL_X11 config BR2_PACKAGE_SDL_X11
bool "SDL X11 video driver" bool "SDL X11 video driver"
depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_XORG7

9
package/sdl/sdl.mk
View File

@ -23,6 +23,8 @@ HOST_SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN
SDL_DEPENDENCIES += host-automake host-autoconf host-libtool SDL_DEPENDENCIES += host-automake host-autoconf host-libtool
HOST_SDL_DEPENDENCIES += host-automake host-autoconf host-libtool HOST_SDL_DEPENDENCIES += host-automake host-autoconf host-libtool
SDL_CONF_OPTS += --enable-video-qtopia=no
ifeq ($(BR2_PACKAGE_SDL_FBCON),y) ifeq ($(BR2_PACKAGE_SDL_FBCON),y)
SDL_CONF_OPTS += --enable-video-fbcon=yes SDL_CONF_OPTS += --enable-video-fbcon=yes
else else
@ -37,13 +39,6 @@ else
SDL_CONF_OPTS += --enable-video-directfb=no SDL_CONF_OPTS += --enable-video-directfb=no
endif endif
ifeq ($(BR2_PACKAGE_SDL_QTOPIA),y)
SDL_CONF_OPTS += --enable-video-qtopia=yes
SDL_DEPENDENCIES += qt
else
SDL_CONF_OPTS += --enable-video-qtopia=no
endif
ifeq ($(BR2_PACKAGE_SDL_X11),y) ifeq ($(BR2_PACKAGE_SDL_X11),y)
SDL_CONF_OPTS += --enable-video-x11=yes SDL_CONF_OPTS += --enable-video-x11=yes
SDL_DEPENDENCIES += \ SDL_DEPENDENCIES += \