[gentoo-commits] repo/gentoo:master commit in: media-video/movit/files/, media-video/movit/

[Patrick Lauer]

commit:     baab4691c357ef98b6ad32786c0942097e9c6eed
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 09:59:37 2016 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 09:59:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baab4691

media-video/movit: Fix locale handling #575438

Package-Manager: portage-2.2.27

 media-video/movit/files/movit-fix-locale.patch           | 16 ++++++++++++++++
 .../movit/{movit-1.3.1.ebuild => movit-1.3.1-r1.ebuild}  |  6 ++++++
 2 files changed, 22 insertions(+)

diff --git a/media-video/movit/files/movit-fix-locale.patch 
b/media-video/movit/files/movit-fix-locale.patch
new file mode 100644
index 0000000..f98c970
--- /dev/null
+++ b/media-video/movit/files/movit-fix-locale.patch
@@ -0,0 +1,16 @@
+--- a/init.cpp 2016-02-14 19:53:12.141197530 +0100
++++ b/init.cpp 2016-02-14 19:55:09.374196665 +0100
+@@ -388,7 +388,12 @@
+       // Now we have something on the form X.YY. We convert it to a float, 
and hope
+       // that if it's inexact (e.g. 1.30), atof() will round the same way the
+       // compiler will.
+-      float glsl_version = atof(glsl_version_str);
++      
++      std::istringstream locale_convert(glsl_version_str);
++      locale_convert.imbue(std::locale("C"));
++      double glsl_version;
++      locale_convert >> glsl_version; 
++      
+       free(glsl_version_str);
+ 
+       return glsl_version;

diff --git a/media-video/movit/movit-1.3.1.ebuild 
b/media-video/movit/movit-1.3.1-r1.ebuild
similarity index 90%
rename from media-video/movit/movit-1.3.1.ebuild
rename to media-video/movit/movit-1.3.1-r1.ebuild
index 0892714..f5931de 100644
--- a/media-video/movit/movit-1.3.1.ebuild
+++ b/media-video/movit/movit-1.3.1-r1.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+inherit eutils
+
 # no sane way to use OpenGL from within tests?
 RESTRICT="test"
 
@@ -26,6 +28,10 @@ RDEPEND="media-libs/mesa
        "
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+       epatch "${FILESDIR}/movit-fix-locale.patch"
+}
+
 src_compile() {
        GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
 }