From: Sagaert Johan <sagaert.johan@skynet.be>
Date: Wed, 30 Apr 2014 22:45:00 +0000 (+0200)
Subject: libwebsockets : bump version
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7d25239cea5bb0a198442fd1a16ca3f5f107fb38;p=buildroot.git

libwebsockets : bump version

bump to v1.23-chrome32-firefox24
The latest releases use the cmake build infrastructure.
Converted the makefile to the cmake infrastructure.
The autotools infrastructure is no longer supported.

[Peter: correct license data, ensure it gets built after openssl if enabled]
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
index ec5244cf39..03c57209a3 100644
--- a/package/libwebsockets/libwebsockets.mk
+++ b/package/libwebsockets/libwebsockets.mk
@@ -4,14 +4,20 @@
 #
 ################################################################################
 
-LIBWEBSOCKETS_VERSION = v1.22-chrome26-firefox18
+LIBWEBSOCKETS_VERSION = v1.23-chrome32-firefox24
 LIBWEBSOCKETS_SOURCE = libwebsockets-$(LIBWEBSOCKETS_VERSION).tar.xz
 LIBWEBSOCKETS_SITE = http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/snapshot
-LIBWEBSOCKETS_LICENSE = LGPLv2.1
-LIBWEBSOCKETS_LICENSE_FILES = COPYING
+LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions
+LIBWEBSOCKETS_LICENSE_FILES = LICENSE
 LIBWEBSOCKETS_DEPENDENCIES = zlib
-LIBWEBSOCKETS_AUTORECONF = YES
-LIBWEBSOCKETS_CONF_OPT = --without-testapps
 LIBWEBSOCKETS_INSTALL_STAGING = YES
 
-$(eval $(autotools-package))
+LIBWEBSOCKETS_CONF_OPT += -DWITHOUT_TESTAPPS=ON
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBWEBSOCKETS_DEPENDENCIES += openssl
+else
+LIBWEBSOCKETS_CONF_OPT += -DWITH_SSL=OFF
+endif
+
+$(eval $(cmake-package))