Skip to content

V
vlc
Commit bd09462a authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Changes on live555 make MacOS-X patch fail in extras/contrib. 

This should repair NB.
parent 1b9fc137
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 12 deletions
extras/contrib/src/Patches/live-osx.patch
View file @ bd09462a
diff -ruN live.orig/Makefile.tail live/Makefile.tail diff -ruN live.old/Makefile.tail live/Makefile.tail
--- live.orig/Makefile.tail 2006-02-15 23:14:39.000000000 +0100 --- live.old/Makefile.tail 2006-11-16 03:34:34.000000000 +0100
+++ live/Makefile.tail 2006-02-22 21:53:14.000000000 +0100 +++ live/Makefile.tail 2006-11-16 03:35:57.000000000 +0100
@@ -15,8 +15,7 @@ @@ -19,7 +19,6 @@
ALL = $(LIVEMEDIA_LIB) \
$(GROUPSOCK_LIB) \ $(GROUPSOCK_LIB) \
$(USAGE_ENVIRONMENT_LIB) \ $(USAGE_ENVIRONMENT_LIB) \
- $(BASIC_USAGE_ENVIRONMENT_LIB) \ $(BASIC_USAGE_ENVIRONMENT_LIB) \
- $(TESTPROGS_APP) - $(TESTPROGS_APP) \
+ $(BASIC_USAGE_ENVIRONMENT_LIB) $(MEDIA_SERVER_APP)
all: $(ALL) all: $(ALL)
diff -ruN live.old/config.macosx live/config.macosx
diff -ruN live.orig/config.macosx live/config.macosx --- live.old/config.macosx 2006-11-16 03:34:34.000000000 +0100
--- live.orig/config.macosx 2006-02-15 23:14:39.000000000 +0100 +++ live/config.macosx 2006-11-16 03:35:23.000000000 +0100
+++ live/config.macosx 2006-02-22 21:53:01.000000000 +0100
@@ -1,4 +1,4 @@ @@ -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
+COMPILE_OPTS = $(INCLUDES) -I. EXTRA_CFLAGS -DBSD=1 -O -DSOCKLEN_T=socklen_t -DUSE_LOCALE -DHAVE_SOCKADDR_LEN=1 +COMPILE_OPTS = $(INCLUDES) -I. EXTRA_CFLAGS -DBSD=1 -O -DSOCKLEN_T=socklen_t -DUSE_LOCALE -DHAVE_SOCKADDR_LEN=1
......
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