Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
4e02106b
Commit
4e02106b
authored
Dec 03, 2005
by
hartman
Browse files
Fix the x264 patch so it works again under Mac OS X
parent
0b62586c
Changes
1
Show whitespace changes
Inline
Side-by-side
extras/contrib/src/Patches/x264_svn.patch
View file @
4e02106b
Index:
encoder/ratecontrol.c
Index:
x264/Makefile
===================================================================
--- encoder/ratecontrol.c (revision 291)
+++ encoder/ratecontrol.c (working copy)
@@ -40,7 +40,7 @@
#if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_NETBSD)
#define exp2f(x) powf( 2, (x) )
#endif
-#if defined(_MSC_VER) || defined(SYS_SunOS)
+#if defined(_MSC_VER) || defined(SYS_SunOS) || defined(SYS_MACOSX)
#define exp2f(x) pow( 2, (x) )
#define sqrtf sqrt
#endif
Index: Makefile
===================================================================
--- Makefile (revision 291)
+++ Makefile (working copy)
@@ -53,7 +53,7 @@
OBJS = $(SRCS:%.c=%.o)
--- x264/Makefile (revision 381)
+++ x264/Makefile (working copy)
@@ -60,7 +60,7 @@
DEP = depend
.PHONY: default fprofiled clean distclean install uninstall
-default: $(DEP) x264$(EXE)
+default: $(DEP)
+default: $(DEP)
libx264.a
libx264.a: .depend $(OBJS) $(OBJASM)
ar rc libx264.a $(OBJS) $(OBJASM)
@@ -
74
,7 +
74
,7 @@
@@ -
82
,7 +
82
,7 @@
.depend: config.mak config.h
rm -f .depend
# Hacky - because gcc 2.9x doesn't have -MT
- $(foreach SRC, $(SRCS) x264.c matroska.c, ( echo -n "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
+ $(foreach SRC, $(SRCS), (
echo -n "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
+ $(foreach SRC, $(SRCS), (echo -n "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
config.h: $(wildcard .svn/entries */.svn/entries */*/.svn/entries)
./version.sh
@@ -
9
1,1
1
+
9
1,1
0
@@
@@ -1
28
,1
3
+1
28
,1
2
@@
distclean: clean
rm -f config.mak vfw/build/cygwin/config.mak
rm -f config.mak vfw/build/cygwin/config.mak
x264.pc
-install: x264
+install: libx264.a
install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
install -m 644 x264.h $(DESTDIR)$(includedir)
install -m 644 libx264.a $(DESTDIR)$(libdir)
install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
- install x264 $(DESTDIR)$(bindir)
ranlib $(DESTDIR)$(libdir)/libx264.a
etags: TAGS
uninstall:
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