Commit graph

34 commits

Author SHA1 Message Date
Fabrice Fontaine 41db884fe4 package/libwebsockets: fix static build with openssl
Fixes:
 - http://autobuild.buildroot.org/results/65d0528b208c0a470264f7e2433be89425971dd7

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-10-21 22:00:34 +02:00
Fabrice Fontaine 492591d53a package/libwebsockets: fix build with libev
Fixes:
 - http://autobuild.buildroot.org/results/b5a2188dce90f3ca9bf0cc7a043c1a946b8e288f

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-10-07 22:47:15 +02:00
Fabrice Fontaine 27f257e98d package/libwebsockets: fix build with libev and libevent
libev and libevent can't be enabled at the same time since version 3.0.0
and
ff2f5f601d

So prefer libev over libevent to have the same default behavior than
upstream LWS_WITH_DISTRO_RECOMMENDED target

Fixes:
 - http://autobuild.buildroot.org/results/ee5ef79a39570bcf5c605b1a4b6b48523605d647

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-10-07 22:46:50 +02:00
Mehmet Sami Tok dda92e2f58 package/libwebsockets: bump version to 3.2.0
License file changes: some files mentioned in LICENSE moved to a
different directory; minimal-examples was added to the list of Public
Domain code.

Signed-off-by: Mehmet Sami Tok <mehmetsamitok@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-10-05 16:11:41 +02:00
Victor Huesca 69808c7536 package: remove 'v' prefix from github-fetched packages
On Github, a large number of projects name their tag vXYZ (i.e v3.0,
v0.1, etc.). In some packages we do:

 <pkg>_VERSION = v0.3
 <pkg>_SITE = $(call github foo,bar,$(<pkg>_VERSION))

And in some other packages we do:

 <pkg>_VERSION = 0.3
 <pkg>_SITE = $(call github foo,bar,v$(<pkg>_VERSION))

I.e in one case we consider the version to be v0.3, in the other case
we consider 0.3 to be the version.

The problem with v0.3 is that when used in conjunction with
release-monitoring.org, it doesn't work very well, because
release-monitoring.org has the concept of "version prefix" and using
that they drop the "v" prefix for the version.

Therefore, a number of packages in Buildroot have a version that
doesn't match with release-monitoring.org because Buildroot has 'v0.3'
and release-monitoring.org has '0.3'.

Since really the version number of 0.3, is makes sense to update our
packages to drop this 'v'.

This commit only addresses the (common) case of github packages where
the prefix is simply 'v'. Other cases will be handled by separate
commits. Also, there are a few cases that couldn't be handled
mechanically that aren't covered by this commit.

Signed-off-by: Victor Huesca <victor.huesca@bootlin.com>
[Arnout: don't change flatbuffers, json-for-modern-cpp, libpagekite,
 python-scapy3k, softether]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-06-19 22:27:55 +02:00
Fabrice Fontaine e46257264e libwebsockets: add optional libevent dependency
libevent is supported since 2.3.0

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-07-01 14:41:10 +02:00
Adam Duskett 710976e748 libwebsockets: bump to v2.4.2
Also add hash for license.

Signed-off-by: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-03-16 10:35:36 +01:00
Adam Duskett 1774e45036 libwebsockets: bump to version 2.2.1
Also remove patch, as it was committed upstream.

Signed-off-by: Adam Duskett <aduskett@codeblue.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-06-15 22:03:32 +02:00
Rahul Bedarkar 30a3e8d108 boot, package: use SPDX short identifier for LGPLv2.1/LGPLv2.1+
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for LGPLv2.1/LGPLv2.1+ is LGPL-2.1/LGPL-2.1+.

This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/LGPLv2.1(\+)?/LGPL-2.1\1/g'

Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-01 15:18:10 +02:00
Kurt Van Dijck f80fc852a3 libwebsockets: cherry-pick upstream patch for v2.1.1
This commit cherry-picks an upstream patch that fixes a compile error
that was introduced in v2.1.1

Signed-off-by: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-03-06 15:52:24 +01:00
Kurt Van Dijck 71d54786a3 libwebsockets: bump to version 2.1.1
Mosquitto combined with version 2.1.0 of libwebsockets yields a failing
system. Version 2.1.1 restores the websocket interface again.

