Mercurial > mxe-octave

annotate src/libvpx-1-fixes.patch @ 3725:2acaa9943159

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qscintilla: update 2.8.4 * src/qscintilla.mk: update to version and checksum for 2.8.4
author John Donoghue
date Mon, 20 Oct 2014 11:01:00 -0400
parents 57ee697ed83b
children 28fa86d2cf21
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2737
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
1 This file is part of MXE.
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
2 See index.html for further information.
2555
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
2737
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
4 Contains ad hoc patches for cross building.
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
5
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
6 From 01c0e284b4d458fade9f8b2288863f3dd4dbc81a Mon Sep 17 00:00:00 2001
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
7 From: MXE
2555
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 Date: Fri, 25 May 2012 23:36:41 +0200
2737
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
9 Subject: [PATCH 1/4] add Libs.private to vpx.pc
2555
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 diff --git a/libs.mk b/libs.mk
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 index e2ba737..209f77e 100644
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 --- a/libs.mk
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 +++ b/libs.mk
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 @@ -242,6 +242,7 @@ vpx.pc: config.mk libs.mk
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 $(qexec)echo 'Requires:' >> $@
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 $(qexec)echo 'Conflicts:' >> $@
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 $(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 + $(qexec)echo 'Libs.private: -lpthread' >> $@
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 $(qexec)echo 'Cflags: -I$${includedir}' >> $@
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 --
2737
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
25 1.7.11.5
2555
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27
2737
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
28 From 73c1c32c41b75a432fbe092fb621474a760d0f51 Mon Sep 17 00:00:00 2001
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
29 From: MXE
2555
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 Date: Fri, 25 May 2012 23:40:00 +0200
2737
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
31 Subject: [PATCH 2/4] linking as test is not good for cross compiling
2555
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34 diff --git a/configure b/configure
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 index 62e1ffb..0c4faf9 100755
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36 --- a/configure
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 +++ b/configure
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38 @@ -481,9 +481,6 @@ process_detect() {
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
39 }
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
40 fi
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 check_header stdio.h || die "Unable to invoke compiler: ${CC} ${CFLAGS}"
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42 - check_ld <<EOF || die "Toolchain is unable to link executables"
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
43 -int main(void) {return 0;}
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
44 -EOF
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
45 # check system headers
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 check_header stdint.h
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
47 check_header pthread.h
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
48 --
2737
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
49 1.7.11.5
2555
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
50
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
51
2737
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
52 From 88bedac576559c599f3084b4eaa61a2ef85cfd06 Mon Sep 17 00:00:00 2001
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
53 From: MXE
2555
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
54 Date: Fri, 25 May 2012 23:40:55 +0200
2737
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
55 Subject: [PATCH 3/4] fix bin/bash
2555
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
56
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
57
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
58 diff --git a/build/make/armlink_adapter.sh b/build/make/armlink_adapter.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
59 index b53669c..71cf7e9 100755
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
60 --- a/build/make/armlink_adapter.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
61 +++ b/build/make/armlink_adapter.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
62 @@ -1,4 +1,4 @@
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
63 -#!/bin/bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
64 +#!/usr/bin/env bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
65 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
66 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
67 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
68 diff --git a/build/make/configure.sh b/build/make/configure.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
69 index 3c772e5..032b5e8 100755
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
70 --- a/build/make/configure.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
71 +++ b/build/make/configure.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
72 @@ -1,4 +1,4 @@
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
73 -#!/bin/bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
74 +#!/usr/bin/env bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
75 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
76 ## configure.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
77 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
78 diff --git a/build/make/gen_asm_deps.sh b/build/make/gen_asm_deps.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
79 index 717f870..81b7095 100755
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
80 --- a/build/make/gen_asm_deps.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
81 +++ b/build/make/gen_asm_deps.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
82 @@ -1,4 +1,4 @@
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
83 -#!/bin/bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
84 +#!/usr/bin/env bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
85 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
86 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
87 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
88 diff --git a/build/make/gen_msvs_def.sh b/build/make/gen_msvs_def.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
89 index 4defcc2..12e3573 100755
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
90 --- a/build/make/gen_msvs_def.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
91 +++ b/build/make/gen_msvs_def.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
92 @@ -1,4 +1,4 @@
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
93 -#!/bin/bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
94 +#!/usr/bin/env bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
95 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
96 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
97 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
98 diff --git a/build/make/gen_msvs_proj.sh b/build/make/gen_msvs_proj.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
99 index 6d42941..4418034 100755
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
100 --- a/build/make/gen_msvs_proj.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
101 +++ b/build/make/gen_msvs_proj.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
102 @@ -1,4 +1,4 @@
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
103 -#!/bin/bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
104 +#!/usr/bin/env bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
105 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
106 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
107 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
108 diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
109 index 240678b..2089f68 100755
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
110 --- a/build/make/gen_msvs_sln.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
111 +++ b/build/make/gen_msvs_sln.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
112 @@ -1,4 +1,4 @@
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
113 -#!/bin/bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
114 +#!/usr/bin/env bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
115 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
116 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
117 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
118 diff --git a/build/make/version.sh b/build/make/version.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
119 index 3efb956..b3a9c23 100755
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
120 --- a/build/make/version.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
121 +++ b/build/make/version.sh
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
122 @@ -1,4 +1,4 @@
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
123 -#!/bin/bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
124 +#!/usr/bin/env bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
125 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
126 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
127 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
128 diff --git a/configure b/configure
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
129 index 0c4faf9..5d1db69 100755
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
130 --- a/configure
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
131 +++ b/configure
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
132 @@ -1,4 +1,4 @@
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
133 -#!/bin/bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
134 +#!/usr/bin/env bash
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
135 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
136 ## configure
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
137 ##
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
138 --
2737
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
139 1.7.11.5
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
140
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
141
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
142 From 3d905203699e813027233bd0f19b05d44b98470d Mon Sep 17 00:00:00 2001
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
143 From: MXE
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
144 Date: Mon, 17 Sep 2012 20:23:14 +1000
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
145 Subject: [PATCH 4/4] Fix for building on OSX
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
146
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
147 Taken from:
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
148 https://gerrit.chromium.org/gerrit/#/c/26027/
2555
5b5cd166da34 package libvpx: add missing private dependency to .pc file
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
149
2737
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
150 diff --git a/build/make/gen_asm_deps.sh b/build/make/gen_asm_deps.sh
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
151 index 81b7095..158ec34 100755
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
152 --- a/build/make/gen_asm_deps.sh
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
153 +++ b/build/make/gen_asm_deps.sh
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
154 @@ -42,7 +42,7 @@ done
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
155
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
156 [ -n "$srcfile" ] || show_help
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
157 sfx=${sfx:-asm}
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
158 -includes=$(LC_ALL=C egrep -i "include +\"?+[a-z0-9_/]+\.${sfx}" $srcfile |
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
159 +includes=$(LC_ALL=C egrep -i "include +\"?[a-z0-9_/]+\.${sfx}" $srcfile |
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
160 perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;")
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
161 #" restore editor state
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
162 for inc in ${includes}; do
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
163 --
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
164 1.7.11.5
57ee697ed83b package libvpx: fix for buidling on OSX
Tony Theodore <tonyt@logyst.com>
parents: 2555
diff changeset
165