add conditional dependences mesa3d/mesa3d etnaviv

Ninoh-FOX · Jun 30, 2021 · 1ec136c · 1ec136c
1 parent 85a1219
commit 1ec136c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk
@@ -10,7 +10,13 @@ SDL2_LICENSE = zlib
 SDL2_LICENSE_FILES = COPYING.txt
 SDL2_INSTALL_STAGING = YES
 
+ifeq ($(BR2_PACKAGE_MESA3D),y)
+LIBGLES_DEPENDENCIES = mesa3d
+endif
+
+ifeq (S(BR2_PACKAGE_MESA3D_ETNA_VIV),y)
 LIBGLES_DEPENDENCIES = mesa3d-etna_viv
+endif
 
 ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
 SDL2_DEPENDENCIES += $(LIBGLES_DEPENDENCIES)

diff --git a/package/sdl_compat/sdl_compat.mk b/package/sdl_compat/sdl_compat.mk
@@ -10,7 +10,15 @@ SDL_COMPAT_LICENSE = LGPL-2.1+
 SDL_COMPAT_LICENSE_FILES = COPYING
 SDL_COMPAT_INSTALL_STAGING = YES
 
-SDL_COMPAT_DEPENDENCIES += sdl sdl2 libgles mesa3d-etna_viv
+SDL_COMPAT_DEPENDENCIES = sdl sdl2 libgles
+
+ifeq ($(BR2_PACKAGE_MESA3D),y)
+SDL_COMPAT_DEPENDENCIES += mesa3d
+endif
+
+ifeq (S(BR2_PACKAGE_MESA3D_ETNA_VIV),y)
+SDL_COMPAT_DEPENDENCIES += mesa3d-etna_viv
+endif
 
 SDL_COMPAT_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 

diff --git a/package/wayland-kms/wayland-kms.mk b/package/wayland-kms/wayland-kms.mk
@@ -16,7 +16,6 @@ WAYLAND_KMS_INSTALL_STAGING = YES
 WAYLAND_KMS_DEPENDENCIES = \
 	wayland \
 	libdrm \
-	mesa3d-etna_viv \
 	etna_viv \
 	expat \
 	host-pkgconf \
@@ -26,5 +25,14 @@ WAYLAND_KMS_DEPENDENCIES = \
 	host-bison \
 	host-python \
 	host-libxml2
+
+ifeq ($(BR2_PACKAGE_MESA3D),y)
+WAYLAND_KMS_DEPENDENCIES += mesa3d
+endif
+
+ifeq (S(BR2_PACKAGE_MESA3D_ETNA_VIV),y)
+WAYLAND_KMS_DEPENDENCIES +=	mesa3d-etna_viv
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))