contrib: part of x264 win32 patch is now in upstream

Remove parts of win32 build patch that are in upstream git.

Signed-off-by: David Flynn <davidf@rd.bbc.co.uk>
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>

diff --git a/extras/contrib/src/Patches/x264-svn-win32.patch b/extras/contrib/src/Patches/x264-svn-win32.patch
index 52cf2df57b167d42d4f3fb43847b5eb06697df57..69afbf6bd15f9149e319db238dbbfcbeabb2459f 100644 (file)
--- a/extras/contrib/src/Patches/x264-svn-win32.patch
+++ b/extras/contrib/src/Patches/x264-svn-win32.patch
@@ -45,34 +45,3 @@
  EOF
  
  
---- Makefile   2008-04-06 09:07:25.000000000 +0200
-+++ Makefile   2008-04-06 09:11:39.000000000 +0200
-@@ -72,8 +72,8 @@
- default: $(DEP) x264$(EXE)
- 
- libx264.a: .depend $(OBJS) $(OBJASM)
--      ar rc libx264.a $(OBJS) $(OBJASM)
--      ranlib libx264.a
-+      $(AR) rc libx264.a $(OBJS) $(OBJASM)
-+      $(RANLIB) libx264.a
- 
- $(SONAME): .depend $(OBJS) $(OBJASM)
-       $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
-@@ -90,7 +90,7 @@
- %.o: %.asm
-       $(AS) $(ASFLAGS) -o $@ $<
- # delete local/anonymous symbols, so they don't show up in oprofile
--      -@ strip -x $@
-+      -@ $(STRIP) -x $@
- 
- .depend: config.mak
-       rm -f .depend
-@@ -155,7 +155,7 @@
-       install -m 644 libx264.a $(DESTDIR)$(libdir)
-       install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
-       install x264$(EXE) $(DESTDIR)$(bindir)
--      ranlib $(DESTDIR)$(libdir)/libx264.a
-+      $(RANLIB) $(DESTDIR)$(libdir)/libx264.a
- ifeq ($(SYS),MINGW)
-       $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
- else