package/kodi-screensaver/visualisation-*: allow OpenGL build on arm

Kodi depends on egl/gles on arm, our Kconfig option BR2_PACKAGE_KODI_GL
reflects this, it depends on !BR2_arm.

This option is wrongly used in many Kodi addons needing OpenGL, they
can be compiled even if Kodi itself uses egl/gles. This patch changes
the dependency on BR2_PACKAGE_KODI_GL to BR2_PACKAGE_HAS_LIBGL.

Tested using this defconfig:

BR2_arm=y
BR2_cortex_a17=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_KODI=y
BR2_PACKAGE_KODI_SCREENSAVER_ASTEROIDS=y
BR2_PACKAGE_KODI_SCREENSAVER_ASTERWAVE=y
BR2_PACKAGE_KODI_SCREENSAVER_BIOGENESIS=y
BR2_PACKAGE_KODI_SCREENSAVER_CPBLOBS=y
BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH=y
BR2_PACKAGE_KODI_SCREENSAVER_GREYNETIC=y
BR2_PACKAGE_KODI_SCREENSAVER_MATRIXTRAILS=y
BR2_PACKAGE_KODI_SCREENSAVER_PINGPONG=y
BR2_PACKAGE_KODI_SCREENSAVER_PLANESTATE=y
BR2_PACKAGE_KODI_SCREENSAVER_PYRO=y
BR2_PACKAGE_KODI_SCREENSAVER_RSXS=y
BR2_PACKAGE_KODI_SCREENSAVER_STARS=y
BR2_PACKAGE_KODI_VISUALISATION_FISHBMC=y
BR2_PACKAGE_KODI_VISUALISATION_FOUNTAIN=y
BR2_PACKAGE_KODI_VISUALISATION_GOOM=y
BR2_PACKAGE_KODI_VISUALISATION_SHADERTOY=y
BR2_PACKAGE_KODI_VISUALISATION_SPECTRUM=y
BR2_PACKAGE_KODI_VISUALISATION_WAVEFORHUE=y
BR2_PACKAGE_KODI_VISUALISATION_WAVEFORM=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST=y
BR2_PACKAGE_MESA3D_OPENGL_EGL=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
BR2_PACKAGE_XORG7=y

$ grep PACKAGE_HAS_LIB .config
BR2_PACKAGE_HAS_LIBGL=y
BR2_PACKAGE_HAS_LIBEGL=y
BR2_PACKAGE_HAS_LIBGLES=y

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2016-05-10 20:40:23 +02:00 committed by Thomas Petazzoni
parent 25ab35697e
commit 71664e775c
15 changed files with 30 additions and 30 deletions

View File

@ -1,10 +1,10 @@
config BR2_PACKAGE_KODI_SCREENSAVER_ASTEROIDS config BR2_PACKAGE_KODI_SCREENSAVER_ASTEROIDS
bool "kodi-screensaver-asteroids" bool "kodi-screensaver-asteroids"
depends on BR2_PACKAGE_KODI_GL depends on BR2_PACKAGE_HAS_LIBGL
help help
Asteroids screensaver for Kodi Asteroids screensaver for Kodi
https://github.com/notspiff/screensaver.asteroids https://github.com/notspiff/screensaver.asteroids
comment "kodi-screensaver-asteroids needs OpenGL" comment "kodi-screensaver-asteroids needs OpenGL"
depends on !BR2_PACKAGE_KODI_GL depends on !BR2_PACKAGE_HAS_LIBGL

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_KODI_SCREENSAVER_ASTERWAVE config BR2_PACKAGE_KODI_SCREENSAVER_ASTERWAVE
bool "kodi-screensaver-asterwave" bool "kodi-screensaver-asterwave"
depends on BR2_PACKAGE_KODI_GL # libsoil depends on BR2_PACKAGE_HAS_LIBGL # libglu, libsoil
select BR2_PACKAGE_LIBGLU select BR2_PACKAGE_LIBGLU
select BR2_PACKAGE_LIBSOIL select BR2_PACKAGE_LIBSOIL
help help
@ -9,4 +9,4 @@ config BR2_PACKAGE_KODI_SCREENSAVER_ASTERWAVE
https://github.com/notspiff/screensaver.asterwave https://github.com/notspiff/screensaver.asterwave
comment "kodi-screensaver-asterwave needs OpenGL" comment "kodi-screensaver-asterwave needs OpenGL"
depends on !BR2_PACKAGE_KODI_GL depends on !BR2_PACKAGE_HAS_LIBGL

