[SCM] liblivemedia/master: Refresh patch

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3bfd8a659697dc8f234fee2dc528beba8bf518da
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Mon Oct 11 23:45:02 2010 +0100

    Refresh patch
    
    Taken from VLC Git repo

diff --git a/debian/patches/022_safe_setlocale.diff b/debian/patches/022_safe_setlocale.diff
index 2b9e74c..e9acb0e 100644
--- a/debian/patches/022_safe_setlocale.diff
+++ b/debian/patches/022_safe_setlocale.diff
@@ -1,9 +1,8 @@
 Copyright (C) 2008 Rémi Denis-Courmont, adaptation by Felix Kühne (C) 2009.
 Licensed under GNU General Public License version 2 or higher.
-Index: liblivemedia/liveMedia/include/Locale.hh
-===================================================================
---- liblivemedia.orig/liveMedia/include/Locale.hh	2010-04-20 23:23:59.000000000 +0100
-+++ liblivemedia/liveMedia/include/Locale.hh	2010-04-20 23:24:30.000000000 +0100
+diff -urN live.orig/liveMedia/include/Locale.hh live/liveMedia/include/Locale.hh
+--- live.orig/liveMedia/include/Locale.hh	2009-03-23 01:26:16 +0300
++++ live/liveMedia/include/Locale.hh	2009-03-26 19:17:43 +0300
 @@ -27,23 +27,26 @@
  
  #ifndef LOCALE_NOT_USED
@@ -38,10 +37,9 @@ Index: liblivemedia/liveMedia/include/Locale.hh
  };
  
  #endif
-Index: liblivemedia/liveMedia/Locale.cpp
-===================================================================
---- liblivemedia.orig/liveMedia/Locale.cpp	2010-04-20 23:23:59.000000000 +0100
-+++ liblivemedia/liveMedia/Locale.cpp	2010-04-20 23:24:30.000000000 +0100
+diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
+--- live.orig/liveMedia/Locale.cpp	2009-03-23 01:26:16 +0300
++++ live/liveMedia/Locale.cpp	2009-03-26 19:17:43 +0300
 @@ -22,19 +22,18 @@
  #include "Locale.hh"
  #include <strDup.hh>
@@ -68,11 +66,9 @@ Index: liblivemedia/liveMedia/Locale.cpp
    }
  #endif
  }
-Index: liblivemedia/liveMedia/RTSPClient.cpp
-===================================================================
---- liblivemedia.orig/liveMedia/RTSPClient.cpp	2010-04-20 23:23:59.000000000 +0100
-+++ liblivemedia/liveMedia/RTSPClient.cpp	2010-04-20 23:24:30.000000000 +0100
-@@ -924,7 +924,7 @@
+--- live.orig/liveMedia/RTSPClient.cpp	2010-03-16 03:09:46.000000000 +0100
++++ live/liveMedia/RTSPClient.cpp	2010-08-24 15:04:31.000000000 +0200
+@@ -1019,7 +1019,7 @@
      // This is the default value; we don't need a "Scale:" header:
      buf[0] = '\0';
    } else {
@@ -81,7 +77,7 @@ Index: liblivemedia/liveMedia/RTSPClient.cpp
      sprintf(buf, "Scale: %f\r\n", scale);
    }
  
-@@ -938,11 +938,11 @@
+@@ -1033,11 +1033,11 @@
      buf[0] = '\0';
    } else if (end < 0) {
      // There's no end time:
@@ -95,25 +91,25 @@ Index: liblivemedia/liveMedia/RTSPClient.cpp
      sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
    }
  
-@@ -2225,7 +2225,7 @@
-   if (_strncasecmp(line, "Scale: ", 7) != 0) return False;
-   line += 7;
+--- live/liveMedia/RTSPClient.cpp	2010-08-24 17:05:46.000000000 +0200
++++ live.new/liveMedia/RTSPClient.cpp	2010-08-24 17:04:50.000000000 +0200
+@@ -935,7 +935,7 @@
+ }
  
+ Boolean RTSPClient::parseScaleParam(char const* paramStr, float& scale) {
 -  Locale l("C", LC_NUMERIC);
 +  Locale l("C", LC_NUMERIC_MASK);
-   return sscanf(line, "%f", &scale) == 1;
+   return sscanf(paramStr, "%f", &scale) == 1;
  }
  
-Index: liblivemedia/liveMedia/RTSPCommon.cpp
-===================================================================
---- liblivemedia.orig/liveMedia/RTSPCommon.cpp	2010-04-20 23:23:59.000000000 +0100
-+++ liblivemedia/liveMedia/RTSPCommon.cpp	2010-04-20 23:24:30.000000000 +0100
-@@ -146,7 +146,7 @@
-   char const* fields = buf + 7;
-   while (*fields == ' ') ++fields;
+--- live/liveMedia/RTSPCommon.cpp.orig	2010-08-22 03:25:03.000000000 +0200
++++ live/liveMedia/RTSPCommon.cpp	2010-08-24 17:06:36.000000000 +0200
+@@ -136,7 +136,7 @@
+ 
+ Boolean parseRangeParam(char const* paramStr, double& rangeStart, double& rangeEnd) {
    double start, end;
 -  Locale l("C", LC_NUMERIC);
 +  Locale l("C", LC_NUMERIC_MASK);
-   if (sscanf(fields, "npt = %lf - %lf", &start, &end) == 2) {
+   if (sscanf(paramStr, "npt = %lf - %lf", &start, &end) == 2) {
      rangeStart = start;
      rangeEnd = end;

-- 
liblivemedia packaging