* fix ffmpeg compilation by reverting their revision 11100

[vlc] / extras / contrib / src / Patches / live-osx.patch

diff --git a/extras/contrib/src/Patches/live-osx.patch b/extras/contrib/src/Patches/live-osx.patch
index 03ae4145f2d2b6d4257e178361d1a914307bb1ee..277e833c08883768c7a834979872765c4d2d3b51 100644 (file)
--- a/extras/contrib/src/Patches/live-osx.patch
+++ b/extras/contrib/src/Patches/live-osx.patch
@@ -1,35 +1,24 @@
---- live/Makefile.tail.orig    2006-07-04 06:25:31.000000000 +0100
-+++ live/Makefile.tail 2007-02-19 17:18:51.471486600 +0000
-@@ -14,8 +14,6 @@
+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) \
+       $(USAGE_ENVIRONMENT_LIB) \
 -      $(BASIC_USAGE_ENVIRONMENT_LIB) \
--      $(TESTPROGS_APP)
-+      $(BASIC_USAGE_ENVIRONMENT_LIB)
+-      $(TESTPROGS_APP) \
+-      $(MEDIA_SERVER_APP)
++      $(BASIC_USAGE_ENVIRONMENT_LIB) 
  all:  $(ALL)
  
-diff -ruN live.old/config.macosx live/config.macosx
---- live.old/config.macosx     2006-11-16 03:09:43.000000000 +0100
-+++ live/config.macosx 2006-11-16 22:09:58.000000000 +0100
+ 
+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
-+COMPILE_OPTS =                $(INCLUDES) -I. $(EXTRA_CFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t
+-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)
-@@ -7,10 +7,10 @@
- CPLUSPLUS_FLAGS =     $(COMPILE_OPTS) -Wall
- OBJ =                 o
- LINK =                        c++ -o 
--LINK_OPTS =           -L.
-+LINK_OPTS =           -L. $(EXTRA_LDFLAGS)
- CONSOLE_LINK_OPTS =   $(LINK_OPTS)
--LIBRARY_LINK =                ld -o 
--LIBRARY_LINK_OPTS =   $(LINK_OPTS) -r 
-+LIBRARY_LINK =                ar cru 
-+LIBRARY_LINK_OPTS =
- LIB_SUFFIX =                  a
- LIBS_FOR_CONSOLE_APPLICATION =
- LIBS_FOR_GUI_APPLICATION =