View File

@ -1,10 +1,10 @@
config BR2_PACKAGE_KODI_SCREENSAVER_BIOGENESIS config BR2_PACKAGE_KODI_SCREENSAVER_BIOGENESIS
bool "kodi-screensaver-biogenesis" bool "kodi-screensaver-biogenesis"
depends on BR2_PACKAGE_KODI_GL depends on BR2_PACKAGE_HAS_LIBGL
help help
BioGenesis screensaver for Kodi BioGenesis screensaver for Kodi
https://github.com/notspiff/screensaver.biogenesis https://github.com/notspiff/screensaver.biogenesis
comment "kodi-screensaver-biogenesis needs OpenGL" comment "kodi-screensaver-biogenesis needs OpenGL"
depends on !BR2_PACKAGE_KODI_GL depends on !BR2_PACKAGE_HAS_LIBGL

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_KODI_SCREENSAVER_CPBLOBS config BR2_PACKAGE_KODI_SCREENSAVER_CPBLOBS
bool "kodi-screensaver-cpblobs" bool "kodi-screensaver-cpblobs"
depends on BR2_PACKAGE_KODI_GL # libsoil depends on BR2_PACKAGE_HAS_LIBGL # libsoil
select BR2_PACKAGE_LIBSOIL select BR2_PACKAGE_LIBSOIL
help help
CpBlobs screensaver for Kodi CpBlobs screensaver for Kodi
@ -8,4 +8,4 @@ config BR2_PACKAGE_KODI_SCREENSAVER_CPBLOBS
https://github.com/notspiff/screensaver.cpblobs https://github.com/notspiff/screensaver.cpblobs
comment "kodi-screensaver-cpblobs needs OpenGL" comment "kodi-screensaver-cpblobs needs OpenGL"
depends on !BR2_PACKAGE_KODI_GL depends on !BR2_PACKAGE_HAS_LIBGL

View File

@ -1,10 +1,10 @@
config BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH config BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH
bool "kodi-screensaver-crystalmorph" bool "kodi-screensaver-crystalmorph"
depends on BR2_PACKAGE_KODI_GL # libglu depends on BR2_PACKAGE_HAS_LIBGL # libglu
help help
CrystalMorph screensaver for Kodi CrystalMorph screensaver for Kodi
https://github.com/notspiff/screensaver.crystalmorph https://github.com/notspiff/screensaver.crystalmorph
comment "kodi-screensaver-crystalmorph needs OpenGL" comment "kodi-screensaver-crystalmorph needs OpenGL"
depends on !BR2_PACKAGE_KODI_GL depends on !BR2_PACKAGE_HAS_LIBGL

View File

