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 <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>

diff --git a/package/kodi-screensaver-asteroids/Config.in b/package/kodi-screensaver-asteroids/Config.in
index 3aa03fb4301e568a430d9d95a661a21d4447bb18..ccc2aba6aa8f5da93afe991dc99c14d5b9c3fb8b 100644 (file)
--- a/package/kodi-screensaver-asteroids/Config.in
+++ b/package/kodi-screensaver-asteroids/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_KODI_SCREENSAVER_ASTEROIDS
        bool "kodi-screensaver-asteroids"
-       depends on BR2_PACKAGE_KODI_GL
+       depends on BR2_PACKAGE_HAS_LIBGL
        help
          Asteroids screensaver for Kodi
 
          https://github.com/notspiff/screensaver.asteroids
 
 comment "kodi-screensaver-asteroids needs OpenGL"
-       depends on !BR2_PACKAGE_KODI_GL
+       depends on !BR2_PACKAGE_HAS_LIBGL

diff --git a/package/kodi-screensaver-asterwave/Config.in b/package/kodi-screensaver-asterwave/Config.in
index 05ce58aa0f2db1b6cfdbb95dfb4e6600a2e112cd..bd5db738cae3ed77bd76cd5b6161f29d12246233 100644 (file)
--- a/package/kodi-screensaver-asterwave/Config.in
+++ b/package/kodi-screensaver-asterwave/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_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_LIBSOIL
        help
@@ -9,4 +9,4 @@ config BR2_PACKAGE_KODI_SCREENSAVER_ASTERWAVE
          https://github.com/notspiff/screensaver.asterwave
 
 comment "kodi-screensaver-asterwave needs OpenGL"
-       depends on !BR2_PACKAGE_KODI_GL
+       depends on !BR2_PACKAGE_HAS_LIBGL

diff --git a/package/kodi-screensaver-biogenesis/Config.in b/package/kodi-screensaver-biogenesis/Config.in
index f2789a0c2efcaf535631df10e28f6acf1ca2199d..cdc2d919510a1fd35c7fdcba1ea491cb6953b998 100644 (file)
--- a/package/kodi-screensaver-biogenesis/Config.in
+++ b/package/kodi-screensaver-biogenesis/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_KODI_SCREENSAVER_BIOGENESIS
        bool "kodi-screensaver-biogenesis"
-       depends on BR2_PACKAGE_KODI_GL
+       depends on BR2_PACKAGE_HAS_LIBGL
        help
          BioGenesis screensaver for Kodi
 
          https://github.com/notspiff/screensaver.biogenesis
 
 comment "kodi-screensaver-biogenesis needs OpenGL"
-       depends on !BR2_PACKAGE_KODI_GL
+       depends on !BR2_PACKAGE_HAS_LIBGL

diff --git a/package/kodi-screensaver-cpblobs/Config.in b/package/kodi-screensaver-cpblobs/Config.in
index aa39f15f87fbbc0251f4893a8ef97f1eaf8a9daf..e80ea0ebb36a2f496977601a91d1c2b2210b26db 100644 (file)
--- a/package/kodi-screensaver-cpblobs/Config.in
+++ b/package/kodi-screensaver-cpblobs/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_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
        help
          CpBlobs screensaver for Kodi
@@ -8,4 +8,4 @@ config BR2_PACKAGE_KODI_SCREENSAVER_CPBLOBS
          https://github.com/notspiff/screensaver.cpblobs
 
 comment "kodi-screensaver-cpblobs needs OpenGL"
-       depends on !BR2_PACKAGE_KODI_GL
+       depends on !BR2_PACKAGE_HAS_LIBGL

diff --git a/package/kodi-screensaver-crystalmorph/Config.in b/package/kodi-screensaver-crystalmorph/Config.in
index 75c8845f78a42f8037f3572ca96cdf134bac1504..1303d229fde6af2a3b5fddc8cd0fbcecf1df8f07 100644 (file)
--- a/package/kodi-screensaver-crystalmorph/Config.in
+++ b/package/kodi-screensaver-crystalmorph/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH
        bool "kodi-screensaver-crystalmorph"
-       depends on BR2_PACKAGE_KODI_GL # libglu
+       depends on BR2_PACKAGE_HAS_LIBGL # libglu
        help
          CrystalMorph screensaver for Kodi
 
          https://github.com/notspiff/screensaver.crystalmorph
 
 comment "kodi-screensaver-crystalmorph needs OpenGL"
