coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-07 17:26:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Include libjpeg unconditionally

Browse Source 
libjpeg/libjpeg.gyp should be used in both local and system libjpeg,
otherwise, header file won't found when build with system libjpeg. see
the comments in third_party/libjpeg/libjpeg.gyp

BUG=chromium:316499
R=michaelbai@chromium.org

Review URL: https://webrtc-codereview.appspot.com/5709004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@912 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2013-12-13 00:25:28 +00:00
parent 0287a3cb53
commit 31ca87408e
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DEPS
View File

@ -81,6 +81,9 @@ deps_os = {
"android": {
"third_party/android_tools":
From("chromium_deps", "src/third_party/android_tools"),
"third_party/libjpeg":
From("chromium_deps", "src/third_party/libjpeg"),
},
"ios": {
# NSS, for SSLClientSocketNSS.

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 911
Version: 912
License: BSD
License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 911
#define LIBYUV_VERSION 912
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

12
libyuv.gyp
View File

@ -24,16 +24,22 @@
'HAVE_JPEG'
],
'conditions': [
[ 'use_system_libjpeg==0', {
# Android uses libjpeg for system jpeg support.
[ 'OS == "android" and use_system_libjpeg == 1', {
'dependencies': [
'<(DEPTH)/third_party/libjpeg/libjpeg.gyp:libjpeg',
],
}, {
'dependencies': [
'<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
],
}, {
}],
[ 'use_system_libjpeg == 1', {
'link_settings': {
'libraries': [
'-ljpeg',
],
},
}
}],
],
}],