From 5904daf1a51f0ba0a7c7403d4a38e9b3a9f3364e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Feb 2021 09:26:14 -0800 Subject: glm: Upgrade to 0.9.9.8 License-Update: Update copyright years [1] Drop patch which is already applied in this release [1] https://github.com/g-truc/glm/commit/a2e2e97a7aa000b41288e795000bf0a6cd365133#diff-93d82d0c89b85c60d37ef8cb3828604e99efd8c53e20003a3214e8bbc715a638 Signed-off-by: Khem Raj --- ...it-int-float-conversion-warnings-with-cla.patch | 158 --------------------- .../glm/glm/0001-Silence-clang-warnings.patch | 50 +++++++ meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb | 39 ----- meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb | 39 +++++ 4 files changed, 89 insertions(+), 197 deletions(-) delete mode 100644 meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch create mode 100644 meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch delete mode 100644 meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb create mode 100644 meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb (limited to 'meta-oe/recipes-graphics/glm') diff --git a/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch b/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch deleted file mode 100644 index 2eb50a5a3a..0000000000 --- a/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 -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 ---- - 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 \ - return_type_scalar_multiplication \ - operator/(Vec lh, T const& s){ \ -- return lh *= 1.0f / s; \ -+ return lh *= 1.0f / static_cast(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 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 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 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 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 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 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 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 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-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch b/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch new file mode 100644 index 0000000000..25e851883e --- /dev/null +++ b/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 +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::max()); +| ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +glm/gtc/../ext/quaternion_common.inl:76:87: error: unused parameter 'k' [-Werror,-Wunused-parameter] + GLM_FUNC_QUALIFIER qua slerp(qua const& x, qua const& y, T a, S k) + ^ + +Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/1055] +Signed-off-by: Khem Raj +--- + 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 phi = angle + static_cast(k) * glm::pi(); + 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::max()); ++ static_cast(std::rand()) % std::numeric_limits::max()); + } + }; + +-- +2.30.0 + diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb deleted file mode 100644 index e2f4dbebc5..0000000000 --- a/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "OpenGL Mathematics Library" -DESCRIPTION = "OpenGL Mathematics (GLM) is a header only C++ \ -mathematics library for graphics software based on the OpenGL \ -Shading Language (GLSL) specifications." -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" - -SRC_URI = " \ - git://github.com/g-truc/glm;branch=master \ - file://0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch \ - file://glmConfig.cmake.in \ - file://glmConfigVersion.cmake.in \ - file://glm.pc.in \ - file://glmTargets.cmake \ -" -SRCREV = "4db8f89aace8f04c839b606e15b39fb8383ec732" - -S = "${WORKDIR}/git" - -inherit cmake - -do_install() { - install -d ${D}${includedir} ${D}${docdir}/glm ${D}${libdir}/pkgconfig ${D}${libdir}/cmake/glm - cp -R --no-dereference --preserve=mode,links ${S}/glm ${D}${includedir} - cp -R --no-dereference --preserve=mode,links ${S}/doc ${D}${docdir}/glm - rm ${D}${includedir}/glm/CMakeLists.txt - sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfigVersion.cmake.in > ${D}${libdir}/cmake/glm/glmConfigVersion.cmake - sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfig.cmake.in > ${D}${libdir}/cmake/glm/glmConfig.cmake - sed "s/@VERSION@/${PV}/" ${WORKDIR}/glm.pc.in > ${D}${libdir}/pkgconfig/glm.pc - install -Dm644 ${WORKDIR}/glmTargets.cmake ${D}${libdir}/cmake/glm/glmTargets.cmake - -} - -RDEPENDS_${PN}-dev = "" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb new file mode 100644 index 0000000000..c5a7c5bff8 --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb @@ -0,0 +1,39 @@ +SUMMARY = "OpenGL Mathematics Library" +DESCRIPTION = "OpenGL Mathematics (GLM) is a header only C++ \ +mathematics library for graphics software based on the OpenGL \ +Shading Language (GLSL) specifications." +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=462e4b97f73ef12f8171c3c546ce4e8d" + +SRC_URI = " \ + git://github.com/g-truc/glm;branch=master \ + file://0001-Silence-clang-warnings.patch \ + file://glmConfig.cmake.in \ + file://glmConfigVersion.cmake.in \ + file://glm.pc.in \ + file://glmTargets.cmake \ +" +SRCREV = "bf71a834948186f4097caa076cd2663c69a10e1e" + +S = "${WORKDIR}/git" + +inherit cmake + +do_install() { + install -d ${D}${includedir} ${D}${docdir}/glm ${D}${libdir}/pkgconfig ${D}${libdir}/cmake/glm + cp -R --no-dereference --preserve=mode,links ${S}/glm ${D}${includedir} + cp -R --no-dereference --preserve=mode,links ${S}/doc ${D}${docdir}/glm + rm ${D}${includedir}/glm/CMakeLists.txt + sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfigVersion.cmake.in > ${D}${libdir}/cmake/glm/glmConfigVersion.cmake + sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfig.cmake.in > ${D}${libdir}/cmake/glm/glmConfig.cmake + sed "s/@VERSION@/${PV}/" ${WORKDIR}/glm.pc.in > ${D}${libdir}/pkgconfig/glm.pc + install -Dm644 ${WORKDIR}/glmTargets.cmake ${D}${libdir}/cmake/glm/glmTargets.cmake + +} + +RDEPENDS_${PN}-dev = "" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg