contrib: add and update x264 win64 patch

c7d84297 · Rémi Denis-Courmont · 25960112 · c7d84297 · c7d84297
Commit c7d84297 authored Jul 01, 2011 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

contrib/src/x264/rules.mak contrib/src/x264/rules.mak +1 -1

contrib/src/x264/x264-svn-win64.patch contrib/src/x264/x264-svn-win64.patch +11 -0

No files found.
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -41,7 +41,7 @@ X264_VERSION := git
 x264: x264-$(X264_VERSION).tar.xz .sum-x264
 	$(UNPACK)
 ifdef HAVE_WIN64
-	$(APPLY) < $(SRC)/x264/x264-svn-win64.patch
+	$(APPLY) $(SRC)/x264/x264-svn-win64.patch
 endif
 	$(MOVE)

--- a/contrib/src/x264/x264-svn-win64.patch
+++ b/contrib/src/x264/x264-svn-win64.patch
+--- x264-git.orig/Makefile	2010-10-08 22:52:14.799265002 +0200
+++ x264-git/Makefile	2010-10-08 22:55:01.549265004 +0200
+@@ -136,7 +136,7 @@
+ 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
+ x264$(EXE): .depend $(OBJCLI) $(CLI_LIBX264)
+-	$(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS)
+	$(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS) -liberty
+ checkasm: tools/checkasm.o libx264.a
+ 	$(CC) -o $@ $+ $(LDFLAGS)