summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-graphics/glm
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2021-02-13 00:32:45 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2021-02-25 23:15:06 +0300
commitac970dd705934286df062e0f1501f776dc2ef01d (patch)
treefadcf250bad7a38afc33bc423c0ebb8733b33345 /meta-openembedded/meta-oe/recipes-graphics/glm
parent1110521700bbfe9ffd32338fed19492114e8bbd4 (diff)
downloadopenbmc-ac970dd705934286df062e0f1501f776dc2ef01d.tar.xz
meta-openembedded: subtree update:fd123c9bb2..7206f7f5bc
Adam Miartus (1): cereal: add cereal a header-only c++11 serialization library Andreas Müller (14): xfce4-appfinder: upgrade 4.16.0 -> 4.16.1 xfce4-whiskermenu-plugin: upgrade 2.5.2 -> 2.5.3 xfce4-panel: upgrade 4.16.0 -> 4.16.1 xfce4-notes-plugin: re-add 1.9.0 gparted: upgrade 1.1.0 -> 1.2.0 poppler: upgrade 21.01.0 -> 21.02.0 fluidsynth: upgrade 2.1.6 -> 2.1.7 mousepad: upgrade 0.5.1 -> 0.5.2 xfce4-cpugraph-plugin: upgrade 1.2.0 -> 1.2.1 babl: upgrade 0.1.82 -> 0.1.84 gegl: upgrade 0.4.26 -> 0.4.28 gtk+: upgrade 2.24.32 -> 2.24.33 libsigc++-2.0: upgrade 2.10.3 -> 2.10.6 gtkmm3: upgrade 3.24.2 -> 3.24.3 Andrei Gherzan (1): gateone: Cleanup assets for removed recipe Andrey Zhizhikin (1): iperf3: fix build with autoconf 2.71 Gianfranco (1): mosquitto: Upgrade 1.6.12 -> 2.0.7 Harpritkaur Bhandari (1): rapidjson: Remove unwanted patches Hongxu Jia (4): lksctp-tools: make conpatible to autoconf-2.70 spice: make conpatible to autoconf-2.70 freeradius: fix build failure with autoconf 2.71 ndpi: fix autoconf-2.71 compatibility Kai Kang (3): meta-oe: add crash to NON_MULTILIB_RECIPES lxdm: support to change user password lxdm: disallow empty new password Khem Raj (28): libssh2: Fix build with autoconf 2.70+ yasm: Fix build with autotools 2.70+ boinc-client: Upgrade to 7.16.16 release net-snmp: Remove hardcoded paths to build host in net-snmp-config keepalived: Upgrade to 2.2.1 gst-shark: Upgrade to 0.7.2 hidapi: Backport patch to fix build with autotools 2.70+ libsrtp: Update to 2.3.0 libsrtp: Do not invoke automake during configure klibc: Upgrade to 2.0.8 release geany,geany-plugins: Upgrade to 1.37.x libstatgrab: Fix build with autoconf 2.70+ libmypaint: Fix build with autotools 2.70+ geany: Fix build with autotools 2.70+ ubi-utils-klibc: Fix build with clang kexecboot: Fix build with clang glm: Upgrade to 0.9.9.8 gimp: Fix build with autoconf-2.70+ klibc: Fix x86_64 build with binutils 2.36+ pavucontrol: Depend on libxml-parser-perl-native libsrtp: Copy ar-lib from automake libmcrypt: Run autoreconf steps manually libsdl2-mixer: Fix build with autoconf 2.70+ openldap: Fix build with autoconf 2.70+ transmission: Fix build with autotools 2.70+ boinc-client: Fix build with autotools 2.70+ iwd: Fix build with ell 0.37 kernel-selftest: Disable building bpf Leon Anavi (29): python3-gevent: Upgrade 20.9.0 -> 21.1.2 python3-prompt-toolkit: Upgrade 3.0.11 -> 3.0.14 python3-urllib3: Upgrade 1.26.2 -> 1.26.3 python3-pybind11: Upgrade 2.5.0 -> 2.6.2 python3-xlrd: Upgrade 1.2.0 -> 2.0.1 python3-croniter: Upgrade 1.0.2 -> 1.0.4 python3-cantools: Upgrade 36.1.0 -> 36.2.0 python3-pyzmq: Upgrade 21.0.2 -> 22.0.2 python3-aiohttp-jinja2: Upgrade 1.2.0 -> 1.4.2 python3-prctl: Upgrade 1.7 -> 1.8.1 python3-cmd2: Upgrade 1.4.0 -> 1.5.0 python3-elementpath: Upgrade 2.1.2 -> 2.1.3 python3-croniter: Upgrade 1.0.4 -> 1.0.5 python3-pychromecast: Upgrade 7.7.2 -> 8.0.0 python3-alembic: Upgrade 1.5.2 -> 1.5.3 python3-meh: Upgrade 0.49 -> 0.50 python3-pywbem: Upgrade 1.1.0 -> 1.1.3 python3-ipython: Upgrade 7.19.0 -> 7.20.0 python3-croniter: Upgrade 1.0.5 -> 1.0.6 python3-pywbemtools: Upgrade 0.8.0 -> 0.8.1 python3-sqlalchemy: Upgrade 1.3.22 -> 1.3.23 python3-flask-migrate: Upgrade 2.5.3 -> 2.6.0 python3-javaobj-py3: Upgrade 0.4.1 -> 0.4.2 python3-pytest-html: Upgrade 2.1.1 -> 3.1.1 python3-graphviz: Upgrade 0.14.2 -> 0.16 python3-tqdm: Upgrade 4.51.0 -> 4.56.0 python3-alembic: Upgrade 1.5.3 -> 1.5.4 python3-pymongo: Upgrade 3.11.2 -> 3.11.3 python3-pymisp: Upgrade 2.4.137.1 -> 2.4.137.3 Martin Jansa (6): zbar: fix random do_prepare_recipe_sysroot_gettext failures zbar: use 4 spaces for indentation net-snmp: fix build with dash wireguard-module: remove PKG assignment graphviz: drop unused SRCREV and outdated comment pidgin: upgrade to 2.14.1 and fix autoconf-2.71 compatibility Mingli Yu (5): net-snmp: improve reproducibility python3-h5py: improve reproducibility opencv: improve reproducibility mozjs: improve reproducibility netsnmp: remove --with-openssl=PATH configure option Nicolas Jeker (2): network-manager-applet: Build without libteam support networkmanager: Add PACKAGECONFIG for ovs Oleksandr Kravchuk (24): iwd: update to 1.11 cpuid: update to 20201006 libblockdev: update to 2.25 nano: update to 5.5 plymouth: update to 0.9.5 adcli: update to 0.9.0 cannelloni: update to 1.0.0 ipset: update to 7.10 kronosnet: update 1.20 nghttp2: update to 1.43.0 atftp: update to 0.7.4 cereal: update to 1.3.0 python3-aws-iot-device-sdk-python: update to 1.4.9 python3-flask-socketio: update to 4.3.1 python3-greenstalk: update to 2.0.0 python3-twitter: update to 3.10.0 fetchmail: udpate to 6.4.16 wireshark: update to 3.4.3 iqrencode: update to 4.1.1 libconfig add UPSTREAM_CHECK_URI ceres-solver: update to 2.0.0 libgit2: update to 1.1.0 hexedit: update to 1.5 ttf-abyssinica: update to 2.000 Oleksiy Obitotskyy (1): libhugetlbfs: improve reproducibility Peter Smith (1): python3-ruamel-yaml: add support for native and nativesdk Qi.Chen@windriver.com (1): minifi-cpp: set PSEUDO_CONSIDER_PATHS Ramon Fried (2): fluentbit: fix systemd input plugin fluentbit: Fix SIGSEGV caused by using flb_free instead of mk_mem_free Robert P. J. Day (1): correct "RRCOMMENDS" typo in ipset recipe Ross Burton (2): python3-ruamel-yaml: add native and nativesdk class extension python3-pykwalify: fix RDEPENDS Sakib Sajal (2): libgpiod: add ptest xfce4-session: increase ALTERNATIVE_PRIORITY Wang Mingyu (1): dnsmasq: upgrade 2.82 -> 2.84 Yi Fan Yu (1): postgresql: bypass autoconf version check Yi Zhao (1): openipmi: upgrade 2.0.30 -> 2.0.31 Zang Ruochen (7): libfastjson: upgrade 0.99.8 -> 0.99.9 libio-pty-perl: upgrade 1.15 -> 1.16 libjson-perl: upgrade 4.02000 -> 4.03000 libmbim: upgrade 1.24.4 -> 1.24.6 sanlock: upgrade 3.8.2 -> 3.8.3 python3-matplotlib: upgrade 3.3.2 -> 3.3.4 python3-pytz: upgrade 2020.1 -> 2021.1 akuster (2): enca: Fix SRC_URI meta-oe/README: add Ubuntu prerequisite information zangrc (6): libtalloc: upgrade 2.3.1 -> 2.3.2 gensio: upgrade 2.2.0 -> 2.2.3 zchunk: upgrade 1.1.8 -> 1.1.9 libnet-ldap-perl: upgrade 0.67 -> 0.68 librole-tiny-perl: upgrade 2.002003 -> 2.002004 cpprest: upgrade 2.10.17 -> 2.10.18 zhengruoqin (4): open-isns: upgrade 0.99 -> 0.101 gd: upgrade 2.3.0 -> 2.3.1 live555: upgrade 20210101 -> 20210129 python3-periphery: upgrade 2.1.0 -> 2.2.0 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I65a2b942fbfbc262976e6417d7481ae3fc82cb17
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics/glm')
-rw-r--r--meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch158
-rw-r--r--meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch50
-rw-r--r--meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb (renamed from meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb)6
3 files changed, 53 insertions, 161 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch b/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch
deleted file mode 100644
index 2eb50a5a3..000000000
--- a/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 461861cd2e34294830b121db834c05ff39424f6f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 27 Dec 2019 18:42:51 -0800
-Subject: [PATCH] Fix Wimplicit-int-float-conversion warnings with clang 10+
-
-This is a new warning in clang which will be available in clang 10
-onwards
-
-Fixes
-error: implicit conversion from 'const int' to 'float' may lose precision [-Werror,-Wimplicit-int-float-conversion]
-
-Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/986]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- glm/gtx/scalar_multiplication.hpp | 2 +-
- test/gtx/gtx_fast_trigonometry.cpp | 32 +++++++++++++++---------------
- 2 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp
-index f391f8de..496ba193 100644
---- a/glm/gtx/scalar_multiplication.hpp
-+++ b/glm/gtx/scalar_multiplication.hpp
-@@ -54,7 +54,7 @@ namespace glm
- template<typename T> \
- return_type_scalar_multiplication<T, Vec> \
- operator/(Vec lh, T const& s){ \
-- return lh *= 1.0f / s; \
-+ return lh *= 1.0f / static_cast<float>(s); \
- }
-
- GLM_IMPLEMENT_SCAL_MULT(vec2)
-diff --git a/test/gtx/gtx_fast_trigonometry.cpp b/test/gtx/gtx_fast_trigonometry.cpp
-index f3bf17bf..f3c4e957 100644
---- a/test/gtx/gtx_fast_trigonometry.cpp
-+++ b/test/gtx/gtx_fast_trigonometry.cpp
-@@ -239,12 +239,12 @@ namespace taylorCos
- std::vector<glm::vec4> Results;
- Results.resize(Samples);
-
-- float Steps = (End - Begin) / Samples;
-+ float Steps = (End - Begin) / float(Samples);
-
- std::clock_t const TimeStampBegin = std::clock();
-
- for(std::size_t i = 0; i < Samples; ++i)
-- Results[i] = fastCosNew(AngleShift + glm::vec4(Begin + Steps * i));
-+ Results[i] = fastCosNew(AngleShift + glm::vec4(Begin + Steps * float(i)));
-
- std::clock_t const TimeStampEnd = std::clock();
-
-@@ -280,12 +280,12 @@ namespace taylorCos
- std::vector<glm::vec4> Results;
- Results.resize(Samples);
-
-- float Steps = (End - Begin) / Samples;
-+ float Steps = (End - Begin) / float(Samples);
-
- std::clock_t const TimeStampBegin = std::clock();
-
- for(std::size_t i = 0; i < Samples; ++i)
-- Results[i] = taylorCos::fastCosDeterminisctic(AngleShift + glm::vec4(Begin + Steps * i));
-+ Results[i] = taylorCos::fastCosDeterminisctic(AngleShift + glm::vec4(Begin + Steps * float(i)));
-
- std::clock_t const TimeStampEnd = std::clock();
-
-@@ -327,12 +327,12 @@ namespace taylorCos
- std::vector<glm::vec4> Results;
- Results.resize(Samples);
-
-- float Steps = (End - Begin) / Samples;
-+ float Steps = (End - Begin) / float(Samples);
-
- std::clock_t const TimeStampBegin = std::clock();
-
- for(std::size_t i = 0; i < Samples; ++i)
-- Results[i] = taylorCos::fastRefCos(AngleShift + glm::vec4(Begin + Steps * i));
-+ Results[i] = taylorCos::fastRefCos(AngleShift + glm::vec4(Begin + Steps * float(i)));
-
- std::clock_t const TimeStampEnd = std::clock();
-
-@@ -349,12 +349,12 @@ namespace taylorCos
- std::vector<glm::vec4> Results;
- Results.resize(Samples);
-
-- float Steps = (End - Begin) / Samples;
-+ float Steps = (End - Begin) / float(Samples);
-
- std::clock_t const TimeStampBegin = std::clock();
-
- for(std::size_t i = 0; i < Samples; ++i)
-- Results[i] = glm::fastCos(AngleShift + glm::vec4(Begin + Steps * i));
-+ Results[i] = glm::fastCos(AngleShift + glm::vec4(Begin + Steps * float(i)));
-
- std::clock_t const TimeStampEnd = std::clock();
-
-@@ -371,12 +371,12 @@ namespace taylorCos
- std::vector<glm::vec4> Results;
- Results.resize(Samples);
-
-- float Steps = (End - Begin) / Samples;
-+ float Steps = (End - Begin) / float(Samples);
-
- std::clock_t const TimeStampBegin = std::clock();
-
- for(std::size_t i = 0; i < Samples; ++i)
-- Results[i] = glm::cos(AngleShift + glm::vec4(Begin + Steps * i));
-+ Results[i] = glm::cos(AngleShift + glm::vec4(Begin + Steps * float(i)));
-
- std::clock_t const TimeStampEnd = std::clock();
-
-@@ -466,12 +466,12 @@ namespace taylor2
- std::vector<float> Results;
- Results.resize(Samples);
-
-- float Steps = (End - Begin) / Samples;
-+ float Steps = (End - Begin) / float(Samples);
-
- std::clock_t const TimeStampBegin = std::clock();
-
- for(std::size_t i = 0; i < Samples; ++i)
-- Results[i] = taylorCosA(AngleShift.x + Begin + Steps * i);
-+ Results[i] = taylorCosA(AngleShift.x + Begin + Steps * float(i));
-
- std::clock_t const TimeStampEnd = std::clock();
-
-@@ -488,12 +488,12 @@ namespace taylor2
- std::vector<float> Results;
- Results.resize(Samples);
-
-- float Steps = (End - Begin) / Samples;
-+ float Steps = (End - Begin) / float(Samples);
-
- std::clock_t const TimeStampBegin = std::clock();
-
- for(std::size_t i = 0; i < Samples; ++i)
-- Results[i] = taylorCosB(AngleShift.x + Begin + Steps * i);
-+ Results[i] = taylorCosB(AngleShift.x + Begin + Steps * float(i));
-
- std::clock_t const TimeStampEnd = std::clock();
-
-@@ -510,12 +510,12 @@ namespace taylor2
- std::vector<float> Results;
- Results.resize(Samples);
-
-- float Steps = (End - Begin) / Samples;
-+ float Steps = (End - Begin) / float(Samples);
-
- std::clock_t const TimeStampBegin = std::clock();
-
- for(std::size_t i = 0; i < Samples; ++i)
-- Results[i] = taylorCosC(AngleShift.x + Begin + Steps * i);
-+ Results[i] = taylorCosC(AngleShift.x + Begin + Steps * float(i));
-
- std::clock_t const TimeStampEnd = std::clock();
-
---
-2.24.1
-
diff --git a/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch b/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch
new file mode 100644
index 000000000..25e851883
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch
@@ -0,0 +1,50 @@
+From 5b83983b246cff440de4421696b6b5dd9072ed2d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 6 Feb 2021 11:36:23 -0800
+Subject: [PATCH] Silence clang warnings
+
+Fixes
+glm/gtc/random.inl:25:17: error: implicit conversion loses integer precision: 'int' to 'unsigned char' [-Werror,-Wimplicit-int-conversion]
+| std::rand() % std::numeric_limits<uint8>::max());
+| ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+glm/gtc/../ext/quaternion_common.inl:76:87: error: unused parameter 'k' [-Werror,-Wunused-parameter]
+ GLM_FUNC_QUALIFIER qua<T, Q> slerp(qua<T, Q> const& x, qua<T, Q> const& y, T a, S k)
+ ^
+
+Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/1055]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ glm/ext/quaternion_common.inl | 2 +-
+ glm/gtc/random.inl | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glm/ext/quaternion_common.inl b/glm/ext/quaternion_common.inl
+index 0e4a3bb2..8f9dccef 100644
+--- a/glm/ext/quaternion_common.inl
++++ b/glm/ext/quaternion_common.inl
+@@ -104,7 +104,7 @@ namespace glm
+ {
+ // Graphics Gems III, page 96
+ T angle = acos(cosTheta);
+- T phi = angle + k * glm::pi<T>();
++ T phi = angle + static_cast<float>(k) * glm::pi<T>();
+ return (sin(angle - a * phi)* x + sin(a * phi) * z) / sin(angle);
+ }
+ }
+diff --git a/glm/gtc/random.inl b/glm/gtc/random.inl
+index 70485098..a4af2a06 100644
+--- a/glm/gtc/random.inl
++++ b/glm/gtc/random.inl
+@@ -22,7 +22,7 @@ namespace detail
+ GLM_FUNC_QUALIFIER static vec<1, uint8, P> call()
+ {
+ return vec<1, uint8, P>(
+- std::rand() % std::numeric_limits<uint8>::max());
++ static_cast<uint8>(std::rand()) % std::numeric_limits<uint8>::max());
+ }
+ };
+
+--
+2.30.0
+
diff --git a/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb b/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb
index e2f4dbebc..c5a7c5bff 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb
@@ -6,17 +6,17 @@ HOMEPAGE = "https://glm.g-truc.net"
BUGTRACKER = "https://github.com/g-truc/glm/issues"
SECTION = "libs"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://copying.txt;md5=4a735e33f271f57404fda17e80085411"
+LIC_FILES_CHKSUM = "file://copying.txt;md5=462e4b97f73ef12f8171c3c546ce4e8d"
SRC_URI = " \
git://github.com/g-truc/glm;branch=master \
- file://0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch \
+ file://0001-Silence-clang-warnings.patch \
file://glmConfig.cmake.in \
file://glmConfigVersion.cmake.in \
file://glm.pc.in \
file://glmTargets.cmake \
"
-SRCREV = "4db8f89aace8f04c839b606e15b39fb8383ec732"
+SRCREV = "bf71a834948186f4097caa076cd2663c69a10e1e"
S = "${WORKDIR}/git"