Mercurial > mxe-octave

diff src/libvpx-1-fixes.patch @ 4026:28fa86d2cf21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ffmpeg: mods for native linux build of ffmpeg * src/ffmpeg.mk: add native build rule * src/libvpx-1-fixes.patch: update patch from mxe.cc * src/libvpx.mk: update to version 1.4.0, add native build rule * src/sdl-1-xdata.patch" new patch file * src/sdl.mk: add native build rule * src/xvidcore.mk: add native build rule
author John D
date Sat, 12 Sep 2015 20:35:11 -0400
parents 57ee697ed83b
children de6e4042489c
line wrap: on
line diff
--- a/src/libvpx-1-fixes.patch	Sat Sep 12 01:56:42 2015 -0400
+++ b/src/libvpx-1-fixes.patch	Sat Sep 12 20:35:11 2015 -0400
@@ -3,39 +3,21 @@
 
 Contains ad hoc patches for cross building.
 
-From 01c0e284b4d458fade9f8b2288863f3dd4dbc81a Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Fri, 25 May 2012 23:36:41 +0200
-Subject: [PATCH 1/4] add Libs.private to vpx.pc
-
+From 1408d07fb86254ae1aded0e8cf38e7e0c2550550 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Thu, 5 Sep 2013 14:25:31 -0700
+Subject: [PATCH 1/2] Linking as test is not good for cross compiling
 
-diff --git a/libs.mk b/libs.mk
-index e2ba737..209f77e 100644
---- a/libs.mk
-+++ b/libs.mk
-@@ -242,6 +242,7 @@ vpx.pc: config.mk libs.mk
- 	$(qexec)echo 'Requires:' >> $@
- 	$(qexec)echo 'Conflicts:' >> $@
- 	$(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
-+	$(qexec)echo 'Libs.private: -lpthread' >> $@
- 	$(qexec)echo 'Cflags: -I$${includedir}' >> $@
- INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
- INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc
--- 
-1.7.11.5
-
-
-From 73c1c32c41b75a432fbe092fb621474a760d0f51 Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Fri, 25 May 2012 23:40:00 +0200
-Subject: [PATCH 2/4] linking as test is not good for cross compiling
-
+Signed-off-by: Timothy Gu <timothygu99@gmail.com>
+---
+ configure | 3 ---
+ 1 file changed, 3 deletions(-)
 
 diff --git a/configure b/configure
-index 62e1ffb..0c4faf9 100755
+index be36e56..987b2e9 100755
 --- a/configure
 +++ b/configure
-@@ -481,9 +481,6 @@ process_detect() {
+@@ -490,9 +490,6 @@ process_detect() {
          }
      fi
      check_header stdio.h || die "Unable to invoke compiler: ${CC} ${CFLAGS}"
@@ -46,45 +28,16 @@
      check_header stdint.h
      check_header pthread.h
 -- 
-1.7.11.5
-
-
-From 88bedac576559c599f3084b4eaa61a2ef85cfd06 Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Fri, 25 May 2012 23:40:55 +0200
-Subject: [PATCH 3/4] fix bin/bash
+1.8.1.2
 
 
-diff --git a/build/make/armlink_adapter.sh b/build/make/armlink_adapter.sh
-index b53669c..71cf7e9 100755
---- a/build/make/armlink_adapter.sh
-+++ b/build/make/armlink_adapter.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- ##
- ##  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- ##
-diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 3c772e5..032b5e8 100755
---- a/build/make/configure.sh
-+++ b/build/make/configure.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- ##
- ##  configure.sh
- ##
-diff --git a/build/make/gen_asm_deps.sh b/build/make/gen_asm_deps.sh
-index 717f870..81b7095 100755
---- a/build/make/gen_asm_deps.sh
-+++ b/build/make/gen_asm_deps.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- ##
- ##  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- ##
+From bada4be247273378809a30bf9a0ca7d9c9d2b936 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Thu, 5 Sep 2013 14:28:28 -0700
+Subject: [PATCH 2/2] Fix /bin/bash
+
+Signed-off-by: Timothy Gu <timothygu99@gmail.com>
+
 diff --git a/build/make/gen_msvs_def.sh b/build/make/gen_msvs_def.sh
 index 4defcc2..12e3573 100755
 --- a/build/make/gen_msvs_def.sh
@@ -115,51 +68,5 @@
  ##
  ##  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  ##
-diff --git a/build/make/version.sh b/build/make/version.sh
-index 3efb956..b3a9c23 100755
---- a/build/make/version.sh
-+++ b/build/make/version.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- ##
- ##  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- ##
-diff --git a/configure b/configure
-index 0c4faf9..5d1db69 100755
---- a/configure
-+++ b/configure
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- ##
- ##  configure
- ##
 -- 
-1.7.11.5
-
-
-From 3d905203699e813027233bd0f19b05d44b98470d Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Mon, 17 Sep 2012 20:23:14 +1000
-Subject: [PATCH 4/4] Fix for building on OSX
-
-Taken from:
-https://gerrit.chromium.org/gerrit/#/c/26027/
-
-diff --git a/build/make/gen_asm_deps.sh b/build/make/gen_asm_deps.sh
-index 81b7095..158ec34 100755
---- a/build/make/gen_asm_deps.sh
-+++ b/build/make/gen_asm_deps.sh
-@@ -42,7 +42,7 @@ done
- 
- [ -n "$srcfile" ] || show_help
- sfx=${sfx:-asm}
--includes=$(LC_ALL=C egrep -i "include +\"?+[a-z0-9_/]+\.${sfx}" $srcfile |
-+includes=$(LC_ALL=C egrep -i "include +\"?[a-z0-9_/]+\.${sfx}" $srcfile |
-            perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;")
- #" restore editor state
- for inc in ${includes}; do
--- 
-1.7.11.5
-
+1.8.1.2