From 65ce8e0ffcc8bccc88df3cfd4f38aabdcf16f371 Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Sun, 2 May 2021 15:06:33 +0200 Subject: [PATCH] dev-libs/cglm: Backport upstream fix to 0.8.2. This fixes a typo in 0.8.2, causing a warning and actual misbehaviour. Closes: https://bugs.gentoo.org/787677 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Oliver Freyermuth --- ...cglm-0.8.2.ebuild => cglm-0.8.2-r1.ebuild} | 5 +++++ .../cglm/files/cglm-0.8.2-fix-vec3-vec4.patch | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+) rename dev-libs/cglm/{cglm-0.8.2.ebuild => cglm-0.8.2-r1.ebuild} (86%) create mode 100644 dev-libs/cglm/files/cglm-0.8.2-fix-vec3-vec4.patch diff --git a/dev-libs/cglm/cglm-0.8.2.ebuild b/dev-libs/cglm/cglm-0.8.2-r1.ebuild similarity index 86% rename from dev-libs/cglm/cglm-0.8.2.ebuild rename to dev-libs/cglm/cglm-0.8.2-r1.ebuild index 4009cf4499..6c84b8aea4 100644 --- a/dev-libs/cglm/cglm-0.8.2.ebuild +++ b/dev-libs/cglm/cglm-0.8.2-r1.ebuild @@ -23,6 +23,11 @@ IUSE="doc" BDEPEND="dev-util/meson doc? ( dev-python/sphinx )" +PATCHES=( + # Upstream patch: https://github.com/recp/cglm/commit/13269f4af8d3c95220f97746c968eac3ba122a32 + "${FILESDIR}"/${PN}-0.8.2-fix-vec3-vec4.patch +) + src_configure() { local emesonargs=( "-Dwerror=false" diff --git a/dev-libs/cglm/files/cglm-0.8.2-fix-vec3-vec4.patch b/dev-libs/cglm/files/cglm-0.8.2-fix-vec3-vec4.patch new file mode 100644 index 0000000000..1819ab1a64 --- /dev/null +++ b/dev-libs/cglm/files/cglm-0.8.2-fix-vec3-vec4.patch @@ -0,0 +1,22 @@ +From 13269f4af8d3c95220f97746c968eac3ba122a32 Mon Sep 17 00:00:00 2001 +From: winter091 +Date: Sat, 1 May 2021 16:48:31 +0300 +Subject: [PATCH] fix typo: vec3 -> vec4 + +--- + include/cglm/call/vec4.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/cglm/call/vec4.h b/include/cglm/call/vec4.h +index 28a3734..f56f599 100644 +--- a/include/cglm/call/vec4.h ++++ b/include/cglm/call/vec4.h +@@ -99,7 +99,7 @@ glmc_vec4_scale(vec4 v, float s, vec4 dest); + + CGLM_EXPORT + void +-glmc_vec4_scale_as(vec3 v, float s, vec3 dest); ++glmc_vec4_scale_as(vec4 v, float s, vec4 dest); + + CGLM_EXPORT + void