Mercurial > mxe-octave

comparison 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
comparison
equal deleted inserted replaced
4025:703b6f9eaea1 4026:28fa86d2cf21
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 Contains ad hoc patches for cross building. 4 Contains ad hoc patches for cross building.
5 5
6 From 01c0e284b4d458fade9f8b2288863f3dd4dbc81a Mon Sep 17 00:00:00 2001 6 From 1408d07fb86254ae1aded0e8cf38e7e0c2550550 Mon Sep 17 00:00:00 2001
7 From: MXE 7 From: Mark Brand <mabrand@mabrand.nl>
8 Date: Fri, 25 May 2012 23:36:41 +0200 8 Date: Thu, 5 Sep 2013 14:25:31 -0700
9 Subject: [PATCH 1/4] add Libs.private to vpx.pc 9 Subject: [PATCH 1/2] Linking as test is not good for cross compiling
10 10
11 11 Signed-off-by: Timothy Gu <timothygu99@gmail.com>
12 diff --git a/libs.mk b/libs.mk 12 ---
13 index e2ba737..209f77e 100644 13 configure | 3 ---
14 --- a/libs.mk 14 1 file changed, 3 deletions(-)
15 +++ b/libs.mk
16 @@ -242,6 +242,7 @@ vpx.pc: config.mk libs.mk
17 $(qexec)echo 'Requires:' >> $@
18 $(qexec)echo 'Conflicts:' >> $@
19 $(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
20 + $(qexec)echo 'Libs.private: -lpthread' >> $@
21 $(qexec)echo 'Cflags: -I$${includedir}' >> $@
22 INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
23 INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc
24 --
25 1.7.11.5
26
27
28 From 73c1c32c41b75a432fbe092fb621474a760d0f51 Mon Sep 17 00:00:00 2001
29 From: MXE
30 Date: Fri, 25 May 2012 23:40:00 +0200
31 Subject: [PATCH 2/4] linking as test is not good for cross compiling
32
33 15
34 diff --git a/configure b/configure 16 diff --git a/configure b/configure
35 index 62e1ffb..0c4faf9 100755 17 index be36e56..987b2e9 100755
36 --- a/configure 18 --- a/configure
37 +++ b/configure 19 +++ b/configure
38 @@ -481,9 +481,6 @@ process_detect() { 20 @@ -490,9 +490,6 @@ process_detect() {
39 } 21 }
40 fi 22 fi
41 check_header stdio.h || die "Unable to invoke compiler: ${CC} ${CFLAGS}" 23 check_header stdio.h || die "Unable to invoke compiler: ${CC} ${CFLAGS}"
42 - check_ld <<EOF || die "Toolchain is unable to link executables" 24 - check_ld <<EOF || die "Toolchain is unable to link executables"
43 -int main(void) {return 0;} 25 -int main(void) {return 0;}
44 -EOF 26 -EOF
45 # check system headers 27 # check system headers
46 check_header stdint.h 28 check_header stdint.h
47 check_header pthread.h 29 check_header pthread.h
48 -- 30 --
49 1.7.11.5 31 1.8.1.2
50 32
51 33
52 From 88bedac576559c599f3084b4eaa61a2ef85cfd06 Mon Sep 17 00:00:00 2001 34 From bada4be247273378809a30bf9a0ca7d9c9d2b936 Mon Sep 17 00:00:00 2001
53 From: MXE 35 From: Mark Brand <mabrand@mabrand.nl>
54 Date: Fri, 25 May 2012 23:40:55 +0200 36 Date: Thu, 5 Sep 2013 14:28:28 -0700
55 Subject: [PATCH 3/4] fix bin/bash 37 Subject: [PATCH 2/2] Fix /bin/bash
56 38
39 Signed-off-by: Timothy Gu <timothygu99@gmail.com>
57 40
58 diff --git a/build/make/armlink_adapter.sh b/build/make/armlink_adapter.sh
59 index b53669c..71cf7e9 100755
60 --- a/build/make/armlink_adapter.sh
61 +++ b/build/make/armlink_adapter.sh
62 @@ -1,4 +1,4 @@
63 -#!/bin/bash
64 +#!/usr/bin/env bash
65 ##
66 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
67 ##
68 diff --git a/build/make/configure.sh b/build/make/configure.sh
69 index 3c772e5..032b5e8 100755
70 --- a/build/make/configure.sh
71 +++ b/build/make/configure.sh
72 @@ -1,4 +1,4 @@
73 -#!/bin/bash
74 +#!/usr/bin/env bash
75 ##
76 ## configure.sh
77 ##
78 diff --git a/build/make/gen_asm_deps.sh b/build/make/gen_asm_deps.sh
79 index 717f870..81b7095 100755
80 --- a/build/make/gen_asm_deps.sh
81 +++ b/build/make/gen_asm_deps.sh
82 @@ -1,4 +1,4 @@
83 -#!/bin/bash
84 +#!/usr/bin/env bash
85 ##
86 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
87 ##
88 diff --git a/build/make/gen_msvs_def.sh b/build/make/gen_msvs_def.sh 41 diff --git a/build/make/gen_msvs_def.sh b/build/make/gen_msvs_def.sh
89 index 4defcc2..12e3573 100755 42 index 4defcc2..12e3573 100755
90 --- a/build/make/gen_msvs_def.sh 43 --- a/build/make/gen_msvs_def.sh
91 +++ b/build/make/gen_msvs_def.sh 44 +++ b/build/make/gen_msvs_def.sh
92 @@ -1,4 +1,4 @@ 45 @@ -1,4 +1,4 @@
113 -#!/bin/bash 66 -#!/bin/bash
114 +#!/usr/bin/env bash 67 +#!/usr/bin/env bash
115 ## 68 ##
116 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. 69 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
117 ## 70 ##
118 diff --git a/build/make/version.sh b/build/make/version.sh
119 index 3efb956..b3a9c23 100755
120 --- a/build/make/version.sh
121 +++ b/build/make/version.sh
122 @@ -1,4 +1,4 @@
123 -#!/bin/bash
124 +#!/usr/bin/env bash
125 ##
126 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
127 ##
128 diff --git a/configure b/configure
129 index 0c4faf9..5d1db69 100755
130 --- a/configure
131 +++ b/configure
132 @@ -1,4 +1,4 @@
133 -#!/bin/bash
134 +#!/usr/bin/env bash
135 ##
136 ## configure
137 ##
138 -- 71 --
139 1.7.11.5 72 1.8.1.2
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