diff options
| author |   Denis Pronin <dannftk@yandex.ru> | 2022-03-12 13:07:26 +0300 |
|---|---|---|
| committer |   James Le Cuirot <chewi@gentoo.org> | 2022-03-13 22:36:29 +0000 |
| commit | 2919a7d7469a54cf50ff469f76f71bf7cc4ca20f (patch) | |
| tree | a002dfa047f78249a9e526398025898ddf164869 /media-libs/ftgl | |
| parent | www-client/vivaldi-snapshot: Drop old 5.1.2567.38 (diff) | |
| download | gentoo-2919a7d7469a54cf50ff469f76f71bf7cc4ca20f.tar.gz gentoo-2919a7d7469a54cf50ff469f76f71bf7cc4ca20f.tar.bz2 gentoo-2919a7d7469a54cf50ff469f76f71bf7cc4ca20f.zip | |
added ftgl-2.1.3_rc5-clang.patch
patch that fixes building with clang using c++11
Signed-off-by: Denis Pronin <dannftk@yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/24505
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'media-libs/ftgl')
| -rw-r--r-- | media-libs/ftgl/files/ftgl-2.1.3_rc5-clang.patch | 24 | ||||
| -rw-r--r-- | media-libs/ftgl/ftgl-2.1.3_rc5.ebuild | 1 |
2 files changed, 25 insertions, 0 deletions
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() { |