summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-support/websocketpp
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2020-01-16 06:08:42 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2020-01-16 06:10:08 +0300
commite42b3e385822fc1b08807a585d4bb2015c823690 (patch)
treedb6a37b71822c4bc81ffc94836624bb21a7743c4 /meta-openembedded/meta-oe/recipes-support/websocketpp
parent48265d8a49254f942423fae353516c35ed7e42b6 (diff)
downloadopenbmc-e42b3e385822fc1b08807a585d4bb2015c823690.tar.xz
meta-openembedded: subtree update:459dbf1078..ea8604a0e3
Adrian Bunk (6): xfsprogs: Remove obsolete patch gpsd: Add a PACKAGECONFIG for disabling usb support libqmi: Upgrade 1.24.0 -> 1.24.2 enchant2: Upgrade 2.2.3 -> 2.2.7 geany-plugins: Use enchant2 instead of the old enchant enchant2: Remove, moved to oe-core Alex Kiernan (11): nftables: Fix documentation generation ldns: Add recipe ostree: Fix DISTRO_FEATURES with ptest but w/o xattr ostree: Drop tests for soup/xattr with ptest ostree: Change PACKAGECONFIG to use manpages ostree: Add PACKAGECONFIG for builtin-grub2-mkconfig ostree: Backport build/test fixes from upstream ostree: Upgrade 2019.5 -> 2019.6 ostree: Add support for gjs tests nftables: Expand PACKAGECONFIG, cleanup build ostree: Tidy FILES_${PN} using PACKAGE_BEFORE_PN Alexander Kanavin (1): enscript/indent/sharutils: fix build with gettext 0.20.x Alistair Francis (2): mycroft: RDEPENDS on mpg123 to allow singing openocd: Enable remote-bitbang build option Andreas Müller (76): gnome-system-monitor: add gsettings to inherit tracker-miners: initial add 2.3.1 nautilus: add tracker-miners to RDPENDS libgnomekbd: cleanup DEPENDS inherit gsettings / remove unused config nodejs: Add PACKAGECONFIG share to allow other projects to use node as library xserver-xorg-cvt-native: initial add 1.20.5 mutter: initial add 3.34.1 pinpoint: remove dead project gnome-keyring: upgrade 3.28.2 -> 3.34.0 libgsf: upgrade 1.14.45 -> 1.14.46 libgnome-keyring: remove gvfs: upgrade 1.41.2 -> 1.42.1 grilo: initial add 0.3.10 gsound: initial add 1.0.2 gnome-backgrounds: initial add 3.34.0 metacity: upgrade 3.32.0 -> 3.34.1 gjs: initial add 1.58.3 gdm: re-add 3.34.1 gnome-shell: initial add 3.34.1 gnome-shell-extensions: initial add 3.34.1 accountsservice: initial add 0.6.55 rest: initial add 0.8.1 gnome-online-accounts: initial add 3.34.1 gnome-control-center: re-add 3.34.1 gnome-session: inital add 3.34.1 gnome-panel: (re)add 3.34.1 gnome-flashback: initial add 3.34.1 Add: packagegroup-gnome-apps / packagegroup-gnome-desktop glfw: add features_check to inherit stalonetray: Add x11 to required distro feature projucer: add x11 to required distro features colord-gtk: add polkit to required distro features yelp: add x11 to required distro features file-roller: remove nautilus from DEPENDS libgdata: add x11 to required distro features accountsservice: Hack musl build fix accountsservice: fix build for systemd not in DISTRO_FEATURES gnome-font-viewer: fix copy & paste typo in SUMMARY libxfce4ui: give up glade3 (=glade for gtk2) support glade3: remove ancient version of glade exo: remove pythonnative from inherit geany: remove pythonnative from inherit gnome-tweaks: initial add 3.34.0 libhandy: initial add 0.0.12 fluidsynth: upgrade 2.0.9 -> 2.1.0 exo: upgrade 0.12.10 -> 0.12.11 tumbler: upgrade 0.2.7 -> 0.2.8 catfish: upgrade 1.4.10 -> 1.4.11 cppunit: upgrade 1.14.0 -> 1.15.1 xfce4-terminal: upgrade 0.8.8 -> 0.8.9 gnome-calculator: initial add 3.34.1 evince: upgrade 3.34.1 -> 3.34.1 file-roller: upgrade 3.32.2 -> 3.32.3 evolution-data-server: upgrade 3.34.1 -> 3.34.2 gedit: upgrade 3.34.0 -> 3.34.1 gnome-autoar: upgrade 0.2.3 -> 0.2.4 gnome-control-center: upgrade 3.34.1 -> 3.34.2 gnome-desktop3: upgrade 3.34.1 -> 3.34.2 gnome-flashback: upgrade 3.34.1 -> 3.34.2 gnome-session: 3.34.1 -> 3.34.2 gnome-settings-daemon: upgrade 3.34.1 -> 3.34.2 gnome-shell-extensions: upgrade 3.34.1 -> 3.34.2 gnome-shell: upgrade 3.34.1 -> 3.34.2 gvfs: upgrade 1.42.1 -> 1.42.2 libgdata: upgrade 0.17.10 -> 0.17.11 mutter: upgrade 3.34.1 -> 3.34.2 nautilus: upgrade 3.34.1 -> 3.34.2 yelp-xsl: upgrade 3.34.0 -> 3.34.2 poppler: upgrade 0.82.0 -> 0.84.0 xfce4-terminal: upgrade 0.8.9 -> 0.8.9.1 mutter: upgrade 3.34.2 -> 3.34.3 gnome-shell: upgrade 3.34.2 -> 3.34.3 evolution-data-server: upgrade 3.34.2 -> 3.34.3 gjs: upgrade 1.58.3 -> 1.58.4 gnome-desktop3: upgrade 3.34.2 -> 3.34.3 libsigc++-3: let meson build Andrei Gherzan (1): kernel-selftest: Include rtc tests Andrej Valek (1): ntp: split ntpdc into separate package Andrey Zhizhikin (1): flatbuffers: add PIC compiler flag required for aarch64 André Draszik (4): python3-jsonrpcserver: update to v4.1.0 python3-jsonrpcserver: allow to use as non-root oniguruma: update to v6.9.4 oniguruma: enable ptest Armin Kuster (3): glfw: missing feature check. libvncserver: fix build depends issue surf: Add opengl requirement Bartosz Golaszewski (10): librsync: new package xdelta3: update to v3.1.0 xdelta3: add native and nativesdk to BBCLASSEXTEND speedtest-cli: new package doxygen: upgrade v1.8.16 -> v1.8.17 libsigrok: upgrade v0.5.1 -> v0.5.2 libsigrokdecode: upgrade v0.5.2 -> v0.5.3 libsigrok: add support for bluetooth integration cloc: new package libsigrok: add support for hidapi integration Changqing Li (5): samba: fix wrong shebang for python3 gtk-xfce-engine: remove this recipe xfce4-kbdleds-plugin: remove this recipe xfce-dusk-gtk3: correct invalid SRC_URI libhugetlbfs: update patch to make it work for python3 Denys Dmytriyenko (1): netperf: add "intervals" and "histogram" PACKAGECONFIGs Diego Rondini (2): cups-filters: add recipe qpdf: add recipe Fabio Berton (1): nanopb: Add recipe for version 0.4.0 Gianfranco Costamagna (6): boinc: update recipe to version 7.16.3 vboxguestdrivers: update to version 6.1.0 and unblacklist websocketpp: add various upstream accepted and proposed patches to fix various issues, including: brotli: rename static libraries avoding the -static suffix. cpprest: fix cmake installation directory websocketpp: also install examples in a new -examples subpackage Hongxu Jia (2): gvfs: add user polkitd and missing depends python3-astor: fix VERSION file not found Jacopo Dall'Aglio (1): netplan: add recipe Jens Rehsack (6): log4cplus: update to 2.0.5 libstatgrab: add logging/tracing options libtest-warnings-perl: add recipe libfile-slurper-perl: add recipe libconfig-autoconf-perl: add recipe libunix-statgrab: add recipe Kai Kang (12): blueman: disable appindicator support xfce4-panel-profiles: 1.0.8 -> 1.0.9 exo: 0.12.9 -> 0.12.10 thunar: 1.8.9 -> 1.8.10 fltk: fix build error when enable package config examples corosync: fix build error when package config rdma enabled rdma-core: 18.1 -> 27.0 openl2tp: update systemd service file bdwgc: make libatomic-ops as dependency volume-key: not create python2 bindings libbytesize: disable doc build adduser: set default shell with /sbin/nologin Khem Raj (113): python-evdev: Fix build for 32bit arches with 64bit time_t x11vnc: Fix build for 32bit arches with 64bit time_t evtest: Fix build for 32bit arches with 64bit time_t lirc: Fix build for 32bit arches with 64bit time_t v4l-utils: Update to 1.18.0 tslib: Fix build for 32bit arches with 64bit time_t utouch-evemu,utouch-frame: Fix build for 32bit arches with 64bit time_t directfb: Fix build for 32bit arches with 64bit time_t kernel-module-emlog: Use compile task from module bbclass emlog: Use RRECOMMEND instead of RDEPEND projucer: Upgrade to 5.4.5 packagegroup-meta-oe: Remove nodejs and uim on riscv libnih: Fix build with latest gettext liblockdev: Loosen the regexp for py3 sigrok-cli: Update to 0.7.1 python-pywbem: Update to 0.15.0 udisks2: Update to 2.8.4 id3lib: Update to newer debian patchset libdc1394: Update to 2.2.6 release libsmi: Use right name for tcl license hdf5: Upgrade to 1.8.21 xterm: Fix latent issue found with musl mozjs: extend --with-intl-api=build to all mips klibc: Apply -no-integrated-as on mips/clang grpc: Define libdir and cmakedir in terms of multilib ufs-utils: Renames from ufs-tool breakpad: Update to latest upstream rsyslog: Sync VALGRIND supported arch list packagegroup-meta-oe: Remove ppc64 specific incompatible packages libpfm4: Moved here from oe-core rdma-core: Replace pthread_yield with sched_yield fvwm: Upgrade to 2.6.9 nlohmann-json: Upgrade to 3.7.3 libqb: Add --enable-nosection-fallback with mips64/clang lcdproc: Upgrade to latest top of tree tinyalsa: fix installation libdir path to match multilibs luajit: Add ppc/ppc64 to unsupported arch list rsyslog: Do not assume atomic built-ins on ppc hiredis: Upgrade to 0.14.0 libfann: Define LIB_SUFFIX suitable for OE multilib needs libgit2: Upgrade to 0.28.4 libinih: Fix multilib build poco: Define LIB_SUFFIX per OE multilibs libcec: Fix multilib build dfu-util-native,sjf2410-linux-native: Fix Deploy in multimachine builds mpv: Remove luajit dependency for ppc64 cannelloni: Update to latest and fix multilib builds nvme-cli: Use nonarch libdir for dracut config files cli11: Fix multilib build lockdev: Make baselib configurable avro-c: Update to 1.9.1 nftables: Package python scripts into nonarch libdir mercurial: Add python scripts into separate python package fluentbit: Fix packaging in multilib env dcadec: Define BASELIB as a knob dbus-broker: Use nonarch_libdir for systemd catalog files websocketapp: Fix multilib build ade: Fix install paths in multilib builds thrift: Upgrade to 0.13 gattlib: Update to latest tip rygel: Use nonarch_libdir for systemd units firewalld: Package firewalld files iwd: Package module conf files via nonarch_libdir civetweb: Upgrade to latest tip ruli: Define OOP_LIB_DIR and INSTALL_LIB_DIR liblightmodbus: Fix packaging errors when using multilib ostree: Fix packaging errors when using lib64 libdir boinc-client: Use nonarch_libdir for systemd_units spirv-tools: Fix multilib builds pam-plugin-ldapdb: Include <stdexcept> for std::invalid_argument dvb-apps: Replace stime with clock_settime redis: Upgrade to 5.0.7 cannelloni: Include stdexcept for runtime_error libubox: Update to latest upm: Fix 'may be used uninitialized' errors memcached: upgrade to 1.5.20 ltrace: Fix build with gcc10 mpd: Fix build with gcc10 wvstreams: Fix build with gcc10 tvheadend: Fix format-truncation warnings open-vm-tools: Ignore -Warray-bounds jsoncpp: Upgrade to 1.9.2 ippool: Fix strncpy -Wformat-truncation warning opensc: Fix misaligned indentation glm: Upgrade to 0.9.9.6 rocksdb: Upgrade to 6.5.2 mariadb: Upgrade to 10.4.11 ruli: Fix implicit conversion from 'unsigned int' to 'float' glfw: Update to latest fluentbit: Upgrade to 1.3.5 renderdoc: Upgrade to 1.5 spirv-tools: Upgrade to v2019.5 upm: Disable -Wno-misleading-indentation with clang10+ libyui: Disable Warnings as errors sanlock: Upgrade to 3.8.0+ udisks2: Updare to latest master beyond 2.8.4 netcat: Fix build with gettext 0.20.x gtkperf: Fix build with latest gettext 0.20.x hddtemp: Fix build with latest gettext 0.20.x vorbis-tools: Use external gettext rwmem: Upgrade to latest wireshark: Enable plugins when enabling qt5 python3-jsonrpcserver: Use PYTHON_BASEVERSION instead of hardcoding py version smbnetfs: Update to latest 0.6.2 rev makedumpfile: Drop linking with libebl cmpi-bindings: append PYTHON_ABI suffix to libpython soname websocketpp: Fix clang specific flags in cmake files rocksdb: Disable Werror spirv-tools: Disable Werror libspatialite: Workaround proj_api.h deprecation in proj 6.0.0 zbar: Switch to github and update to latest gstd: Upgrade to 0.8.1 gst-shark: Upgrade to 0.6.1 Laurent Bonnans (1): opensc: fix RDEPENDS in pcsc PACKAGECONFIG Leon Anavi (1): mosquitto: update to 1.6.8 Martin Jansa (2): googletest: fix build with newer oe-core without python in HOSTTOOLS proj: upgrade to 6.2.0 Max Krummenacher (1): libsoc: use python3 for python bindings Maxime Roussin-Bélanger (1): libvncserver: add missing cmake configration option to packageconfig Mingde (Matthew) Zeng (1): poppler/poppler-data: Add HOMEPAGE tags Nicola Lunghi (1): python3-jsonrpcserver: update to 4.1.2 Pau Espin Pedrol (1): lksctp-tools: Add RRECOMENDS kernel-module-sctp for pkg lksctp-tools Peter Kolbus (9): python(3)-ujson: extend to native(sdk) python-ipaddress: remove unneeded pip dependency python3-html2text: add recipe python(3)-beautifulsoup4: fix RDEPENDS python3-soupsieve: add recipe python-soupsieve: add recipe python(3)-beautifulsoup4: add soupsieve to RDEPENDS python3-booleanpy: add recipe python3-license-expression: add recipe Pierre-Jean Texier (3): libssh2: add nativesdk support python3-xmltodict: add recipe libmxml: upgrade 3.0 -> 3.1 Quanyang Wang (1): glog: fix do_fetch error Randy MacLeod (3): imagemagick: update from 7.8.47 to 7.9.16 tigervnc: update from 1.9.0 to 1.10.1 rsyslog: update from 8.1910 to 8.1911 Robert Yang (1): rocksdb: Fix compile error for DEBUG_BUILD Ross Burton (11): python-jsonpointer: enable native/nativesdk python3-pystemd: upgrade to 0.7.0 python-slip-dbus: don't use relative paths python-m2crypto: don't use relative paths python-coloredlogs: don't use relative paths python-lxml: remove redundant sed (fixed in 4.3.0 onwards) python-lxml: remove redundant RDEPENDS_class-native opencv: don't download during configure opencv: also download face alignment data in do_fetch() opencv: PACKAGECONFIG for G-API, use system ADE opencv: abort configure if we need to download Stefan Agner (1): Revert "zstd: move recipe to oe-core" Stefan Lendl (2): tinyproxy: Install a default tinyproxy.conf tinyproxy: Fix user and group in tinyproxy install Sumit Garg (1): mariadb: fix library LZ4 lookup Todd Cunningham (2): libnftnl: upgrade 1.1.4 -> 1.1.5 nftables: upgrade 0.9.2 -> 0.9.3 Trevor Gamblin (4): python-twisted: add python3-pyserial to RDEPENDS python-twisted: add missing RDEPENDS for conch samba: disable guest access and anonymous queries python3-twisted: fix broken MemoryReactor import Wang Mingyu (66): python-cmd2: upgrade 0.9.19 -> 0.9.21 python-pluggy: upgrade 0.13.0 -> 0.13.1 python-pyasn1: upgrade 0.4.7 -> 0.4.8 python-pyopenssl: upgrade 19.0.0 -> 19.1.0 python-simplejson: upgrade 3.16.0 -> 3.17.0 python-thrift: upgrade 0.11.0 -> 0.13.0 python-alembic: upgrade 1.3.0 -> 1.3.1 python-dbus: upgrade 1.2.12 -> 1.2.14 python-pbr: upgrade 5.4.3 -> 5.4.4 python-paste: 3.2.2 -> 3.2.3 python-lxml: 4.4.1 -> 4.4.2 postgresql: 12.0 -> 12.1 python-jsonschema: 3.1.1 -> 3.2.0 python-pytest: upgrade 5.2.2 -> 5.3.1 xterm: upgrade 350 -> 351 wireshark: upgrade 3.0.6 -> 3.0.7 python3-xxhash: upgrade 1.4.2 -> 1.4.3 fuse3: upgrade 3.8.0 -> 3.9.0 kea: upgrade 1.7.0 -> 1.7.2 krb5: upgrade 1.17 -> 1.17.1 hwdata: upgrade 0.329 -> 0.330 python-pytest: upgrade 5.2.1 -> 5.3.2 python-waitress: upgrade 1.3.1 -> 1.4.1 python-cachetools: upgrade 3.1.1 -> 4.0.0 python-sqlalchemy: upgrade 1.1.17 -> 1.3.12 strongswan: upgrade 5.8.1 -> 5.8.2 smartmontools: upgrade 7.0 -> 7.1 spitools: upgrade 0.8.3 -> 0.8.4 python-pyyaml: upgrade 5.1.2 -> 5.2 arno-iptables-firewall: upgrade 2.0.3 -> 2.1.0 ipvsadm: upgrade 1.30 -> 1.31 lftp: upgrade 4.8.4 -> 4.9.0 nghttp2: upgrade 1.39.2 -> 1.40.0 opensaf: upgrade 5.19.07 -> 5.19.10 wolfssl: upgrade 4.2.0 -> 4.3.0 kea: upgrade 1.7.2 -> 1.7.3 wireshark: upgrade 3.0.7 -> 3.2.0 botan: upgrade 2.11.0 -> 2.13.0 cppzmq: upgrade 4.4.1 -> 4.5.0 iozone3: upgrade 487 -> 488 libmbim: upgrade 1.20.2 -> 1.20.4 libnfc: upgrade to 1.7.1 libsigc++-2.0: upgrade 3.0.0 -> 3.0.2 libuv: upgrade 1.33.1 -> 1.34.0 phoronix-test-suite: upgrade 9.0.1 -> 9.2.1 rabbitmq-c: upgrade 0.9.0 -> 0.10.0 cscope: upgrade 15.8b -> 15.9 msgpack-c: upgrade 3.1.1 -> 3.2.1 gnuplot: upgrade 5.2.2 -> 5.2.8 gphoto2: upgrade 2.5.14 -> 2.5.23 gtkwave: upgrade 3.3.102 -> 3.3.103 haveged: upgrade 1.9.6 -> 1.9.8 libgphoto2: upgrade 2.5.17 -> 2.5.23 libplist: upgrade 2.0.0 -> 2.1.0 ipmiutil: upgrade 3.0.5 -> 3.1.5 libburn: upgrade 1.5.0 -> 1.5.2 libdvdread: upgrade 6.0.1 -> 6.0.2 libsdl2-image: upgrade 2.0.3 -> 2.0.5 libsdl2-mixer: upgrade 2.0.2 -> 2.0.4 libsdl2-ttf: upgrade 2.0.14 -> 2.0.15 yad: upgrade 4.1 -> 5.0 python3-astor: 0.8 -> 0.8.1 python3-bandit: 1.5.1 -> 1.6.2 python-asn1crypto: 1.2.0 -> 1.3.0 python-bitarray: 1.2.0 -> 1.2.1 python-pyconnman: 0.1.0 -> 0.2.0 William A. Kennington III via Openembedded-devel (1): stunnel: bump to version 5.56 Yi Zhao (4): phpmyadmin: upgrade 4.9.1 -> 4.9.2 tk: upgrade 8.6.9 -> 8.6.10 ntp: restrict NTP mode 6 queries samba: upgrade 4.10.10 -> 4.10.11 Yongxin Liu (1): ndctl: Upgrade to v67 Zang Ruochen (17): python-alembic: upgrade 1.3.1 -> 1.3.2 python-beautifulsoup4: upgrade 4.8.1 -> 4.8.2 python-bitarray: upgrade 1.1.0 -> 1.2.0 python-certifi: upgrade 2019.9.11 -> 2019.11.28 python-cmd2: upgrade 0.9.21 -> 0.9.22 python-engineio: upgrade 3.10.0 -> 3.11.1 python-parse: upgrade 1.12.1 -> 1.14.0 python-passlib: upgrade 1.7.1 -> 1.7.2 python-pexpect: upgrade 4.6.0 -> 4.7.0 python-psutil: upgrade 5.6.5 -> 5.6.7 python-py: upgrade 1.8.0 -> 1.8.1 python-pycryptodome: upgrade 3.9.3 -> 3.9.4 python-pymisp: upgrade 2.4.117.2 -> 2.4.119.1 python-pymongo: upgrade 3.9.0 -> 3.10.0 python-pyparsing: upgrade 2.4.5 -> 2.4.6 python-pyperf: upgrade 1.6.1 -> 1.7.0 python-backports-functools-lru-cache: Add python3 version Zhixiong Chi (1): dnsmasq: CVE-2019-14834 hmenn (1): add sqlite-orm v1.5 madhavank27 (1): Added bb file for libcamera integration sangelovic (1): sdbus-c++: Introduce recipes for sdbus-c++ library and its tools Change-Id: I5e7559de35d61167e234161ffb768f6f95d30f41 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/websocketpp')
-rw-r--r--meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch32
-rw-r--r--meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-cmake-Use-GNUInstallDirs.patch35
-rw-r--r--meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch22
-rw-r--r--meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch30
-rw-r--r--meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch23
-rw-r--r--meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/857.patch132
-rw-r--r--meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb26
7 files changed, 299 insertions, 1 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch
new file mode 100644
index 0000000000..4217897284
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-Correct-clang-compiler-flags.patch
@@ -0,0 +1,32 @@
+From 5ccaff351297bca0e254bbfd66e3f03fef9d9c75 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 10 Jan 2020 21:54:39 -0800
+Subject: [PATCH] Correct clang compiler flags
+
+Fix misplaced quotes, this was leading to spurious ; in compiler cmdline
+Remove demanding libc++, clang can link with both libc++ and libstdc++
+and platforms have their own defaults, user can demand non defaults via
+adding it to cmake flags
+
+Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/859]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2d13117..c17354a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -148,7 +148,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
+ endif()
+ set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
+ set (WEBSOCKETPP_BOOST_LIBS system thread)
+- set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here?
++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+ if (NOT APPLE)
+ add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these?
+ endif ()
+--
+2.24.1
+
diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-cmake-Use-GNUInstallDirs.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-cmake-Use-GNUInstallDirs.patch
new file mode 100644
index 0000000000..0ef2e12375
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-cmake-Use-GNUInstallDirs.patch
@@ -0,0 +1,35 @@
+From 771d79eeb0ac5079482a4b3a131bbda744793e7d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 19 Dec 2019 20:07:11 -0800
+Subject: [PATCH] cmake: Use GNUInstallDirs
+
+Helps install cmakefiles in right libdir
+
+Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/854]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2786aba..080be3e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,11 +39,13 @@ endif()
+
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
++include(GNUInstallDirs)
++
+ set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
+ if (WIN32 AND NOT CYGWIN)
+ set (DEF_INSTALL_CMAKE_DIR cmake)
+ else ()
+- set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp)
++ set (DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/websocketpp)
+ endif ()
+ set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
+
+--
+2.24.1
+
diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
new file mode 100644
index 0000000000..bc65efb7dd
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
@@ -0,0 +1,22 @@
+From 4bccfb04a264704ec9b80ba332ee1cf113ce7f1b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= <c72578@yahoo.de>
+Date: Thu, 1 Nov 2018 20:58:10 +0100
+Subject: [PATCH] Update version number in CMakeLists.txt to 0.8.1
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2786aba9..2d13117b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,7 +24,7 @@ endif ()
+ ############ Project name and version
+ set (WEBSOCKETPP_MAJOR_VERSION 0)
+ set (WEBSOCKETPP_MINOR_VERSION 8)
+-set (WEBSOCKETPP_PATCH_VERSION 0)
++set (WEBSOCKETPP_PATCH_VERSION 1)
+ set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
+
+ if(POLICY CMP0048)
diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
new file mode 100644
index 0000000000..c3651e94ab
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
@@ -0,0 +1,30 @@
+From 7f7e2be01b4fa6580ce27f668e61adf37853ad67 Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc <begasus@gmail.com>
+Date: Wed, 18 Sep 2019 11:35:43 +0200
+Subject: [PATCH] Fix "include" directory installation. the variable
+ INSTALL_INCLUDE_DIR already exists, and defaults to include if not
+ specificied otherwise. Using it allows people to customize the installation
+ from outside, fixing issues with other OS like Haiku
+
+Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
+---
+ cmake/CMakeHelpers.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/CMakeHelpers.cmake b/cmake/CMakeHelpers.cmake
+index 1478f4b..f603632 100644
+--- a/cmake/CMakeHelpers.cmake
++++ b/cmake/CMakeHelpers.cmake
+@@ -80,7 +80,7 @@ macro (final_target)
+ endif ()
+
+ install (DIRECTORY ${CMAKE_SOURCE_DIR}/${TARGET_NAME}
+- DESTINATION include/
++ DESTINATION ${INSTALL_INCLUDE_DIR}/
+ FILES_MATCHING PATTERN "*.hpp*")
+ endmacro ()
+
+--
+2.17.1
+
diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
new file mode 100644
index 0000000000..a1ee627b34
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
@@ -0,0 +1,23 @@
+From 3590d77bb9753fbbf076028e2395182ced6466ba Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+Date: Wed, 8 Jan 2020 17:59:48 +0100
+Subject: [PATCH] Fix cmake find boost with version >= 1.71
+
+For some reasons "system;thread;random;unit_test_framework" was seen as a single module, because of the quotes.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2d13117b..9a46bc10 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -213,7 +213,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
+ set (Boost_USE_MULTITHREADED TRUE)
+ set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these!
+
+- find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}")
++ find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS})
+
+ if (Boost_FOUND)
+ # Boost is a project wide global dependency.
diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/857.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/857.patch
new file mode 100644
index 0000000000..f221cd6999
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/857.patch
@@ -0,0 +1,132 @@
+From 931a55347a322f38eb82d5f387b2924e6c7a1746 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+Date: Thu, 9 Jan 2020 10:07:20 +0100
+Subject: [PATCH] Update SConstruct with new Python3 syntax: - new raise
+ keyword syntax - has_key deprecated method is now removed - commands
+ deprecated library is replaced by subprocess - print function fixes
+
+This should fix FTBFS against new scons 3.1.2
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=947584
+---
+ SConstruct | 45 +++++++++++++++++++++++----------------------
+ 1 file changed, 23 insertions(+), 22 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index ae3df10b..9d1c8914 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1,18 +1,19 @@
+-import os, sys, commands
++import os, sys
++from subprocess import check_output
+ env = Environment(ENV = os.environ)
+
+ # figure out a better way to configure this
+-if os.environ.has_key('CXX'):
++if 'CXX' in os.environ:
+ env['CXX'] = os.environ['CXX']
+
+-if os.environ.has_key('DEBUG'):
++if 'DEBUG' in os.environ:
+ env['DEBUG'] = os.environ['DEBUG']
+
+-if os.environ.has_key('CXXFLAGS'):
++if 'CXXFLAGS' in os.environ:
+ #env['CXXFLAGS'] = os.environ['CXXFLAGS']
+ env.Append(CXXFLAGS = os.environ['CXXFLAGS'])
+
+-if os.environ.has_key('LINKFLAGS'):
++if 'LINKFLAGS' in os.environ:
+ #env['LDFLAGS'] = os.environ['LDFLAGS']
+ env.Append(LINKFLAGS = os.environ['LINKFLAGS'])
+
+@@ -22,24 +23,24 @@ if os.environ.has_key('LINKFLAGS'):
+ ## or set BOOST_INCLUDES and BOOST_LIBS if Boost comes with your OS distro e.g. and
+ ## needs BOOST_INCLUDES=/usr/include/boost and BOOST_LIBS=/usr/lib like Ubuntu.
+ ##
+-if os.environ.has_key('BOOSTROOT'):
++if 'BOOSTROOT' in os.environ:
+ os.environ['BOOST_ROOT'] = os.environ['BOOSTROOT']
+
+-if os.environ.has_key('BOOST_ROOT'):
++if 'BOOST_ROOT' in os.environ:
+ env['BOOST_INCLUDES'] = os.environ['BOOST_ROOT']
+ env['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT'], 'stage', 'lib')
+-elif os.environ.has_key('BOOST_INCLUDES') and os.environ.has_key('BOOST_LIBS'):
++elif 'BOOST_INCLUDES' in os.environ and 'BOOST_LIBS' in os.environ:
+ env['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES']
+ env['BOOST_LIBS'] = os.environ['BOOST_LIBS']
+ else:
+- raise SCons.Errors.UserError, "Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS was set!"
++ raise SCons.Errors.UserError("Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS were set!")
+
+ ## Custom OpenSSL
+-if os.environ.has_key('OPENSSL_PATH'):
++if 'OPENSSL_PATH' in os.environ:
+ env.Append(CPPPATH = os.path.join(os.environ['OPENSSL_PATH'], 'include'))
+ env.Append(LIBPATH = os.environ['OPENSSL_PATH'])
+
+-if os.environ.has_key('WSPP_ENABLE_CPP11'):
++if 'WSPP_ENABLE_CPP11' in os.environ:
+ env['WSPP_ENABLE_CPP11'] = True
+ else:
+ env['WSPP_ENABLE_CPP11'] = False
+@@ -76,7 +77,7 @@ if env['PLATFORM'].startswith('win'):
+ env['CCFLAGS'] = '%s /EHsc /GR /GS- /MD /nologo %s %s' % (warn_flags, arch_flags, opt_flags)
+ env['LINKFLAGS'] = '/INCREMENTAL:NO /MANIFEST /NOLOGO /OPT:REF /OPT:ICF /MACHINE:X86'
+ elif env['PLATFORM'] == 'posix':
+- if env.has_key('DEBUG'):
++ if 'DEBUG' in env:
+ env.Append(CCFLAGS = ['-g', '-O0'])
+ else:
+ env.Append(CPPDEFINES = ['NDEBUG'])
+@@ -84,9 +85,9 @@ elif env['PLATFORM'] == 'posix':
+ env.Append(CCFLAGS = ['-Wall'])
+ #env['LINKFLAGS'] = ''
+ elif env['PLATFORM'] == 'darwin':
+- if not os.environ.has_key('CXX'):
++ if not 'CXX' in os.environ:
+ env['CXX'] = "clang++"
+- if env.has_key('DEBUG'):
++ if 'DEBUG' in env:
+ env.Append(CCFLAGS = ['-g', '-O0'])
+ else:
+ env.Append(CPPDEFINES = ['NDEBUG'])
+@@ -157,29 +158,29 @@ env_cpp11 = env.Clone ()
+
+ if env_cpp11['CXX'].startswith('g++'):
+ # TODO: check g++ version
+- GCC_VERSION = commands.getoutput(env_cpp11['CXX'] + ' -dumpversion')
++ GCC_VERSION = check_output([env_cpp11['CXX'], '-dumpversion'])
+
+- if GCC_VERSION > "4.4.0":
+- print "C++11 build environment partially enabled"
++ if GCC_VERSION.decode('utf-8') > "4.4.0":
++ print("C++11 build environment partially enabled")
+ env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x'],TOOLSET = ['g++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_'])
+ else:
+- print "C++11 build environment is not supported on this version of G++"
++ print("C++11 build environment is not supported on this version of G++")
+ elif env_cpp11['CXX'].startswith('clang++'):
+- print "C++11 build environment enabled"
++ print("C++11 build environment enabled")
+ env.Append(CXXFLANGS = ['-stdlib=libc++'],LINKFLAGS=['-stdlib=libc++'])
+ env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x','-stdlib=libc++'],LINKFLAGS = ['-stdlib=libc++'],TOOLSET = ['clang++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_'])
+
+ # look for optional second boostroot compiled with clang's libc++ STL library
+ # this prevents warnings/errors when linking code built with two different
+ # incompatible STL libraries.
+- if os.environ.has_key('BOOST_ROOT_CPP11'):
++ if 'BOOST_ROOT_CPP11' in os.environ:
+ env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_ROOT_CPP11']
+ env_cpp11['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT_CPP11'], 'stage', 'lib')
+- elif os.environ.has_key('BOOST_INCLUDES_CPP11') and os.environ.has_key('BOOST_LIBS_CPP11'):
++ elif 'BOOST_INCLUDES_CPP11' in os.environ and 'BOOST_LIBS_CPP11' in os.environ:
+ env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES_CPP11']
+ env_cpp11['BOOST_LIBS'] = os.environ['BOOST_LIBS_CPP11']
+ else:
+- print "C++11 build environment disabled"
++ print("C++11 build environment disabled")
+
+ # if the build system is known to allow the isystem modifier for library include
+ # values then use it for the boost libraries. Otherwise just add them to the
diff --git a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb
index 551621708c..af6d30a281 100644
--- a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb
+++ b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb
@@ -3,16 +3,40 @@ SECTION = "libs/network"
HOMEPAGE = "https://github.com/zaphoyd/websocketpp"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=4d168d763c111f4ffc62249870e4e0ea"
-DEPENDS = "openssl boost zlib"
+
+DEPENDS = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'openssl boost zlib', '', d)} "
SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https \
file://0001-Replace-make_shared-with-new-in-some-cases.patch \
file://0002-Fix-missed-entries-fix-testing.patch \
+ file://0001-cmake-Use-GNUInstallDirs.patch \
+ file://842.patch \
+ file://771.patch \
+ file://855.patch \
+ file://857.patch \
+ file://0001-Correct-clang-compiler-flags.patch \
"
+EXTRA_OECMAKE = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '-DBUILD_EXAMPLES=ON -DBUILD_TESTS=ON', '', d)} "
+
+# this is an header only library, do not depend on the main package
+RDEPENDS_${PN}-dev = ""
+
+# to add this package to an SDK, since it isn't a reverse-dependency of anything, just use something like this:
+# TOOLCHAIN_TARGET_TASK_append = " websocketpp-dev"
+
# tag 0.8.1
SRCREV= "c6d7e295bf5a0ab9b5f896720cc1a0e0fdc397a7"
S = "${WORKDIR}/git"
inherit cmake
+
+PACKAGES =+ "${PN}-examples"
+
+FILES_${PN}-examples = "${docdir}"
+
+do_install_append() {
+ install -d ${D}${docdir}/${BPN}
+ cp -R ${S}/examples ${D}${docdir}/${BPN}
+}