summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2016-02-23 10:59:37 +0100
committerPatrick Lauer <patrick@gentoo.org>2016-02-23 10:59:51 +0100
commitbaab4691c357ef98b6ad32786c0942097e9c6eed (patch)
tree7170eaefbf0020c6c205f2ac839893e1d299b8ec /media-video
parentnet-fs/openafs: version bump to 1.6.16 (diff)
downloadgentoo-baab4691c357ef98b6ad32786c0942097e9c6eed.tar.gz
gentoo-baab4691c357ef98b6ad32786c0942097e9c6eed.tar.bz2
gentoo-baab4691c357ef98b6ad32786c0942097e9c6eed.zip
media-video/movit: Fix locale handling #575438
Package-Manager: portage-2.2.27
Diffstat (limited to 'media-video')
-rw-r--r--media-video/movit/files/movit-fix-locale.patch16
-rw-r--r--media-video/movit/movit-1.3.1-r1.ebuild (renamed from media-video/movit/movit-1.3.1.ebuild)6
2 files changed, 22 insertions, 0 deletions
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 000000000000..f98c9705e9f9
--- /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
index 08927148bea1..f5931deb44e5 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
}