[vlc-commits] commit: win64 contribs: run autoreconf -fi when needed ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Wed Oct  6 13:21:40 2010 +0200| [04476453d3c4bba6fd5562c45fe0a7c2ee2a6bd5] | committer: Rafaël Carré 

win64 contribs: run autoreconf -fi when needed

Some old libraries configured with ancient autotools  don't recongize
amd64-mingw32msvc-
Also update libswscale patch (one hunk applied upstream)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=04476453d3c4bba6fd5562c45fe0a7c2ee2a6bd5
---

 extras/contrib/src/Makefile                   |    9 +++++++
 extras/contrib/src/Patches/ffmpeg-win64.patch |   31 -------------------------
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 2e80d5a..b707891 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -543,6 +543,9 @@ a52dec: a52dec-$(A52DEC_VERSION).tar.gz
 ifeq ($(ARCH),armel)
 	(cd $@ ; patch -p0 < ../Patches/liba52-fixed.diff)
 endif
+ifdef HAVE_WIN64
+	(cd $@ ; autoreconf -if)
+endif
 
 .a52: a52dec
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && cd liba52 && make && make install && cd ../include && make && make install)
@@ -753,6 +756,9 @@ libtheora-$(THEORA_VERSION).tar.bz2:
 libtheora: libtheora-$(THEORA_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 	patch -p0 < Patches/libtheora-includes.patch
+ifdef HAVE_WIN64
+	(cd $@ ; autoreconf -if -I m4)
+endif
 
 THEORACONF = --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples
 
@@ -1629,6 +1635,9 @@ portaudio: pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz
 ifneq ($(HOST),$(BUILD))
 	(patch -p0 < Patches/portaudio-cross.patch;cd $@;  autoconf)
 endif
+ifdef HAVE_WIN64
+	(cd $@ ; autoreconf -if)
+endif
 
 .portaudio: portaudio
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make  install)
diff --git a/extras/contrib/src/Patches/ffmpeg-win64.patch b/extras/contrib/src/Patches/ffmpeg-win64.patch
index d1c8e7f..ea65999 100644
--- a/extras/contrib/src/Patches/ffmpeg-win64.patch
+++ b/extras/contrib/src/Patches/ffmpeg-win64.patch
@@ -1,34 +1,3 @@
-Index: swscale.c
-===================================================================
---- swscale.c	(revision 31036)
-+++ swscale.c	(working copy)
-@@ -994,7 +994,7 @@
-     }
- }
- 
--static inline void rgb48ToY(uint8_t *dst, const uint8_t *src, int width,
-+static inline void rgb48ToY(uint8_t *dst, const uint8_t *src, long width,
-                             uint32_t *unused)
- {
-     int i;
-@@ -1009,7 +1009,7 @@
- 
- static inline void rgb48ToUV(uint8_t *dstU, uint8_t *dstV,
-                              const uint8_t *src1, const uint8_t *src2,
--                             int width, uint32_t *unused)
-+                             long width, uint32_t *unused)
- {
-     int i;
-     assert(src1==src2);
-@@ -1025,7 +1025,7 @@
- 
- static inline void rgb48ToUV_half(uint8_t *dstU, uint8_t *dstV,
-                                   const uint8_t *src1, const uint8_t *src2,
--                                  int width, uint32_t *unused)
-+                                  long width, uint32_t *unused)
- {
-     int i;
-     assert(src1==src2);
 Index: swscale_template.c
 ===================================================================
 --- swscale_template.c	(revision 31036)