Skip to content

V
vlc
Commit 0a9d0f07 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

contrib: delete old live patches

parent b58e2cd3
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 277 deletions
extras/contrib/src/Patches/live-config.patch deleted 100644 → 0
View file @ b58e2cd3
diff -x Makefile -uN live/config.cygwin live.new/config.cygwin
--- live/config.cygwin 2007-02-20 12:33:45.000000000 +0100
+++ live.new/config.cygwin 2007-02-22 09:32:20.000000000 +0100
@@ -1,4 +1,4 @@
-COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t
+COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -DUSE_SYSTEM_RANDOM=1
C = c
C_COMPILER = gcc
C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__CYGWIN__
diff -x Makefile -uN live/config.freebsd live.new/config.freebsd
--- live/config.freebsd 2007-02-20 12:33:45.000000000 +0100
+++ live.new/config.freebsd 2007-02-22 09:32:06.000000000 +0100
@@ -1,4 +1,4 @@
-COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1
+COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DUSE_SYSTEM_RANDOM=1
C = c
C_COMPILER = cc
C_FLAGS = $(COMPILE_OPTS)
diff -x Makefile -uN live/config.linux live.new/config.linux
--- live/config.linux 2007-02-20 12:33:45.000000000 +0100
+++ live.new/config.linux 2007-02-22 09:31:24.000000000 +0100
@@ -1,4 +1,4 @@
-COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DUSE_SYSTEM_RANDOM=1
C = c
C_COMPILER = cc
C_FLAGS = $(COMPILE_OPTS)
diff -x Makefile -uN live/config.linux-gdb live.new/config.linux-gdb
--- live/config.linux-gdb 2007-02-20 12:33:45.000000000 +0100
+++ live.new/config.linux-gdb 2007-02-22 09:09:55.000000000 +0100
@@ -1,4 +1,4 @@
-COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -g -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -g -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DUSE_SYSTEM_RANDOM=1
C = c
C_COMPILER = cc
C_FLAGS = $(COMPILE_OPTS)
diff -x Makefile -uN live/config.macosx-before-version-10.4 live.new/config.macosx-before-version-10.4
--- live/config.macosx-before-version-10.4 2007-02-20 12:33:45.000000000 +0100
+++ live.new/config.macosx-before-version-10.4 2007-02-22 09:10:30.000000000 +0100
@@ -1,4 +1,4 @@
-COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=int
+COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=int -DUSE_SYSTEM_RANDOM=1
C = c
C_COMPILER = cc
C_FLAGS = $(COMPILE_OPTS)
diff -x Makefile -uN live/config.mingw live.new/config.mingw
--- live/config.mingw 2007-02-20 12:33:45.000000000 +0100
+++ live.new/config.mingw 2007-02-22 09:10:48.000000000 +0100
@@ -1,4 +1,4 @@
-COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=int
+COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=int -DUSE_SYSTEM_RANDOM=1
C = c
C_COMPILER = gcc
C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__
diff -x Makefile -uN live/config.openbsd live.new/config.openbsd
--- live/config.openbsd 2007-02-20 12:33:45.000000000 +0100
+++ live.new/config.openbsd 2007-02-22 09:31:42.000000000 +0100
@@ -1,5 +1,5 @@
.SUFFIXES: .cpp
-COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t
+COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DUSE_SYSTEM_RANDOM=1
C = c
C_COMPILER = cc
C_FLAGS = $(COMPILE_OPTS)
diff -x Makefile -uN live/config.solaris live.new/config.solaris
--- live/config.solaris 2007-02-20 12:33:45.000000000 +0100
+++ live.new/config.solaris 2007-02-22 09:34:49.000000000 +0100
@@ -1,4 +1,4 @@
-COMPILE_OPTS = $(INCLUDES) -I. -O -DSOLARIS -DSOCKLEN_T=socklen_t
+COMPILE_OPTS = $(INCLUDES) -I. -O -DSOLARIS -DSOCKLEN_T=socklen_t -DUSE_SYSTEM_RANDOM=1
C = c
C_COMPILER = cc
C_FLAGS = $(COMPILE_OPTS)
diff -x Makefile -uN live/config.uClinux live.new/config.uClinux
--- live/config.uClinux 2007-02-20 12:33:45.000000000 +0100
+++ live.new/config.uClinux 2007-02-22 09:35:01.000000000 +0100
@@ -1,4 +1,4 @@
-COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DUSE_SYSTEM_RANDOM=1
C = c
C_COMPILER = $(CC)
CFLAGS += $(COMPILE_OPTS)
--- live/config.armlinux 2007-04-24 11:38:22.000000000 +0200
+++ live.new/config.armlinux 2007-04-28 15:59:33.000000000 +0200
@@ -1,5 +1,5 @@
CROSS_COMPILE= arm-elf-
-COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_STRSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_STRSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DUSE_SYSTEM_RANDOM=1
C = c
C_COMPILER = $(CROSS_COMPILE)gcc
C_FLAGS = $(COMPILE_OPTS)
--- /dev/null 2007-05-14 09:00:32.045340388 +0200
+++ live/config.armeb-uclibc 2007-05-14 16:55:22.000000000 +0200
@@ -0,0 +1,18 @@
+CROSS_COMPILE= armeb-linux-uclibc-
+COMPILE_OPTS = $(INCLUDES) -I. -Os -DSOCKLEN_T=socklen_t -DNO_STRSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DUSE_SYSTEM_RANDOM=1
+C = c
+C_COMPILER = $(CROSS_COMPILE)gcc
+C_FLAGS = $(COMPILE_OPTS)
+CPP = cpp
+CPLUSPLUS_COMPILER = $(CROSS_COMPILE)g++
+CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1
+OBJ = o
+LINK = $(CROSS_COMPILE)gcc -o
+LINK_OPTS = -L.
+CONSOLE_LINK_OPTS = $(LINK_OPTS)
+LIBRARY_LINK = $(CROSS_COMPILE)ld -o
+LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic
+LIB_SUFFIX = a
+LIBS_FOR_CONSOLE_APPLICATION =
+LIBS_FOR_GUI_APPLICATION =
+EXE =
extras/contrib/src/Patches/live-osx.patch deleted 100644 → 0
View file @ b58e2cd3
diff -ruN live/Makefile.tail live.new/Makefile.tail
--- live/Makefile.tail 2007-01-17 21:44:27.000000000 +0100
+++ live.new/Makefile.tail 2007-02-20 08:45:20.000000000 +0100
@@ -17,10 +17,8 @@
ALL = $(LIVEMEDIA_LIB) \
$(GROUPSOCK_LIB) \
$(USAGE_ENVIRONMENT_LIB) \
- $(BASIC_USAGE_ENVIRONMENT_LIB) \
- $(TESTPROGS_APP) \
- $(MEDIA_SERVER_APP)
+ $(BASIC_USAGE_ENVIRONMENT_LIB)
all: $(ALL)
diff -ruN live/config.macosx live.new/config.macosx
--- live/config.macosx 2007-01-17 21:44:26.000000000 +0100
+++ live.new/config.macosx 2007-02-20 08:43:45.000000000 +0100
@@ -1,4 +1,4 @@
-COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1
+COMPILE_OPTS = $(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1
C = c
C_COMPILER = cc
C_FLAGS = $(COMPILE_OPTS)
extras/contrib/src/Patches/live.patch deleted 100644 → 0
View file @ b58e2cd3
diff -ru live/groupsock/Groupsock.cpp live-patched/groupsock/Groupsock.cpp
--- live/groupsock/Groupsock.cpp Thu Nov 6 03:53:15 2003
+++ live-patched/groupsock/Groupsock.cpp Sun Dec 7 21:30:15 2003
@@ -26,7 +26,7 @@
#if defined(__WIN32__) || defined(_WIN32)
#include <strstrea.h>
#else
-#include <strstream.h>
+#include <strstream>
#endif
#include <stdio.h>
diff -ru live/groupsock/NetInterface.cpp live-patched/groupsock/NetInterface.cpp
--- live/groupsock/NetInterface.cpp Thu Nov 6 03:53:15 2003
+++ live-patched/groupsock/NetInterface.cpp Sun Dec 7 21:30:30 2003
@@ -24,7 +24,7 @@
#if defined(__WIN32__) || defined(_WIN32)
#include <strstrea.h>
#else
-#include <strstream.h>
+#include <strstream>
#endif
////////// NetInterface //////////
--- live/liveMedia/RTSPClient.cpp 2007-04-24 11:38:22.000000000 +0200
+++ live-patched/liveMedia/RTSPClient.cpp 2007-04-26 15:19:54.000000000 +0200
@@ -21,13 +21,53 @@
#include "RTSPClient.hh"
#include "RTSPCommon.hh"
#include "Base64.hh"
-#include "Locale.hh"
#include <GroupsockHelper.hh>
#include "our_md5.h"
#ifdef SUPPORT_REAL_RTSP
#include "../RealRTSP/include/RealRTSP.hh"
#endif
+#include <locale.h>
+#include <stdarg.h>
+/* Radix safe (always uses .) printf and friends */
+int radix_safe_sprintf( char *str, const char *format, ...)
+{
+ va_list args;
+ int result = 0;
+ char *locale = NULL;
+
+ locale = strDup( setlocale( LC_NUMERIC, NULL ) );
+ setlocale( LC_NUMERIC, "C" );
+
+ va_start( args, format );
+ result = vsprintf(str, format, args );
+ va_end( args );
+
+ setlocale( LC_NUMERIC, locale );
+ delete[] locale;
+
+ return result;
+}
+
+int radix_safe_sscanf( const char *str, const char *format, ...)
+{
+ va_list args;
+ int result = 0;
+ char *locale = NULL;
+
+ locale = strDup( setlocale( LC_NUMERIC, NULL ) );
+ setlocale( LC_NUMERIC, "C" );
+
+ va_start( args, format );
+ result = vsscanf(str, format, args );
+ va_end( args );
+
+ setlocale( LC_NUMERIC, locale );
+ delete[] locale;
+
+ return result;
+}
+
////////// RTSPClient //////////
RTSPClient* RTSPClient::createNew(UsageEnvironment& env,
@@ -989,8 +1029,7 @@
// This is the default value; we don't need a "Scale:" header:
buf[0] = '\0';
} else {
- Locale("POSIX", LC_NUMERIC);
- sprintf(buf, "Scale: %f\r\n", scale);
+ radix_safe_sprintf(buf, "Scale: %f\r\n", scale);
}
return strDup(buf);
@@ -1003,12 +1042,10 @@
buf[0] = '\0';
} else if (end < 0) {
// There's no end time:
- Locale("POSIX", LC_NUMERIC);
- sprintf(buf, "Range: npt=%.3f-\r\n", start);
+ radix_safe_sprintf(buf, "Range: npt=%.3f-\r\n", start);
} else {
// There's both a start and an end time; include them both in the "Range:" hdr
- Locale("POSIX", LC_NUMERIC);
- sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
+ radix_safe_sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
}
return strDup(buf);
@@ -2246,8 +2283,7 @@
if (_strncasecmp(line, "Scale: ", 7) != 0) return False;
line += 7;
- Locale("POSIX", LC_NUMERIC);
- return sscanf(line, "%f", &scale) == 1;
+ return radix_safe_sscanf(line, "%f", &scale) == 1;
}
Boolean RTSPClient::parseGetParameterHeader(char const* line,
extras/contrib/src/Patches/livedotcom-win32.patch deleted 100644 → 0
View file @ b58e2cd3
diff -ru live.orig/config.mingw live/config.mingw
--- live.orig/config.mingw 2005-10-23 08:50:31.000000000 +0200
+++ live/config.mingw 2005-10-23 17:09:35.000000000 +0200
@@ -1,15 +1,15 @@
COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=int
C = c
-C_COMPILER = gcc
-C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__
+C_COMPILER = $(CC)
+C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__ -DUSE_LOCALE
CPP = cpp
-CPLUSPLUS_COMPILER = c++
-CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -D__MINGW32__ -Wall -Wno-deprecated
+CPLUSPLUS_COMPILER = $(CXX)
+CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -D__MINGW32__ -DUSE_LOCALE -Wall -Wno-deprecated
OBJ = o
-LINK = c++ -o
+LINK = $(CXX) -o
LINK_OPTS = -L.
CONSOLE_LINK_OPTS = $(LINK_OPTS)
-LIBRARY_LINK = ld -o
+LIBRARY_LINK = $(LD) -o
LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic
LIB_SUFFIX = a
LIBS_FOR_CONSOLE_APPLICATION = -lws2_32
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