089acff6fe
+ switch from using system sqlite to the bundled one because they have many modifications that are needed + add a new mirror for the distfile because the google one is utterly slow
68 lines
2.4 KiB
Plaintext
68 lines
2.4 KiB
Plaintext
$OpenBSD: patch-third_party_ffmpeg_ffmpeg_gyp,v 1.3 2011/04/29 13:18:02 robert Exp $
|
|
--- third_party/ffmpeg/ffmpeg.gyp.orig Tue Apr 26 10:02:53 2011
|
|
+++ third_party/ffmpeg/ffmpeg.gyp Thu Apr 28 17:32:14 2011
|
|
@@ -204,10 +204,12 @@
|
|
'patched-ffmpeg-mt/libavformat/mp3.c',
|
|
],
|
|
}], # ffmpeg_branding
|
|
- ['target_arch=="ia32" or target_arch=="x64"', {
|
|
+ ['use_system_yasm==0', {
|
|
'dependencies': [
|
|
'../yasm/yasm.gyp:yasm#host',
|
|
],
|
|
+ }],
|
|
+ ['target_arch=="ia32" or target_arch=="x64"', {
|
|
'sources': [
|
|
'patched-ffmpeg-mt/libavcodec/libvpxdec.c',
|
|
'patched-ffmpeg-mt/libavcodec/libvpxenc.c', # sep 09
|
|
@@ -365,9 +367,13 @@
|
|
],
|
|
},
|
|
'variables': {
|
|
- 'yasm_path': '<(PRODUCT_DIR)/yasm',
|
|
'obj_format': 'elf',
|
|
'conditions': [
|
|
+ [ 'use_system_yasm==1', {
|
|
+ 'yasm_path': '<!(which yasm)',
|
|
+ }, {
|
|
+ 'yasm_path': '<(PRODUCT_DIR)/yasm',
|
|
+ }],
|
|
[ 'target_arch=="ia32"', {
|
|
'yasm_flags': [
|
|
'-DARCH_X86_32',
|
|
@@ -429,10 +435,14 @@
|
|
],
|
|
},
|
|
'variables': {
|
|
- 'yasm_path': '<(PRODUCT_DIR)/yasm',
|
|
'obj_format': 'macho',
|
|
'yasm_flags': [ '-DPREFIX' ],
|
|
'conditions': [
|
|
+ [ 'use_system_yasm==1', {
|
|
+ 'yasm_path': '<!(which yasm)',
|
|
+ }, {
|
|
+ 'yasm_path': '<(PRODUCT_DIR)/yasm',
|
|
+ }],
|
|
[ 'target_arch=="ia32"', {
|
|
'yasm_flags': [
|
|
'-DARCH_X86_32',
|
|
@@ -458,7 +468,7 @@
|
|
}, {
|
|
# Using libvpx provided by the system.
|
|
'include_dirs': [
|
|
- '/usr/include/vpx',
|
|
+ '/usr/local/include',
|
|
],
|
|
}
|
|
],
|
|
@@ -738,6 +748,9 @@
|
|
],
|
|
},
|
|
},
|
|
+ 'include_dirs': [
|
|
+ '/usr/local/include',
|
|
+ ],
|
|
}],
|
|
|
|
# Add pkg-config result to include path when use_system_ffmpeg!=0
|