Commit 724d0c1b authored by fbarchard@google.com's avatar fbarchard@google.com

gyp build for jpeg

BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/392022

git-svn-id: http://libyuv.googlecode.com/svn/trunk@184 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent 2842f253
vars = { vars = {
"libyuv_trunk" : "https://libyuv.googlecode.com/svn/trunk", "libyuv_trunk" : "https://libyuv.googlecode.com/svn/trunk",
"chromium_trunk" : "http://src.chromium.org/svn/trunk", "chromium_trunk" : "http://src.chromium.org/svn/trunk",
"chromium_revision": "95033", "chromium_revision": "120526",
# Use this googlecode_url variable only if there is an internal mirror for it. # Use this googlecode_url variable only if there is an internal mirror for it.
# If you do not know, use the full path while defining your new deps entry. # If you do not know, use the full path while defining your new deps entry.
"googlecode_url": "http://%s.googlecode.com/svn", "googlecode_url": "http://%s.googlecode.com/svn",
...@@ -20,12 +20,31 @@ deps = { ...@@ -20,12 +20,31 @@ deps = {
"trunk/tools/gyp": "trunk/tools/gyp":
(Var("googlecode_url") % "gyp") + "/trunk@985", (Var("googlecode_url") % "gyp") + "/trunk@985",
# Needed by build/common.gypi.
"trunk/tools/win/supalink":
Var("chromium_trunk") + "/src/tools/win/supalink@" + Var("chromium_revision"),
# Dependencies used by libjpeg-turbo # Dependencies used by libjpeg-turbo
# Optional jpeg decoder
"trunk/third_party/libjpeg_turbo/": "trunk/third_party/libjpeg_turbo/":
Var("chromium_trunk") + "/deps/third_party/libjpeg_turbo@119959", Var("chromium_trunk") + "/deps/third_party/libjpeg_turbo@119959",
# Yasm assember required for libjpeg_turbo
"trunk/third_party/yasm/": "trunk/third_party/yasm/":
Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"), Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"),
"trunk/third_party/yasm/source/patched-yasm":
Var("chromium_trunk") + "/deps/third_party/yasm/patched-yasm@73761",
"trunk/third_party/yasm/binaries":
Var("chromium_trunk") + "/deps/third_party/yasm/binaries@74228",
}
deps_os = {
"win": {
"trunk/third_party/cygwin/":
Var("chromium_trunk") + "/deps/third_party/cygwin@66844",
}
} }
hooks = [ hooks = [
......
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 183 Version: 184
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ #ifndef INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 183 #define LIBYUV_VERSION 184
#endif // INCLUDE_LIBYUV_VERSION_H_ #endif // INCLUDE_LIBYUV_VERSION_H_
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
'target_name': 'libyuv', 'target_name': 'libyuv',
'type': 'static_library', 'type': 'static_library',
'defines': [ 'defines': [
#'HAVE_JPEG', 'HAVE_JPEG',
], ],
'include_dirs': [ 'include_dirs': [
'include', 'include',
'.', '.',
#'third_party/libjpeg_turbo', 'third_party/libjpeg_turbo',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
'source/cpu_id.cc', 'source/cpu_id.cc',
'source/format_conversion.cc', 'source/format_conversion.cc',
'source/planar_functions.cc', 'source/planar_functions.cc',
#'source/mjpeg_decoder.cc', 'source/mjpeg_decoder.cc',
'source/rotate.cc', 'source/rotate.cc',
'source/rotate_neon.cc', 'source/rotate_neon.cc',
'source/row_common.cc', 'source/row_common.cc',
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# The tests are based on gtest # The tests are based on gtest
'testing/gtest.gyp:gtest', 'testing/gtest.gyp:gtest',
'testing/gtest.gyp:gtest_main', 'testing/gtest.gyp:gtest_main',
#'third_party/libjpeg_turbo/libjpeg.gyp:libjpeg', 'third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
], ],
'sources': [ 'sources': [
# headers # headers
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment