diff options
author | Johan Sagaert <sagaert.johan@proximus.be> | 2015-04-06 01:52:55 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-04-06 10:59:41 +0200 |
commit | 54d70feddef7c1777cd611aedb8f3e3311ced8e1 (patch) | |
tree | f098fbd40d5dfecaf27e5bf5fe7e1f6ed2596466 /package/libwebsockets | |
parent | 5ec45823c173e4a6e3ba59424c86e1cb5afbd681 (diff) |
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>
Diffstat (limited to 'package/libwebsockets')
-rw-r--r-- | package/libwebsockets/0001-cmake-disable-shared-library-build-when-BUILD_SHARED.patch (renamed from package/libwebsockets/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch) | 0 | ||||
-rw-r--r-- | package/libwebsockets/0001-cmake-set-the-project-language.patch | 34 | ||||
-rw-r--r-- | package/libwebsockets/libwebsockets.hash | 2 | ||||
-rw-r--r-- | package/libwebsockets/libwebsockets.mk | 2 |
4 files changed, 3 insertions, 35 deletions
diff --git a/package/libwebsockets/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch b/package/libwebsockets/0001-cmake-disable-shared-library-build-when-BUILD_SHARED.patch index 95d1ad8f3..95d1ad8f3 100644 --- a/package/libwebsockets/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch +++ b/package/libwebsockets/0001-cmake-disable-shared-library-build-when-BUILD_SHARED.patch diff --git a/package/libwebsockets/0001-cmake-set-the-project-language.patch b/package/libwebsockets/0001-cmake-set-the-project-language.patch deleted file mode 100644 index 7b017a725..000000000 --- a/package/libwebsockets/0001-cmake-set-the-project-language.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6ab441e0509a9fda179fd1febf73d0f9fae321d6 Mon Sep 17 00:00:00 2001 -From: Samuel Martin <s.martin49@gmail.com> -Date: Fri, 2 May 2014 14:24:58 +0200 -Subject: [PATCH] cmake: set the project language - -By default, CMake sets C and C++ as languages used by the project. -This makes the configuration failed if no C++ compiler is found. - -Since libwesockets in written in pure C, no C++, there is no reason to -disable it when the toolchain has no C++ support. - -This patch just make the CMake code reflecting the real status of the -project with regard to the languages used. - -Signed-off-by: Samuel Martin <s.martin49@gmail.com> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f1b6ace..72391b0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 2.6) - --project(libwebsockets) -+project(libwebsockets C) - - set(PACKAGE "libwebsockets") - set(CPACK_PACKAGE_NAME "${PACKAGE}") --- -1.9.2 - diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash new file mode 100644 index 000000000..eadff73cb --- /dev/null +++ b/package/libwebsockets/libwebsockets.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 63e14fbc768a22b01a3ade61a8e6a89ab0eac329b0f9fbb40ce9fb7210fcaa70 libwebsockets-v1.4-chrome43-firefox-36.tar.xz diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index e1a1aa38b..da1a87247 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = v1.3-chrome37-firefox30 +LIBWEBSOCKETS_VERSION = v1.4-chrome43-firefox-36 LIBWEBSOCKETS_SOURCE = libwebsockets-$(LIBWEBSOCKETS_VERSION).tar.xz LIBWEBSOCKETS_SITE = http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/snapshot LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions |