Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
bd09462a
Commit
bd09462a
authored
Nov 16, 2006
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes on live555 make MacOS-X patch fail in extras/contrib.
This should repair NB.
parent
1b9fc137
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
12 deletions
+10
-12
extras/contrib/src/Patches/live-osx.patch
extras/contrib/src/Patches/live-osx.patch
+10
-12
No files found.
extras/contrib/src/Patches/live-osx.patch
View file @
bd09462a
diff -ruN live.orig/Makefile.tail live/Makefile.tail
--- live.orig/Makefile.tail 2006-02-15 23:14:39.000000000 +0100
+++ live/Makefile.tail 2006-02-22 21:53:14.000000000 +0100
@@ -15,8 +15,7 @@
ALL = $(LIVEMEDIA_LIB) \
diff -ruN live.old/Makefile.tail live/Makefile.tail
--- live.old/Makefile.tail 2006-11-16 03:34:34.000000000 +0100
+++ live/Makefile.tail 2006-11-16 03:35:57.000000000 +0100
@@ -19,7 +19,6 @@
$(GROUPSOCK_LIB) \
$(USAGE_ENVIRONMENT_LIB) \
-
$(BASIC_USAGE_ENVIRONMENT_LIB) \
- $(TESTPROGS_APP)
+ $(BASIC_USAGE_ENVIRONMENT_LIB
)
$(BASIC_USAGE_ENVIRONMENT_LIB) \
- $(TESTPROGS_APP)
\
$(MEDIA_SERVER_APP
)
all: $(ALL)
diff -ruN live.orig/config.macosx live/config.macosx
--- live.orig/config.macosx 2006-02-15 23:14:39.000000000 +0100
+++ live/config.macosx 2006-02-22 21:53:01.000000000 +0100
diff -ruN live.old/config.macosx live/config.macosx
--- live.old/config.macosx 2006-11-16 03:34:34.000000000 +0100
+++ live/config.macosx 2006-11-16 03:35:23.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_CFLAGS -DBSD=1 -O -DSOCKLEN_T=socklen_t -DUSE_LOCALE -DHAVE_SOCKADDR_LEN=1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment