Mercurial > mxe-octave

comparison src/libvpx-1-fixes.patch @ 2737:57ee697ed83b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package libvpx: fix for buidling on OSX
author Tony Theodore <tonyt@logyst.com>
date Mon, 17 Sep 2012 20:29:12 +1000
parents 5b5cd166da34
children 28fa86d2cf21
comparison
equal deleted inserted replaced
2736:b28cc3e50c33 2737:57ee697ed83b
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 From 0db7805768cb8be8dfe2c95f451fd5965b2b52b7 Mon Sep 17 00:00:00 2001 4 Contains ad hoc patches for cross building.
5 From: Mark Brand <mabrand@mabrand.nl> 5
6 From 01c0e284b4d458fade9f8b2288863f3dd4dbc81a Mon Sep 17 00:00:00 2001
7 From: MXE
6 Date: Fri, 25 May 2012 23:36:41 +0200 8 Date: Fri, 25 May 2012 23:36:41 +0200
7 Subject: [PATCH 1/3] add Libs.private to vpx.pc 9 Subject: [PATCH 1/4] add Libs.private to vpx.pc
8 10
9 ---
10 libs.mk | 1 +
11 1 file changed, 1 insertion(+)
12 11
13 diff --git a/libs.mk b/libs.mk 12 diff --git a/libs.mk b/libs.mk
14 index e2ba737..209f77e 100644 13 index e2ba737..209f77e 100644
15 --- a/libs.mk 14 --- a/libs.mk
16 +++ b/libs.mk 15 +++ b/libs.mk
21 + $(qexec)echo 'Libs.private: -lpthread' >> $@ 20 + $(qexec)echo 'Libs.private: -lpthread' >> $@
22 $(qexec)echo 'Cflags: -I$${includedir}' >> $@ 21 $(qexec)echo 'Cflags: -I$${includedir}' >> $@
23 INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc 22 INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
24 INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc 23 INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc
25 -- 24 --
26 1.7.9.2 25 1.7.11.5
27 26
28 27
29 From 5805ff3f9f16036b7556d74b2874a6d18ea655fa Mon Sep 17 00:00:00 2001 28 From 73c1c32c41b75a432fbe092fb621474a760d0f51 Mon Sep 17 00:00:00 2001
30 From: Mark Brand <mabrand@mabrand.nl> 29 From: MXE
31 Date: Fri, 25 May 2012 23:40:00 +0200 30 Date: Fri, 25 May 2012 23:40:00 +0200
32 Subject: [PATCH 2/3] linking as test is not good for cross compiling 31 Subject: [PATCH 2/4] linking as test is not good for cross compiling
33 32
34 ---
35 configure | 3 ---
36 1 file changed, 3 deletions(-)
37 33
38 diff --git a/configure b/configure 34 diff --git a/configure b/configure
39 index 62e1ffb..0c4faf9 100755 35 index 62e1ffb..0c4faf9 100755
40 --- a/configure 36 --- a/configure
41 +++ b/configure 37 +++ b/configure
48 -EOF 44 -EOF
49 # check system headers 45 # check system headers
50 check_header stdint.h 46 check_header stdint.h
51 check_header pthread.h 47 check_header pthread.h
52 -- 48 --
53 1.7.9.2 49 1.7.11.5
54 50
55 51
56 From bf308b8ed07f8bf0e9c648314e1f3c070a647731 Mon Sep 17 00:00:00 2001 52 From 88bedac576559c599f3084b4eaa61a2ef85cfd06 Mon Sep 17 00:00:00 2001
57 From: Mark Brand <mabrand@mabrand.nl> 53 From: MXE
58 Date: Fri, 25 May 2012 23:40:55 +0200 54 Date: Fri, 25 May 2012 23:40:55 +0200
59 Subject: [PATCH 3/3] fix bin/bash 55 Subject: [PATCH 3/4] fix bin/bash
60 56
61 ---
62 build/make/armlink_adapter.sh | 2 +-
63 build/make/configure.sh | 2 +-
64 build/make/gen_asm_deps.sh | 2 +-
65 build/make/gen_msvs_def.sh | 2 +-
66 build/make/gen_msvs_proj.sh | 2 +-
67 build/make/gen_msvs_sln.sh | 2 +-
68 build/make/version.sh | 2 +-
69 configure | 2 +-
70 8 files changed, 8 insertions(+), 8 deletions(-)
71 57
72 diff --git a/build/make/armlink_adapter.sh b/build/make/armlink_adapter.sh 58 diff --git a/build/make/armlink_adapter.sh b/build/make/armlink_adapter.sh
73 index b53669c..71cf7e9 100755 59 index b53669c..71cf7e9 100755
74 --- a/build/make/armlink_adapter.sh 60 --- a/build/make/armlink_adapter.sh
75 +++ b/build/make/armlink_adapter.sh 61 +++ b/build/make/armlink_adapter.sh
148 +#!/usr/bin/env bash 134 +#!/usr/bin/env bash
149 ## 135 ##
150 ## configure 136 ## configure
151 ## 137 ##
152 -- 138 --
153 1.7.9.2 139 1.7.11.5
154 140
141
142 From 3d905203699e813027233bd0f19b05d44b98470d Mon Sep 17 00:00:00 2001
143 From: MXE
144 Date: Mon, 17 Sep 2012 20:23:14 +1000
145 Subject: [PATCH 4/4] Fix for building on OSX
146
147 Taken from:
148 https://gerrit.chromium.org/gerrit/#/c/26027/
149
150 diff --git a/build/make/gen_asm_deps.sh b/build/make/gen_asm_deps.sh
151 index 81b7095..158ec34 100755
152 --- a/build/make/gen_asm_deps.sh
153 +++ b/build/make/gen_asm_deps.sh
154 @@ -42,7 +42,7 @@ done
155
156 [ -n "$srcfile" ] || show_help
157 sfx=${sfx:-asm}
158 -includes=$(LC_ALL=C egrep -i "include +\"?+[a-z0-9_/]+\.${sfx}" $srcfile |
159 +includes=$(LC_ALL=C egrep -i "include +\"?[a-z0-9_/]+\.${sfx}" $srcfile |
160 perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;")
161 #" restore editor state
162 for inc in ${includes}; do
163 --
164 1.7.11.5
165