@ -1,10 +1,10 @@
config BR2_PACKAGE_KODI_SCREENSAVER_GREYNETIC config BR2_PACKAGE_KODI_SCREENSAVER_GREYNETIC
bool "kodi-screensaver-greynetic" bool "kodi-screensaver-greynetic"
depends on BR2_PACKAGE_KODI_GL depends on BR2_PACKAGE_HAS_LIBGL
help help
Greynetic screensaver for Kodi Greynetic screensaver for Kodi
https://github.com/notspiff/screensaver.greynetic https://github.com/notspiff/screensaver.greynetic
comment "kodi-screensaver-greynetic needs OpenGL" comment "kodi-screensaver-greynetic needs OpenGL"
depends on !BR2_PACKAGE_KODI_GL depends on !BR2_PACKAGE_HAS_LIBGL

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_KODI_SCREENSAVER_MATRIXTRAILS config BR2_PACKAGE_KODI_SCREENSAVER_MATRIXTRAILS
bool "kodi-screensaver-matrixtrails" bool "kodi-screensaver-matrixtrails"
depends on BR2_PACKAGE_KODI_GL # libsoil depends on BR2_PACKAGE_HAS_LIBGL # libsoil
select BR2_PACKAGE_LIBSOIL select BR2_PACKAGE_LIBSOIL
help help
Matrix trails screensaver for Kodi Matrix trails screensaver for Kodi
@ -8,4 +8,4 @@ config BR2_PACKAGE_KODI_SCREENSAVER_MATRIXTRAILS
https://github.com/notspiff/screensaver.matrixtrails https://github.com/notspiff/screensaver.matrixtrails
comment "kodi-screensaver-matrixtrails needs OpenGL" comment "kodi-screensaver-matrixtrails needs OpenGL"
depends on !BR2_PACKAGE_KODI_GL depends on !BR2_PACKAGE_HAS_LIBGL

View File

@ -1,10 +1,10 @@
config BR2_PACKAGE_KODI_SCREENSAVER_PINGPONG config BR2_PACKAGE_KODI_SCREENSAVER_PINGPONG
bool "kodi-screensaver-pingpong" bool "kodi-screensaver-pingpong"
depends on BR2_PACKAGE_KODI_GL depends on BR2_PACKAGE_HAS_LIBGL
help help
Ping-pong screensaver for Kodi Ping-pong screensaver for Kodi
https://github.com/notspiff/screensaver.pingpong https://github.com/notspiff/screensaver.pingpong
comment "kodi-screensaver-pingpong needs OpenGL" comment "kodi-screensaver-pingpong needs OpenGL"
depends on !BR2_PACKAGE_KODI_GL depends on !BR2_PACKAGE_HAS_LIBGL

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_KODI_SCREENSAVER_PLANESTATE config BR2_PACKAGE_KODI_SCREENSAVER_PLANESTATE
bool "kodi-screensaver-planestate" bool "kodi-screensaver-planestate"
depends on BR2_PACKAGE_KODI_GL # libsoil depends on BR2_PACKAGE_HAS_LIBGL # libsoil
select BR2_PACKAGE_LIBSOIL select BR2_PACKAGE_LIBSOIL
help help
PlaneState screensaver for Kodi PlaneState screensaver for Kodi
@ -8,4 +8,4 @@ config BR2_PACKAGE_KODI_SCREENSAVER_PLANESTATE
https://github.com/notspiff/screensaver.planestate https://github.com/notspiff/screensaver.planestate
comment "kodi-screensaver-planestate needs OpenGL" comment "kodi-screensaver-planestate needs OpenGL"
depends on !BR2_PACKAGE_KODI_GL depends on !BR2_PACKAGE_HAS_LIBGL

View File

@ -1,10 +1,10 @@
config BR2_PACKAGE_KODI_SCREENSAVER_PYRO config BR2_PACKAGE_KODI_SCREENSAVER_PYRO
bool "kodi-screensaver-pyro" bool "kodi-screensaver-pyro"
depends on BR2_PACKAGE_KODI_GL depends on BR2_PACKAGE_HAS_LIBGL
help help
Pyro screensaver for Kodi Pyro screensaver for Kodi
https://github.com/notspiff/screensaver.pyro https://github.com/notspiff/screensaver.pyro
comment "kodi-screensaver-pyro needs OpenGL" comment "kodi-screensaver-pyro needs OpenGL"
depends on !BR2_PACKAGE_KODI_GL depends on !BR2_PACKAGE_HAS_LIBGL

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_KODI_SCREENSAVER_RSXS config BR2_PACKAGE_KODI_SCREENSAVER_RSXS
bool "kodi-screensaver-rsxs" bool "kodi-screensaver-rsxs"
depends on BR2_PACKAGE_KODI_GL # libglu depends on BR2_PACKAGE_HAS_LIBGL # libglu
depends on BR2_PACKAGE_XORG7 # xlib_libXmu depends on BR2_PACKAGE_XORG7 # xlib_libXmu
select BR2_PACKAGE_XLIB_LIBXMU select BR2_PACKAGE_XLIB_LIBXMU
help help
@ -9,4 +9,4 @@ config BR2_PACKAGE_KODI_SCREENSAVER_RSXS
https://github.com/notspiff/screensavers.rsxs https://github.com/notspiff/screensavers.rsxs
comment "kodi-screensaver-rsxs depends on X.org and needs OpenGL" comment "kodi-screensaver-rsxs depends on X.org and needs OpenGL"
depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_KODI_GL depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL

View File

@ -1,10 +1,10 @@
config BR2_PACKAGE_KODI_SCREENSAVER_STARS config BR2_PACKAGE_KODI_SCREENSAVER_STARS
bool "kodi-screensaver-stars" bool "kodi-screensaver-stars"
depends on BR2_PACKAGE_KODI_GL depends on BR2_PACKAGE_HAS_LIBGL
help help
Starfield screensaver for Kodi Starfield screensaver for Kodi
https://github.com/notspiff/screensaver.stars https://github.com/notspiff/screensaver.stars
comment "kodi-screensaver-stars needs OpenGL" comment "kodi-screensaver-stars needs OpenGL"
depends on !BR2_PACKAGE_KODI_GL depends on !BR2_PACKAGE_HAS_LIBGL

View File

@ -1,10 +1,10 @@
config BR2_PACKAGE_KODI_VISUALISATION_FISHBMC config BR2_PACKAGE_KODI_VISUALISATION_FISHBMC
bool "kodi-visualisation-fishbmc" bool "kodi-visualisation-fishbmc"
depends on BR2_PACKAGE_KODI_GL depends on BR2_PACKAGE_HAS_LIBGL
help help
Fische visualiser for Kodi Fische visualiser for Kodi
https://github.com/notspiff/visualization.fishbmc https://github.com/notspiff/visualization.fishbmc
comment "kodi-visualisation-fishbmc needs OpenGL" comment "kodi-visualisation-fishbmc needs OpenGL"
depends on !BR2_PACKAGE_KODI_GL depends on !BR2_PACKAGE_HAS_LIBGL

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_KODI_VISUALISATION_FOUNTAIN config BR2_PACKAGE_KODI_VISUALISATION_FOUNTAIN
bool "kodi-visualisation-fountain" bool "kodi-visualisation-fountain"
depends on BR2_PACKAGE_KODI_GL # libsoil depends on BR2_PACKAGE_HAS_LIBGL # libsoil
select BR2_PACKAGE_LIBSOIL select BR2_PACKAGE_LIBSOIL
help help
Fountain visualization for Kodi Fountain visualization for Kodi
@ -8,4 +8,4 @@ config BR2_PACKAGE_KODI_VISUALISATION_FOUNTAIN
https://github.com/notspiff/visualization.fountain https://github.com/notspiff/visualization.fountain
comment "kodi-visualisation-fountain needs OpenGL" comment "kodi-visualisation-fountain needs OpenGL"
depends on !BR2_PACKAGE_KODI_GL depends on !BR2_PACKAGE_HAS_LIBGL

View File

@ -1,10 +1,10 @@
config BR2_PACKAGE_KODI_VISUALISATION_GOOM config BR2_PACKAGE_KODI_VISUALISATION_GOOM
bool "kodi-visualisation-goom" bool "kodi-visualisation-goom"
depends on BR2_PACKAGE_KODI_GL depends on BR2_PACKAGE_HAS_LIBGL
help help
GOOM visualiser for Kodi GOOM visualiser for Kodi
https://github.com/notspiff/visualization.goom https://github.com/notspiff/visualization.goom
comment "kodi-visualization-goom needs OpenGL" comment "kodi-visualization-goom needs OpenGL"
depends on !BR2_PACKAGE_KODI_GL depends on !BR2_PACKAGE_HAS_LIBGL