diff 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
line wrap: on
line diff
--- 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