vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Jul 1 23:42:32 2011 +0300| [c7d84297b6cca47afc832c9ab7cc4ba0952018b2] | committer: Rémi Denis-Courmont
contrib: add and update x264 win64 patch > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c7d84297b6cca47afc832c9ab7cc4ba0952018b2 --- contrib/src/x264/rules.mak | 2 +- contrib/src/x264/x264-svn-win64.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak index f98636e..b9997c7 100644 --- 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) diff --git a/contrib/src/x264/x264-svn-win64.patch b/contrib/src/x264/x264-svn-win64.patch new file mode 100644 index 0000000..906f08b --- /dev/null +++ b/contrib/src/x264/x264-svn-win64.patch @@ -0,0 +1,11 @@ +--- 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) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
