Revert previous commit, and updates faac & live-config patches
[vlc.git] / extras / contrib / src / Patches / live-config.patch
1 diff -Nur live.orig/config.armeb-uclibc live/config.armeb-uclibc
2 --- live.orig/config.armeb-uclibc       1970-01-01 01:00:00.000000000 +0100
3 +++ live/config.armeb-uclibc    2007-09-17 01:49:49.000000000 +0200
4 @@ -0,0 +1,18 @@
5 +CROSS_COMPILE=         armeb-linux-uclibc-
6 +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
7 +C =                    c
8 +C_COMPILER =           $(CROSS_COMPILE)gcc
9 +C_FLAGS =              $(COMPILE_OPTS)
10 +CPP =                  cpp
11 +CPLUSPLUS_COMPILER =   $(CROSS_COMPILE)g++
12 +CPLUSPLUS_FLAGS =      $(COMPILE_OPTS) -Wall -DBSD=1
13 +OBJ =                  o
14 +LINK =                 $(CROSS_COMPILE)gcc -o
15 +LINK_OPTS =            -L.
16 +CONSOLE_LINK_OPTS =    $(LINK_OPTS)
17 +LIBRARY_LINK =         $(CROSS_COMPILE)ld -o
18 +LIBRARY_LINK_OPTS =    $(LINK_OPTS) -r -Bstatic
19 +LIB_SUFFIX =                   a
20 +LIBS_FOR_CONSOLE_APPLICATION =
21 +LIBS_FOR_GUI_APPLICATION =
22 +EXE =
23 diff -Nur live.orig/config.armlinux live/config.armlinux
24 --- live.orig/config.armlinux   2007-08-03 18:38:58.000000000 +0200
25 +++ live/config.armlinux        2007-09-17 01:50:22.000000000 +0200
26 @@ -1,5 +1,5 @@
27  CROSS_COMPILE=         arm-elf-\r
28 -COMPILE_OPTS =         $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_STRSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64\r
29 +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\r
30  C =                    c\r
31  C_COMPILER =           $(CROSS_COMPILE)gcc\r
32  C_FLAGS =              $(COMPILE_OPTS)\r
33 diff -Nur live.orig/config.armlinux.orig live/config.armlinux.orig
34 --- live.orig/config.armlinux.orig      1970-01-01 01:00:00.000000000 +0100
35 +++ live/config.armlinux.orig   2007-08-03 18:38:58.000000000 +0200
36 @@ -0,0 +1,18 @@
37 +CROSS_COMPILE=         arm-elf-\r
38 +COMPILE_OPTS =         $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_STRSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64\r
39 +C =                    c\r
40 +C_COMPILER =           $(CROSS_COMPILE)gcc\r
41 +C_FLAGS =              $(COMPILE_OPTS)\r
42 +CPP =                  cpp\r
43 +CPLUSPLUS_COMPILER =   $(CROSS_COMPILE)gcc\r
44 +CPLUSPLUS_FLAGS =      $(COMPILE_OPTS) -Wall -DBSD=1\r
45 +OBJ =                  o\r
46 +LINK =                 $(CROSS_COMPILE)gcc -o\r
47 +LINK_OPTS =            -L.\r
48 +CONSOLE_LINK_OPTS =    $(LINK_OPTS)\r
49 +LIBRARY_LINK =         $(CROSS_COMPILE)ld -o\r
50 +LIBRARY_LINK_OPTS =    $(LINK_OPTS) -r -Bstatic\r
51 +LIB_SUFFIX =                   a\r
52 +LIBS_FOR_CONSOLE_APPLICATION =\r
53 +LIBS_FOR_GUI_APPLICATION =\r
54 +EXE =\r
55 diff -Nur live.orig/config.armlinux.rej live/config.armlinux.rej
56 --- live.orig/config.armlinux.rej       1970-01-01 01:00:00.000000000 +0100
57 +++ live/config.armlinux.rej    2007-09-17 01:49:49.000000000 +0200
58 @@ -0,0 +1,13 @@
59 +***************
60 +*** 1,5 ****
61 +  CROSS_COMPILE=               arm-elf-
62 +- COMPILE_OPTS =               $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_STRSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
63 +  C =                  c
64 +  C_COMPILER =         $(CROSS_COMPILE)gcc
65 +  C_FLAGS =            $(COMPILE_OPTS)
66 +--- 1,5 ----
67 +  CROSS_COMPILE=               arm-elf-
68 ++ 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
69 +  C =                  c
70 +  C_COMPILER =         $(CROSS_COMPILE)gcc
71 +  C_FLAGS =            $(COMPILE_OPTS)
72 diff -Nur live.orig/config.cygwin live/config.cygwin
73 --- live.orig/config.cygwin     2007-08-03 18:38:58.000000000 +0200
74 +++ live/config.cygwin  2007-09-17 01:49:49.000000000 +0200
75 @@ -1,4 +1,4 @@
76 -COMPILE_OPTS =         $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t
77 +COMPILE_OPTS =         $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -DUSE_SYSTEM_RANDOM=1
78  C =                    c
79  C_COMPILER =           gcc
80  C_FLAGS =              $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__CYGWIN__
81 diff -Nur live.orig/config.freebsd live/config.freebsd
82 --- live.orig/config.freebsd    2007-08-03 18:38:58.000000000 +0200
83 +++ live/config.freebsd 2007-09-17 01:49:49.000000000 +0200
84 @@ -1,4 +1,4 @@
85 -COMPILE_OPTS =         $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1
86 +COMPILE_OPTS =         $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DUSE_SYSTEM_RANDOM=1
87  C =                    c
88  C_COMPILER =           cc
89  C_FLAGS =              $(COMPILE_OPTS)
90 diff -Nur live.orig/config.linux live/config.linux
91 --- live.orig/config.linux      2007-08-03 18:38:58.000000000 +0200
92 +++ live/config.linux   2007-09-17 01:49:49.000000000 +0200
93 @@ -1,4 +1,4 @@
94 -COMPILE_OPTS =         $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
95 +COMPILE_OPTS =         $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DUSE_SYSTEM_RANDOM=1
96  C =                    c
97  C_COMPILER =           cc
98  C_FLAGS =              $(COMPILE_OPTS)
99 diff -Nur live.orig/config.linux-gdb live/config.linux-gdb
100 --- live.orig/config.linux-gdb  2007-08-03 18:38:58.000000000 +0200
101 +++ live/config.linux-gdb       2007-09-17 01:49:49.000000000 +0200
102 @@ -1,4 +1,4 @@
103 -COMPILE_OPTS =         $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -g -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
104 +COMPILE_OPTS =         $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -g -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DUSE_SYSTEM_RANDOM=1
105  C =                    c
106  C_COMPILER =           cc
107  C_FLAGS =              $(COMPILE_OPTS)
108 diff -Nur live.orig/config.macosx-before-version-10.4 live/config.macosx-before-version-10.4
109 --- live.orig/config.macosx-before-version-10.4 2007-08-03 18:38:58.000000000 +0200
110 +++ live/config.macosx-before-version-10.4      2007-09-17 01:49:49.000000000 +0200
111 @@ -1,4 +1,4 @@
112 -COMPILE_OPTS =         $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=int
113 +COMPILE_OPTS =         $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=int -DUSE_SYSTEM_RANDOM=1
114  C =                    c
115  C_COMPILER =           cc
116  C_FLAGS =              $(COMPILE_OPTS)
117 diff -Nur live.orig/config.mingw live/config.mingw
118 --- live.orig/config.mingw      2007-08-03 18:38:58.000000000 +0200
119 +++ live/config.mingw   2007-09-17 01:49:49.000000000 +0200
120 @@ -1,4 +1,4 @@
121 -COMPILE_OPTS =         $(INCLUDES) -I. -O -DSOCKLEN_T=int
122 +COMPILE_OPTS =         $(INCLUDES) -I. -O -DSOCKLEN_T=int -DUSE_SYSTEM_RANDOM=1
123  C =                    c
124  C_COMPILER =           gcc
125  C_FLAGS =              $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__
126 diff -Nur live.orig/config.openbsd live/config.openbsd
127 --- live.orig/config.openbsd    2007-08-03 18:38:58.000000000 +0200
128 +++ live/config.openbsd 2007-09-17 01:49:49.000000000 +0200
129 @@ -1,5 +1,5 @@
130  .SUFFIXES: .cpp
131 -COMPILE_OPTS =         $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t
132 +COMPILE_OPTS =         $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DUSE_SYSTEM_RANDOM=1
133  C =                    c
134  C_COMPILER =           cc
135  C_FLAGS =              $(COMPILE_OPTS)
136 diff -Nur live.orig/config.solaris live/config.solaris
137 --- live.orig/config.solaris    2007-08-03 18:38:58.000000000 +0200
138 +++ live/config.solaris 2007-09-17 01:49:49.000000000 +0200
139 @@ -1,4 +1,4 @@
140 -COMPILE_OPTS =         $(INCLUDES) -I. -O -DSOLARIS -DSOCKLEN_T=socklen_t
141 +COMPILE_OPTS =         $(INCLUDES) -I. -O -DSOLARIS -DSOCKLEN_T=socklen_t -DUSE_SYSTEM_RANDOM=1
142  C =                    c
143  C_COMPILER =           cc
144  C_FLAGS =              $(COMPILE_OPTS)
145 diff -Nur live.orig/config.uClinux live/config.uClinux
146 --- live.orig/config.uClinux    2007-08-03 18:38:58.000000000 +0200
147 +++ live/config.uClinux 2007-09-17 01:49:49.000000000 +0200
148 @@ -1,4 +1,4 @@
149 -COMPILE_OPTS =         $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
150 +COMPILE_OPTS =         $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DUSE_SYSTEM_RANDOM=1
151  C =                    c
152  C_COMPILER =           $(CC)
153  CFLAGS +=              $(COMPILE_OPTS)