Mercurial > mxe-octave
comparison src/x264-1-fix-bin-bash.patch @ 4029:c4a341e3e014
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
author | John Donoghue |
---|---|
date | Fri, 18 Sep 2015 08:05:55 -0400 |
parents | 99516e73b368 |
children |
comparison
equal
deleted
inserted
replaced
4028:8803dfa40236 | 4029:c4a341e3e014 |
---|---|
1 This file is part of MXE. | 1 This file is part of MXE. |
2 See index.html for further information. | 2 See index.html for further information. |
3 | 3 |
4 diff -urN x264-snapshot-20100714-2245/configure x264-snapshot-20100714-2245.new/configure | 4 diff -urN x264-snapshot-20100714-2245/configure x264-snapshot-20100714-2245.new/configure |
5 --- x264-snapshot-20100714-2245/configure 2010-07-15 06:45:06.000000000 +1000 | 5 --- x264-snapshot-20100714-2245/configure 2010-07-15 06:45:07.000000000 +1000 |
6 +++ x264-snapshot-20100714-2245.new/configure 2010-10-03 23:58:24.000000000 +1100 | 6 +++ x264-snapshot-20100714-2245.new/configure 2010-10-03 23:58:24.000000000 +1100 |
7 @@ -1,4 +1,4 @@ | 7 @@ -1,4 +1,4 @@ |
8 -#!/bin/bash | 8 -#!/bin/bash |
9 +#!/usr/bin/env bash | 9 +#!/usr/bin/env bash |
10 | 10 |
11 if test x"$1" = x"-h" -o x"$1" = x"--help" ; then | 11 if test x"$1" = x"-h" -o x"$1" = x"--help" ; then |
12 cat <<EOF | 12 cat <<EOF |
13 diff -urN x264-snapshot-20100714-2245/version.sh x264-snapshot-20100714-2245.new/version.sh | |
14 --- x264-snapshot-20100714-2245/version.sh 2010-07-15 06:45:07.000000000 +1000 | |
15 +++ x264-snapshot-20100714-2245.new/version.sh 2010-10-03 23:58:24.000000000 +1100 | |
16 @@ -1,4 +1,4 @@ | |
17 -#!/bin/bash | |
18 +#!/usr/bin/env bash | |
19 git rev-list HEAD | sort > config.git-hash | |
20 LOCALVER=`wc -l config.git-hash | awk '{print $1}'` | |
21 if [ $LOCALVER \> 1 ] ; then |