Signed-off-by: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-03-05 21:32:50 +01:00
Danomi Manchego d49fed8fe2 libwebsockets: bump to version 2.1.0
Fixes:
    http://autobuild.buildroot.net/results/d88/d88889ba30444e73cfb12ae1357db25ff6a3a4fb/

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-10-18 12:00:33 +02:00
Danomi Manchego 4b480c4ea7 libwebsockets: bump to version 2.0.2
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-09-04 15:46:46 +02:00
Danomi Manchego cf51b0b2c0 libwebsockets: bump to version 1.7.5
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-04-13 22:45:16 +02:00
Jörg Krause ecaf770360 libwebsockets: bump to version 1.7.4
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-31 03:49:18 +02:00
Jörg Krause 44dcf3ec02 libwebsockets: fix build with nothread toolchains
>From upstream changelog:
> If LWS_MAX_SMP=1, then there is no code related to pthreads compiled in the
  library. If more than 1, a small amount of pthread mutex code is built into
  the library.

Set LWS_MAX_SMP=1 for toolchains without thread support, otherwise leave it
unset so upstreams CMakeLists.txt will take care of it.

Fixes:
http://autobuild.buildroot.net/results/dbf/dbf45a52b9aef602fd62ad1ca10957bafe656923/
http://autobuild.buildroot.net/results/26c/26c2ac28f44f8f1b227caa715af60bcd92a5f740/
http://autobuild.buildroot.net/results/d65/d65dcbfb96b249e01b034c01a52884b522c778b3/
http://autobuild.buildroot.net/results/e55/e550ebfdd1e8f459ca7b12f2708a704eaec52474/
.. and more.

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-31 03:49:14 +02:00
Jörg Krause 745b591d7e libwebsockets: add patch to fix musl build
Add patch from upstream [1] to fix musl build:
fatal error: sys/cdefs.h: No such file or directory

Fixes:
http://autobuild.buildroot.net/results/564/564675be0d4fbfa113a0f2e52874e0dce2d5ba5e/
http://autobuild.buildroot.net/results/c41/c41d87c0cf22f3b88e5f80ad6bf5e81900603c1d/

Backported from: 9eec5e4470397632af035c429295a41b74bd0585

[1] 9eec5e4470

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-31 03:49:10 +02:00
Johan Sagaert 74458d0f44 libwebsockets: bump to v1.7.3
- Drop
   0001-cmake-disable-shared-library-build-when-BUILD_SHARED.patch,
   since CMakeLists has been reworked. Static/shared build can now be
   configured via configuration options.

 - Add support for optional libev and libuv.

 - Use the github macro for download.

 - Update hash.

