]>
Commit | Line | Data |
---|---|---|
42e551c9 ER |
1 | todo use generate_shim_headers script |
2 | ||
3 | --- chromium-browser-24.0.1312.45/src/third_party/libXNVCtrl/libXNVCtrl.gyp 2013-01-04 00:45:35.620067292 +0200 | |
4 | +++ chromium-browser-25.0.1364.29/src/third_party/libXNVCtrl/libXNVCtrl.gyp 2013-01-12 16:17:25.440747088 +0200 | |
5 | @@ -5,14 +5,55 @@ | |
4884fc99 ER |
6 | { |
7 | - 'targets': [ | |
8 | - { | |
9 | - 'target_name': 'libXNVCtrl', | |
10 | - 'type': 'static_library', | |
11 | - 'sources': [ | |
12 | - 'NVCtrl.c', | |
13 | - 'NVCtrl.h', | |
14 | - 'NVCtrlLib.h', | |
15 | - 'nv_control.h', | |
16 | + 'variables': { | |
17 | + 'use_system_libxnvctrl%': 0, | |
18 | + }, | |
19 | + 'conditions': [ | |
20 | + ['use_system_libxnvctrl==0', { | |
21 | + 'targets': [ | |
22 | + { | |
23 | + 'target_name': 'libXNVCtrl', | |
24 | + 'type': 'static_library', | |
25 | + 'sources': [ | |
26 | + 'NVCtrl.c', | |
27 | + 'NVCtrl.h', | |
28 | + 'NVCtrlLib.h', | |
29 | + 'nv_control.h', | |
30 | + ], | |
31 | + }, | |
32 | ], | |
33 | - }, | |
34 | - ], | |
35 | + }, { # use_system_libxnvctrl==1 | |
36 | + 'conditions': [ | |
37 | + ['sysroot!=""', { | |
38 | + 'variables': { | |
39 | + 'pkg-config': '../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"', | |
40 | + }, | |
41 | + }, { | |
42 | + 'variables': { | |
43 | + 'pkg-config': 'pkg-config' | |
44 | + }, | |
45 | + }], | |
46 | + ], | |
47 | + 'targets': [ | |
48 | + { | |
49 | + 'target_name': 'libXNVCtrl', | |
50 | + 'type': 'none', | |
51 | + 'direct_dependent_settings': { | |
52 | + 'cflags': [ | |
53 | + '<!@(<(pkg-config) --cflags libXNVCtrl)', | |
54 | + ], | |
42e551c9 ER |
55 | + 'defines': [ |
56 | + 'USE_SYSTEM_LIBXNVCTRL', | |
57 | + ], | |
4884fc99 ER |
58 | + }, |
59 | + 'link_settings': { | |
60 | + 'ldflags': [ | |
61 | + '<!@(<(pkg-config) --libs-only-L --libs-only-other libXNVCtrl)', | |
62 | + ], | |
63 | + 'libraries': [ | |
64 | + '<!@(<(pkg-config) --libs-only-l libXNVCtrl)', | |
65 | + ], | |
66 | + }, | |
67 | + } | |
68 | + ], | |
69 | + }], | |
70 | + ] | |
71 | } | |
42e551c9 ER |
72 | --- chromium-browser-25.0.1364.29/src/content/gpu/gpu_info_collector_linux.cc 2013-01-12 16:11:48.998635662 +0200 |
73 | +++ chromium-browser-25.0.1364.29/src/content/gpu/gpu_info_collector_linux.cc 2013-01-12 16:29:12.273316708 +0200 | |
74 | @@ -18,8 +18,7 @@ | |
75 | #include "base/string_tokenizer.h" | |
76 | #include "base/string_util.h" | |
77 | #include "library_loaders/libpci.h" | |
78 | -#include "third_party/libXNVCtrl/NVCtrl.h" | |
79 | -#include "third_party/libXNVCtrl/NVCtrlLib.h" | |
80 | +#include "third_party/libXNVCtrl/libXNVCtrl.h" | |
81 | #include "ui/gl/gl_bindings.h" | |
82 | #include "ui/gl/gl_context.h" | |
83 | #include "ui/gl/gl_implementation.h" | |
84 | --- /dev/null 2007-02-13 18:29:53.000000000 +0200 | |
85 | +++ hromium-browser-25.0.1364.29/src/third_party/libXNVCtrl/libXNVCtrl.h 2013-01-12 16:27:55.676465329 +0200 | |
86 | @@ -0,0 +1,17 @@ | |
87 | +// Copyright (c) 2013 The Chromium Authors. All rights reserved. | |
88 | +// Use of this source code is governed by a BSD-style license that can be | |
89 | +// found in the LICENSE file. | |
90 | + | |
91 | +// This is a shim header to include the right opus header. | |
92 | +// Use this instead of referencing the opus header directly. | |
93 | + | |
94 | +#if !defined(THIRD_PARTY_LIBXNVCTRL_LIBXNVCTRL_H) | |
95 | +#define THIRD_PARTY_LIBXNVCTRL_LIBXNVCTRL_H | |
96 | +#if defined(USE_SYSTEM_LIBXNVCTRL) | |
97 | +#include <NVCtrl.h> | |
98 | +#include <NVCtrlLib.h> | |
99 | +#else | |
100 | +#include "third_party/libXNVCtrl/NVCtrl.h" | |
101 | +#include "third_party/libXNVCtrl/NVCtrlLib.h" | |
102 | +#endif | |
103 | +#endif |