From baab4691c357ef98b6ad32786c0942097e9c6eed Mon Sep 17 00:00:00 2001
From: Patrick Lauer <patrick@gentoo.org>
Date: Tue, 23 Feb 2016 10:59:37 +0100
Subject: media-video/movit: Fix locale handling #575438

Package-Manager: portage-2.2.27
---
 media-video/movit/files/movit-fix-locale.patch | 16 ++++++++++
 media-video/movit/movit-1.3.1-r1.ebuild        | 41 ++++++++++++++++++++++++++
 media-video/movit/movit-1.3.1.ebuild           | 35 ----------------------
 3 files changed, 57 insertions(+), 35 deletions(-)
 create mode 100644 media-video/movit/files/movit-fix-locale.patch
 create mode 100644 media-video/movit/movit-1.3.1-r1.ebuild
 delete mode 100644 media-video/movit/movit-1.3.1.ebuild

(limited to 'media-video')

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-r1.ebuild b/media-video/movit/movit-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..f5931deb44e5
--- /dev/null
+++ b/media-video/movit/movit-1.3.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+# no sane way to use OpenGL from within tests?
+RESTRICT="test"
+
+DESCRIPTION="Modern Video Toolkit"
+HOMEPAGE="http://movit.sesse.net/"
+# Tests need gtest, makefile unconditionally builds tests, so ... yey!
+SRC_URI="http://movit.sesse.net/${P}.tar.gz
+	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/mesa
+	>=dev-cpp/eigen-3.2.0:3
+	media-libs/libepoxy
+	sci-libs/fftw
+	media-libs/libsdl2
+	"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/movit-fix-locale.patch"
+}
+
+src_compile() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
+}
+
+src_test() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
+}
diff --git a/media-video/movit/movit-1.3.1.ebuild b/media-video/movit/movit-1.3.1.ebuild
deleted file mode 100644
index 08927148bea1..000000000000
--- a/media-video/movit/movit-1.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# no sane way to use OpenGL from within tests?
-RESTRICT="test"
-
-DESCRIPTION="Modern Video Toolkit"
-HOMEPAGE="http://movit.sesse.net/"
-# Tests need gtest, makefile unconditionally builds tests, so ... yey!
-SRC_URI="http://movit.sesse.net/${P}.tar.gz
-	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/mesa
-	>=dev-cpp/eigen-3.2.0:3
-	media-libs/libepoxy
-	sci-libs/fftw
-	media-libs/libsdl2
-	"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
-}
-
-src_test() {
-	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
-}
-- 
cgit v1.2.3-65-gdbad