NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/sconeserver: disable image

Browse Source 
Build of http::sconesite::image module was silently broken until commit
d3b818c3cf

However, sconeserver fails to build with ImageMagick because:
- it checks for ImageMagick++.pc instead of ImageMagick.pc
- it uses the transform function which has been removed from the public
  API since version 7.0.1-0 and
  06f590165f

As sconeserver does not seem to be maintained anymore, drop
BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE.

Fixes:
 - http://autobuild.buildroot.org/results/895ab582d1140f7677fc1c6934fa2e0c47c49f20

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
[Arnout: add legacy symbol. It costs us exactly nothing, and if someone
actually had that selected, they know what's going on.]
(cherry picked from commit fdb6fc2b4a)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2021-03-21 12:47:12 +01:00 committed by Peter Korsgaard
parent bb654efb07
commit c958b484f9
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in.legacy
View File

@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2021.02" 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 config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV
bool "KDrive/TinyX evdev input driver removed" bool "KDrive/TinyX evdev input driver removed"
select BR2_LEGACY select BR2_LEGACY

8
package/sconeserver/Config.in
View File

@ -26,14 +26,6 @@ config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE
help help
http::sconesite module for Sconeserver 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 config BR2_PACKAGE_SCONESERVER_MYSQL
bool "mysql" bool "mysql"
depends on BR2_USE_MMU # mysql depends on BR2_USE_MMU # mysql

15
package/sconeserver/sconeserver.mk
View File

@ -14,10 +14,16 @@ SCONESERVER_DEPENDENCIES = \
host-pkgconf \ host-pkgconf \
$(if $(BR2_PACKAGE_PCRE),pcre) \ $(if $(BR2_PACKAGE_PCRE),pcre) \
zlib zlib
# disable image as it fails to build with ImageMagick
# disable markdown module because its git submodule cmark # disable markdown module because its git submodule cmark
# https://github.com/sconemad/sconeserver/tree/master/markdown # https://github.com/sconemad/sconeserver/tree/master/markdown
# has no cross-compile support provided by the sconeserver build system # 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. # Sconeserver configure script fails to find the libxml2 headers.
ifeq ($(BR2_PACKAGE_LIBXML2),y) ifeq ($(BR2_PACKAGE_LIBXML2),y)
@ -45,13 +51,6 @@ else
SCONESERVER_CONF_OPTS += --without-sconesite SCONESERVER_CONF_OPTS += --without-sconesite
endif 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) ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
SCONESERVER_DEPENDENCIES += mysql SCONESERVER_DEPENDENCIES += mysql
SCONESERVER_CONF_OPTS += \ SCONESERVER_CONF_OPTS += \