Initial revision

1 files changed, 43 insertions, 0 deletions

diff --git a/vlc/build/projectM_locale.patch b/vlc/build/projectM_locale.patch
new file mode 100644
index 00000000..79e23d2e
--- /dev/null
+++ b/vlc/build/projectM_locale.patch
@@ -0,0 +1,43 @@
+From: Ilkka Ollakka <ileoo@videolan.org>
+Date: Mon, 29 Nov 2010 20:06:40 +0000 (+0200)
+Subject: projectm: quick fix to get projectm visualisation to work on all locales
+X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=3b9074b2edc6aabd9e6f6408a7e14625b9b86912
+
+projectm: quick fix to get projectm visualisation to work on all locales
+---
+
+diff --git a/modules/visualization/projectm.cpp b/modules/visualization/projectm.cpp
+index 84b3ff8..be2677f 100644
+--- a/modules/visualization/projectm.cpp
++++ b/modules/visualization/projectm.cpp
+@@ -292,6 +292,8 @@ static void *Thread( void *p_data )
+     vout_opengl_t *gl;
+     int i_last_width  = 0;
+     int i_last_height = 0;
++    locale_t loc;
++    locale_t oldloc;
+ #ifdef HAVE_PROJECTM2
+     projectM::Settings settings;
+ #endif
+@@ -339,6 +341,8 @@ static void *Thread( void *p_data )
+         goto error;
+     }
+ 
++    loc = newlocale (LC_NUMERIC_MASK, "C", NULL);
++    oldloc = uselocale (loc);
+     /* Create the projectM object */
+ #ifndef HAVE_PROJECTM2
+     p_sys->p_projectm = new projectM( p_sys->psz_config );
+@@ -402,6 +406,11 @@ static void *Thread( void *p_data )
+             delete p_sys->p_projectm;
+             vout_DeleteDisplay( p_sys->p_vd, NULL );
+             vlc_object_release( p_sys->p_vout );
++            if (loc != (locale_t)0)
++            {
++                uselocale (oldloc);
++                freelocale (loc);
++            }
+             return NULL;
+         }
+         vlc_mutex_unlock( &p_sys->lock );
+