[packages/chromium-browser/DEVEL] improve system libXNVCtrl patch; actually apply it

glen glen at pld-linux.org
Sat Jan 12 17:33:20 CET 2013


commit 42e551c9b8bde812d3c4b70da4de94333061a3eb
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Jan 12 18:32:44 2013 +0200

    improve system libXNVCtrl patch; actually apply it

 chromium-browser.spec   |  1 +
 clean-source.sh         |  1 +
 system-libxnvctrl.patch | 45 ++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 42 insertions(+), 5 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 3844314..cdd27e8 100644
--- 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 bab5e27..64ba65f 100755
--- 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 5d161a6..c332fef 100644
--- 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/42e551c9b8bde812d3c4b70da4de94333061a3eb



More information about the pld-cvs-commit mailing list