[pkg-nvidia-devel] r735 - in /packages/nvidia-settings/trunk/debian: changelog control copyright nvidia-settings.install patches/05_remove_X_XF86VidModeGetGammaRampSize_checks.diff patches/series rules

fabo at users.alioth.debian.org fabo at users.alioth.debian.org
Wed Feb 17 11:27:36 UTC 2010 

Author: fabo
Date: Wed Feb 17 11:27:31 2010
New Revision: 735

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=735
Log:
* Ship nv-control-dpy binary with nvidia-settings package
  (closes: #564654)
* Add 05_remove_X_XF86VidModeGetGammaRampSize_checks.diff:
  The protocol defines were moved to a different header in recent versions of
  the XF86VidMode protocol packages, which breaks the build.
* Update debian/control:
  - Bump debhelper version to 7.4.13
  - Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed)
* Update debian/copyright: add myself to packaging copyright
* Update debian/nvidia-settings.install: add nvidia-control-dpy
* Update debian/rules:
  - Enable parallel build (pass --parallel option to dh)
  - Build samples to ship nv-control-dpy binary
  - Add override_dh_installexamples to avoid built samples binaries install

Added:
    packages/nvidia-settings/trunk/debian/patches/05_remove_X_XF86VidModeGetGammaRampSize_checks.diff
Modified:
    packages/nvidia-settings/trunk/debian/changelog
    packages/nvidia-settings/trunk/debian/control
    packages/nvidia-settings/trunk/debian/copyright
    packages/nvidia-settings/trunk/debian/nvidia-settings.install
    packages/nvidia-settings/trunk/debian/patches/series
    packages/nvidia-settings/trunk/debian/rules

