| Message ID | 20240523173640.1510882-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/x11vnc: drop unrecognized options | expand |
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > --without-{jpeg,sdl,zlib} are unrecognized since bump to version > 0.9.14 in commit aeea662fb12e69073a233fe1058287212fbbca33 and > https://github.com/LibVNC/x11vnc/commit/d287ed9a77c647f35e85e0b10621a6661e911fad > because those dependencies were linked to libvncserver, not x11vnc > Fixes: aeea662fb12e69073a233fe1058287212fbbca33 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed, thanks.
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > --without-{jpeg,sdl,zlib} are unrecognized since bump to version > 0.9.14 in commit aeea662fb12e69073a233fe1058287212fbbca33 and > https://github.com/LibVNC/x11vnc/commit/d287ed9a77c647f35e85e0b10621a6661e911fad > because those dependencies were linked to libvncserver, not x11vnc > Fixes: aeea662fb12e69073a233fe1058287212fbbca33 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2024.02.x, thanks.
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk index aa0f14c456..645ef40643 100644 --- a/package/x11vnc/x11vnc.mk +++ b/package/x11vnc/x11vnc.mk @@ -6,9 +6,6 @@ X11VNC_VERSION = 0.9.16 X11VNC_SITE = $(call github,LibVNC,x11vnc,$(X11VNC_VERSION)) -# sdl support is not used in x11vnc, but host include / library search paths -# leak in if host has sdl-config -X11VNC_CONF_OPTS = --without-sdl X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst libvncserver X11VNC_LICENSE = GPL-2.0+ X11VNC_LICENSE_FILES = COPYING @@ -25,12 +22,6 @@ else X11VNC_CONF_OPTS += --without-avahi endif -ifeq ($(BR2_PACKAGE_JPEG),y) -X11VNC_DEPENDENCIES += jpeg -else -X11VNC_CONF_OPTS += --without-jpeg -endif - ifeq ($(BR2_PACKAGE_OPENSSL),y) X11VNC_DEPENDENCIES += openssl else @@ -61,10 +52,4 @@ else X11VNC_CONF_OPTS += --without-xdamage endif -ifeq ($(BR2_PACKAGE_ZLIB),y) -X11VNC_DEPENDENCIES += zlib -else -X11VNC_CONF_OPTS += --without-zlib -endif - $(eval $(autotools-package))
--without-{jpeg,sdl,zlib} are unrecognized since bump to version 0.9.14 in commit aeea662fb12e69073a233fe1058287212fbbca33 and https://github.com/LibVNC/x11vnc/commit/d287ed9a77c647f35e85e0b10621a6661e911fad because those dependencies were linked to libvncserver, not x11vnc Fixes: aeea662fb12e69073a233fe1058287212fbbca33 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/x11vnc/x11vnc.mk | 15 --------------- 1 file changed, 15 deletions(-)