This patch adds mingw32 cross-compilation support to HandBrake trunk to

[handbrake-jp/handbrake-jp-git.git] / contrib / ffmpeg / module.defs

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index b412910..af34b3a 100644 (file)
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -1,12 +1,14 @@
 $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,FAAD2))
 $(eval $(call import.CONTRIB.defs,FFMPEG))
 
-FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg-r15974.tar.gz
-FFMPEG.EXTRACT.tarbase = ffmpeg
+FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg_0.5.tar.gz
+FFMPEG.EXTRACT.tarbase = ffmpeg-0.5
 
 FFMPEG.CONFIGURE.deps =
 FFMPEG.CONFIGURE.env  =
 FFMPEG.CONFIGURE.host =
+#FFMPEG.CONFIGURE.shared =
+#FFMPEG.CONFIGURE.static =
 
 FFMPEG.CONFIGURE.extra = \
     --disable-bsfs \
@@ -21,12 +23,33 @@ FFMPEG.CONFIGURE.extra = \
     --enable-gpl \
     --enable-libfaad \
     --enable-muxer=ipod \
-    --enable-pthreads \
     --enable-swscale \
     --cc="$(GCC.gcc)" \
-    --extra-cflags="$(call fn.ARGS,FFMPEG.GCC,*archs) -I$(call fn.ABSOLUTE,$(CONTRIB.build/)include)" \
-    --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)"
+    --extra-cflags="$(call fn.ARGS,FFMPEG.GCC,*archs ?extra) -I$(call fn.ABSOLUTE,$(CONTRIB.build/)include)" \
+    --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)"
 
-ifeq ($(BUILD.cross),1)
-    FFMPEG.CONFIGURE.extra += --enable-cross-compile --arch=$(FFMPEG.GCC.archs)
+## check against tuple: B-SYSTEM where B is { 0 | 1 } for cross-compiling flag
+ifeq (0-cygwin,$(BUILD.cross)-$(BUILD.system))
+    FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-memalign-hack
+    FFMPEG.GCC.args.extra = -fno-common
+else ifeq (1-darwin,$(BUILD.cross)-$(BUILD.system))
+    ## section for darwin-archs
+    FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-cross-compile --arch=$(BUILD.machine)
+else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+    FFMPEG.CONFIGURE.extra += \
+        --enable-w32threads \
+        --enable-memalign-hack \
+        --target-os=mingw32 \
+        --enable-cross-compile --cross-prefix=$(BUILD.cross.prefix)
+    FFMPEG.GCC.args.extra += -fno-common
+else
+    FFMPEG.CONFIGURE.extra += --enable-pthreads
 endif
+
+#
+# MPC8 Doesn't compile on SPARC
+#
+ifeq (solaris,$(BUILD.system))
+    FFMPEG.CONFIGURE.extra += --disable-demuxer=mpc8
+endif
+