From 4f45c11aaf05acec716f5d1ad1bb3abaffef9cf6 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Tue, 24 Jul 2012 18:32:05 +0000 Subject: [PATCH] Allow use of the system libjpeg. BUG=56 TEST=gentoo builds chromium with libyuv with system jpeg Review URL: https://webrtc-codereview.appspot.com/699005 git-svn-id: http://libyuv.googlecode.com/svn/trunk@311 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- libyuv.gyp | 17 +++++++++++++++-- unit_test/planar_test.cc | 14 +++++++------- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/README.chromium b/README.chromium index 8da2e0d12..1140b59c0 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 310 +Version: 311 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 0414992e0..5080331db 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 310 +#define LIBYUV_VERSION 311 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/libyuv.gyp b/libyuv.gyp index 0aaccc0cc..77b33b62e 100644 --- a/libyuv.gyp +++ b/libyuv.gyp @@ -7,12 +7,25 @@ # be found in the AUTHORS file in the root of the source tree. { + 'variables': { + 'use_system_libjpeg%': 0, + }, 'targets': [ { 'target_name': 'libyuv', 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg', + 'conditions': [ + ['use_system_libjpeg==0', { + 'dependencies': [ + '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg', + ], + }, { + 'link_settings': { + 'libraries': [ + '-ljpeg', + ], + }, + }], ], 'defines': [ 'HAVE_JPEG', diff --git a/unit_test/planar_test.cc b/unit_test/planar_test.cc index 6addaa267..7c209cbda 100644 --- a/unit_test/planar_test.cc +++ b/unit_test/planar_test.cc @@ -70,7 +70,7 @@ TEST_F(libyuvTest, FMT_PLANAR##To##FMT_B##_OptVsC) { \ } \ } \ } \ - EXPECT_LE(max_diff, 2);; \ + EXPECT_LE(max_diff, 2); \ free_aligned_buffer_16(src_y) \ free_aligned_buffer_16(src_u) \ free_aligned_buffer_16(src_v) \ @@ -131,7 +131,7 @@ TEST_F(libyuvTest, FMT_PLANAR##To##FMT_B##_OptVsC) { \ } \ } \ } \ - EXPECT_LE(max_diff, 3);; \ + EXPECT_LE(max_diff, 3); \ free_aligned_buffer_16(src_y) \ free_aligned_buffer_16(src_uv) \ free_aligned_buffer_16(dst_argb_c) \ @@ -184,7 +184,7 @@ TEST_F(libyuvTest, FMT_A##To##FMT_PLANAR##_OptVsC) { \ } \ } \ } \ - EXPECT_LE(max_diff, 2);; \ + EXPECT_LE(max_diff, 2); \ for (int i = 0; i < kHeight / SUBSAMP_Y; ++i) { \ for (int j = 0; j < kWidth / SUBSAMP_X; ++j) { \ int abs_diff = \ @@ -195,7 +195,7 @@ TEST_F(libyuvTest, FMT_A##To##FMT_PLANAR##_OptVsC) { \ } \ } \ } \ - EXPECT_LE(max_diff, 2);; \ + EXPECT_LE(max_diff, 2); \ for (int i = 0; i < kHeight / SUBSAMP_Y; ++i) { \ for (int j = 0; j < kWidth / SUBSAMP_X; ++j) { \ int abs_diff = \ @@ -206,7 +206,7 @@ TEST_F(libyuvTest, FMT_A##To##FMT_PLANAR##_OptVsC) { \ } \ } \ } \ - EXPECT_LE(max_diff, 2);; \ + EXPECT_LE(max_diff, 2); \ free_aligned_buffer_16(dst_y_c) \ free_aligned_buffer_16(dst_u_c) \ free_aligned_buffer_16(dst_v_c) \ @@ -260,7 +260,7 @@ TEST_F(libyuvTest, FMT_A##To##FMT_B##_OptVsC) { \ max_diff = abs_diff; \ } \ } \ - EXPECT_LE(max_diff, 2);; \ + EXPECT_LE(max_diff, 2); \ free_aligned_buffer_16(src_argb) \ free_aligned_buffer_16(dst_argb_c) \ free_aligned_buffer_16(dst_argb_opt) \ @@ -316,7 +316,7 @@ TEST_F(libyuvTest, FMT_A##To##FMT_B##_Random) { \ max_diff = abs_diff; \ } \ } \ - EXPECT_LE(max_diff, 2);; \ + EXPECT_LE(max_diff, 2); \ free_aligned_buffer_page_end(src_argb) \ free_aligned_buffer_page_end(dst_argb_c) \ free_aligned_buffer_page_end(dst_argb_opt) \