Modified: packages/nvidia-settings/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/changelog?rev=735&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/debian/changelog (original)
+++ packages/nvidia-settings/trunk/debian/changelog Wed Feb 17 11:27:31 2010
@@ -1,6 +1,22 @@
-nvidia-settings (190.53-1) UNRELEASED; urgency=low
+nvidia-settings (190.53-1) unstable; urgency=low
 
   * New upstream release (closes: #564792)
+
+  [ Fathi Boudra ]
+  * Ship nv-control-dpy binary with nvidia-settings package
+    (closes: #564654)
+  * Add 05_remove_X_XF86VidModeGetGammaRampSize_checks.diff:
+    The protocol defines were moved to a different header in recent versions of
+    the XF86VidMode protocol packages, which breaks the build.
+  * Update debian/control:
+    - Bump debhelper version to 7.4.13
+    - Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed)
+  * Update debian/copyright: add myself to packaging copyright
+  * Update debian/nvidia-settings.install: add nvidia-control-dpy
+  * Update debian/rules:
+    - Enable parallel build (pass --parallel option to dh)
+    - Build samples to ship nv-control-dpy binary
+    - Add override_dh_installexamples to avoid built samples binaries install
 
  -- Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>  Wed, 17 Feb 2010 10:27:28 +0100
 

Modified: packages/nvidia-settings/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/control?rev=735&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/debian/control (original)
+++ packages/nvidia-settings/trunk/debian/control Wed Feb 17 11:27:31 2010
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>
 Uploaders: Randall Donald <rdonald at debian.org>
-Build-Depends: debhelper (>= 7.2), sharutils, m4, libgtk2.0-dev,
+Build-Depends: debhelper (>= 7.4.13), sharutils, m4, libgtk2.0-dev,
  libgl1-mesa-dev | libgl-dev, libxext-dev, libxrandr-dev, libxv-dev,
  libxxf86vm-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 
 Package: nvidia-settings
 Architecture: i386 amd64

Modified: packages/nvidia-settings/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/copyright?rev=735&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/debian/copyright (original)
+++ packages/nvidia-settings/trunk/debian/copyright Wed Feb 17 11:27:31 2010
@@ -41,7 +41,8 @@
 
 The Debian packaging is:
 
-    Copyright (C) 2004-2009 Randall Donald <rdonald at debian.org>
+    Copyright (C) 2009-2010 Fathi Boudra <fabo at debian.org>
+    Copyright (C) 2004-2010 Randall Donald <rdonald at debian.org>
 
 and is licensed under the GPL version 2,
 see `/usr/share/common-licenses/GPL-2'.

Modified: packages/nvidia-settings/trunk/debian/nvidia-settings.install
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/nvidia-settings.install?rev=735&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/debian/nvidia-settings.install (original)
+++ packages/nvidia-settings/trunk/debian/nvidia-settings.install Wed Feb 17 11:27:31 2010
@@ -1,5 +1,6 @@
+debian/nvidia-settings.desktop /usr/share/applications/
 debian/nvidia-settings.png /usr/share/pixmaps/
-debian/nvidia-settings.desktop /usr/share/applications/
-src/libXNVCtrl/libXNVCtrl.a /usr/lib/
+samples/nv-control-dpy /usr/bin/
 src/libXNVCtrl/NVCtrl.h /usr/include/NVCtrl/
 src/libXNVCtrl/NVCtrlLib.h /usr/include/NVCtrl/
+src/libXNVCtrl/libXNVCtrl.a /usr/lib/

Added: packages/nvidia-settings/trunk/debian/patches/05_remove_X_XF86VidModeGetGammaRampSize_checks.diff
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/patches/05_remove_X_XF86VidModeGetGammaRampSize_checks.diff?rev=735&op=file
==============================================================================
--- packages/nvidia-settings/trunk/debian/patches/05_remove_X_XF86VidModeGetGammaRampSize_checks.diff (added)
+++ packages/nvidia-settings/trunk/debian/patches/05_remove_X_XF86VidModeGetGammaRampSize_checks.diff Wed Feb 17 11:27:31 2010
@@ -1,0 +1,99 @@
+From d5d8479137dc5f1b9cb60b77297c577db3df3226 Mon Sep 17 00:00:00 2001
+From: Andy Ritger <aritger at nvidia.com>
+Date: Fri, 15 Jan 2010 08:50:51 +0000
+Subject: Remove X_XF86VidModeGetGammaRampSize checks.
+
+The protocol defines were moved to a different header in recent versions of the
+XF86VidMode protocol packages, which breaks the build.
+
+The GammaRamp related entry points were added to the XF86VidMode extension in
+version 2.1.  Years ago, it was not uncommon to try to build nvidia-settings
+with a pre-2.1 version of xf86vmode.h, but I don't think that happens frequently
+any more.
+
+Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
+
+Origin: upstream, http://cgit.freedesktop.org/~aplattner/nvidia-settings/commit/?id=d5d8479137dc5f1b9cb60b77297c577db3df3226
+
+--- a/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
++++ b/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
+@@ -41,8 +41,6 @@ static unsigned short computeVal(NvCtrlA
+ #define BLUE  BLUE_CHANNEL_INDEX
+ 
+ 
+-#if defined(X_XF86VidModeGetGammaRampSize)
+-
+ /*
+  * XXX The XF86VidMode extension can block remote clients.
+  * Unfortunately, there doesn't seem to be a good way to determine if
+@@ -72,9 +70,6 @@ static int vidModeErrorHandler(Display *
+     return 1;
+ }
+ 
+-#endif /* X_XF86VidModeGetGammaRampSize */
+-
+-
+ 
+ 
+ NvCtrlVidModeAttributes *
+@@ -89,8 +84,6 @@ NvCtrlInitVidModeAttributes(NvCtrlAttrib
+         goto failed;
+     }
+ 
+-#if defined(X_XF86VidModeGetGammaRampSize)
+-
+     ret = XF86VidModeQueryExtension(h->dpy, &event, &vidModeErrorBase);
+     if (ret != True) goto failed;
+ 
+@@ -190,12 +183,6 @@ NvCtrlInitVidModeAttributes(NvCtrlAttrib
+     
+     return (vm);
+ 
+-#else
+-    
+-#warning Old xf86vmode.h; dynamic gamma ramp support will not be compiled.
+-    
+-#endif
+-    
+  blocked:
+     
+     nv_warning_msg("The VidMode extension is blocked for remote "
+@@ -272,8 +259,6 @@ ReturnStatus NvCtrlSetColorAttributes(Nv
+     int i, ch;
+     Bool ret;
+     
+-#if defined(X_XF86VidModeGetGammaRampSize)
+-    
+     NvCtrlAttributePrivateHandle *h;
+ 
+     h = (NvCtrlAttributePrivateHandle *) handle;
+@@ -340,10 +325,6 @@ ReturnStatus NvCtrlSetColorAttributes(Nv
+     if (ret != True) return NvCtrlError;
+ 
+     return NvCtrlSuccess;
+-#else
+-    return NvCtrlMissingExtension;
+-
+-#endif /* X_XF86VidModeGetGammaRampSize */
+     
+ } /* NvCtrlSetColorAttribute() */
+ 
+@@ -353,8 +334,6 @@ ReturnStatus NvCtrlGetColorRamp(NvCtrlAt
+                                 unsigned short **lut,
+                                 int *n)
+ {
+-#if defined(X_XF86VidModeGetGammaRampSize)
+-    
+     NvCtrlAttributePrivateHandle *h;
+ 
+     h = (NvCtrlAttributePrivateHandle *) handle;
+@@ -375,9 +354,6 @@ ReturnStatus NvCtrlGetColorRamp(NvCtrlAt
+     }
+     
+     return NvCtrlSuccess;
+-#else
+-    return NvCtrlMissingExtension;
+-#endif
+ }
+ 
+ 

Modified: packages/nvidia-settings/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/patches/series?rev=735&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/debian/patches/series (original)
+++ packages/nvidia-settings/trunk/debian/patches/series Wed Feb 17 11:27:31 2010
@@ -3,3 +3,4 @@
 02_fix_manpage_type.diff
 03_build_xnvctrl_with_fpic.diff
 04_add_missing_linked_library.diff
+05_remove_X_XF86VidModeGetGammaRampSize_checks.diff

Modified: packages/nvidia-settings/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/debian/rules?rev=735&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/debian/rules (original)
+++ packages/nvidia-settings/trunk/debian/rules Wed Feb 17 11:27:31 2010
@@ -1,15 +1,21 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh --parallel $@
 
 override_dh_auto_build:
 	dh_auto_build
+	$(MAKE) -C samples
 	uudecode debian/nvidia-settings.png.uue -o debian/nvidia-settings.png
 
 override_dh_clean:
 	dh_clean debian/nvidia-settings.png
 	[ ! -f src/XF86Config-parser/Makefile ] || $(MAKE) -C src/XF86Config-parser clean
+	[ ! -f samples/Makefile ] || $(MAKE) -C samples clean
+
+override_dh_installexamples:
+	[ ! -f samples/Makefile ] || $(MAKE) -C samples clean
+	dh_installexamples
 
 override_dh_compress:
 	dh_compress --exclude=.c --exclude=.txt

More information about the Pkg-nvidia-devel mailing list