# HG changeset patch
# User John Donoghue
# Date 1442577955 14400
# Node ID c4a341e3e01487d23e35d33b85fcdefb6b883f48
# Parent  8803dfa40236eea8428fc61b7016f132cf6c271b
ffmpeg: updates to work in windows

* src/ffmpeg.mk: add --extra-libs='-mconsole'

* src/libvpx.mk: set as to yasm

* src/x264-1-fix-bin-bash.patch: update vpx patch from mxe.cc

* src/x264.mk: update version,checksum for 20141130-2245

* src/xvidcore.mk: dont rename xvidcore.dll to libxvidecore.dll

diff -r 8803dfa40236 -r c4a341e3e014 src/ffmpeg.mk
--- a/src/ffmpeg.mk	Wed Sep 16 07:51:27 2015 -0400
+++ b/src/ffmpeg.mk	Fri Sep 18 08:05:55 2015 -0400
@@ -29,13 +29,13 @@
         --arch=$(firstword $(subst -, ,$(TARGET))) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
+        --extra-libs='-mconsole' \
         --disable-debug \
         --disable-doc \
         --enable-memalign-hack \
         --enable-gpl \
         --enable-version3 \
         --disable-nonfree \
-        --enable-postproc \
         --disable-pthreads \
         --enable-w32threads \
         --enable-avisynth \
@@ -44,7 +44,6 @@
         --enable-libvorbis \
         --enable-libmp3lame \
         --enable-libxvid \
-        --disable-libfaac \
         --enable-libopencore-amrnb \
         --enable-libopencore-amrwb \
         --enable-libx264 \
diff -r 8803dfa40236 -r c4a341e3e014 src/libvpx.mk
--- a/src/libvpx.mk	Wed Sep 16 07:51:27 2015 -0400
+++ b/src/libvpx.mk	Fri Sep 18 08:05:55 2015 -0400
@@ -36,6 +36,8 @@
         ./configure \
         --prefix='$(HOST_PREFIX)' \
         $($(PKG)_TARGET_OPTS) \
+        --as=yasm \
+        --extra-cflags='-std=gnu89' \
         --disable-examples \
         --disable-install-docs
     $(MAKE) -C '$(1)' -j '$(JOBS)'
diff -r 8803dfa40236 -r c4a341e3e014 src/x264-1-fix-bin-bash.patch
--- a/src/x264-1-fix-bin-bash.patch	Wed Sep 16 07:51:27 2015 -0400
+++ b/src/x264-1-fix-bin-bash.patch	Fri Sep 18 08:05:55 2015 -0400
@@ -2,7 +2,7 @@
 See index.html for further information.
 
 diff -urN x264-snapshot-20100714-2245/configure x264-snapshot-20100714-2245.new/configure
---- x264-snapshot-20100714-2245/configure	2010-07-15 06:45:06.000000000 +1000
+--- x264-snapshot-20100714-2245/configure	2010-07-15 06:45:07.000000000 +1000
 +++ x264-snapshot-20100714-2245.new/configure	2010-10-03 23:58:24.000000000 +1100
 @@ -1,4 +1,4 @@
 -#!/bin/bash
@@ -10,12 +10,3 @@
  
  if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
  cat <<EOF
-diff -urN x264-snapshot-20100714-2245/version.sh x264-snapshot-20100714-2245.new/version.sh
---- x264-snapshot-20100714-2245/version.sh	2010-07-15 06:45:07.000000000 +1000
-+++ x264-snapshot-20100714-2245.new/version.sh	2010-10-03 23:58:24.000000000 +1100
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- git rev-list HEAD | sort > config.git-hash
- LOCALVER=`wc -l config.git-hash | awk '{print $1}'`
- if [ $LOCALVER \> 1 ] ; then
diff -r 8803dfa40236 -r c4a341e3e014 src/x264.mk
--- a/src/x264.mk	Wed Sep 16 07:51:27 2015 -0400
+++ b/src/x264.mk	Fri Sep 18 08:05:55 2015 -0400
@@ -3,8 +3,8 @@
 
 PKG             := x264
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 20111018-2245
-$(PKG)_CHECKSUM := a6c4a6786a2347b5b1d50dc0ddfd378bf1890481
+$(PKG)_VERSION  := 20141130-2245
+$(PKG)_CHECKSUM := e2a4f5dd0a773a3e89f7c5cf1b3d2efc95f282b8
 $(PKG)_SUBDIR   := $(PKG)-snapshot-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://download.videolan.org/pub/videolan/$(PKG)/snapshots/$($(PKG)_FILE)
@@ -14,14 +14,30 @@
     date -d yesterday +%Y%m%d-2245
 endef
 
+ifeq ($(MXE_NATIVE_BUILD),no)
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --cross-prefix='$(MXE_TOOL_PREFIX)' \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
+        --cross-prefix='$(MXE_TOOL_PREFIX)' \
+        --disable-lavf \
+        --disable-swscale \
         --enable-win32thread
     $(MAKE) -C '$(1)' -j 1 uninstall
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
 endef
+else
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        $(ENABLE_SHARED_OR_STATIC) \
+        --disable-lavf \
+        --disable-swscale
+    $(MAKE) -C '$(1)' -j 1 uninstall
+    $(MAKE) -C '$(1)' -j '$(JOBS)'
+    $(MAKE) -C '$(1)' -j 1 install
+endef
+endif
diff -r 8803dfa40236 -r c4a341e3e014 src/xvidcore.mk
--- a/src/xvidcore.mk	Wed Sep 16 07:51:27 2015 -0400
+++ b/src/xvidcore.mk	Fri Sep 18 08:05:55 2015 -0400
@@ -30,7 +30,7 @@
       $(INSTALL) -m644 '$(1)/build/xvidcore.a' '$(HOST_LIBDIR)/libxvidcore.a'; \
     else \
       $(INSTALL) -m644 '$(1)/build/xvidcore.dll.a' '$(HOST_LIBDIR)/libxvidcore.dll.a'; \
-      $(INSTALL) -m644 '$(1)/build/xvidcore.dll' '$(HOST_BINDIR)/libxvidcore.dll'; \
+      $(INSTALL) -m644 '$(1)/build/xvidcore.dll' '$(HOST_BINDIR)/'; \
     fi
 endef
 else