[Buildroot] [git commit] package/stella: zlib is optional, not mandatory
Arnout Vandecappelle (Essensium/Mind)
arnout at mind.be
Sun Dec 12 12:21:42 UTC 2021
commit: https://git.buildroot.net/buildroot/commit/?id=671eb03b3b3375f6a8d88e1e51c7b87d173def64
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
zlib is optional, not mandatory since version 6.1 and
https://github.com/stella-emu/stella/commit/00e464afc3a2581e2716b3eec9c516a36f895236
Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
---
package/stella/Config.in | 1 -
package/stella/stella.mk | 9 ++++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/package/stella/Config.in b/package/stella/Config.in
index c74c7a704d..7722f8a540 100644
--- a/package/stella/Config.in
+++ b/package/stella/Config.in
@@ -6,7 +6,6 @@ config BR2_PACKAGE_STELLA
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
select BR2_PACKAGE_SDL2
- select BR2_PACKAGE_ZLIB
help
Stella is a multi-platform Atari 2600 VCS emulator.
diff --git a/package/stella/stella.mk b/package/stella/stella.mk
index e7b0082e7e..9e21606155 100644
--- a/package/stella/stella.mk
+++ b/package/stella/stella.mk
@@ -10,7 +10,7 @@ STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VE
STELLA_LICENSE = GPL-2.0+
STELLA_LICENSE_FILES = Copyright.txt License.txt
-STELLA_DEPENDENCIES = sdl2 zlib
+STELLA_DEPENDENCIES = sdl2
STELLA_CONF_OPTS = \
--host=$(GNU_TARGET_NAME) \
@@ -24,6 +24,13 @@ else
STELLA_CONF_OPTS += --disable-png
endif
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+STELLA_CONF_OPTS += --enable-zip
+STELLA_DEPENDENCIES += zlib
+else
+STELLA_CONF_OPTS += --disable-zip
+endif
+
# The configure script is not autoconf based, so we use the
# generic-package infrastructure
define STELLA_CONFIGURE_CMDS
More information about the buildroot
mailing list