Signed-off-by: Sagaert Johan <sagaert.johan@proximus.be>
[Thomas: tweak the commit log a bit.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-06 15:54:43 +01:00
Baptiste Moraine 977ea262bc libwebsockets: add LWS_ prefix to LWS_WITHOUT_TESTAPPS=ON cmake option
Currently, libwebsockets.mk is passing -DWITHOUT_TESTAPPS=ON to disable
the building of libwebsockets test applications, but this is doing nothing
because the option is really named  LWS_WITHOUT_TESTAPPS.
This commit fixes that by using the correct option name.

Signed-off-by: Baptiste Moraine <baptiste.moraine@kapelse.com>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-29 18:57:38 +02:00
Gustavo Zacarias 79ce08bbdc packages: remove non-IPv6 dependencies and tweaks
Now that IPv6 is mandatory remove package dependencies and conditionals
for it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-22 23:06:35 +02:00
Johan Sagaert 54d70fedde libwebsockets: bump version to v1.4-chrome43-firefox-36
dropped upstream patch 0001
renamed patch 0002 -> 0001
added hash
details : https://github.com/warmcat/libwebsockets/blob/master/changelog

Signed-off-by: Sagaert Johan <sagaert.johan@proximus.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-06 10:59:41 +02:00
Peter Korsgaard 298cd8eaa2 package/*: rename patches according to the new policy
Autogenerated from rename-patch.py (http://patchwork.ozlabs.org/patch/403345)

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-02-03 14:52:56 +01:00
Yann E. MORIN 181a17f1b2 package/libwebsockets: fix static build
Fixes:
http://autobuild.buildroot.net/results/afc/afc56e03a9d410563f43e5d26cf8b12fc4da7e5b/
http://autobuild.buildroot.net/results/922/9221b4967d069c9b634cb1f98ead193593d22dbc/

When the version was bumped, the existing patch to fix static linking
was not proprerly tested, and was missing three new locations to be
fixed.

[Peter: add autobuilder reference]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Sagaert Johan <sagaert.johan@skynet.be>
Cc: Samuel Martin <s.martin49@gmail.com>
Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-11-30 23:48:13 +01:00
Peter Korsgaard 037a5d3655 libwebsockets: needs host-openssl when built with openssl support
Fixes
http://autobuild.buildroot.net/results/d01/d0190a6e5c6b5aa78cfefc29e4e8a4e4b135450b/
http://autobuild.buildroot.net/results/9bb/9bb8defedb8024de83eb3a609ab584efb5d0d2b0/
http://autobuild.buildroot.net/results/e4a/e4a1b298e7e158d3614b89e61d40ef9a00e7ff67/
http://autobuild.buildroot.net/results/5e2/5e24a90058111f7d5618047410f809b45bc165f6/

And many others.

The build system wants to create a ssl key for testing using host-openssl,
so ensure it is available.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-11-03 11:04:46 +01:00
Sagaert Johan a1b4effcbb libwebsockets : bump version to v1.3-chrome37-firefox30
Bumped the version and did some trivial reworking of the patch file :
libwebsockets-0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch

[Thomas:
 - Pass LWS_IPV6={ON,OFF} depending on the value of BR2_INET_IPV6,
   otherwise the build failed in a non-IPv6 configuration.
 - The name of the CMake option for OpenSSL support has changed, it's
   now LWS_WITH_SSL={ON,OFF}.
 - Adjust the description of patch 0002.]

Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-11-01 18:16:45 +01:00
Thomas De Schampheleire aaffd209fa packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.

Sed command used:
   find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-04 18:54:16 +02:00
Samuel Martin 1ddffb0e1a package/libwebsockets: fix static link
- disable shared object build when BR2_PREFER_STATIC_LIB is set

Fixes:
  http://autobuild.buildroot.net/results/0a9/0a9f0c3c101550e73f7100f2b88a88c1f2bbad95/

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-08-30 23:34:50 +02:00
Gustavo Zacarias b6b5bb518d libwebsockets: needs mmu
Fixes:
http://autobuild.buildroot.net/results/92d/92d29c3f8ab0686c6de765c108937240a6649d18/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-03 22:34:05 +02:00
Samuel Martin 26132bac8d libwebsockets: disable checks for C++ compiler
Since libwesockets in written in pure C, no C++, there is no reason to
disable it or make the configuration failed when the toolchain has no
C++ support.

Unfortunately, CMake defaults sets C and C++ as languages used by the
project. This makes the configuration failed if no C++ compiler is found.

This patch just make the CMake code of libwebsockets reflecting the real
status of the project with regard to the languages used.

Should fix:
  http://autobuild.buildroot.org/results/fef/fef98ef289d44d13ec61025c50febba1e835b421/

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-02 15:07:43 +02:00
Sagaert Johan 7d25239cea 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>
2014-05-01 22:46:10 +02:00
Jerzy Grzegorek 62146ea3ad change package tarball compression to xz whenever possible
[Peter: leave change xz tarball format to not end up with circular deps]
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-08 22:44:23 +02:00
Andreas Wetzel 72fa62dd7b libwebsockets: do not build/install testapps to target
Signed-off-by: Andreas Wetzel <andreas.wetzel@nanotronic.ch>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-21 23:20:10 +02:00
Andreas Wetzel c8da02c3bf libwebsockets: bump to version 1.22-chrome26-firefox18
Signed-off-by: Andreas Wetzel <andreas.wetzel@nanotronic.ch>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-21 23:19:34 +02:00
Andreas Wetzel 381c4646c5 package: add libwebsockets
[Peter: add missing zlib select to Config.in]
Signed-off-by: Andreas Wetzel <andreas.wetzel@nanotronic.ch>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-14 21:35:10 +02:00