improve system libXNVCtrl patch; actually apply it

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 3844314ddbf25b2b1e6a997981006494511c9967..cdd27e8504a4aeac71b749f726c584c7b7d3e3c5 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -251,6 +251,7 @@ ln -s %{SOURCE7} src
 %patch4 -p1
 %patch6 -p1
 %patch7 -p1
+%patch10 -p1
 %patch15 -p1
 cd src
 %patch9 -p0

diff --git a/clean-source.sh b/clean-source.sh
index bab5e2797f3eabb7dcb4ad3528a130a867c358f3..64ba65fd288e54123232d59db72c8379d35ca507 100755 (executable)
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -743,6 +743,7 @@ strip_system_dirs \
        third_party/flac \
        third_party/icu \
        third_party/jsoncpp \
+       third_party/libXNVCtrl \
        third_party/libevent \
        third_party/libexif \
        third_party/libjpeg \

diff --git a/system-libxnvctrl.patch b/system-libxnvctrl.patch
index 5d161a6e9f4aec6b70a636330ac7781ef3d7e8a1..c332fef6ab15d859e69c6687d4d0e23f9ac0f279 100644 (file)
--- a/system-libxnvctrl.patch
+++ b/system-libxnvctrl.patch
@@ -1,8 +1,8 @@
---- chromium-browser-24.0.1312.45/src/third_party/libXNVCtrl/libXNVCtrl.gyp~   2013-01-04 00:45:32.000000000 +0200
-+++ chromium-browser-24.0.1312.45/src/third_party/libXNVCtrl/libXNVCtrl.gyp    2013-01-04 00:45:35.620067292 +0200
-@@ -3,16 +3,54 @@
- # found in the LICENSE file.
- 
+todo use generate_shim_headers script
+
+--- chromium-browser-24.0.1312.45/src/third_party/libXNVCtrl/libXNVCtrl.gyp    2013-01-04 00:45:35.620067292 +0200
++++ chromium-browser-25.0.1364.29/src/third_party/libXNVCtrl/libXNVCtrl.gyp    2013-01-12 16:17:25.440747088 +0200
+@@ -5,14 +5,55 @@
  {
 -  'targets': [
 -    {
@@ -52,6 +52,9 @@
 +            'cflags': [
 +                '<!@(<(pkg-config) --cflags libXNVCtrl)',
 +            ],
++            'defines': [
++                'USE_SYSTEM_LIBXNVCTRL',
++            ],
 +          },
 +          'link_settings': {
 +            'ldflags': [
@@ -66,3 +69,35 @@
 +    }],
 +  ]
  }
+--- chromium-browser-25.0.1364.29/src/content/gpu/gpu_info_collector_linux.cc  2013-01-12 16:11:48.998635662 +0200
++++ chromium-browser-25.0.1364.29/src/content/gpu/gpu_info_collector_linux.cc  2013-01-12 16:29:12.273316708 +0200
+@@ -18,8 +18,7 @@
+ #include "base/string_tokenizer.h"
+ #include "base/string_util.h"
+ #include "library_loaders/libpci.h"
+-#include "third_party/libXNVCtrl/NVCtrl.h"
+-#include "third_party/libXNVCtrl/NVCtrlLib.h"
++#include "third_party/libXNVCtrl/libXNVCtrl.h"
+ #include "ui/gl/gl_bindings.h"
+ #include "ui/gl/gl_context.h"
+ #include "ui/gl/gl_implementation.h"
+--- /dev/null  2007-02-13 18:29:53.000000000 +0200
++++ hromium-browser-25.0.1364.29/src/third_party/libXNVCtrl/libXNVCtrl.h       2013-01-12 16:27:55.676465329 +0200
+@@ -0,0 +1,17 @@
++// Copyright (c) 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// This is a shim header to include the right opus header.
++// Use this instead of referencing the opus header directly.
++
++#if !defined(THIRD_PARTY_LIBXNVCTRL_LIBXNVCTRL_H)
++#define THIRD_PARTY_LIBXNVCTRL_LIBXNVCTRL_H
++#if defined(USE_SYSTEM_LIBXNVCTRL)
++#include <NVCtrl.h>
++#include <NVCtrlLib.h>
++#else
++#include "third_party/libXNVCtrl/NVCtrl.h"
++#include "third_party/libXNVCtrl/NVCtrlLib.h"
++#endif
++#endif