debian/0000755000000000000000000000000012141606666007176 5ustar debian/nvclock-qt.install0000644000000000000000000000002311114241145012624 0ustar usr/bin/nvclock_qt debian/nvclock-gtk.menu0000644000000000000000000000030611402436134012273 0ustar ?package(nvclock-gtk):\ needs="X11"\ section="Applications/System/Hardware"\ longtitle="nvclock: overclock your nVidia card (GTK GUI)"\ title="Nvclock for GTK+"\ command="/usr/bin/nvclock_gtk" debian/control0000644000000000000000000000461112141605565010600 0ustar Source: nvclock Section: x11 Priority: extra Maintainer: Debian NVIDIA Maintainers Uploaders: Russ Allbery , Andreas Beckmann , Build-Depends: debhelper (>= 9), dh-autoreconf, libglib2.0-dev, libgtk2.0-dev, libqt4-dev, Build-Conflicts: autoconf2.13, automake1.4, libqt3-mt-dev, Standards-Version: 3.9.4 Homepage: http://www.linuxhardware.org/nvclock/ Vcs-Svn: svn://anonscm.debian.org/pkg-nvidia/packages/nvclock/trunk Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvclock/ Package: nvclock Architecture: alpha amd64 armel armhf hppa i386 ia64 powerpc sparc Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: smartdimmer Suggests: ${nvidia:Suggests} Description: Overclock an NVIDIA card This program allows you to overclock your NVIDIA-based video card. The official binary NVIDIA drivers are required for accesses other than by root. . This is the console version. See nvclock-gtk or nvclock-qt for graphical versions. Package: nvclock-gtk Architecture: alpha amd64 armel armhf hppa i386 ia64 powerpc sparc Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: ${nvidia:Suggests} Description: Overclock an NVIDIA card (GTK+ interface) This program allows you to overclock your NVIDIA-based video card. The official binary NVIDIA drivers are required for accesses other than by root. . This is the GTK+ version. See nvclock-qt for a Qt version and nvclock for the console version. Package: nvclock-qt Architecture: alpha amd64 armel armhf hppa i386 ia64 powerpc sparc Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: ${nvidia:Suggests} Description: Overclock an NVIDIA card (Qt interface) This program allows you to overclock your NVIDIA-based video card. The official binary NVIDIA drivers are required for accesses other than by root. . This is the Qt version. See nvclock-gtk for a GTK+ version and nvclock for the console version. Package: smartdimmer Architecture: alpha amd64 armel armhf hppa i386 ia64 powerpc sparc Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: nvclock (<< 0.8b4+cvs20100914-2~) Replaces: nvclock (<< 0.8b4+cvs20100914-2~) Description: Change LCD brightness on GeForce cards NVIDIA GeForce Go 6xxx, GeForce Go 7xxx, GeForce 8xxxM, GeForce 9xxxM, and other cards contain hardware LCD brightness control. Smartdimmer allows this to be controlled through software. debian/README.source0000644000000000000000000000111011517527155011347 0ustar CVS Snapshots ============= The nvclock package is currently built from snapshots of the upstream CVS repository located at :pserver:anonymous@nvclock.cvs.sourceforge.net:/cvsroot/nvclock The CVS module is called 'nvclock'. The 'get-cvs-snapshot' target in debian/rules can be used to download and pack a new snapshot. To get a snapshot for a specific date, set the SNAPSHOT_BEFORE variable to the desired point in time: debian/rules get-cvs-snapshot SNAPSHOT_BEFORE=2010-01-01 -- Andreas Beckmann Tue, 25 Jan 2011 10:49:51 +0100 debian/nvclock_gtk.10000644000000000000000000000137211114241145011551 0ustar .TH NVCLOCK_GTK 1 "May 08, 2002" .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection .\" other parms are allowed: see man(7), man(1) .SH NAME nvclock_gtk \- Overclock your NVidia graphics adapter. .SH SYNOPSIS .B nvclock_gtk .SH "DESCRIPTION" This manual page documents briefly the .BR nvclock_gtk command. This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page. .PP .B nvclock_gtk is a program that allows you to overclock your NVidia's memory and core speed using a GTK interface. .SH OPTIONS This command does not have any options. .SH AUTHOR This manual page was written by Wouter de Vries , for the Debian GNU/Linux system (but may be used by others). debian/nvclock-gtk.manpages0000644000000000000000000000002511114241145013114 0ustar debian/nvclock_gtk.1 debian/nvclock-gtk.lintian-overrides0000644000000000000000000000014411556715462015003 0ustar # false positive: hyphenated govern-ment in upstream license spelling-error-in-copyright ment meant debian/nvclock.manpages0000644000000000000000000000005011717176552012351 0ustar debian/tmp/usr/share/man/man1/nvclock.1 debian/nvclock-qt.lintian-overrides0000644000000000000000000000014411556715462014642 0ustar # false positive: hyphenated govern-ment in upstream license spelling-error-in-copyright ment meant debian/nvclock.lintian-overrides0000644000000000000000000000014411556715462014220 0ustar # false positive: hyphenated govern-ment in upstream license spelling-error-in-copyright ment meant debian/nvclock-gtk.install0000644000000000000000000000015211445656001013000 0ustar usr/bin/nvclock_gtk usr/share/applications/nvclock.desktop usr/share/icons/hicolor/48x48/apps/nvclock.png debian/nvclock-qt.docs0000644000000000000000000000003111517534234012120 0ustar ABOUT AUTHORS FAQ README debian/smartdimmer.10000644000000000000000000000130611402725214011572 0ustar .TH SMARTDIMMER "1" "June 2010" "smartdimmer 0.8b4" "User Commands" .SH NAME smartdimmer \- backlight dimming tool for laptops .SH SYNOPSIS .B smartdimmer [\fIOPTION\fR]... .SH DESCRIPTION NVClock SmartDimmer adjustment tool version 0.8b4. .SH OPTIONS .TP \fB\-g\fR \fB\-\-get\fR Query brightness level. .TP \fB\-s\fR \fB\-\-set\fR Set brightness level (15\-100) .TP \fB\-i\fR \fB\-\-increase\fR Increase brightness with one level. .TP \fB\-d\fR \fB\-\-decrease\fR Decrease brightness with one level. .TP \fB\-h\fR \fB\-\-help\fR Prints this help text. .SH AUTHOR This manual page was written by Andreas Beckmann , for the Debian GNU/Linux system (but may be used by others). debian/copyright0000644000000000000000000001452212100600620011110 0ustar Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202&view=co Upstream-Name: nvclock Upstream-Contact: Roderick Colenbrander Source: http://www.linuxhardware.org/nvclock/ Files: * Copyright: 2001-2009 Roderick Colenbrander Christian Zander 2001 Jan Prokop 2005 Erik Waling 2005 Matt Wright 1998 Itai Nahshon, Michael Schimek 1998 Gerd Knorr 2004 NVIDIA Corporation. License: GPL-2+ Files: src/backend/nv40.c src/backend/i2c.c Copyright: 1993-2003 NVIDIA, Corporation License: NVIDIA NOTICE TO USER: The source code is copyrighted under U.S. and international laws. Users and possessors of this source code are hereby granted a nonexclusive, royalty-free copyright license to use this code in individual and commercial software. . Any use of this source code must include, in the user documenta- tion and internal comments to the code, notices to the end user as follows: . Copyright 1993-2003 NVIDIA, Corporation. All rights reserved. . NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND. NVIDIA, CORPOR- ATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE- MENT, AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL NVIDIA, CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT, INCI- DENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RE- SULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. . U.S. Government End Users. This source code is a "commercial item," as that term is defined at 48 C.F.R. 2.101 (OCT 1995), consisting of "commercial computer software" and "commercial computer software documentation," as such terms are used in 48 C.F.R. 12.212 (SEPT 1995) and is provided to the U.S. Govern- ment only as a commercial end item. Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (JUNE 1995), all U.S. Government End Users acquire the source code with only those rights set forth herein. . As clarified by upstream, NVIDIA applies a very generous interpretation of the term "use" in the license above: . GPL licensing note -- nVidia is allowing a liberal interpretation of the documentation restriction above, to merely say that this nVidia's copyright and disclaimer should be included with all code derived from this source. . The code covered by this license and used as the basis of the code included in this package is also part of the xserver-xorg-video-nv package and has been relicensed by NVIDIA under the following license: . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Files: src/backend/libc_wrapper.c Copyright: 1997 by The XFree86 Project, Inc. License: XFree86 Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the names of Orest Zborowski and David Wexelblat not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. Orest Zborowski and David Wexelblat make no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. . THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. Files: debian/* Copyright: © 2001 Wouter de Vries © 2002 Aurelien Jarno © 2002-2009 Randall Donald © 2010-2013 Andreas Beckmann License: GPL-2+ License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. debian/smartdimmer.install0000644000000000000000000000002411717176552013112 0ustar usr/bin/smartdimmer debian/nvclock.docs0000644000000000000000000000003111517534234011476 0ustar ABOUT AUTHORS FAQ README debian/nvclock_qt.10000644000000000000000000000136411114241145011411 0ustar .TH NVCLOCK_QT 1 "May 08, 2002" .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection .\" other parms are allowed: see man(7), man(1) .SH NAME nvclock_qt \- Overclock your NVidia graphics adapter. .SH SYNOPSIS .B nvclock_qt .SH "DESCRIPTION" This manual page documents briefly the .BR nvclock_qt command. This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page. .PP .B nvclock_qt is a program that allows you to overclock your NVidia's memory and core speed using a Qt interface. .SH OPTIONS This command does not have any options. .SH AUTHOR This manual page was written by Wouter de Vries , for the Debian GNU/Linux system (but may be used by others). debian/nvclock.install0000644000000000000000000000002011717176552012221 0ustar usr/bin/nvclock debian/smartdimmer.manpages0000644000000000000000000000002511717176552013240 0ustar debian/smartdimmer.1 debian/smartdimmer.lintian-overrides0000644000000000000000000000014411717176552015105 0ustar # false positive: hyphenated govern-ment in upstream license spelling-error-in-copyright ment meant debian/watch0000644000000000000000000000010311402716660010214 0ustar version=3 http://www.linuxhardware.org/nvclock/ nvclock(.*).tar.gz debian/changelog0000644000000000000000000002404212141606534011044 0ustar nvclock (0.8b4+cvs20100914-5) unstable; urgency=low * Build with dh_autoreconf. * fix-unsafe-format.diff: New patch to fix an unsafe format string. * Use canonical Vcs-* URLs. * Bump Standards-Version to 3.9.4. No changes needed. * Switch to debhelper 9. -- Andreas Beckmann Mon, 06 May 2013 03:54:36 +0200 nvclock (0.8b4+cvs20100914-4) unstable; urgency=low * fix-segfaults.diff: Fix missing braces. Thanks to Евгений Сыромятников for noticing this and the patch. (Closes: #703454) * Update my email address and drop DMUA. -- Andreas Beckmann Wed, 20 Mar 2013 13:32:51 +0100 nvclock (0.8b4+cvs20100914-3) unstable; urgency=low * Build binary packages for armhf, since it should have similar hardware availability to armel. (Closes: #684490) * fix-segfaults.diff: New patch to fix segmentation faults with newer GPUs and newer Nvidia drivers. (Closes: #671135) -- Andreas Beckmann Thu, 16 Aug 2012 17:45:56 +0200 nvclock (0.8b4+cvs20100914-2) unstable; urgency=low [ Andreas Beckmann ] * Update Standards-Version to 3.9.2 (no changes needed). * debian/copyright: Update to dep5.mdwn?revision=202. * Try to eliminate the Ubuntu diff: * Use a substitution variable to allow vendor specific Suggests. * multiarch.diff: New patch to add /usr/lib/ to the QT library search paths. * Move smartdimmer binary from package nvclock to new package smartdimmer. [ Russ Allbery ] * Add DM-Upload-Allowed: yes. -- Russ Allbery Thu, 16 Feb 2012 11:00:20 -0800 nvclock (0.8b4+cvs20100914-1) unstable; urgency=low [ Andreas Beckmann ] * Repack source from nvclock CVS snapshot. * Update to upstream CVS as of 2010-09-14. * README.source: document CVS snapshot generation. * debian/rules: add a get-cvs-snapshot target to download and pack CVS snapshots. * link-with-all-libs.diff: reorder libraries to fix FTBFS with binutils-gold. (Closes: #555781, #609616) * qt4.diff: new patch to convert nvclock_qt from qt3 to qt4. (Closes: #604365) * Add lintian overrides for false positive misspelling 'ment' in hyphenated govern-ment in upstream license. -- Andreas Beckmann Mon, 21 Feb 2011 21:36:47 -0800 nvclock (0.8b4-3) unstable; urgency=low [ Andreas Beckmann ] * Update Standards-Version to 3.9.1 (no changes needed). * Switch to debhelper compat level 8 (no changes needed). * Suggest nvidia-glx without alternatives. This is now a virtual package provided by nvidia-glx-legacy-* as well. * Add myself to Uploaders. [ Russ Allbery ] * Install desktop file and icon for nvclock-gtk, matching upstream. * Re-add builds for alpha, armel, hppa, ia64, powerpc, and sparc. NVIDIA hardware was more widespread than I thought. * Shorten the short description and fix capitalization in the long description. Add cross-references for the other packages to the long descriptions. -- Russ Allbery Sat, 18 Sep 2010 14:12:59 -0700 nvclock (0.8b4-2) unstable; urgency=low [ Steve Langasek ] * lintian fixes: (closes: #520569) - debian/copyright: add an actual copyright notice. - debian/copyright: copy the GPLv2+ license text. - remove empty debian/nvclock.postinst - minor, but makes dpkg less efficient about package states - debian/control: GTK -> GTK+ - debian/control: add ${misc:Depends} to the deps of all packages - debian/nvclock-{qt,gtk}.menu: quote the "needs" and "section" strings, and use the menu section that the Debian menu policy explicitly says this package should be using (System/Hardware) :-) - debian/rules, debian/compat: set the debhelper compat level in the authoritative place. - debian/rules: don't ignore errors from 'make clean'. - debian/control: Standards-Version to 3.8.0 [ Andreas Beckmann ] * Team change: switch Uploaders from Randall to Russ. * Switch to source format 3.0 (quilt). * Update to upstream CVS as of 2009-06-22. (Closes: #463890, #570325) * Rerun autogen.sh since we patch configure.in. * Add patch nvclock_hurd.debdiff from Barry deFreese to fix FTBFS on GNU/Hurd. (Closes: #533918) * Add patch link-with-all-libs.diff to fix FTBFS with binutils-gold. (Closes: #555781) * Update to debhelper compat level 7 and Standards-Version 3.8.4. * Ship upstream manpage nvclock.1 instead of the outdated Debian version. * Add patch manpage-fixes.diff to fix typos and hyphenation in that manpage. * Do not ship duplicate copies of the upstream changelog. * Ship the smartdimmer binary, new in 0.8b4. * Add manpage smartdimmer.1, generated with help2man. * Add a watch file. * Adjust suggestions to cover nvidia-glx-legacy-*, too. * Add lintian overrides for problems in the upstream source that could be solved by repacking only. * debian/rules: switch to dh and minimize. * Remove obsolete empty maintainer scripts. * Convert debian/copyright to DEP-5 format. * Add Vcs-* URLs. [ Russ Allbery ] * Only build on i386 and amd64, since this package is useless without NVIDIA hardware. (Closes: #551096) * Flesh out debian/copyright with some files released under different licenses and add more copyright holders. * Add a Homepage control field. -- Russ Allbery Sat, 12 Jun 2010 21:06:17 -0700 nvclock (0.8b4-1) unstable; urgency=low * New upstream release. (Closes: #511979, #433375, #360097, #414236, #459494) -- Randall Donald Fri, 20 Feb 2009 12:02:17 -0800 nvclock (0.8b3-1) unstable; urgency=low * New upstream release * Change Maintainer to packaging team. -- Randall Donald Sat, 05 Jan 2008 13:02:01 -0800 nvclock (0.8b2-1) unstable; urgency=low * New upstream release, sorry for the delay (closes: #386633) * change to debhelper 5 -- Randall Donald Mon, 16 Oct 2006 16:25:00 -0700 nvclock (0.8b-1) unstable; urgency=low * New upstream. (closes: #276451, #231941) * compile against new libqt3-mt (closes: #327943) * change description regarding nvidia drivers (closes: #296907) * add suggests on nvidia-glx -- Randall Donald Wed, 21 Sep 2005 11:51:07 -0700 nvclock (0.7-2) unstable; urgency=low * link against qt3-mt. (closes: #203899) -- Randall Donald Sat, 2 Aug 2003 13:45:22 -0700 nvclock (0.7-1) unstable; urgency=low * New upstream. * remove debconf note. -- Randall Donald Tue, 29 Jul 2003 14:08:52 -0700 nvclock (0.6.2-1) unstable; urgency=low * Build against qt3-mt (in src/qt). * create new moc file. * clean up qt Makefile building bit. * New upstream. -- Randall Donald Wed, 12 Feb 2003 12:03:28 -0800 nvclock (0.6-5) unstable; urgency=low * fix automake build-deps. (closes: #165124) -- Randall Donald Wed, 16 Oct 2002 22:43:15 -0700 nvclock (0.6-4) unstable; urgency=low * Doh! Change the Maintainer field. -- Randall Donald Wed, 16 Oct 2002 14:37:55 -0700 nvclock (0.6-3) unstable; urgency=low * New Maintainer. -- Randall Donald Mon, 14 Oct 2002 15:10:06 -0700 nvclock (0.6-2) unstable; urgency=low * Ran automoc in source tree. Should now build correctly on ia64. -- Aurelien Jarno Tue, 8 Oct 2002 01:53:55 +0200 nvclock (0.6-1) unstable; urgency=low * New upstream release. Changelog: - NV18, NV18-GL, NV28, and NV28 support (untested) - GTK 2.x support - improved commandline version - improved GTK gui - fixed multiple card support - adjusted the speed ranges for various cards - additional card info from card registers (GTK gui's only) - code cleanups * Built with GTK+ 2.0 -- Aurelien Jarno Mon, 7 Oct 2002 23:52:41 +0200 nvclock (0.5-6) unstable; urgency=low * Changing search paths for moc in configure.in to be compatible with autoconf2.50 (Closes: Bug#159135). -- Aurelien Jarno Wed, 4 Sep 2002 15:49:08 +0200 nvclock (0.5-5) unstable; urgency=low * Changing build dependency from automake1.5 to automake1.4 (Closes: Bug#159135). * Updated Policy standard compliance to 3.5.7 -- Aurelien Jarno Wed, 4 Sep 2002 11:34:07 +0200 nvclock (0.5-4) unstable; urgency=low * Changing build dependency from automake to automake1.5 -- Aurelien Jarno Wed, 3 Jul 2002 23:30:42 +0200 nvclock (0.5-3) unstable; urgency=low * Rewritten debian/rules from scratch. * Now also compile the Qt frontend. * Splited package in nvclock, nvclock-qt and nvclock-gtk. * Added a debconf template to tell that overclocking can damage the hardware. * Updated copyright file. * Updated man pages. -- Aurelien Jarno Wed, 8 May 2002 23:52:25 +0200 nvclock (0.5-2) unstable; urgency=low * New maintainer. -- Aurelien Jarno Wed, 8 May 2002 21:19:21 +0200 nvclock (0.5-1) unstable; urgency=low * New upstream version. -- Wouter de Vries Tue, 19 Mar 2002 15:52:27 +0100 nvclock (0.4.2-3) unstable; urgency=low * Added distclean to clean buildtarget (Closes: Bug#127179) -- Wouter de Vries Fri, 15 Feb 2002 15:06:45 +0100 nvclock (0.4.2-2) unstable; urgency=low * Fixed build-depends. (Closes: Bug#126285) -- Wouter de Vries Fri, 28 Dec 2001 16:21:04 +0100 nvclock (0.4.2-1) unstable; urgency=low * New upstream version (Closes: Bug#124040) -- Wouter de Vries Thu, 20 Dec 2001 01:27:33 +0100 nvclock (0.2-3) unstable; urgency=low * Fixes missing build-depends on debmake. (Closes: Bug#95037) -- Wouter de Vries Tue, 24 Apr 2001 03:45:40 +0200 nvclock (0.2-2) unstable; urgency=low * Fixed spelling in description. -- Wouter de Vries Sun, 22 Apr 2001 12:38:16 +0200 nvclock (0.2-1) unstable; urgency=low * Initial release. -- Wouter de Vries Fri, 20 Apr 2001 01:15:44 +0200 debian/compat0000644000000000000000000000000212141601571010362 0ustar 9 debian/nvclock-gtk.docs0000644000000000000000000000003111517534234012261 0ustar ABOUT AUTHORS FAQ README debian/smartdimmer.docs0000644000000000000000000000003111717176552012372 0ustar ABOUT AUTHORS FAQ README debian/rules0000755000000000000000000000323312141605431010244 0ustar #!/usr/bin/make -f # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH) ifeq ($(ARCH),alpha) export CFLAGS=-O0 -mieee export CXXFLAGS=-O0 -mieee endif ifeq ($(ARCH),hppa) export CXXFLAGS=-ffunction-sections endif suggests ?= $(or $(if $(shell dpkg-vendor --derives-from Ubuntu && echo Ubuntu),nvidia-common [amd64 i386]),\ nvidia-glx-any [amd64 i386]) %: dh $@ --with autoreconf override_dh_auto_configure: dh_auto_configure -- --enable-gtk --enable-qt override_dh_install: dh_install --list-missing override_dh_gencontrol: dh_gencontrol -- -V'nvidia:Suggests=$(suggests)' ############################################################################ get-cvs-snapshot: rm -rf nvclock+cvs.orig cvs -d:pserver:anonymous@nvclock.cvs.sourceforge.net:/cvsroot/nvclock export -D $(SNAPSHOT_BEFORE) -d nvclock+cvs.orig nvclock rm -f nvclock+cvs.orig/.cvsignore nvclock+cvs.orig/*/.cvsignore nvclock+cvs.orig/*/*/.cvsignore debian/rules pack-cvs-snapshot \ NVCLOCK_CVS_VERSION="$$(sed -ne '1,9{/^v/{s/ .*//;s/v//p}}' nvclock+cvs.orig/ChangeLog)" \ NVCLOCK_CVS_DATE="$$(stat -c%y $$(ls -1t $$(find nvclock+cvs.orig -type f) | head -n 1) | sed -e 's/ .*//' -e 's/-//g')" SNAPSHOT_BEFORE ?= now NVCLOCK_CVS_VERSION ?= unknown NVCLOCK_CVS_DATE ?= yyyymmdd NVCLOCK_CVS ?= $(NVCLOCK_CVS_VERSION)+cvs$(NVCLOCK_CVS_DATE) pack-cvs-snapshot: rm -rf nvclock-$(NVCLOCK_CVS).orig mv nvclock+cvs.orig nvclock-$(NVCLOCK_CVS).orig rm -f nvclock_$(NVCLOCK_CVS).orig.tar.bz2 tar cfvj nvclock_$(NVCLOCK_CVS).orig.tar.bz2 \ --owner=root --group=src \ nvclock-$(NVCLOCK_CVS).orig rm -rf nvclock-$(NVCLOCK_CVS).orig debian/nvclock-qt.menu0000644000000000000000000000030111402436134012125 0ustar ?package(nvclock-qt):\ needs="X11"\ section="Applications/System/Hardware"\ longtitle="nvclock: overclock your nVidia card (Qt GUI)"\ title="Nvclock for Qt"\ command="/usr/bin/nvclock_qt" debian/nvclock-qt.manpages0000644000000000000000000000002411114241145012752 0ustar debian/nvclock_qt.1 debian/source/0000755000000000000000000000000012141606635010472 5ustar debian/source/format0000644000000000000000000000001411402443024011666 0ustar 3.0 (quilt) debian/patches/0000755000000000000000000000000012141606635010621 5ustar debian/patches/qt4.diff0000644000000000000000000003335111517653534012176 0ustar Author: Andreas Beckmann Description: Qt4 support This patch converts nvclock_qt from qt3 to qt4. The source code was converted with qt3to4, the build system was manually hacked so that it works with Qt4 (but probably no longer with Qt3). . Patch is vs. nvclock CVS 2010-09-14. Origin: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/debian/patches/qt4.diff Bug: https://sourceforge.net/tracker/?func=detail&aid=3165282&group_id=21335&atid=371817 Bug-Debian: http://bugs.debian.org/604365 Last-Update: 2011-01-24 Index: b/acinclude.m4 =================================================================== --- a/acinclude.m4 2011-01-24 04:51:05.647352156 +0000 +++ b/acinclude.m4 2011-01-24 04:51:26.783352667 +0000 @@ -98,12 +98,14 @@ #Some distributions don't use QTDIR and use "standard" places like /usr/include/qt3 for headers and /usr/lib for libs #We try to detect qt in those standard places when we haven't found anything in QTDIR if test x$QT_INC_DIR = x; then - QT_INC_SEARCH="/usr/include/qt /usr/include/qt2 /usr/include/qt3 /usr/include/qt3" + QT_INC_SEARCH="/usr/include/qt /usr/include/qt2 /usr/include/qt3 /usr/include/qt3 /usr/include/qt4" #Try to find the qt headers in places like /usr/include/qt3 for i in $QT_INC_SEARCH; do if test -f $i/qglobal.h -a x$QTDIR = x; then QT_INC_DIR=$i + elif test -f $i/Qt/qglobal.h -a x$QTDIR = x; then + QT_INC_DIR=$i fi done fi @@ -115,6 +117,8 @@ for i in $QT_LIB_SEARCH; do if test "x`ls $i/libqt* 2> /dev/null`" != x ; then QT_LIB_DIR=$i + elif test "x`ls $i/libQt* 2> /dev/null`" != x ; then + QT_LIB_DIR=$i fi done fi @@ -135,7 +139,7 @@ # Figure out which version of Qt we are using AC_MSG_CHECKING([Qt version]) -QT_VER=`grep 'define.*QT_VERSION_STR\W' $QT_INC_DIR/qglobal.h | perl -p -e 's/\D//g'` +QT_VER=`grep 'define.*QT_VERSION_STR\W' $QT_INC_DIR/Qt/qglobal.h | perl -p -e 's/\D//g'` case "${QT_VER}" in 2*) QT_MAJOR="2" @@ -143,6 +147,9 @@ 3*) QT_MAJOR="3" ;; + 4*) + QT_MAJOR="4" + ;; *) AC_MSG_ERROR([*** Don't know how to handle this Qt major version]) ;; @@ -168,7 +175,7 @@ # Calculate Qt include path -QT_CXXFLAGS="-I$QT_INC_DIR" +QT_CXXFLAGS="-I$QT_INC_DIR -DQT3_SUPPORT -I$QT_INC_DIR/Qt3Support -I$QT_INC_DIR/QtGui" QT_IS_EMBEDDED="no" # On unix, figure out if we're doing a static or dynamic link @@ -204,11 +211,17 @@ if test x$QT_IS_STATIC = xno ; then QT_IS_DYNAMIC=`ls $QT_LIB_DIR/libqt*.so 2> /dev/null` if test "x$QT_IS_DYNAMIC" = x; then + QT_IS_DYNAMIC=`ls $QT_LIB_DIR/libQt3Support.so 2> /dev/null` + fi + if test "x$QT_IS_DYNAMIC" = x; then AC_MSG_ERROR([*** Couldn't find any Qt libraries]) fi fi - if test "x`ls $QT_LIB_DIR/libqt.* 2> /dev/null`" != x ; then + if test "x`ls $QT_LIB_DIR/libQt3Support.* 2> /dev/null`" != x ; then + QT_LIB="-lQt3Support -lQtCore -lQtGui" + QT_IS_MT="yes" + elif test "x`ls $QT_LIB_DIR/libqt.* 2> /dev/null`" != x ; then QT_LIB="-lqt" QT_IS_MT="no" elif test "x`ls $QT_LIB_DIR/libqt-mt.* 2> /dev/null`" != x ; then Index: b/src/qt/main.cpp =================================================================== --- a/src/qt/main.cpp 2011-01-24 04:51:05.631352599 +0000 +++ b/src/qt/main.cpp 2011-01-24 04:51:26.783352667 +0000 @@ -16,6 +16,7 @@ #include #include +#include //*********************************************************************** @@ -29,7 +30,7 @@ return(-1); } - nvclock.dpy = qt_xdisplay(); /* small hack, to keep the QT version working */ + nvclock.dpy = QX11Info::display(); /* small hack, to keep the QT version working */ CNVclock nv(0, "nv"); Index: b/src/qt/qt_nvclock.cpp =================================================================== --- a/src/qt/qt_nvclock.cpp 2011-01-24 04:51:05.615352727 +0000 +++ b/src/qt/qt_nvclock.cpp 2011-01-24 04:51:26.783352667 +0000 @@ -9,6 +9,9 @@ #include "qt_xfree.h" #include "qt_nvclock.h" +//Added by qt3to4: +#include +#include #include "../../config.h" #include @@ -16,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -82,7 +85,7 @@ CTabNVidia::CTabNVidia(QWidget *parent, const char *name) : QWidget(parent, name) { - l = new QGridLayout(this, 2, 3, 4, 4); + l = new Q3GridLayout(this, 2, 3, 4, 4); l->setColStretch(1, 20); int yy = 0; @@ -121,7 +124,7 @@ void CTabNVidia::addLabel(const QString &text, int yy) -{ l->addWidget(new QLabel(text, this), yy, 0, AlignRight | AlignVCenter); } +{ l->addWidget(new QLabel(text, this), yy, 0, Qt::AlignRight | Qt::AlignVCenter); } //******************************************************************************** @@ -134,11 +137,11 @@ lname->setFont(f); \ layout->addWidget(lname, yy, 1); yy++; - cardInfo = new QGroupBox(tr("Card info"), this); + cardInfo = new Q3GroupBox(tr("Card info"), this); l->addMultiCellWidget(cardInfo, posy, posy, 0, 2); int yy = 0; - QGridLayout *layout = new QGridLayout(cardInfo, 5, 2, 4, 2); + Q3GridLayout *layout = new Q3GridLayout(cardInfo, 5, 2, 4, 2); layout->addRowSpacing(yy++, 10); QFont f(font()); @@ -164,11 +167,11 @@ lname->setFont(f); \ layout->addWidget(lname, yy, 1); yy++; - agpInfo = new QGroupBox(tr("AGP info"), this); + agpInfo = new Q3GroupBox(tr("AGP info"), this); l->addMultiCellWidget(agpInfo, posy, posy, 0, 2); int yy = 0; - QGridLayout *layout = new QGridLayout(agpInfo, 6, 2, 4, 2); + Q3GridLayout *layout = new Q3GridLayout(agpInfo, 6, 2, 4, 2); layout->addRowSpacing(yy++, 10); QFont f(font()); @@ -193,11 +196,11 @@ lname->setFont(f); \ layout->addWidget(lname, yy, 1); yy++; - biosInfo = new QGroupBox(tr("BIOS Info"), this); + biosInfo = new Q3GroupBox(tr("BIOS Info"), this); l->addMultiCellWidget(biosInfo, posy, posy, 0, 2); int yy = 0; - QGridLayout *layout = new QGridLayout(biosInfo, 6, 2, 4, 2); + Q3GridLayout *layout = new Q3GridLayout(biosInfo, 6, 2, 4, 2); layout->addRowSpacing(yy++, 10); QFont f(font()); @@ -383,7 +386,7 @@ //******************************************************************************** CNVclock::CNVclock(QWidget *parent, const char *name) -: QTabDialog(parent, name) +: Q3TabDialog(parent, name) { setCaption(tr("Linux Overclocker - NVclock QT ")); @@ -396,11 +399,11 @@ CTabXFree *tabXFree = new CTabXFree(this); addTab(tabXFree, QPixmap(x_xpm), tr("XFree")); - QTextBrowser *browser = new QTextBrowser(this); + Q3TextBrowser *browser = new Q3TextBrowser(this); browser->setText(txtLinks); addTab(browser, QPixmap(links_xpm), tr("Links")); - browser = new QTextBrowser(this); + browser = new Q3TextBrowser(this); browser->setText(txtAbout); addTab(browser, QPixmap(people_xpm), tr("About")); } Index: b/src/qt/qt_nvclock.h =================================================================== --- a/src/qt/qt_nvclock.h 2011-01-24 04:51:05.611352647 +0000 +++ b/src/qt/qt_nvclock.h 2011-01-24 04:51:26.783352667 +0000 @@ -10,8 +10,11 @@ #ifndef QT_NVCLOCK #define QT_NVCLOCK -#include -#include +#include +#include +//Added by qt3to4: +#include +#include #include "nvclock.h" @@ -19,8 +22,8 @@ class QSpinBox; class QCheckBox; class QComboBox; -class QGroupBox; -class QGridLayout; +class Q3GroupBox; +class Q3GridLayout; //------------------------------------------------------------------ @@ -38,8 +41,8 @@ QComboBox *comboCardNo; QSpinBox *spinCore, *spinMemory; QCheckBox *checkDebug; - QGridLayout *l; - QGroupBox *cardInfo, *agpInfo, *biosInfo; + Q3GridLayout *l; + Q3GroupBox *cardInfo, *agpInfo, *biosInfo; QLabel *labelGPUName, *labelBustype, *labelMemorySize, *labelMemoryType; QLabel *labelAGPstatus, *labelSupAGPrates, *labelAGPrate; @@ -63,7 +66,7 @@ //------------------------------------------------------------------ -class CNVclock : public QTabDialog { +class CNVclock : public Q3TabDialog { public: CNVclock(QWidget *parent = NULL, const char *name = NULL); }; Index: b/src/qt/qt_nvclock.pro =================================================================== --- a/src/qt/qt_nvclock.pro 2011-01-24 04:51:05.603352205 +0000 +++ b/src/qt/qt_nvclock.pro 2011-01-24 04:51:26.783352667 +0000 @@ -7,3 +7,5 @@ HEADERS += qt_nvclock.h qt_xfree.h SOURCES += main.cpp qt_nvclock.cpp qt_xfree.cpp +#The following line was inserted by qt3to4 +QT += qt3support Index: b/src/qt/qt_xfree.cpp =================================================================== --- a/src/qt/qt_xfree.cpp 2011-01-24 04:51:05.599352871 +0000 +++ b/src/qt/qt_xfree.cpp 2011-01-24 04:51:26.783352667 +0000 @@ -13,10 +13,12 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include +//Added by qt3to4: +#include //***************************************************************************** @@ -148,7 +150,7 @@ CTabXFree::CTabXFree(QWidget *parent, char *name) : QWidget(parent, name) { - QGridLayout *l = new QGridLayout(this, 2, 3, 4, 4); + Q3GridLayout *l = new Q3GridLayout(this, 2, 3, 4, 4); int yy = 0; @@ -165,7 +167,7 @@ checkTwinView = new QCheckBox(tr("TwinView"), this); l->addWidget(checkTwinView, yy++, 0); - QGroupBox *box = initTwinView(); + Q3GroupBox *box = initTwinView(); box->setEnabled(FALSE); l->addMultiCellWidget(box, yy, yy, 0, 1); connect(checkTwinView, SIGNAL(toggled(bool)), box, SLOT(setEnabled(bool))); @@ -188,11 +190,11 @@ //***************************************************************************** -QGroupBox* +Q3GroupBox* CTabXFree::initTwinView() { - QGroupBox *g = new QGroupBox(tr("TwinView Setup"), this); - QGridLayout *l = new QGridLayout(g, 4, 2, 4, 2); + Q3GroupBox *g = new Q3GroupBox(tr("TwinView Setup"), this); + Q3GridLayout *l = new Q3GridLayout(g, 4, 2, 4, 2); int yy = 0; l->addRowSpacing(yy++, 15); @@ -214,11 +216,11 @@ //***************************************************************************** -QGroupBox* +Q3GroupBox* CTabXFree::initTVOut() { - QGroupBox *g = new QGroupBox(tr("TV Out Setup"), this); - QGridLayout *l = new QGridLayout(g, 4, 2, 4, 2); + Q3GroupBox *g = new Q3GroupBox(tr("TV Out Setup"), this); + Q3GridLayout *l = new Q3GridLayout(g, 4, 2, 4, 2); int yy = 0; l->addRowSpacing(yy++, 15); @@ -240,7 +242,7 @@ for(int i=0; list[i].text; i++) combo->insertItem(list[i].text); - QWhatsThis::add(combo, txt); + Q3WhatsThis::add(combo, txt); } //***************************************************************************** @@ -251,16 +253,16 @@ for(int i=0; list[i].text; i++) combo->insertItem(list[i].text); - QWhatsThis::add(combo, txt); + Q3WhatsThis::add(combo, txt); } //***************************************************************************** QComboBox* CTabXFree::addCombo(const QString &label, int yy, - QWidget *parent, QGridLayout *gl) + QWidget *parent, Q3GridLayout *gl) { - gl->addWidget(new QLabel(label, parent), yy, 0, AlignRight | AlignVCenter); + gl->addWidget(new QLabel(label, parent), yy, 0, Qt::AlignRight | Qt::AlignVCenter); QComboBox *combo = new QComboBox(parent); gl->addWidget(combo, yy, 1); @@ -310,9 +312,9 @@ output += line("TVFormat", nvTVFormat_list[cTVFormat->currentItem()].value); } - static QTextEdit *textOutput = NULL; + static Q3TextEdit *textOutput = NULL; if(!textOutput) { - textOutput = new QTextEdit(0); + textOutput = new Q3TextEdit(0); textOutput->setReadOnly(TRUE); } textOutput->setText(output); Index: b/src/qt/qt_xfree.h =================================================================== --- a/src/qt/qt_xfree.h 2011-01-24 04:51:05.591352627 +0000 +++ b/src/qt/qt_xfree.h 2011-01-24 04:51:26.783352667 +0000 @@ -11,11 +11,13 @@ #define QT_XFREE #include +//Added by qt3to4: +#include class QCheckBox; -class QGroupBox; +class Q3GroupBox; class QComboBox; -class QGridLayout; +class Q3GridLayout; //---------------------------------------------------------------------- @@ -45,10 +47,10 @@ void initCombo(QComboBox *combo, const char_item *list, const char *txt); QComboBox *addCombo(const QString &label, int yy, - QWidget *parent, QGridLayout *gl); + QWidget *parent, Q3GridLayout *gl); - QGroupBox *initTwinView(); - QGroupBox *initTVOut(); + Q3GroupBox *initTwinView(); + Q3GroupBox *initTVOut(); QString line(const char *txt, int value) const; QString line(const char *txt, const QString &value) const; Index: b/src/qt/Makefile.in =================================================================== --- a/src/qt/Makefile.in 2011-01-24 04:51:26.751352743 +0000 +++ b/src/qt/Makefile.in 2011-01-24 04:51:26.783352667 +0000 @@ -34,7 +34,7 @@ $(CXX) $(CXXFLAGS) -o nvclock_qt $(CXXFLAGS) $(OBJECTS) $(LIBS) clean: - rm -f nvclock_qt *.core *.moc *.o + rm -f nvclock_qt *.core *.moc *.moc.cpp *.o distclean: clean rm -f Makefile debian/patches/series0000644000000000000000000000022412141604256012031 0ustar nvclock_hurd.debdiff link-with-all-libs.diff manpage-fixes.diff desktop-fixes.diff qt4.diff multiarch.diff fix-segfault.diff fix-unsafe-format.diff debian/patches/fix-unsafe-format.diff0000644000000000000000000000061312141604330014774 0ustar Author: Andreas Beckmann Description: fix unsafe format strings --- a/src/gtk/banner.c +++ b/src/gtk/banner.c @@ -112,7 +112,7 @@ if(banner->text) g_free(banner->text); - banner->text = g_strdup_printf(text); + banner->text = g_strdup_printf("%s", text); banner->type = type; /* Refresh the banner */ banner_expose(GTK_WIDGET(banner), NULL, banner); debian/patches/link-with-all-libs.diff0000644000000000000000000000471711517653534015075 0ustar From: Andreas Beckmann Subject: Fix FTBFS with binutils-gold Because --no-add-needed is the default with gold, all libraries need to be specified at link time and in correct order. . Patch is vs. nvclock CVS 2010-09-14. Origin: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/debian/patches/link-with-all-libs.diff Bug: https://sourceforge.net/tracker/?func=detail&aid=3165280&group_id=21335&atid=371817 Bug-Debian: http://bugs.debian.org/555781 Bug-Debian: http://bugs.debian.org/609616 Last-Update: 2011-01-24 Index: b/src/gtk/Makefile.in =================================================================== --- a/src/gtk/Makefile.in 2011-01-24 21:29:01.494352489 +0100 +++ b/src/gtk/Makefile.in 2011-01-24 21:29:04.590354032 +0100 @@ -20,11 +20,11 @@ ifeq ($(HAVE_NVCONTROL), yes) DEPS=$(libbackend) $(libnvcontrol) - LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol + LIBS=-Wl,--as-needed @GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol @X11_LIBS@ -ldl OBJECTS=banner.o gl.o hw.o main.o settings.o else DEPS=$(libbackend) - LIBS=@GTK_LIBS@ -L../backend -lbackend + LIBS=-Wl,--as-needed @GTK_LIBS@ -L../backend -lbackend @X11_LIBS@ -ldl OBJECTS=banner.o hw.o main.o settings.o endif Index: b/src/qt/Makefile.in =================================================================== --- a/src/qt/Makefile.in 2011-01-24 21:29:01.482351925 +0100 +++ b/src/qt/Makefile.in 2011-01-24 21:29:04.590354032 +0100 @@ -21,10 +21,10 @@ ifeq ($(HAVE_NVCONTROL), yes) DEPS=$(libbackend) $(libnvcontrol) - LIBS=@QT_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol + LIBS=@QT_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol @X11_LIBS@ else DEPS=$(libbackend) - LIBS=@QT_LIBS@ -L../backend -lbackend + LIBS=@QT_LIBS@ -L../backend -lbackend @X11_LIBS@ endif .PHONY: clean distclean install Index: b/src/Makefile.in =================================================================== --- a/src/Makefile.in 2011-01-24 21:29:38.678353655 +0100 +++ b/src/Makefile.in 2011-01-24 21:31:28.382353189 +0100 @@ -16,7 +16,7 @@ ifeq ($(HAVE_NVCONTROL), yes) DEPS=$(libbackend) $(libnvcontrol) INCLUDES=@X11_CFLAGS@ -I./backend -I./nvcontrol -I.. - LIBS=@X11_LIBS@ -L./backend -lbackend -L./nvcontrol -lnvcontrol + LIBS=-Wl,--as-needed -L./backend -lbackend -L./nvcontrol -lnvcontrol @X11_LIBS@ else DEPS=$(libbackend) INCLUDES=-I./backend -I./nvcontrol -I.. debian/patches/multiarch.diff0000644000000000000000000000073711717177236013462 0ustar Author: Andreas Beckmann Description: multiarch support Add /usr/lib/ to QT_LIB_SEARCH. Last-Update: 2012-02-16 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -111,7 +111,7 @@ fi if test x$QT_LIB_DIR = x; then - QT_LIB_SEARCH="/usr/lib /usr/local/lib" + QT_LIB_SEARCH="/usr/lib /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) /usr/local/lib" #Try to find the qt libs in /usr/lib and /usr/local/lib for i in $QT_LIB_SEARCH; do debian/patches/fix-segfault.diff0000644000000000000000000000250312122242312014034 0ustar Author: Andreas Beckmann Subject: fix segmentation faults with newer driver and GPUs fix device mask to exclude new devices error out if mmap()ing PMC failed Bug-Debian: http://bugs.debian.org/671135 --- a/src/backend/utils.c +++ b/src/backend/utils.c @@ -88,7 +88,7 @@ int get_gpu_arch(int device_id) { int arch; - switch(device_id & 0xff0) + switch(device_id & 0xfff0) { case 0x20: arch = NV5; --- a/src/backend/back_linux.c +++ b/src/backend/back_linux.c @@ -270,6 +270,8 @@ base = mmap((caddr_t)0, Size + alignOff, PROT_READ|PROT_WRITE, mapflags, dev->fd, (off_t)realBase); + if (base == MAP_FAILED) + return NULL; return (void *) ((char *)base + alignOff); } --- a/src/backend/backend.c +++ b/src/backend/backend.c @@ -41,6 +41,10 @@ nv_card->PFB = map_dev_mem(fd, nv_card->reg_address + 0x100000, 0x1000); /* normally pmc is till 0x2000 but extended it for nv40 */ nv_card->PMC = map_dev_mem(fd, nv_card->reg_address + 0x000000, 0x2ffff); + if (!nv_card->PMC) { + set_error_str("failed to mmap PMC"); + return 0; + } nv_card->PCIO = map_dev_mem(fd, nv_card->reg_address + 0x601000, 0x2000); nv_card->PDISPLAY = map_dev_mem(fd, nv_card->reg_address + NV_PDISPLAY_OFFSET, NV_PDISPLAY_SIZE); nv_card->PRAMDAC = map_dev_mem(fd, nv_card->reg_address + 0x680000, 0x2000); debian/patches/nvclock_hurd.debdiff0000644000000000000000000000044311445656001014606 0ustar Description: fix FTBFS on Debian GNU/Hurd From: Barry deFreese Bug-Debian: http://bugs.debian.org/533918 --- nvclock.orig/configure.in +++ nvclock/configure.in @@ -22,6 +22,8 @@ ;; Linux) ;; + GNU) + ;; CYGWIN_NT-5.*) system=Win32 ;; debian/patches/desktop-fixes.diff0000644000000000000000000000060011445656001014232 0ustar Description: Fix problems with upstream desktop file Forwarded: no Author: Russ Allbery Remove the Encoding key, which is obsolete according to the current desktop file standard. --- nvclock.orig/nvclock.desktop +++ nvclock/nvclock.desktop @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=NVCLOCK Comment=Overclock and Monitor NVIDIA cards Exec=nvclock_gtk debian/patches/fix-CFLAGS.diff0000644000000000000000000000076412013212622013170 0ustar --- a/src/backend/Makefile.in +++ b/src/backend/Makefile.in @@ -1,11 +1,11 @@ -CC=@CC@ -O0 +CC=@CC@ AR=ar RANLIB=@RANLIB@ system=@system@ HAVE_NVCONTROL=@HAVE_NVCONTROL@ OBJECTS=backend.o bios.o config.o error.o nv30.o nv40.o nv50.o info.o overclock.o utils.o i2c.o xf86i2c.o adt7473.o f75375.o lm99.o w83781d.o w83l785r.o libc_wrapper.o -CFLAGS=@X11_CFLAGS@ -I../.. -I../nvcontrol +CFLAGS=@CFLAGS@ @X11_CFLAGS@ -I../.. -I../nvcontrol -O0 ifeq ($(system), FreeBSD) OBJECTS+=back_bsd.o debian/patches/manpage-fixes.diff0000644000000000000000000001624611402722220014174 0ustar From: Andreas Beckmann Subject: manpage typo and hyphenation fixes Index: b/nvclock.1 =================================================================== --- a/nvclock.1 2010-06-06 15:22:36.135536777 +0200 +++ b/nvclock.1 2010-06-06 15:24:13.523536746 +0200 @@ -28,13 +28,13 @@ Enable/Disable overclocking related debug info. This information shows the data stored in the PLLs during various operations. .TP .BI "\-D, \-\-Debug" -Print a long list of GPU registers containing their current value. All this info is very usefull for debugging. +Print a long list of GPU registers containing their current value. All this info is very useful for debugging. .TP .B "\-f, \-\-force" Force support for a card that is currently disabled. Cards can be disabled by default if the code for them is experimental or in case a Laptop is being used. Laptops are disabled for safety reasons as overclocking on them is more dangerous. In case you know what you are doing you can use this option to enable downclocking of your GPU as a way to save power. .TP .BI "\-F, \-\-fanspeed " "speed" -Using this option you can adjust the duty cycle of the fanspeed. The value you can enter can be a delta like +10 or -10 which increases/decreases the fanspeed with 10%. Further the value can be a number like 20 which would set the fanspeed to 20%. Further if your sensor supports automatic (temperature controlled) fanspeed adjustments you can also use the value 'auto' to switch back to automatic control. Note that in all cases the (final) fanspeed should lie between 10% and 100%. A low duty cycle correspons to a low fanspeed. +Using this option you can adjust the duty cycle of the fanspeed. The value you can enter can be a delta like +10 or \-10 which increases/decreases the fanspeed with 10%. Further the value can be a number like 20 which would set the fanspeed to 20%. Further if your sensor supports automatic (temperature controlled) fanspeed adjustments you can also use the value 'auto' to switch back to automatic control. Note that in all cases the (final) fanspeed should lie between 10% and 100%. A low duty cycle correspons to a low fanspeed. Note that the duty cycle is NOT the fanspeed. The duty cycle controls the percentage of time in a fixed time interval in which the fan is 'on'. By choosing a higher value the fan is enabled a larger part of the time which results in a higher fanspeed. Changing the duty cycle from 20% to 40% doesn't double the noise or fanspeed. .TP @@ -50,7 +50,7 @@ .BI "\-P, \-\-Punit " "mask" The Geforce6/7 are designed in such a way that one single GPU can be used for creating different types of boards. For instance they produce a NV40 (6800-class) GPU and when the GPU is functioning properly they turn it into a 6800GT/Ultra or when something is damaged or when it can't reach high clocks they call it a 6800NU/LE. The same is the case for NV43 based 6200/6600 cards. A 6800LE card ships with 8 disabled pixel units and 2 disabled vertex units. On various cards it is possible to re-enable those units and if it works correctly it can greatly improve 3D performance. The problem is that some units can be broken which results in artifacts or instability. Further not all GPU models can be unlocked either because Nvidia protected the GPUs against modding or because there are no extra units to enable. -Using this option you can enable extra pixel units. First check using the -i switch which pixel units are masked. If none are masked it means that none can be unlocked. For an explanation I will take a 6800LE as an example which by default has 8 of its 16 pixel units disabled. The -i option showed the mask '1100' which means that the first and second block of pixel units are disabled. One block of pixel unit contains 4 pipelines in case of most boards with the exception of NV44/NV46 which use 2 pipelines for each pixel unit. To enable the first and second pipeline use -P 1111 (binary) or i you prefer hex 0xf. NVClock will then try to unlock the pipelines note that even when there are masked pipelines some can be locked in hardware so that they can't be enabled. +Using this option you can enable extra pixel units. First check using the \-i switch which pixel units are masked. If none are masked it means that none can be unlocked. For an explanation I will take a 6800LE as an example which by default has 8 of its 16 pixel units disabled. The \-i option showed the mask '1100' which means that the first and second block of pixel units are disabled. One block of pixel unit contains 4 pipelines in case of most boards with the exception of NV44/NV46 which use 2 pipelines for each pixel unit. To enable the first and second pipeline use \-P 1111 (binary) or i you prefer hex 0xf. NVClock will then try to unlock the pipelines note that even when there are masked pipelines some can be locked in hardware so that they can't be enabled. .TP .BI "\-r, \-\-reset" Restore the original clockspeeds @@ -59,10 +59,10 @@ Print current clockspeeds in MHz .TP .BI "\-S, \-\-smartdimmer" -For use on laptops Nvidia added functionality called smartdimmer which can be used to adjust the brightness of the backlight. At the moment the feature is limited to Geforce6200Go cards but if needed more cards can be added if they really provide Smartdimmer support. To use this option you can select a value between 15% and 100% and the brightness will be set to that level or you can use a delta like +10 / -10 which should decrease the brightness with +10% / -10%. +For use on laptops Nvidia added functionality called smartdimmer which can be used to adjust the brightness of the backlight. At the moment the feature is limited to Geforce6200Go cards but if needed more cards can be added if they really provide Smartdimmer support. To use this option you can select a value between 15% and 100% and the brightness will be set to that level or you can use a delta like +10 / \-10 which should decrease the brightness with +10% / \-10%. .TP .BI "\-V, \-\-Vunit " "mask" -This option can be used to enable disabled vertex pipelines which can appear on Geforce6/7 cards. For an introduction to pipeline modding check the -P option first. The syntax and working option is the same as the pixel unit one with the difference that one bit corresponds to 1 vertex pipeline instead of multiple. Again check -i to see which vertex units are locked. On a 6800LE you might see '001111' which means that the fifth and sixth unit are locked. To enable all units use -V 111111 (binary) or 0x3f (hex). Note that it isn't certain that a unit can be enabled as on some cards units are locked. +This option can be used to enable disabled vertex pipelines which can appear on Geforce6/7 cards. For an introduction to pipeline modding check the \-P option first. The syntax and working option is the same as the pixel unit one with the difference that one bit corresponds to 1 vertex pipeline instead of multiple. Again check \-i to see which vertex units are locked. On a 6800LE you might see '001111' which means that the fifth and sixth unit are locked. To enable all units use \-V 111111 (binary) or 0x3f (hex). Note that it isn't certain that a unit can be enabled as on some cards units are locked. .TP Below is a list with Display / OpenGL related options .TP