[vlc-commits] commit: win64 contribs: misc fixes ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Fri Oct  8 23:36:29 2010 +0200| [13948ee731cd2ec1b1e3452a06f7cac6b272129d] | committer: Rafaël Carré 

win64 contribs: misc fixes

gecko-win32 -> gecko
build dirac
don't make ffmpeg depend on libvpx
don't build portaudio
patch x264 to link x264.exe with -liberty (debian's amd64 runtime hasn't getopt)
patch pthreads to link with libws2_32 instead of libwsock32

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

 extras/contrib/src/Distributions/win64.mak      |    4 ++--
 extras/contrib/src/Makefile                     |    7 +++++++
 extras/contrib/src/Patches/pthreads-win64.patch |   12 ++++++++++++
 extras/contrib/src/Patches/x264-svn-win64.patch |   11 +++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/src/Distributions/win64.mak b/extras/contrib/src/Distributions/win64.mak
index b6a0232..618da20 100644
--- a/extras/contrib/src/Distributions/win64.mak
+++ b/extras/contrib/src/Distributions/win64.mak
@@ -5,8 +5,8 @@ all: .iconv .intl .freetype .fribidi .zlib \
         .live .goom2k4 .caca .mod .x264  .xml .twolame \
         .png .gpg-error .gcrypt .gnutls .mpcdec \
         .dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \
-        .dx_headers .dshow_headers .gecko-win32 .dca \
-        .lua .tag .fontconfig .portaudio .kate .libass
+        .dx_headers .dshow_headers .gecko .dca \
+        .lua .tag .fontconfig .kate .libass .dirac
 # .pthreads
 #.zvbi \
 #        .fluid
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index bfea663..414e5b1 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1101,10 +1101,14 @@ else
 ifeq ($(ARCH),armel)
 .ffmpeg: ffmpeg .lame .gsm .zlib
 else
+ifdef HAVE_WIN64
+.ffmpeg: ffmpeg .lame .gsm .zlib
+else
 .ffmpeg: ffmpeg .lame .gsm .libvpx .zlib
 endif
 endif
 endif
+endif
 	(cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(FFMPEG_CFLAGS) -DHAVE_STDINT_H" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
 	touch $@
 
@@ -1397,6 +1401,9 @@ x264:
 ifdef HAVE_WIN32
 	(cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
 endif
+ifdef HAVE_WIN64
+	(cd x264; patch -p0 < ../Patches/x264-svn-win64.patch )
+endif
 else
 x264:
 	echo "x264 snapshot is too old, you MUST use Git !"
diff --git a/extras/contrib/src/Patches/pthreads-win64.patch b/extras/contrib/src/Patches/pthreads-win64.patch
index 5bb8354..aebe07c 100644
--- a/extras/contrib/src/Patches/pthreads-win64.patch
+++ b/extras/contrib/src/Patches/pthreads-win64.patch
@@ -9,3 +9,15 @@
  #define HAVE_STRUCT_TIMESPEC 1
  struct timespec {
          long tv_sec;
+diff -urN pthreads/GNUmakefile pthreads.new/GNUmakefile
+--- pthreads/GNUmakefile	2010-10-08 22:30:43.029264998 +0200
++++ pthreads.new/GNUmakefile	2010-10-08 22:30:55.989265032 +0200
+@@ -63,7 +63,7 @@
+ XOPT	=
+ 
+ RCFLAGS		= --include-dir=.
+-LFLAGS		= -lwsock32
++LFLAGS		= -lws2_32
+ 
+ # ----------------------------------------------------------------------
+ # The library can be built with some alternative behaviour to
diff --git a/extras/contrib/src/Patches/x264-svn-win64.patch b/extras/contrib/src/Patches/x264-svn-win64.patch
new file mode 100644
index 0000000..979651f
--- /dev/null
+++ b/extras/contrib/src/Patches/x264-svn-win64.patch
@@ -0,0 +1,11 @@
+--- Makefile	2010-10-08 22:52:14.799265002 +0200
++++ Makefile	2010-10-08 22:55:01.549265004 +0200
+@@ -136,7 +136,7 @@
+ 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
+ 
+ x264$(EXE): $(OBJCLI) libx264.a
+-	$(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS)
++	$(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS) -liberty
+ 
+ checkasm: tools/checkasm.o libx264.a
+ 	$(CC) -o $@ $+ $(LDFLAGS)