Skip to content

V
vlc
Commit b59a8f91 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

contrib: backport liveMedia patch

parent 69212582
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 34 deletions
extras/contrib/src/Patches/live-uselocale.patch
View file @ b59a8f91
Copyright (C) 2008 Rémi Denis-Courmont. Copyright (C) 2008 Rémi Denis-Courmont, adaptation by Felix Kühne (C) 2009.
Licensed under GNU General Public License version 2 or higher. Licensed under GNU General Public License version 2 or higher.
diff -ru live.old/liveMedia/include/Locale.hh live/liveMedia/include/Locale.hh diff -urN live.orig/config.mingw live/config.mingw
--- live.old/liveMedia/include/Locale.hh 2008-07-06 04:10:57.000000000 +0300 --- live.orig/config.mingw 2009-03-23 01:26:16 +0300
+++ live/liveMedia/include/Locale.hh 2008-07-13 12:54:21.000000000 +0300 +++ live/config.mingw 2009-03-26 19:17:43 +0300
@@ -1,4 +1,4 @@
-COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=int
+COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=int -DLOCALE_NOT_USED
C = c
C_COMPILER = $(CC)
C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__
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 @@ @@ -27,23 +27,26 @@
#ifndef LOCALE_NOT_USED #ifndef LOCALE_NOT_USED
...@@ -37,9 +46,9 @@ diff -ru live.old/liveMedia/include/Locale.hh live/liveMedia/include/Locale.hh ...@@ -37,9 +46,9 @@ diff -ru live.old/liveMedia/include/Locale.hh live/liveMedia/include/Locale.hh
}; };
#endif #endif
diff -ru live.old/liveMedia/Locale.cpp live/liveMedia/Locale.cpp diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
--- live.old/liveMedia/Locale.cpp 2008-07-06 04:10:57.000000000 +0300 --- live.orig/liveMedia/Locale.cpp 2009-03-23 01:26:16 +0300
+++ live/liveMedia/Locale.cpp 2008-07-13 12:55:32.000000000 +0300 +++ live/liveMedia/Locale.cpp 2009-03-26 19:17:43 +0300
@@ -22,19 +22,18 @@ @@ -22,19 +22,18 @@
#include "Locale.hh" #include "Locale.hh"
#include <strDup.hh> #include <strDup.hh>
...@@ -66,58 +75,50 @@ diff -ru live.old/liveMedia/Locale.cpp live/liveMedia/Locale.cpp ...@@ -66,58 +75,50 @@ diff -ru live.old/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
} }
#endif #endif
} }
diff -ru live.old/liveMedia/RTSPClient.cpp live/liveMedia/RTSPClient.cpp diff -urN live.orig/liveMedia/RTSPClient.cpp live/liveMedia/RTSPClient.cpp
--- live.old/liveMedia/RTSPClient.cpp 2008-07-06 04:10:57.000000000 +0300 --- live.orig/liveMedia/RTSPClient.cpp 2009-03-23 01:26:16 +0300
+++ live/liveMedia/RTSPClient.cpp 2008-07-13 12:53:35.000000000 +0300 +++ live/liveMedia/RTSPClient.cpp 2009-03-26 19:29:38 +0300
@@ -1017,7 +1017,7 @@ @@ -1019,7 +1019,7 @@
// This is the default value; we don't need a "Scale:" header: // This is the default value; we don't need a "Scale:" header:
buf[0] = '\0'; buf[0] = '\0';
} else { } else {
- Locale("C", LC_NUMERIC); - Locale l("C", LC_NUMERIC);
+ Locale("C", LC_NUMERIC_MASK); + Locale l("C", LC_NUMERIC_MASK);
sprintf(buf, "Scale: %f\r\n", scale); sprintf(buf, "Scale: %f\r\n", scale);
} }
@@ -1031,11 +1031,11 @@ @@ -1033,11 +1033,11 @@
buf[0] = '\0'; buf[0] = '\0';
} else if (end < 0) { } else if (end < 0) {
// There's no end time: // There's no end time:
- Locale("C", LC_NUMERIC); - Locale l("C", LC_NUMERIC);
+ Locale("C", LC_NUMERIC_MASK); + Locale l("C", LC_NUMERIC_MASK);
sprintf(buf, "Range: npt=%.3f-\r\n", start); sprintf(buf, "Range: npt=%.3f-\r\n", start);
} else { } else {
// There's both a start and an end time; include them both in the "Range:" hdr // There's both a start and an end time; include them both in the "Range:" hdr
- Locale("C", LC_NUMERIC); - Locale l("C", LC_NUMERIC);
+ Locale("C", LC_NUMERIC_MASK); + Locale l("C", LC_NUMERIC_MASK);
sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end); sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
} }
@@ -2306,7 +2306,7 @@ @@ -2342,7 +2342,7 @@
if (_strncasecmp(line, "Scale: ", 7) != 0) return False; if (_strncasecmp(line, "Scale: ", 7) != 0) return False;
line += 7; line += 7;
- Locale("C", LC_NUMERIC); - Locale l("C", LC_NUMERIC);
+ Locale("C", LC_NUMERIC_MASK); + Locale l("C", LC_NUMERIC_MASK);
return sscanf(line, "%f", &scale) == 1; return sscanf(line, "%f", &scale) == 1;
} }
diff -ru live.old/liveMedia/RTSPCommon.cpp live/liveMedia/RTSPCommon.cpp diff -urN live.orig/liveMedia/RTSPCommon.cpp live/liveMedia/RTSPCommon.cpp
--- live.old/liveMedia/RTSPCommon.cpp 2008-11-03 23:28:14.000000000 -1000 --- live.orig/liveMedia/RTSPCommon.cpp 2009-03-23 01:26:16 +0300
+++ live/liveMedia/RTSPCommon.cpp 2008-11-06 09:05:19.000000000 -1000 +++ live/liveMedia/RTSPCommon.cpp 2009-03-26 19:23:25 +0300
@@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
char const* fields = buf + 7; char const* fields = buf + 7;
while (*fields == ' ') ++fields; while (*fields == ' ') ++fields;
double start, end; double start, end;
- Locale("C", LC_NUMERIC); - Locale l("C", LC_NUMERIC);
+ Locale("C", LC_NUMERIC_MASK); + Locale l("C", LC_NUMERIC_MASK);
if (sscanf(fields, "npt = %lf - %lf", &start, &end) == 2) { if (sscanf(fields, "npt = %lf - %lf", &start, &end) == 2) {
rangeStart = start; rangeStart = start;
rangeEnd = end; rangeEnd = end;
--- live/config.mingw.old 2008-07-27 17:13:52.000000000 +0100
+++ live/config.mingw 2008-07-27 17:19:04.000000000 +0100
@@ -1,4 +1,4 @@
-COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=int
+COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=int -DLOCALE_NOT_USED
C = c
C_COMPILER = $(CC)
C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment