diff --git a/Config.in.legacy b/Config.in.legacy index 937aed7399..af0c1ba50c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2021.02" +config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE + bool "sconeserver http::sconesite::image removed" + help + Sconeserver cannot be built with ImageMagick - it uses the + "transofrm" function which is removed from public API. + config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV bool "KDrive/TinyX evdev input driver removed" select BR2_LEGACY diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in index 429ac81fe1..d46ba85fbc 100644 --- a/package/sconeserver/Config.in +++ b/package/sconeserver/Config.in @@ -26,14 +26,6 @@ config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE help http::sconesite module for Sconeserver -config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE - bool "http::sconesite::image" - depends on BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE - depends on BR2_USE_MMU # imagemagick - select BR2_PACKAGE_IMAGEMAGICK - help - http::sconesite::image module for Sconeserver - config BR2_PACKAGE_SCONESERVER_MYSQL bool "mysql" depends on BR2_USE_MMU # mysql diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index 62cc128d77..17407c29f5 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -14,10 +14,16 @@ SCONESERVER_DEPENDENCIES = \ host-pkgconf \ $(if $(BR2_PACKAGE_PCRE),pcre) \ zlib +# disable image as it fails to build with ImageMagick # disable markdown module because its git submodule cmark # https://github.com/sconemad/sconeserver/tree/master/markdown # has no cross-compile support provided by the sconeserver build system -SCONESERVER_CONF_OPTS += --with-ip --with-local --with-ip6 --without-markdown +SCONESERVER_CONF_OPTS += \ + --with-ip \ + --with-local \ + --with-ip6 \ + --without-image \ + --without-markdown # Sconeserver configure script fails to find the libxml2 headers. ifeq ($(BR2_PACKAGE_LIBXML2),y) @@ -45,13 +51,6 @@ else SCONESERVER_CONF_OPTS += --without-sconesite endif -ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE),y) -SCONESERVER_DEPENDENCIES += imagemagick -SCONESERVER_CONF_OPTS += --with-image -else -SCONESERVER_CONF_OPTS += --without-image -endif - ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y) SCONESERVER_DEPENDENCIES += mysql SCONESERVER_CONF_OPTS += \