From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EA90615808B for ; Sun, 13 Mar 2022 22:37:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CF34E086A; Sun, 13 Mar 2022 22:37:04 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6988DE086A for ; Sun, 13 Mar 2022 22:37:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A038342F68 for ; Sun, 13 Mar 2022 22:37:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 115552C3 for ; Sun, 13 Mar 2022 22:37:00 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1647210989.2919a7d7469a54cf50ff469f76f71bf7cc4ca20f.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/ftgl/files/, media-libs/ftgl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/ftgl/files/ftgl-2.1.3_rc5-clang.patch media-libs/ftgl/ftgl-2.1.3_rc5.ebuild X-VCS-Directories: media-libs/ftgl/files/ media-libs/ftgl/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 2919a7d7469a54cf50ff469f76f71bf7cc4ca20f X-VCS-Branch: master Date: Sun, 13 Mar 2022 22:37:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 68b8645b-095b-46a1-8d11-91fecc179b8f X-Archives-Hash: eaa69a7c37fe8fd289259c948b621e98 commit: 2919a7d7469a54cf50ff469f76f71bf7cc4ca20f Author: Denis Pronin yandex ru> AuthorDate: Sat Mar 12 10:07:26 2022 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Mar 13 22:36:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2919a7d7 added ftgl-2.1.3_rc5-clang.patch patch that fixes building with clang using c++11 Signed-off-by: Denis Pronin yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/24505 Signed-off-by: James Le Cuirot gentoo.org> media-libs/ftgl/files/ftgl-2.1.3_rc5-clang.patch | 24 ++++++++++++++++++++++++ media-libs/ftgl/ftgl-2.1.3_rc5.ebuild | 1 + 2 files changed, 25 insertions(+) diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-clang.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-clang.patch new file mode 100644 index 000000000000..d9866a591733 --- /dev/null +++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-clang.patch @@ -0,0 +1,24 @@ +--- a/demo/simple.cpp ++++ b/demo/simple.cpp +@@ -105,14 +105,14 @@ + float t2 = sin(n / 50 + 1); + float t3 = sin(n / 30 + 2); + +- float ambient[4] = { (t1 + 2.0) / 3, +- (t2 + 2.0) / 3, +- (t3 + 2.0) / 3, 0.3 }; +- float diffuse[4] = { 1.0, 0.9, 0.9, 1.0 }; +- float specular[4] = { 1.0, 0.7, 0.7, 1.0 }; +- float position[4] = { 100.0, 100.0, 0.0, 1.0 }; ++ float ambient[4] = { (t1 + 2.0f) / 3, ++ (t2 + 2.0f) / 3, ++ (t3 + 2.0f) / 3, 0.3 }; ++ float diffuse[4] = { 1.0f, 0.9f, 0.9f, 1.0f }; ++ float specular[4] = { 1.0f, 0.7f, 0.7f, 1.0f }; ++ float position[4] = { 100.0f, 100.0f, 0.0f, 1.0f }; + +- float front_ambient[4] = { 0.7, 0.7, 0.7, 0.0 }; ++ float front_ambient[4] = { 0.7f, 0.7f, 0.7f, 0.0f }; + + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild index 8d9baca0cd07..22107b5dd36a 100644 --- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild +++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild @@ -31,6 +31,7 @@ PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-underlink.patch "${FILESDIR}"/${P}-freetype_pkgconfig.patch + "${FILESDIR}"/${P}-clang.patch ) src_prepare() {