-       depends on !BR2_PACKAGE_KODI_GL
+       depends on !BR2_PACKAGE_HAS_LIBGL

diff --git a/package/kodi-screensaver-greynetic/Config.in b/package/kodi-screensaver-greynetic/Config.in
index 611ba5168191898d1979599983961e0d22524266..ce636b82718de24ab62ce15055de4b2eb08ded80 100644 (file)
--- a/package/kodi-screensaver-greynetic/Config.in
+++ b/package/kodi-screensaver-greynetic/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_KODI_SCREENSAVER_GREYNETIC
        bool "kodi-screensaver-greynetic"
-       depends on BR2_PACKAGE_KODI_GL
+       depends on BR2_PACKAGE_HAS_LIBGL
        help
          Greynetic screensaver for Kodi
 
          https://github.com/notspiff/screensaver.greynetic
 
 comment "kodi-screensaver-greynetic needs OpenGL"
-       depends on !BR2_PACKAGE_KODI_GL
+       depends on !BR2_PACKAGE_HAS_LIBGL

diff --git a/package/kodi-screensaver-matrixtrails/Config.in b/package/kodi-screensaver-matrixtrails/Config.in
index 50629d821edbc519b97355f3f1b0e984180c456c..e2d3f71acfda111a18b5c1714291a04fb20e5dce 100644 (file)
--- a/package/kodi-screensaver-matrixtrails/Config.in
+++ b/package/kodi-screensaver-matrixtrails/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_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
        help
          Matrix trails screensaver for Kodi
@@ -8,4 +8,4 @@ config BR2_PACKAGE_KODI_SCREENSAVER_MATRIXTRAILS
          https://github.com/notspiff/screensaver.matrixtrails
 
 comment "kodi-screensaver-matrixtrails needs OpenGL"
-       depends on !BR2_PACKAGE_KODI_GL
+       depends on !BR2_PACKAGE_HAS_LIBGL

diff --git a/package/kodi-screensaver-pingpong/Config.in b/package/kodi-screensaver-pingpong/Config.in
index aea083329cfe01364a23c74a66a736931c3d5997..3971052b94e9253a6e026f9d6cb766629e9ebceb 100644 (file)
--- a/package/kodi-screensaver-pingpong/Config.in
+++ b/package/kodi-screensaver-pingpong/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_KODI_SCREENSAVER_PINGPONG
        bool "kodi-screensaver-pingpong"
-       depends on BR2_PACKAGE_KODI_GL
+       depends on BR2_PACKAGE_HAS_LIBGL
        help
          Ping-pong screensaver for Kodi
 
          https://github.com/notspiff/screensaver.pingpong
 
 comment "kodi-screensaver-pingpong needs OpenGL"
-       depends on !BR2_PACKAGE_KODI_GL
+       depends on !BR2_PACKAGE_HAS_LIBGL

diff --git a/package/kodi-screensaver-planestate/Config.in b/package/kodi-screensaver-planestate/Config.in
index 2f816b2db676b34a541669c72b6c140ea11b9e1d..b63d70e6418749b893aa46f8d7b590f2e4408b68 100644 (file)
--- a/package/kodi-screensaver-planestate/Config.in
+++ b/package/kodi-screensaver-planestate/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_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
        help
          PlaneState screensaver for Kodi
@@ -8,4 +8,4 @@ config BR2_PACKAGE_KODI_SCREENSAVER_PLANESTATE
          https://github.com/notspiff/screensaver.planestate
 
 comment "kodi-screensaver-planestate needs OpenGL"
-       depends on !BR2_PACKAGE_KODI_GL
+       depends on !BR2_PACKAGE_HAS_LIBGL

diff --git a/package/kodi-screensaver-pyro/Config.in b/package/kodi-screensaver-pyro/Config.in
index 35a2be20a2ca3792ff3e0d07185fde6553b8af3c..982542d5a35e27574b23891c7d2def7873eb0c00 100644 (file)
--- a/package/kodi-screensaver-pyro/Config.in
+++ b/package/kodi-screensaver-pyro/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_KODI_SCREENSAVER_PYRO
        bool "kodi-screensaver-pyro"
-       depends on BR2_PACKAGE_KODI_GL
+       depends on BR2_PACKAGE_HAS_LIBGL
        help
          Pyro screensaver for Kodi
 
          https://github.com/notspiff/screensaver.pyro
 
 comment "kodi-screensaver-pyro needs OpenGL"
-       depends on !BR2_PACKAGE_KODI_GL
+       depends on !BR2_PACKAGE_HAS_LIBGL

diff --git a/package/kodi-screensaver-rsxs/Config.in b/package/kodi-screensaver-rsxs/Config.in
index 0698c7dd817d20698b34168597fd4e62c04f413a..11546ad1f89cec9a3b7a8bc27c111f66fa27ffd9 100644 (file)
--- a/package/kodi-screensaver-rsxs/Config.in
+++ b/package/kodi-screensaver-rsxs/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_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
        select BR2_PACKAGE_XLIB_LIBXMU
        help
@@ -9,4 +9,4 @@ config BR2_PACKAGE_KODI_SCREENSAVER_RSXS
          https://github.com/notspiff/screensavers.rsxs
 
 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

diff --git a/package/kodi-screensaver-stars/Config.in b/package/kodi-screensaver-stars/Config.in
index 3c14773ee5d082094a6f2a19796c5823aac1c8b1..bcfb47b2cc87384f838a0bce0e64fd9d48b63180 100644 (file)
--- a/package/kodi-screensaver-stars/Config.in
+++ b/package/kodi-screensaver-stars/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_KODI_SCREENSAVER_STARS
        bool "kodi-screensaver-stars"
-       depends on BR2_PACKAGE_KODI_GL
+       depends on BR2_PACKAGE_HAS_LIBGL
        help
          Starfield screensaver for Kodi
 
          https://github.com/notspiff/screensaver.stars
 
 comment "kodi-screensaver-stars needs OpenGL"
-       depends on !BR2_PACKAGE_KODI_GL
+       depends on !BR2_PACKAGE_HAS_LIBGL

diff --git a/package/kodi-visualisation-fishbmc/Config.in b/package/kodi-visualisation-fishbmc/Config.in
index 50472a96e3988eca5e292994a2c37a7f90db4ab8..9e2eabbdbc033abfdc271129709b34a3debbfeb9 100644 (file)
--- a/package/kodi-visualisation-fishbmc/Config.in
+++ b/package/kodi-visualisation-fishbmc/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_KODI_VISUALISATION_FISHBMC
        bool "kodi-visualisation-fishbmc"
-       depends on BR2_PACKAGE_KODI_GL
+       depends on BR2_PACKAGE_HAS_LIBGL
        help
          Fische visualiser for Kodi
 
          https://github.com/notspiff/visualization.fishbmc
 
 comment "kodi-visualisation-fishbmc needs OpenGL"
-       depends on !BR2_PACKAGE_KODI_GL
+       depends on !BR2_PACKAGE_HAS_LIBGL

diff --git a/package/kodi-visualisation-fountain/Config.in b/package/kodi-visualisation-fountain/Config.in
index 3eeef1697a225e92ce10d2db3a289ae4b7da4316..570d169338cf376f068376835a13ba4e10d2a16b 100644 (file)
--- a/package/kodi-visualisation-fountain/Config.in
+++ b/package/kodi-visualisation-fountain/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_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
        help
          Fountain visualization for Kodi
@@ -8,4 +8,4 @@ config BR2_PACKAGE_KODI_VISUALISATION_FOUNTAIN
          https://github.com/notspiff/visualization.fountain
 
 comment "kodi-visualisation-fountain needs OpenGL"
-       depends on !BR2_PACKAGE_KODI_GL
+       depends on !BR2_PACKAGE_HAS_LIBGL

diff --git a/package/kodi-visualisation-goom/Config.in b/package/kodi-visualisation-goom/Config.in
index 8577e61a04402745d2be1fb237300101fe36cc80..de4d2ef2ff48cbdb223234339924abbde9c9072b 100644 (file)
--- a/package/kodi-visualisation-goom/Config.in
+++ b/package/kodi-visualisation-goom/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_KODI_VISUALISATION_GOOM
        bool "kodi-visualisation-goom"
-       depends on BR2_PACKAGE_KODI_GL
+       depends on BR2_PACKAGE_HAS_LIBGL
        help
          GOOM visualiser for Kodi
 
          https://github.com/notspiff/visualization.goom
 
 comment "kodi-visualization-goom needs OpenGL"
-       depends on !BR2_PACKAGE_KODI_GL
+       depends on !BR2_PACKAGE_HAS_LIBGL