From: Jean-Baptiste Kempf Date: Mon, 31 May 2010 23:47:11 +0000 (+0200) Subject: Contribs: cleanup X-Git-Tag: 1.2.0-pre1~6372 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5e57a6a57c5c5db271836bdb487df6b2c99fcdc3;p=vlc Contribs: cleanup Remove unneeded old patches Rename patche for consistency --- diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 5b2bd2ad85..6c5bfcb6b0 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -693,7 +693,7 @@ libogg-$(OGG_VERSION).tar.gz: libogg: libogg-$(OGG_VERSION).tar.gz $(EXTRACT_GZ) - patch -p0 < Patches/ogg.patch + patch -p0 < Patches/libogg-inttypes.patch patch -p0 < Patches/libogg-1.1.patch ifdef HAVE_WINCE patch -p0 < Patches/libogg-wince.patch @@ -1405,19 +1405,11 @@ x264: ifdef HAVE_WIN32 (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch ) endif - else +x264: + echo "x264 snapshot is too old, you MUST use Git !" + exit -1 -x264: x264-$(X264_VERSION).tar.gz - $(EXTRACT_GZ) -ifdef HAVE_WIN32 - ifndef HAVE_CYGWIN - (cd x264;patch -p0 <../Patches/x264-20050624-win32.patch) - endif -else - patch -p0 < Patches/x264.patch - rm x264/x264.c -endif endif ifdef HAVE_WIN32 diff --git a/extras/contrib/src/Patches/ogg.patch b/extras/contrib/src/Patches/libogg-inttypes.patch similarity index 100% rename from extras/contrib/src/Patches/ogg.patch rename to extras/contrib/src/Patches/libogg-inttypes.patch diff --git a/extras/contrib/src/Patches/x264-20050624-win32.patch b/extras/contrib/src/Patches/x264-20050624-win32.patch deleted file mode 100644 index 382455cbb4..0000000000 --- a/extras/contrib/src/Patches/x264-20050624-win32.patch +++ /dev/null @@ -1,203 +0,0 @@ -Index: common/i386/dct-a.asm -=================================================================== ---- common/i386/dct-a.asm (revision 270) -+++ common/i386/dct-a.asm (working copy) -@@ -125,27 +125,6 @@ - ;%endmacro - - ;============================================================================= --; Local Data (Read Only) --;============================================================================= -- --%ifdef FORMAT_COFF --SECTION .rodata data --%else --SECTION .rodata data align=16 --%endif -- --;----------------------------------------------------------------------------- --; Various memory constants (trigonometric values or rounding values) --;----------------------------------------------------------------------------- -- --ALIGN 16 --x264_mmx_1: -- dw 1, 1, 1, 1 -- --x264_mmx_32: -- dw 32, 32, 32, 32 -- --;============================================================================= - ; Code - ;============================================================================= - -@@ -311,3 +290,23 @@ - - ret - -+;============================================================================= -+; Local Data (Read Only) -+;============================================================================= -+ -+%ifdef FORMAT_COFF -+SECTION .rodata data -+%else -+SECTION .rodata data align=16 -+%endif -+ -+;----------------------------------------------------------------------------- -+; Various memory constants (trigonometric values or rounding values) -+;----------------------------------------------------------------------------- -+ -+ALIGN 16 -+x264_mmx_1: -+ dw 1, 1, 1, 1 -+ -+x264_mmx_32: -+ dw 32, 32, 32, 32 -Index: common/i386/mc-a.asm -=================================================================== ---- common/i386/mc-a.asm (revision 270) -+++ common/i386/mc-a.asm (working copy) -@@ -46,22 +46,6 @@ - %endmacro - - ;============================================================================= --; Local Data (Read Only) --;============================================================================= -- --%ifdef FORMAT_COFF --SECTION .rodata data --%else --SECTION .rodata data align=16 --%endif -- --;----------------------------------------------------------------------------- --; Various memory constants (trigonometric values or rounding values) --;----------------------------------------------------------------------------- -- --ALIGN 16 -- --;============================================================================= - ; Code - ;============================================================================= - -@@ -487,3 +471,20 @@ - .finish - pop edi - ret -+ -+;============================================================================= -+; Local Data (Read Only) -+;============================================================================= -+ -+%ifdef FORMAT_COFF -+SECTION .rodata data -+%else -+SECTION .rodata data align=16 -+%endif -+ -+;----------------------------------------------------------------------------- -+; Various memory constants (trigonometric values or rounding values) -+;----------------------------------------------------------------------------- -+ -+ALIGN 16 -+ -Index: common/i386/mc-a2.asm -=================================================================== ---- common/i386/mc-a2.asm (revision 270) -+++ common/i386/mc-a2.asm (working copy) -@@ -33,22 +33,6 @@ - %endif - %endmacro - --;============================================================================= --; Read only data --;============================================================================= -- --SECTION .rodata data align=16 -- --ALIGN 16 --mmx_dw_one: -- times 4 dw 16 --mmx_dd_one: -- times 2 dd 512 --mmx_dw_20: -- times 4 dw 20 --mmx_dw_5: -- times 4 dw -5 -- - %assign twidth 0 - %assign theight 4 - %assign tdstp1 8 -@@ -60,7 +44,6 @@ - %assign toffset 32 - %assign tbuffer 36 - -- - ;============================================================================= - ; Macros - ;============================================================================= -@@ -375,3 +358,23 @@ - pop edi - - ret -+ -+;============================================================================= -+; Read only data -+;============================================================================= -+ -+%ifdef FORMAT_COFF -+SECTION .rodata data -+%else -+SECTION .rodata data align=16 -+%endif -+ -+ALIGN 16 -+mmx_dw_one: -+ times 4 dw 16 -+mmx_dd_one: -+ times 2 dd 512 -+mmx_dw_20: -+ times 4 dw 20 -+mmx_dw_5: -+ times 4 dw -5 -Index: build/cygwin/Makefile -=================================================================== ---- build/cygwin/Makefile (revision 270) -+++ build/cygwin/Makefile (working copy) -@@ -7,6 +7,8 @@ - # $Id: Makefile,v 1.4 2004/06/18 02:00:40 chenm001 Exp $ - ############################################################################## - -+CC=i586-mingw32msvc-gcc -+ - # Current dir - DIR_CUR=$(shell pwd) - -@@ -18,7 +20,7 @@ - # Sources - SRC_C= common/mc.c common/predict.c common/pixel.c common/macroblock.c \ - common/frame.c common/dct.c common/cpu.c common/cabac.c \ -- common/common.c common/mdate.c common/csp.c \ -+ common/common.c common/mdate.c common/csp.c common/set.c \ - encoder/analyse.c encoder/me.c encoder/ratecontrol.c \ - encoder/set.c encoder/macroblock.c encoder/cabac.c encoder/cavlc.c \ - encoder/encoder.c encoder/eval.c \ -@@ -33,7 +35,7 @@ - ############################################################################## - # PFLAGS - ############################################################################## --PFLAGS=-DARCH_X86 -DHAVE_MMXEXT -UHAVE_SSE2 -+PFLAGS=-DHAVE_PTHREAD -DARCH_X86 -DHAVE_MMXEXT -UHAVE_SSE2 - - ############################################################################## - # CFLAGS -@@ -107,7 +109,7 @@ - libx264.a: $(DIR_BUILD) $(OBJECTS) - @echo " L: $(@F)" - @cd $(DIR_BUILD) && \ -- ar rc libx264.a $(OBJECTS) && \ -+ i586-mingw32msvc-ar rc libx264.a $(OBJECTS) && \ - cp -f libx264.a $(DIR_SRC) - - x264.exe: $(DIR_BUILD) $(OBJECTS) x264.obj diff --git a/extras/contrib/src/Patches/x264.patch b/extras/contrib/src/Patches/x264.patch deleted file mode 100644 index 6728c8e159..0000000000 --- a/extras/contrib/src/Patches/x264.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -ruN x264.orig/Makefile x264/Makefile ---- x264.orig/Makefile Mon May 30 21:47:02 2005 -+++ x264/Makefile Sun Jun 26 03:09:05 2005 -@@ -40,7 +40,7 @@ - OBJS = $(SRCS:%.c=%.o) - DEP = depend - --default: $(DEP) x264$(EXE) -+default: $(DEP) libx264.a - - libx264.a: .depend $(OBJS) $(OBJASM) - ar rc libx264.a $(OBJS) $(OBJASM) -@@ -61,7 +61,7 @@ - .depend: config.mak config.h - rm -f .depend - # Hacky - because gcc 2.9x doesn't have -MT -- $(foreach SRC, $(SRCS) x264.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;) - - config.h: $(wildcard .svn/entries */.svn/entries */*/.svn/entries) - ./version.sh -@@ -78,11 +78,10 @@ - distclean: clean - rm -f config.mak vfw/build/cygwin/config.mak - --install: x264 -+install: libx264.a - install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) - install -m 644 x264.h $(DESTDIR)$(includedir) - install -m 644 libx264.a $(DESTDIR)$(libdir) -- install x264 $(DESTDIR)$(bindir) - - etags: TAGS -