Commit 13948ee7 authored by Rafaël Carré's avatar 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
parent 4b103b84
...@@ -5,8 +5,8 @@ all: .iconv .intl .freetype .fribidi .zlib \ ...@@ -5,8 +5,8 @@ all: .iconv .intl .freetype .fribidi .zlib \
.live .goom2k4 .caca .mod .x264 .xml .twolame \ .live .goom2k4 .caca .mod .x264 .xml .twolame \
.png .gpg-error .gcrypt .gnutls .mpcdec \ .png .gpg-error .gcrypt .gnutls .mpcdec \
.dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \ .dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \
.dx_headers .dshow_headers .gecko-win32 .dca \ .dx_headers .dshow_headers .gecko .dca \
.lua .tag .fontconfig .portaudio .kate .libass .lua .tag .fontconfig .kate .libass .dirac
# .pthreads # .pthreads
#.zvbi \ #.zvbi \
# .fluid # .fluid
......
...@@ -1101,9 +1101,13 @@ else ...@@ -1101,9 +1101,13 @@ else
ifeq ($(ARCH),armel) ifeq ($(ARCH),armel)
.ffmpeg: ffmpeg .lame .gsm .zlib .ffmpeg: ffmpeg .lame .gsm .zlib
else else
ifdef HAVE_WIN64
.ffmpeg: ffmpeg .lame .gsm .zlib
else
.ffmpeg: ffmpeg .lame .gsm .libvpx .zlib .ffmpeg: ffmpeg .lame .gsm .libvpx .zlib
endif endif
endif 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) (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 $@ touch $@
...@@ -1397,6 +1401,9 @@ x264: ...@@ -1397,6 +1401,9 @@ x264:
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd x264; patch -p0 < ../Patches/x264-svn-win32.patch ) (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
endif endif
ifdef HAVE_WIN64
(cd x264; patch -p0 < ../Patches/x264-svn-win64.patch )
endif
else else
x264: x264:
echo "x264 snapshot is too old, you MUST use Git !" echo "x264 snapshot is too old, you MUST use Git !"
......
...@@ -9,3 +9,15 @@ ...@@ -9,3 +9,15 @@
#define HAVE_STRUCT_TIMESPEC 1 #define HAVE_STRUCT_TIMESPEC 1
struct timespec { struct timespec {
long tv_sec; 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
--- 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)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment