[pkg-nvidia-devel] r535 - in /packages/nvclock/trunk: ./ CVS/ debian/ src/ src/CVS/ src/backend/ src/backend/CVS/ src/gtk/ src/gtk/CVS/ src/nvcontrol/CVS/ src/qt/ src/qt/CVS/
rdonald at users.alioth.debian.org
rdonald at users.alioth.debian.org
Tue Feb 24 05:51:57 UTC 2009
Author: rdonald
Date: Tue Feb 24 05:51:56 2009
New Revision: 535
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=535
Log:
prepare 08b4
Added:
packages/nvclock/trunk/config.h
- copied unchanged from r534, packages/nvclock/branches/upstream/current/config.h
packages/nvclock/trunk/config.log
- copied, changed from r534, packages/nvclock/branches/upstream/current/config.log
packages/nvclock/trunk/config.status
- copied, changed from r534, packages/nvclock/branches/upstream/current/config.status
packages/nvclock/trunk/nvclock.desktop
- copied unchanged from r534, packages/nvclock/branches/upstream/current/nvclock.desktop
packages/nvclock/trunk/nvclock.png
- copied unchanged from r534, packages/nvclock/branches/upstream/current/nvclock.png
packages/nvclock/trunk/src/smartdimmer.c
- copied unchanged from r534, packages/nvclock/branches/upstream/current/src/smartdimmer.c
packages/nvclock/trunk/stamp-h
- copied unchanged from r534, packages/nvclock/branches/upstream/current/stamp-h
Modified:
packages/nvclock/trunk/CVS/Entries
packages/nvclock/trunk/ChangeLog
packages/nvclock/trunk/Makefile.in
packages/nvclock/trunk/README
packages/nvclock/trunk/acinclude.m4
packages/nvclock/trunk/configure
packages/nvclock/trunk/configure.in
packages/nvclock/trunk/debian/changelog
packages/nvclock/trunk/src/CVS/Entries
packages/nvclock/trunk/src/Makefile.in
packages/nvclock/trunk/src/backend/CVS/Entries
packages/nvclock/trunk/src/backend/adt7473.c
packages/nvclock/trunk/src/backend/back_bsd.c
packages/nvclock/trunk/src/backend/back_linux.c
packages/nvclock/trunk/src/backend/back_win32.c
packages/nvclock/trunk/src/backend/backend.c
packages/nvclock/trunk/src/backend/backend.h
packages/nvclock/trunk/src/backend/bios.c
packages/nvclock/trunk/src/backend/config.c
packages/nvclock/trunk/src/backend/info.c
packages/nvclock/trunk/src/backend/lm99.c
packages/nvclock/trunk/src/backend/nv40.c
packages/nvclock/trunk/src/backend/nv50.c
packages/nvclock/trunk/src/backend/nvclock.h
packages/nvclock/trunk/src/backend/nvreg.h
packages/nvclock/trunk/src/backend/utils.c
packages/nvclock/trunk/src/backend/xf86i2c.h
packages/nvclock/trunk/src/gtk/CVS/Entries
packages/nvclock/trunk/src/gtk/Makefile.in
packages/nvclock/trunk/src/gtk/gl.c
packages/nvclock/trunk/src/gtk/hw.c
packages/nvclock/trunk/src/gtk/main.c
packages/nvclock/trunk/src/nvclock.c
packages/nvclock/trunk/src/nvcontrol/CVS/Entries
packages/nvclock/trunk/src/qt/CVS/Entries
packages/nvclock/trunk/src/qt/Makefile.in
packages/nvclock/trunk/src/qt/qt_nvclock.moc.cpp
packages/nvclock/trunk/src/qt/qt_xfree.moc.cpp
Modified: packages/nvclock/trunk/CVS/Entries
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/CVS/Entries?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/CVS/Entries (original)
+++ packages/nvclock/trunk/CVS/Entries Tue Feb 24 05:51:56 2009
@@ -1,18 +1,20 @@
/.cvsignore/1.1/Mon Sep 15 16:42:43 2003//
-/ABOUT/1.2/Thu May 26 20:29:15 2005//
/AUTHORS/1.3/Tue Aug 30 15:46:04 2005//
/COPYING/1.1/Mon Sep 15 15:40:05 2003//
/INSTALL/1.1/Mon Sep 15 15:40:05 2003//
-/Makefile.in/1.4/Sat May 28 14:11:35 2005//
/NEWS/1.1/Mon Sep 15 15:40:05 2003//
-/acinclude.m4/1.4/Sat Aug 13 21:12:18 2005//
/autogen.sh/1.2/Fri Aug 26 16:13:23 2005//
/install-sh/1.1/Mon Sep 15 15:49:41 2003//
D/src////
-/configure.in/1.15/Sun Dec 2 21:30:17 2007//
-/config.h.in/1.1/Sat Dec 29 01:48:18 2007//
-/configure/1.1/Thu Dec 27 15:15:32 2007//
-/README/1.10/Fri Jan 4 17:34:13 2008//
-/nvclock.1/1.9/Fri Jan 4 17:33:40 2008//
-/FAQ/1.3/Fri Jan 4 18:41:57 2008//
-/ChangeLog/1.16/Fri Jan 4 17:32:07 2008//
+/config.h.in/1.1/Thu Dec 27 13:18:09 2007//
+/ABOUT/1.3/Sun May 11 10:25:44 2008//
+/FAQ/1.3/Sun May 11 10:25:44 2008//
+/Makefile.in/1.7/Sun May 11 10:25:44 2008//
+/acinclude.m4/1.5/Sun May 11 10:25:45 2008//
+/nvclock.1/1.9/Sun May 11 10:25:45 2008//
+/nvclock.desktop/1.1/Sun Jan 6 13:28:26 2008//
+/nvclock.png/1.1/Sun Jan 6 13:28:26 2008//
+/configure/1.3/Sat Aug 16 16:53:59 2008//
+/configure.in/1.16/Sat Aug 16 16:53:54 2008//
+/ChangeLog/1.17/Sat Jan 3 17:05:07 2009//
+/README/1.11/Sat Jan 3 17:10:56 2009//
Modified: packages/nvclock/trunk/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/ChangeLog?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/ChangeLog (original)
+++ packages/nvclock/trunk/ChangeLog Tue Feb 24 05:51:56 2009
@@ -1,5 +1,19 @@
Revision History:
=================
+
+v0.8b4 - January, 4, 2009
+-------------------------
+
+ o Initial GT200 support
+ o Smartdimmer support for various Geforce8/9 laptops from Sony, Samsung, HP and Apple
+ o Added an smartdimmer program to replace the original smartdimmer 0.1 program by Erik Wahling
+ o Bios dumping using PRAMIN to prevent flickering
+ o Bios parsing fixes for newer Geforce9/GT200 bioses
+ o Fanspeed adjustment on various Geforce8/9/GT200 cards
+ o Use of video bios sensor calibration data on Geforce6-GT200 cards
+ o Improved support for internal GPU diode temperature on G84/G86/G94/G96 cards
+ o Fixed NV-CONTROL crash in nvclock_gtk
+ o Many small bugfixes
v0.8b3 - January, 4, 2008
-------------------------
Modified: packages/nvclock/trunk/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/Makefile.in?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/Makefile.in (original)
+++ packages/nvclock/trunk/Makefile.in Tue Feb 24 05:51:56 2009
@@ -1,6 +1,6 @@
INSTALL=@INSTALL@
-prefix=@prefix@
+prefix=$(DESTDIR)@prefix@
docdir=${prefix}/share/doc/nvclock
mandir=${prefix}/man
DOCS= ABOUT AUTHORS ChangeLog FAQ README
@@ -15,7 +15,7 @@
$(MAKE) -C src distclean
rm -f *.h config.log config.cache config.status Makefile stamp-h
-install: install-docs install-man
+install: install-docs install-man install-desktop-shortcut
$(MAKE) -C src install
install-docs:
@@ -29,11 +29,17 @@
echo "installing $$doc as $$dir/$$name"; \
done
+install-desktop-shortcut:
+ mkdir -p $(prefix)/share/applications
+ mkdir -p $(prefix)/share/icons/hicolor/48x48/apps
+ cp nvclock.desktop $(prefix)/share/applications
+ cp nvclock.png $(prefix)/share/icons/hicolor/48x48/apps
+
install-man:
mkdir -p $(mandir)/man1
cp nvclock.1 $(mandir)/man1
-uninstall: uninstall-docs uninstall-man
+uninstall: uninstall-docs uninstall-man uninstall-desktop-shortcut
$(MAKE) -C src uninstall
uninstall-docs:
@@ -46,6 +52,12 @@
echo "removing $$dir/$$name" ; \
done
+uninstall-desktop-shortcut:
+ rm -f $(prefix)/share/applications/nvclock.desktop
+ echo "removing $$prefix/share/applications/nvclock.desktop" ; \
+ rm -f $(prefix)/share/icons/hicolor/48x48/apps/nvclock.png
+ echo "removing $$prefix/share/icons/hicolor/48x48/apps/nvclock.png" ; \
+
uninstall-man:
rm -f $(mandir)/man1/nvclock.1
echo "removing $$mandir/man1/nvclock.1" ; \
Modified: packages/nvclock/trunk/README
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/README?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/README (original)
+++ packages/nvclock/trunk/README Tue Feb 24 05:51:56 2009
@@ -1,4 +1,4 @@
-NVClock Version 0.8 (Beta3)
+NVClock Version 0.8 (Beta4)
site: http://nvclock.sourceforge.net
@@ -93,6 +93,19 @@
at frequencies higher than 300 MHz you might notice that overclocking goes in steps of 6-7 MHz or
sometimes even 13-14MHz. On GeforceFX/Geforce6 cards the situation is normal again.
+As of 0.8b4 NVClock also ships with a program called smartdimmer which can be used on laptops to tune
+the backlight. This program works on various Geforce6/7 laptops from Sony and Geforce8/9 laptops from
+Sony, Samsung, HP, Apple and Zepto.
+
+Usage: ./smartdimmer [options]
+
+Options:
+ -g --get Query brightness level.
+ -s --set <level> Set brightness level (15-100)
+ -i --increase Increase brightness with one level.
+ -d --decrease Decrease brightness with one level.
+ -h --help Prints this help text.
+
Acknowledgments
===============
@@ -103,7 +116,8 @@
o Jan Prokop for creating a qt version
o NVIDIA, for having good Linux drivers
o Ashley from EntechTaiwan for helping me a bit.
- o levon, Dragoran, chr-, etorix, Kano, kelmo, ddl, w00ter, dopez and all others (from #nvidia/#nvclock/#kanotix)
+ o Lipp Moritz (neldoreth) for a lot of testing of 0.8b4
+ o levon, Dragoran, chr-, etorix, Kano, kelmo, Daenjo, ddl, w00ter, dopez and all others (from #nvidia/#nvclock/#kanotix)
o Alexey Nicolaychuk (Unwinder)
Plans for the future
Modified: packages/nvclock/trunk/acinclude.m4
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/acinclude.m4?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/acinclude.m4 (original)
+++ packages/nvclock/trunk/acinclude.m4 Tue Feb 24 05:51:56 2009
@@ -113,12 +113,13 @@
#Try to find the qt libs in /usr/lib and /usr/local/lib
for i in $QT_LIB_SEARCH; do
- if test "x`ls $i/libqt.* 2> /dev/null`" != x ; then
+ if test "x`ls $i/libqt* 2> /dev/null`" != x ; then
QT_LIB_DIR=$i
fi
done
fi
-
+echo $QT_LIB_DIR
+echo $QT_INC_DIR
if test x"$QT_INC_DIR" = x -o x"$QT_LIB_DIR" = x; then
echo "*** Can't find qt header/library directories, you can fix this using two ways depending on your system:"
echo "*** - set QTDIR or use -with-qtdir=DIR option"
Copied: packages/nvclock/trunk/config.log (from r534, packages/nvclock/branches/upstream/current/config.log)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/config.log?rev=535&op=diff
==============================================================================
--- packages/nvclock/branches/upstream/current/config.log (original)
+++ packages/nvclock/trunk/config.log Tue Feb 24 05:51:56 2009
@@ -4,22 +4,22 @@
It was created by configure, which was
generated by GNU Autoconf 2.61. Invocation command line was
- $ ./configure
+ $ ./configure --build x86_64-linux-gnu --prefix=/usr --enable-gtk2 --enable-qt
## --------- ##
## Platform. ##
## --------- ##
-hostname = roderick
-uname -m = i686
-uname -r = 2.6.21.1
+hostname = juliet2
+uname -m = x86_64
+uname -r = 2.6.26-1-amd64
uname -s = Linux
-uname -v = #2 SMP Fri May 18 13:12:58 CEST 2007
+uname -v = #1 SMP Mon Dec 15 17:25:36 UTC 2008
/usr/bin/uname -p = unknown
/bin/uname -X = unknown
-/bin/arch = i686
+/bin/arch = unknown
/usr/bin/arch -k = unknown
/usr/convex/getsysinfo = unknown
/usr/bin/hostinfo = unknown
@@ -27,13 +27,11 @@
/usr/bin/oslevel = unknown
/bin/universe = unknown
-PATH: /sbin
+PATH: /usr/lib/j2sdk1.5-sun//bin
+PATH: /usr/local/bin
+PATH: /usr/bin
PATH: /bin
-PATH: /usr/sbin
-PATH: /usr/bin
-PATH: /usr/X11R6/bin
-PATH: /usr/local/sbin
-PATH: /usr/local/bin
+PATH: /usr/bin/X11
PATH: /usr/games
@@ -41,96 +39,96 @@
## Core tests. ##
## ----------- ##
-configure:1785: checking for gcc
-configure:1801: found /usr/bin/gcc
-configure:1812: result: gcc
-configure:2050: checking for C compiler version
-configure:2057: gcc --version >&5
-gcc (GCC) 4.0.3 (Debian 4.0.3-1)
-Copyright (C) 2006 Free Software Foundation, Inc.
+configure:1783: checking for gcc
+configure:1799: found /usr/bin/gcc
+configure:1810: result: gcc
+configure:2048: checking for C compiler version
+configure:2055: gcc --version >&5
+gcc (Debian 4.3.3-4) 4.3.3
+Copyright (C) 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-configure:2060: $? = 0
-configure:2067: gcc -v >&5
+configure:2058: $? = 0
+configure:2065: gcc -v >&5
Using built-in specs.
-Target: i486-linux-gnu
-Configured with: ../src/configure -v --enable-languages=c,c++,java,f95,objc,ada,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.0 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-java-awt=gtk-default --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.4.2-gcj-4.0-1.4.2.0/jre --enable-mpfr --disable-werror --with-tune=i686 --enable-checking=release i486-linux-gnu
+Target: x86_64-linux-gnu
+Configured with: ../src/configure -v --with-pkgversion='Debian 4.3.3-4' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
Thread model: posix
-gcc version 4.0.3 (Debian 4.0.3-1)
-configure:2070: $? = 0
-configure:2077: gcc -V >&5
+gcc version 4.3.3 (Debian 4.3.3-4)
+configure:2068: $? = 0
+configure:2075: gcc -V >&5
gcc: '-V' option must have argument
-configure:2080: $? = 1
-configure:2103: checking for C compiler default output file name
-configure:2130: gcc conftest.c >&5
-configure:2133: $? = 0
-configure:2171: result: a.out
-configure:2188: checking whether the C compiler works
-configure:2198: ./a.out
-configure:2201: $? = 0
-configure:2218: result: yes
-configure:2225: checking whether we are cross compiling
-configure:2227: result: no
-configure:2230: checking for suffix of executables
-configure:2237: gcc -o conftest conftest.c >&5
-configure:2240: $? = 0
-configure:2264: result:
-configure:2270: checking for suffix of object files
-configure:2296: gcc -c conftest.c >&5
-configure:2299: $? = 0
-configure:2322: result: o
-configure:2326: checking whether we are using the GNU C compiler
-configure:2355: gcc -c conftest.c >&5
-configure:2361: $? = 0
-configure:2378: result: yes
-configure:2383: checking whether gcc accepts -g
-configure:2413: gcc -c -g conftest.c >&5
-configure:2419: $? = 0
-configure:2518: result: yes
-configure:2535: checking for gcc option to accept ISO C89
-configure:2609: gcc -c -g -O2 conftest.c >&5
-configure:2615: $? = 0
-configure:2638: result: none needed
-configure:2714: checking for g++
-configure:2730: found /usr/bin/g++
-configure:2741: result: g++
-configure:2772: checking for C++ compiler version
-configure:2779: g++ --version >&5
-g++ (GCC) 4.0.3 (Debian 4.0.3-1)
-Copyright (C) 2006 Free Software Foundation, Inc.
+configure:2078: $? = 1
+configure:2101: checking for C compiler default output file name
+configure:2128: gcc -g -O2 conftest.c >&5
+configure:2131: $? = 0
+configure:2169: result: a.out
+configure:2186: checking whether the C compiler works
+configure:2196: ./a.out
+configure:2199: $? = 0
+configure:2216: result: yes
+configure:2223: checking whether we are cross compiling
+configure:2225: result: no
+configure:2228: checking for suffix of executables
+configure:2235: gcc -o conftest -g -O2 conftest.c >&5
+configure:2238: $? = 0
+configure:2262: result:
+configure:2268: checking for suffix of object files
+configure:2294: gcc -c -g -O2 conftest.c >&5
+configure:2297: $? = 0
+configure:2320: result: o
+configure:2324: checking whether we are using the GNU C compiler
+configure:2353: gcc -c -g -O2 conftest.c >&5
+configure:2359: $? = 0
+configure:2376: result: yes
+configure:2381: checking whether gcc accepts -g
+configure:2411: gcc -c -g conftest.c >&5
+configure:2417: $? = 0
+configure:2516: result: yes
+configure:2533: checking for gcc option to accept ISO C89
+configure:2607: gcc -c -g -O2 conftest.c >&5
+configure:2613: $? = 0
+configure:2636: result: none needed
+configure:2712: checking for g++
+configure:2728: found /usr/bin/g++
+configure:2739: result: g++
+configure:2770: checking for C++ compiler version
+configure:2777: g++ --version >&5
+g++ (Debian 4.3.3-4) 4.3.3
+Copyright (C) 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-configure:2782: $? = 0
-configure:2789: g++ -v >&5
+configure:2780: $? = 0
+configure:2787: g++ -v >&5
Using built-in specs.
-Target: i486-linux-gnu
-Configured with: ../src/configure -v --enable-languages=c,c++,java,f95,objc,ada,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.0 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-java-awt=gtk-default --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.4.2-gcj-4.0-1.4.2.0/jre --enable-mpfr --disable-werror --with-tune=i686 --enable-checking=release i486-linux-gnu
+Target: x86_64-linux-gnu
+Configured with: ../src/configure -v --with-pkgversion='Debian 4.3.3-4' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
Thread model: posix
-gcc version 4.0.3 (Debian 4.0.3-1)
-configure:2792: $? = 0
-configure:2799: g++ -V >&5
+gcc version 4.3.3 (Debian 4.3.3-4)
+configure:2790: $? = 0
+configure:2797: g++ -V >&5
g++: '-V' option must have argument
-configure:2802: $? = 1
-configure:2805: checking whether we are using the GNU C++ compiler
-configure:2834: g++ -c conftest.cpp >&5
-configure:2840: $? = 0
-configure:2857: result: yes
-configure:2862: checking whether g++ accepts -g
-configure:2892: g++ -c -g conftest.cpp >&5
-configure:2898: $? = 0
-configure:2997: result: yes
-configure:3064: checking for a BSD-compatible install
-configure:3120: result: /usr/bin/install -c
-configure:3131: checking whether make sets $(MAKE)
-configure:3152: result: yes
-configure:3167: checking how to run the C preprocessor
-configure:3207: gcc -E conftest.c
-configure:3213: $? = 0
-configure:3244: gcc -E conftest.c
+configure:2800: $? = 1
+configure:2803: checking whether we are using the GNU C++ compiler
+configure:2832: g++ -c -g -O2 conftest.cpp >&5
+configure:2838: $? = 0
+configure:2855: result: yes
+configure:2860: checking whether g++ accepts -g
+configure:2890: g++ -c -g conftest.cpp >&5
+configure:2896: $? = 0
+configure:2995: result: yes
+configure:3062: checking for a BSD-compatible install
+configure:3118: result: /usr/bin/install -c
+configure:3129: checking whether make sets $(MAKE)
+configure:3150: result: yes
+configure:3165: checking how to run the C preprocessor
+configure:3205: gcc -E conftest.c
+configure:3211: $? = 0
+configure:3242: gcc -E conftest.c
conftest.c:8:28: error: ac_nonexistent.h: No such file or directory
-configure:3250: $? = 1
+configure:3248: $? = 1
configure: failed program was:
| /* confdefs.h. */
| #define PACKAGE_NAME ""
@@ -140,12 +138,12 @@
| #define PACKAGE_BUGREPORT ""
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
-configure:3283: result: gcc -E
-configure:3312: gcc -E conftest.c
-configure:3318: $? = 0
-configure:3349: gcc -E conftest.c
+configure:3281: result: gcc -E
+configure:3310: gcc -E conftest.c
+configure:3316: $? = 0
+configure:3347: gcc -E conftest.c
conftest.c:8:28: error: ac_nonexistent.h: No such file or directory
-configure:3355: $? = 1
+configure:3353: $? = 1
configure: failed program was:
| /* confdefs.h. */
| #define PACKAGE_NAME ""
@@ -155,169 +153,120 @@
| #define PACKAGE_BUGREPORT ""
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
-configure:3393: checking for grep that handles long lines and -e
-configure:3467: result: /bin/grep
-configure:3472: checking for egrep
-configure:3550: result: /bin/grep -E
-configure:3555: checking for ANSI C header files
-configure:3585: gcc -c -g -O2 conftest.c >&5
-configure:3591: $? = 0
-configure:3690: gcc -o conftest -g -O2 conftest.c >&5
-configure:3693: $? = 0
-configure:3699: ./conftest
-configure:3702: $? = 0
-configure:3719: result: yes
-configure:3753: checking for library containing getopt_long
-configure:3794: gcc -o conftest conftest.c >&5
-configure:3800: $? = 0
-configure:3828: result: none required
-configure:3854: checking for sys/types.h
-configure:3875: gcc -c conftest.c >&5
-configure:3881: $? = 0
-configure:3897: result: yes
-configure:3854: checking for sys/stat.h
-configure:3875: gcc -c conftest.c >&5
-configure:3881: $? = 0
-configure:3897: result: yes
-configure:3854: checking for stdlib.h
-configure:3875: gcc -c conftest.c >&5
-configure:3881: $? = 0
-configure:3897: result: yes
-configure:3854: checking for string.h
-configure:3875: gcc -c conftest.c >&5
-configure:3881: $? = 0
-configure:3897: result: yes
-configure:3854: checking for memory.h
-configure:3875: gcc -c conftest.c >&5
-configure:3881: $? = 0
-configure:3897: result: yes
-configure:3854: checking for strings.h
-configure:3875: gcc -c conftest.c >&5
-configure:3881: $? = 0
-configure:3897: result: yes
-configure:3854: checking for inttypes.h
-configure:3875: gcc -c conftest.c >&5
-configure:3881: $? = 0
-configure:3897: result: yes
-configure:3854: checking for stdint.h
-configure:3875: gcc -c conftest.c >&5
-configure:3881: $? = 0
-configure:3897: result: yes
-configure:3854: checking for unistd.h
-configure:3875: gcc -c conftest.c >&5
-configure:3881: $? = 0
-configure:3897: result: yes
-configure:3919: checking getopt.h usability
-configure:3936: gcc -c conftest.c >&5
-configure:3942: $? = 0
-configure:3956: result: yes
-configure:3960: checking getopt.h presence
-configure:3975: gcc -E conftest.c
-configure:3981: $? = 0
-configure:3995: result: yes
-configure:4023: checking for getopt.h
-configure:4030: result: yes
-configure:4096: checking for pkg-config
-configure:4114: found /usr/bin/pkg-config
-configure:4127: result: /usr/bin/pkg-config
-configure:4145: checking for gtk+-2.0 >= 2.4.0
-configure:4149: result: yes
-configure:4153: checking GTK_CFLAGS
-configure:4156: result: -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12
-configure:4159: checking GTK_LIBS
-configure:4162: result: -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
-configure:4937: checking whether -R must be followed by a space
-configure:4963: gcc -o conftest conftest.c -RNONE >&5
-gcc: unrecognized option '-RNONE'
-configure:4969: $? = 0
-configure: failed program was:
-| /* confdefs.h. */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| /* end confdefs.h. */
-|
-| int
-| main ()
-| {
-|
-| ;
-| return 0;
-| }
-configure:5004: gcc -o conftest conftest.c -R NONE >&5
-gcc: NONE: No such file or directory
-gcc: unrecognized option '-R'
-configure:5010: $? = 1
-configure: failed program was:
-| /* confdefs.h. */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| /* end confdefs.h. */
-|
-| int
-| main ()
-| {
-|
-| ;
-| return 0;
-| }
-configure:5023: result: neither works
-configure:5076: gcc -o conftest conftest.c -LNONE -lX11 >&5
-configure:5082: $? = 0
-configure:5239: checking for gethostbyname
-configure:5295: gcc -o conftest conftest.c >&5
-configure:5301: $? = 0
-configure:5318: result: yes
-configure:5463: checking for connect
-configure:5519: gcc -o conftest conftest.c >&5
-configure:5525: $? = 0
-configure:5542: result: yes
-configure:5614: checking for remove
-configure:5670: gcc -o conftest conftest.c >&5
-configure:5676: $? = 0
-configure:5693: result: yes
-configure:5765: checking for shmat
-configure:5821: gcc -o conftest conftest.c >&5
-configure:5827: $? = 0
-configure:5844: result: yes
-configure:5925: checking for IceConnectionNumber in -lICE
-configure:5960: gcc -o conftest -LNONE conftest.c -lICE >&5
-configure:5966: $? = 0
-configure:5984: result: yes
-configure:6142: checking for XOpenDisplay in -lX11
-configure:6177: gcc -o conftest conftest.c -lX11 -LNONE >&5
-configure:6183: $? = 0
-configure:6201: result: yes
-configure:6213: checking for XextFindDisplay in -lXext
-configure:6248: gcc -o conftest conftest.c -lXext -LNONE -lXext -lX11 >&5
-configure:6254: $? = 0
-configure:6272: result: yes
-configure:6417: creating ./config.status
+configure:3391: checking for grep that handles long lines and -e
+configure:3465: result: /bin/grep
+configure:3470: checking for egrep
+configure:3548: result: /bin/grep -E
+configure:3553: checking for ANSI C header files
+configure:3583: gcc -c -g -O2 conftest.c >&5
+configure:3589: $? = 0
+configure:3688: gcc -o conftest -g -O2 conftest.c >&5
+configure:3691: $? = 0
+configure:3697: ./conftest
+configure:3700: $? = 0
+configure:3717: result: yes
+configure:3751: checking for library containing getopt_long
+configure:3792: gcc -o conftest conftest.c >&5
+configure:3798: $? = 0
+configure:3826: result: none required
+configure:3852: checking for sys/types.h
+configure:3873: gcc -c conftest.c >&5
+configure:3879: $? = 0
+configure:3895: result: yes
+configure:3852: checking for sys/stat.h
+configure:3873: gcc -c conftest.c >&5
+configure:3879: $? = 0
+configure:3895: result: yes
+configure:3852: checking for stdlib.h
+configure:3873: gcc -c conftest.c >&5
+configure:3879: $? = 0
+configure:3895: result: yes
+configure:3852: checking for string.h
+configure:3873: gcc -c conftest.c >&5
+configure:3879: $? = 0
+configure:3895: result: yes
+configure:3852: checking for memory.h
+configure:3873: gcc -c conftest.c >&5
+configure:3879: $? = 0
+configure:3895: result: yes
+configure:3852: checking for strings.h
+configure:3873: gcc -c conftest.c >&5
+configure:3879: $? = 0
+configure:3895: result: yes
+configure:3852: checking for inttypes.h
+configure:3873: gcc -c conftest.c >&5
+configure:3879: $? = 0
+configure:3895: result: yes
+configure:3852: checking for stdint.h
+configure:3873: gcc -c conftest.c >&5
+configure:3879: $? = 0
+configure:3895: result: yes
+configure:3852: checking for unistd.h
+configure:3873: gcc -c conftest.c >&5
+configure:3879: $? = 0
+configure:3895: result: yes
+configure:3917: checking getopt.h usability
+configure:3934: gcc -c conftest.c >&5
+configure:3940: $? = 0
+configure:3954: result: yes
+configure:3958: checking getopt.h presence
+configure:3973: gcc -E conftest.c
+configure:3979: $? = 0
+configure:3993: result: yes
+configure:4021: checking for getopt.h
+configure:4028: result: yes
+configure:4094: checking for pkg-config
+configure:4112: found /usr/bin/pkg-config
+configure:4125: result: /usr/bin/pkg-config
+configure:4143: checking for gtk+-2.0 >= 2.4.0
+configure:4147: result: yes
+configure:4151: checking GTK_CFLAGS
+configure:4154: result: -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12
+configure:4157: checking GTK_LIBS
+configure:4160: result: -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0
+configure:4199: checking for X
+configure:4369: gcc -o conftest conftest.c -lX11 >&5
+configure:4375: $? = 0
+configure:4434: result: libraries , headers
+configure:4442: checking QTDIR
+configure:4519: checking Qt version
+configure:4535: result: 338 (3)
+configure:4541: checking for moc
+configure:4557: found /usr/bin/moc
+configure:4568: result: moc
+configure:4585: checking for uic
+configure:4601: found /usr/bin/uic
+configure:4612: result: uic
+configure:4631: checking for qembed
+configure:4647: found /usr/bin/qembed
+configure:4658: result: qembed
+configure:4732: checking if Qt is static
+configure:4734: result: yes
+configure:4736: checking if Qt is multithreaded
+configure:4738: result: yes
+configure:4740: checking if Qt is embedded
+configure:4742: result: no
+configure:4822: checking for XftFontOpen in -lXft
+configure:4857: gcc -o conftest conftest.c -lXft -L/usr/lib -lqt-mt -L -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg >&5
+configure:4863: $? = 0
+configure:4881: result: yes
+configure:4890: checking QT_CXXFLAGS
+configure:4892: result: -I/usr/include/qt3 -D_REENTRANT -DQT_THREAD_SUPPORT
+configure:4894: checking QT_LDADD
+configure:4896: result: -L/usr/lib -lqt-mt -L -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg -lXft
+configure:4973: checking for x11
+configure:4977: result: yes
+configure:4981: checking X11_CFLAGS
+configure:4984: result:
+configure:4987: checking X11_LIBS
+configure:4990: result: -lX11
+configure:5072: checking for xext
+configure:5076: result: yes
+configure:5080: checking XEXT_CFLAGS
+configure:5083: result:
+configure:5086: checking XEXT_LIBS
+configure:5089: result: -lXext
+configure:5244: creating ./config.status
## ---------------------- ##
## Running config.status. ##
@@ -332,16 +281,16 @@
CONFIG_COMMANDS =
$ ./config.status
-on roderick
-
-config.status:639: creating src/Makefile
-config.status:639: creating src/backend/Makefile
-config.status:639: creating src/nvcontrol/Makefile
-config.status:639: creating src/qt/Makefile
-config.status:639: creating src/gtk/Makefile
-config.status:639: creating Makefile
-config.status:639: creating config.h
-config.status:873: executing default-1 commands
+on juliet2
+
+config.status:637: creating src/Makefile
+config.status:637: creating src/backend/Makefile
+config.status:637: creating src/nvcontrol/Makefile
+config.status:637: creating src/qt/Makefile
+config.status:637: creating src/gtk/Makefile
+config.status:637: creating Makefile
+config.status:637: creating config.h
+config.status:869: executing default-1 commands
## ---------------- ##
## Cache variables. ##
@@ -353,32 +302,29 @@
ac_cv_env_CCC_value=
ac_cv_env_CC_set=
ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=
-ac_cv_env_CFLAGS_value=
-ac_cv_env_CPPFLAGS_set=
+ac_cv_env_CFLAGS_set=set
+ac_cv_env_CFLAGS_value='-g -O2'
+ac_cv_env_CPPFLAGS_set=set
ac_cv_env_CPPFLAGS_value=
ac_cv_env_CPP_set=
ac_cv_env_CPP_value=
-ac_cv_env_CXXFLAGS_set=
-ac_cv_env_CXXFLAGS_value=
+ac_cv_env_CXXFLAGS_set=set
+ac_cv_env_CXXFLAGS_value='-g -O2'
ac_cv_env_CXX_set=
ac_cv_env_CXX_value=
-ac_cv_env_LDFLAGS_set=
+ac_cv_env_LDFLAGS_set=set
ac_cv_env_LDFLAGS_value=
ac_cv_env_LIBS_set=
ac_cv_env_LIBS_value=
ac_cv_env_XMKMF_set=
ac_cv_env_XMKMF_value=
-ac_cv_env_build_alias_set=
-ac_cv_env_build_alias_value=
+ac_cv_env_build_alias_set=set
+ac_cv_env_build_alias_value=x86_64-linux-gnu
ac_cv_env_host_alias_set=
ac_cv_env_host_alias_value=
ac_cv_env_target_alias_set=
ac_cv_env_target_alias_value=
-ac_cv_func_connect=yes
-ac_cv_func_gethostbyname=yes
-ac_cv_func_remove=yes
-ac_cv_func_shmat=yes
+ac_cv_have_x='have_x=yes ac_x_includes='\'''\'' ac_x_libraries='\'''\'''
ac_cv_header_getopt_h=yes
ac_cv_header_inttypes_h=yes
ac_cv_header_memory_h=yes
@@ -390,15 +336,16 @@
ac_cv_header_sys_stat_h=yes
ac_cv_header_sys_types_h=yes
ac_cv_header_unistd_h=yes
-ac_cv_lib_ICE_IceConnectionNumber=yes
-ac_cv_lib_X11_XOpenDisplay=yes
-ac_cv_lib_Xext_XextFindDisplay=yes
+ac_cv_lib_Xft_XftFontOpen=yes
ac_cv_objext=o
ac_cv_path_EGREP='/bin/grep -E'
ac_cv_path_GREP=/bin/grep
ac_cv_path_PKG_CONFIG=/usr/bin/pkg-config
ac_cv_path_install='/usr/bin/install -c'
ac_cv_prog_CPP='gcc -E'
+ac_cv_prog_MOC=moc
+ac_cv_prog_QEMBED=qembed
+ac_cv_prog_UIC=uic
ac_cv_prog_ac_ct_CC=gcc
ac_cv_prog_ac_ct_CXX=g++
ac_cv_prog_cc_c89=
@@ -424,19 +371,19 @@
EGREP='/bin/grep -E'
EXEEXT=''
GREP='/bin/grep'
-GTK_CFLAGS='-I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 '
-GTK_LIBS='-lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 '
+GTK_CFLAGS='-D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 '
+GTK_LIBS='-lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 '
HAVE_GTK2='yes'
HAVE_NVCONTROL='yes'
-HAVE_QT='no'
+HAVE_QT='yes'
INSTALL_DATA='${INSTALL} -m 644'
INSTALL_PROGRAM='${INSTALL}'
INSTALL_SCRIPT='${INSTALL}'
LDFLAGS=''
LIBOBJS=''
-LIBS='-lXext -lX11 '
+LIBS='-L/usr/lib -lqt-mt -L -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg'
LTLIBOBJS=''
-MOC=''
+MOC='moc'
OBJEXT='o'
PACKAGE_BUGREPORT=''
PACKAGE_NAME=''
@@ -445,28 +392,26 @@
PACKAGE_VERSION=''
PATH_SEPARATOR=':'
PKG_CONFIG='/usr/bin/pkg-config'
-QASSISTANTCLIENT_LDADD=''
-QEMBED=''
-QT_CFLAGS=''
-QT_CXXFLAGS=''
+QASSISTANTCLIENT_LDADD='-lqassistantclient'
+QEMBED='qembed'
+QT_CFLAGS='-I/usr/include/qt3 -D_REENTRANT -DQT_THREAD_SUPPORT'
+QT_CXXFLAGS='-I/usr/include/qt3 -D_REENTRANT -DQT_THREAD_SUPPORT'
QT_GUILINK=''
-QT_LDADD=''
-QT_LIBS=''
+QT_LDADD='-L/usr/lib -lqt-mt -L -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg -lXft'
+QT_LIBS='-L/usr/lib -lqt-mt -L -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg -lXft'
RANLIB='ranlib'
SET_MAKE=''
SHELL='/bin/sh'
-UIC=''
-X11_CFLAGS=' -INONE'
-X11_LIBS=' -LNONE -lXext -lX11 '
+UIC='uic'
+X11_CFLAGS=' '
+X11_LIBS='-lX11 -lXext '
+XEXT_CFLAGS=' '
+XEXT_LIBS='-lXext '
XMKMF=''
-X_CFLAGS=' -INONE'
-X_EXTRA_LIBS=''
-X_LIBS=' -LNONE'
-X_PRE_LIBS=' -lSM -lICE'
ac_ct_CC='gcc'
ac_ct_CXX='g++'
bindir='${exec_prefix}/bin'
-build_alias=''
+build_alias='x86_64-linux-gnu'
datadir='${datarootdir}'
datarootdir='${prefix}/share'
docdir='${datarootdir}/doc/${PACKAGE}'
@@ -483,7 +428,7 @@
mandir='${datarootdir}/man'
oldincludedir='/usr/include'
pdfdir='${docdir}'
-prefix='/usr/local'
+prefix='/usr'
program_transform_name='s,x,x,'
psdir='${docdir}'
sbindir='${exec_prefix}/sbin'
@@ -511,8 +456,6 @@
#define HAVE_INTTYPES_H 1
#define HAVE_STDINT_H 1
#define HAVE_UNISTD_H 1
-#define HAVE_LIBX11 1
-#define HAVE_LIBXEXT 1
#define HAVE_NVCONTROL 1
configure: exit 0
Copied: packages/nvclock/trunk/config.status (from r534, packages/nvclock/branches/upstream/current/config.status)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/config.status?rev=535&op=diff
==============================================================================
--- packages/nvclock/branches/upstream/current/config.status (original)
+++ packages/nvclock/trunk/config.status Tue Feb 24 05:51:56 2009
@@ -335,13 +335,13 @@
ac_cs_version="\
config.status
configured by ./configure, generated by GNU Autoconf 2.61,
- with options \"\"
+ with options \"'--build' 'x86_64-linux-gnu' '--prefix=/usr' '--enable-gtk2' '--enable-qt' 'build_alias=x86_64-linux-gnu' 'CFLAGS=-g -O2' 'LDFLAGS=' 'CPPFLAGS=' 'CXXFLAGS=-g -O2'\"
Copyright (C) 2006 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-ac_pwd='/var/tmp/nvclock'
+ac_pwd='/home/randy/debian/build-area/nvclock-0.8b4'
srcdir='.'
INSTALL='/usr/bin/install -c'
# If no file are specified by the user, then we need to provide default
@@ -409,10 +409,10 @@
fi
if $ac_cs_recheck; then
- echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " $ac_configure_extra_args " --no-create --no-recursion" >&6
+ echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " '--build' 'x86_64-linux-gnu' '--prefix=/usr' '--enable-gtk2' '--enable-qt' 'build_alias=x86_64-linux-gnu' 'CFLAGS=-g -O2' 'LDFLAGS=' 'CPPFLAGS=' 'CXXFLAGS=-g -O2' $ac_configure_extra_args " --no-create --no-recursion" >&6
CONFIG_SHELL=/bin/sh
export CONFIG_SHELL
- exec /bin/sh "./configure" $ac_configure_extra_args --no-create --no-recursion
+ exec /bin/sh "./configure" '--build' 'x86_64-linux-gnu' '--prefix=/usr' '--enable-gtk2' '--enable-qt' 'build_alias=x86_64-linux-gnu' 'CFLAGS=-g -O2' 'LDFLAGS=' 'CPPFLAGS=' 'CXXFLAGS=-g -O2' $ac_configure_extra_args --no-create --no-recursion
fi
exec 5>>config.log
@@ -507,7 +507,7 @@
s, at PACKAGE_STRING@,|#_!!_#|,g
s, at PACKAGE_BUGREPORT@,|#_!!_#|,g
s, at exec_prefix@,|#_!!_#|${prefix},g
-s, at prefix@,|#_!!_#|/usr/local,g
+s, at prefix@,|#_!!_#|/usr,g
s, at program_transform_name@,|#_!!_#|s\,x\,x\,,g
s, at bindir@,|#_!!_#|${exec_prefix}/bin,g
s, at sbindir@,|#_!!_#|${exec_prefix}/sbin,g
@@ -532,8 +532,8 @@
s, at ECHO_C@,|#_!!_#|,g
s, at ECHO_N@,|#_!!_#|-n,g
s, at ECHO_T@,|#_!!_#|,g
-s, at LIBS@,|#_!!_#|-lXext -lX11 ,g
-s, at build_alias@,|#_!!_#|,g
+s, at LIBS@,|#_!!_#|-L/usr/lib -lqt-mt -L -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg,g
+s, at build_alias@,|#_!!_#|x86_64-linux-gnu,g
s, at host_alias@,|#_!!_#|,g
s, at target_alias@,|#_!!_#|,g
s, at CC@,|#_!!_#|gcc,g
@@ -555,26 +555,24 @@
s, at EGREP@,|#_!!_#|/bin/grep -E,g
s, at system@,|#_!!_#|Linux,g
s, at PKG_CONFIG@,|#_!!_#|/usr/bin/pkg-config,g
-s, at GTK_CFLAGS@,|#_!!_#|-I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 ,g
-s, at GTK_LIBS@,|#_!!_#|-lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 ,g
+s, at GTK_CFLAGS@,|#_!!_#|-D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 ,g
+s, at GTK_LIBS@,|#_!!_#|-lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 ,g
s, at XMKMF@,|#_!!_#|,g
-s, at MOC@,|#_!!_#|,g
-s, at UIC@,|#_!!_#|,g
-s, at QEMBED@,|#_!!_#|,g
-s, at QT_CXXFLAGS@,|#_!!_#|,g
-s, at QT_LDADD@,|#_!!_#|,g
+s, at MOC@,|#_!!_#|moc,g
+s, at UIC@,|#_!!_#|uic,g
+s, at QEMBED@,|#_!!_#|qembed,g
+s, at QT_CXXFLAGS@,|#_!!_#|-I/usr/include/qt3 -D_REENTRANT -DQT_THREAD_SUPPORT,g
+s, at QT_LDADD@,|#_!!_#|-L/usr/lib -lqt-mt -L -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg -lXft,g
s, at QT_GUILINK@,|#_!!_#|,g
-s, at QASSISTANTCLIENT_LDADD@,|#_!!_#|,g
-s, at QT_CFLAGS@,|#_!!_#|,g
-s, at QT_LIBS@,|#_!!_#|,g
-s, at X_CFLAGS@,|#_!!_#| -INONE,g
-s, at X_PRE_LIBS@,|#_!!_#| -lSM -lICE,g
-s, at X_LIBS@,|#_!!_#| -LNONE,g
-s, at X_EXTRA_LIBS@,|#_!!_#|,g
-s, at X11_CFLAGS@,|#_!!_#| -INONE,g
-s, at X11_LIBS@,|#_!!_#| -LNONE -lXext -lX11 ,g
+s, at QASSISTANTCLIENT_LDADD@,|#_!!_#|-lqassistantclient,g
+s, at QT_CFLAGS@,|#_!!_#|-I/usr/include/qt3 -D_REENTRANT -DQT_THREAD_SUPPORT,g
+s, at QT_LIBS@,|#_!!_#|-L/usr/lib -lqt-mt -L -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg -lXft,g
+s, at X11_CFLAGS@,|#_!!_#| ,g
+s, at X11_LIBS@,|#_!!_#|-lX11 -lXext ,g
+s, at XEXT_CFLAGS@,|#_!!_#| ,g
+s, at XEXT_LIBS@,|#_!!_#|-lXext ,g
s, at HAVE_GTK2@,|#_!!_#|yes,g
-s, at HAVE_QT@,|#_!!_#|no,g
+s, at HAVE_QT@,|#_!!_#|yes,g
s, at HAVE_NVCONTROL@,|#_!!_#|yes,g
s, at RANLIB@,|#_!!_#|ranlib,g
s, at LIBOBJS@,|#_!!_#|,g
@@ -845,8 +843,6 @@
s,^\([ #]*\)[^ ]*\([ ]*HAVE_INTTYPES_H\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_STDINT_H\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_UNISTD_H\)[ (].*,\1define\2 1 ,
-s,^\([ #]*\)[^ ]*\([ ]*HAVE_LIBX11\)[ (].*,\1define\2 1 ,
-s,^\([ #]*\)[^ ]*\([ ]*HAVE_LIBXEXT\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_NVCONTROL\)[ (].*,\1define\2 1 ,
s/ $//
s,^[ #]*u.*,/* & */,
Modified: packages/nvclock/trunk/configure
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/configure?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/configure (original)
+++ packages/nvclock/trunk/configure Tue Feb 24 05:51:56 2009
@@ -683,10 +683,8 @@
QT_LIBS
X11_CFLAGS
X11_LIBS
-X_CFLAGS
-X_PRE_LIBS
-X_LIBS
-X_EXTRA_LIBS
+XEXT_CFLAGS
+XEXT_LIBS
HAVE_GTK2
HAVE_QT
HAVE_NVCONTROL
@@ -4502,7 +4500,8 @@
fi
done
fi
-
+echo $QT_LIB_DIR
+echo $QT_INC_DIR
if test x"$QT_INC_DIR" = x -o x"$QT_LIB_DIR" = x; then
echo "*** Can't find qt header/library directories, you can fix this using two ways depending on your system:"
echo "*** - set QTDIR or use -with-qtdir=DIR option"
@@ -5010,1383 +5009,115 @@
if test $succeeded = yes; then
:
else
- if test "$no_x" = yes; then
- # Not all programs may use this symbol, but it does not hurt to define it.
-
-cat >>confdefs.h <<\_ACEOF
-#define X_DISPLAY_MISSING 1
-_ACEOF
-
- X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
- if test -n "$x_includes"; then
- X_CFLAGS="$X_CFLAGS -I$x_includes"
+ { { echo "$as_me:$LINENO: error: \"X11 required for nvcontrol support\"" >&5
+echo "$as_me: error: \"X11 required for nvcontrol support\"" >&2;}
+ { (exit 1); exit 1; }; }
fi
- # It would also be nice to do this for all -L options, not just this one.
- if test -n "$x_libraries"; then
- X_LIBS="$X_LIBS -L$x_libraries"
- # For Solaris; some versions of Sun CC require a space after -R and
- # others require no space. Words are not sufficient . . . .
- { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
- ac_xsave_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
+
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
- X_LIBS="$X_LIBS -R$x_libraries"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- LIBS="$ac_xsave_LIBS -R $x_libraries"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- { echo "$as_me:$LINENO: result: yes" >&5
+fi
+
+
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ { echo "$as_me:$LINENO: checking for xext" >&5
+echo $ECHO_N "checking for xext... $ECHO_C" >&6; }
+
+ if $PKG_CONFIG --exists "xext" ; then
+ { echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- X_LIBS="$X_LIBS -R $x_libraries"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: result: neither works" >&5
-echo "${ECHO_T}neither works" >&6; }
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- ac_c_werror_flag=$ac_xsave_c_werror_flag
- LIBS=$ac_xsave_LIBS
+ succeeded=yes
+
+ { echo "$as_me:$LINENO: checking XEXT_CFLAGS" >&5
+echo $ECHO_N "checking XEXT_CFLAGS... $ECHO_C" >&6; }
+ XEXT_CFLAGS=`$PKG_CONFIG --cflags "xext"`
+ { echo "$as_me:$LINENO: result: $XEXT_CFLAGS" >&5
+echo "${ECHO_T}$XEXT_CFLAGS" >&6; }
+
+ { echo "$as_me:$LINENO: checking XEXT_LIBS" >&5
+echo $ECHO_N "checking XEXT_LIBS... $ECHO_C" >&6; }
+ XEXT_LIBS=`$PKG_CONFIG --libs "xext"`
+ { echo "$as_me:$LINENO: result: $XEXT_LIBS" >&5
+echo "${ECHO_T}$XEXT_LIBS" >&6; }
+ else
+ XEXT_CFLAGS=""
+ XEXT_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ XEXT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xext"`
+
+ fi
+
+
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
+ fi
fi
- # Check for system-dependent libraries X programs must link with.
- # Do this before checking for the system-independent R6 libraries
- # (-lICE), since we may need -lsocket or whatever for X linking.
-
- if test "$ISC" = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+ if test $succeeded = yes; then
+ :
else
- # Martyn Johnson says this is needed for Ultrix, if the X
- # libraries were built with DECnet support. And Karl Berry says
- # the Alpha needs dnet_stub (dnet does not exist).
- ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XOpenDisplay ();
-int
-main ()
-{
-return XOpenDisplay ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dnet_ntoa ();
-int
-main ()
-{
-return dnet_ntoa ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dnet_dnet_ntoa=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dnet_dnet_ntoa=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-fi
-
- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
- { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet_stub $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dnet_ntoa ();
-int
-main ()
-{
-return dnet_ntoa ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dnet_stub_dnet_ntoa=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dnet_stub_dnet_ntoa=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-fi
-
- fi
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_xsave_LIBS"
-
- # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
- # to get the SysV transport functions.
- # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
- # needs -lnsl.
- # The nsl library prevents programs from opening the X display
- # on Irix 5.2, according to T.E. Dickey.
- # The functions gethostbyname, getservbyname, and inet_addr are
- # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
- { echo "$as_me:$LINENO: checking for gethostbyname" >&5
-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
-if test "${ac_cv_func_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define gethostbyname innocuous_gethostbyname
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gethostbyname (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef gethostbyname
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_gethostbyname || defined __stub___gethostbyname
-choke me
-#endif
-
-int
-main ()
-{
-return gethostbyname ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func_gethostbyname=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_gethostbyname=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
-
- if test $ac_cv_func_gethostbyname = no; then
- { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_nsl_gethostbyname=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_nsl_gethostbyname=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-fi
-
- if test $ac_cv_lib_nsl_gethostbyname = no; then
- { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_bsd_gethostbyname=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_bsd_gethostbyname=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test $ac_cv_lib_bsd_gethostbyname = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
-fi
-
- fi
- fi
-
- # lieder at skyler.mavd.honeywell.com says without -lsocket,
- # socket/setsockopt and other routines are undefined under SCO ODT
- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
- # on later versions), says Simon Leinen: it contains gethostby*
- # variants that don't use the name server (or something). -lsocket
- # must be given before -lnsl if both are needed. We assume that
- # if connect needs -lnsl, so does gethostbyname.
- { echo "$as_me:$LINENO: checking for connect" >&5
-echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
-if test "${ac_cv_func_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define connect innocuous_connect
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char connect (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef connect
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char connect ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_connect || defined __stub___connect
-choke me
-#endif
-
-int
-main ()
-{
-return connect ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func_connect=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_connect=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6; }
-
- if test $ac_cv_func_connect = no; then
- { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char connect ();
-int
-main ()
-{
-return connect ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_socket_connect=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_socket_connect=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
-if test $ac_cv_lib_socket_connect = yes; then
- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-fi
-
- fi
-
- # Guillermo Gomez says -lposix is necessary on A/UX.
- { echo "$as_me:$LINENO: checking for remove" >&5
-echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
-if test "${ac_cv_func_remove+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define remove innocuous_remove
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char remove (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef remove
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char remove ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_remove || defined __stub___remove
-choke me
-#endif
-
-int
-main ()
-{
-return remove ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func_remove=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_remove=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-echo "${ECHO_T}$ac_cv_func_remove" >&6; }
-
- if test $ac_cv_func_remove = no; then
- { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
-if test "${ac_cv_lib_posix_remove+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lposix $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char remove ();
-int
-main ()
-{
-return remove ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_posix_remove=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_posix_remove=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
-if test $ac_cv_lib_posix_remove = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-fi
-
- fi
-
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- { echo "$as_me:$LINENO: checking for shmat" >&5
-echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
-if test "${ac_cv_func_shmat+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shmat innocuous_shmat
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shmat (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shmat
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shmat ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_shmat || defined __stub___shmat
-choke me
-#endif
-
-int
-main ()
-{
-return shmat ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func_shmat=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_shmat=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
-
- if test $ac_cv_func_shmat = no; then
- { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lipc $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shmat ();
-int
-main ()
-{
-return shmat ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_ipc_shmat=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_ipc_shmat=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
-if test $ac_cv_lib_ipc_shmat = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-fi
-
- fi
+ { { echo "$as_me:$LINENO: error: \"Xext required for nvcontrol support\"" >&5
+echo "$as_me: error: \"Xext required for nvcontrol support\"" >&2;}
+ { (exit 1); exit 1; }; }
fi
- # Check for libraries that X11R6 Xt/Xaw programs need.
- ac_save_LDFLAGS=$LDFLAGS
- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
- # check for ICE first), but we must link in the order -lSM -lICE or
- # we get undefined symbols. So assume we have SM if we have ICE.
- # These have to be linked with before -lX11, unlike the other
- # libraries we check for below, so use a different variable.
- # John Interrante, Karl Berry
- { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char IceConnectionNumber ();
-int
-main ()
-{
-return IceConnectionNumber ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_ICE_IceConnectionNumber=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_ICE_IceConnectionNumber=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-fi
-
- LDFLAGS=$ac_save_LDFLAGS
-
-fi
-
- fi
-
- if test x$no_x = x ; then
- if test x$x_libraries = x ; then
- X11_LIBS=
-
-{ echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
-echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6; }
-if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lX11 $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XOpenDisplay ();
-int
-main ()
-{
-return XOpenDisplay ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_X11_XOpenDisplay=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_X11_XOpenDisplay=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6; }
-if test $ac_cv_lib_X11_XOpenDisplay = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBX11 1
-_ACEOF
-
- LIBS="-lX11 $LIBS"
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for XextFindDisplay in -lXext" >&5
-echo $ECHO_N "checking for XextFindDisplay in -lXext... $ECHO_C" >&6; }
-if test "${ac_cv_lib_Xext_XextFindDisplay+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXext -lXext $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XextFindDisplay ();
-int
-main ()
-{
-return XextFindDisplay ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_Xext_XextFindDisplay=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_Xext_XextFindDisplay=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XextFindDisplay" >&5
-echo "${ECHO_T}$ac_cv_lib_Xext_XextFindDisplay" >&6; }
-if test $ac_cv_lib_Xext_XextFindDisplay = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXEXT 1
-_ACEOF
-
- LIBS="-lXext $LIBS"
-
-fi
-
- HAVE_NVCONTROL=yes
- else
-
-{ echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
-echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6; }
-if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lX11 -L$x_libraries $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XOpenDisplay ();
-int
-main ()
-{
-return XOpenDisplay ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_X11_XOpenDisplay=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_X11_XOpenDisplay=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6; }
-if test $ac_cv_lib_X11_XOpenDisplay = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBX11 1
-_ACEOF
-
- LIBS="-lX11 $LIBS"
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for XextFindDisplay in -lXext" >&5
-echo $ECHO_N "checking for XextFindDisplay in -lXext... $ECHO_C" >&6; }
-if test "${ac_cv_lib_Xext_XextFindDisplay+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXext -L$x_libraries -lXext $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XextFindDisplay ();
-int
-main ()
-{
-return XextFindDisplay ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_Xext_XextFindDisplay=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_Xext_XextFindDisplay=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XextFindDisplay" >&5
-echo "${ECHO_T}$ac_cv_lib_Xext_XextFindDisplay" >&6; }
-if test $ac_cv_lib_Xext_XextFindDisplay = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXEXT 1
-_ACEOF
-
- LIBS="-lXext $LIBS"
-
-fi
-
- HAVE_NVCONTROL=yes
- fi
- else
- { echo "$as_me:$LINENO: no X Window System found" >&5
-echo "$as_me: no X Window System found" >&6;}
- HAVE_NVCONTROL=no
- fi
-
- if test x"$HAVE_NVCONTROL" = "xyes" ; then
- X11_CFLAGS=$X_CFLAGS
- X11_LIBS="$X_LIBS $LIBS"
+
+ X11_CFLAGS="$X11_CFLAGS $XEXT_CFLAGS"
+ X11_LIBS="$X11_LIBS $XEXT_LIBS"
+ if test x"$X11_LIBS" != x ; then
+ HAVE_NVCONTROL=yes
@@ -6394,7 +5125,7 @@
#define HAVE_NVCONTROL 1
_ACEOF
- fi
+ fi
fi
@@ -7112,10 +5843,8 @@
QT_LIBS!$QT_LIBS$ac_delim
X11_CFLAGS!$X11_CFLAGS$ac_delim
X11_LIBS!$X11_LIBS$ac_delim
-X_CFLAGS!$X_CFLAGS$ac_delim
-X_PRE_LIBS!$X_PRE_LIBS$ac_delim
-X_LIBS!$X_LIBS$ac_delim
-X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
+XEXT_CFLAGS!$XEXT_CFLAGS$ac_delim
+XEXT_LIBS!$XEXT_LIBS$ac_delim
HAVE_GTK2!$HAVE_GTK2$ac_delim
HAVE_QT!$HAVE_QT$ac_delim
HAVE_NVCONTROL!$HAVE_NVCONTROL$ac_delim
@@ -7124,7 +5853,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 80; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: packages/nvclock/trunk/configure.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/configure.in?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/configure.in (original)
+++ packages/nvclock/trunk/configure.in Tue Feb 24 05:51:56 2009
@@ -103,30 +103,17 @@
fi
if test x"$enable_nvcontrol" = "xyes"; then
- PKG_CHECK_MODULES([X11], [x11], , [AC_PATH_XTRA])
- if test x$no_x = x ; then
- if test x$x_libraries = x ; then
- X11_LIBS=
- AC_CHECK_LIB(X11, XOpenDisplay)
- AC_CHECK_LIB(Xext, XextFindDisplay,,, -lXext)
- HAVE_NVCONTROL=yes
- else
- AC_CHECK_LIB(X11, XOpenDisplay,,, -L$x_libraries)
- AC_CHECK_LIB(Xext, XextFindDisplay,,, -L$x_libraries -lXext)
- HAVE_NVCONTROL=yes
- fi
- else
- AC_MSG_NOTICE([no X Window System found])
- HAVE_NVCONTROL=no
- fi
+ PKG_CHECK_MODULES([X11], [x11], , AC_MSG_ERROR("X11 required for nvcontrol support"))
+ PKG_CHECK_MODULES([XEXT], [xext], , AC_MSG_ERROR("Xext required for nvcontrol support"))
- if test x"$HAVE_NVCONTROL" = "xyes" ; then
- X11_CFLAGS=$X_CFLAGS
- X11_LIBS="$X_LIBS $LIBS"
+ X11_CFLAGS="$X11_CFLAGS $XEXT_CFLAGS"
+ X11_LIBS="$X11_LIBS $XEXT_LIBS"
+ if test x"$X11_LIBS" != x ; then
+ HAVE_NVCONTROL=yes
AC_SUBST(X11_CFLAGS)
- AC_SUBST(X11_LIBS)
+ AC_SUBST(X11_LIBS)
AC_DEFINE([HAVE_NVCONTROL], [1], [NV-CONTROL support for changing OpenGL settings])
- fi
+ fi
fi
AC_SUBST(HAVE_GTK2)
Modified: packages/nvclock/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/debian/changelog?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/debian/changelog (original)
+++ packages/nvclock/trunk/debian/changelog Tue Feb 24 05:51:56 2009
@@ -1,3 +1,9 @@
+nvclock (0.8b4-1) unstable; urgency=low
+
+ * New upstream release. (closes: #511979, #433375, #360097, #414236)
+
+ -- Randall Donald <rdonald at debian.org> Fri, 20 Feb 2009 12:02:17 -0800
+
nvclock (0.8b3-1) unstable; urgency=low
* New upstream release
Modified: packages/nvclock/trunk/src/CVS/Entries
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/CVS/Entries?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/CVS/Entries (original)
+++ packages/nvclock/trunk/src/CVS/Entries Tue Feb 24 05:51:56 2009
@@ -1,7 +1,8 @@
/.cvsignore/1.1/Mon Sep 15 16:40:12 2003//
-/Makefile.in/1.8/Fri Sep 2 08:56:03 2005//
D/backend////
D/gtk////
D/nvcontrol////
D/qt////
-/nvclock.c/1.84/Fri Jan 4 17:32:57 2008//
+/Makefile.in/1.12/Sat Jan 3 17:02:54 2009//
+/smartdimmer.c/1.3/Sat Jan 3 17:11:22 2009//
+/nvclock.c/1.95/Sun Jan 4 10:54:28 2009//
Modified: packages/nvclock/trunk/src/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/Makefile.in?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/Makefile.in (original)
+++ packages/nvclock/trunk/src/Makefile.in Tue Feb 24 05:51:56 2009
@@ -1,15 +1,16 @@
CC=@CC@
INSTALL=@INSTALL@
-SOURCES=nvclock.c
+nvclock_SOURCES=nvclock.c
+smartdimmer_SOURCES=smartdimmer.c
SUBDIRS=backend nvcontrol gtk qt
HAVE_NVCONTROL=@HAVE_NVCONTROL@
libbackend=./backend/libbackend.a
libnvcontrol=./nvcontrol/libnvcontrol.a
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
+prefix=$(DESTDIR)@prefix@
+exec_prefix=$(DESTDIR)@exec_prefix@
+bindir=$(DESTDIR)@bindir@
ifeq ($(HAVE_NVCONTROL), yes)
DEPS=$(libbackend) $(libnvcontrol)
@@ -26,16 +27,20 @@
distclean install install-app install-recursive
-all: all-recursive nvclock
+all: all-recursive nvclock smartdimmer
nvclock: $(DEPS) $(LIB) nvclock.c
- $(CC) -o nvclock $(SOURCES) $(INCLUDES) $(LIBS)
+ $(CC) -o nvclock $(nvclock_SOURCES) $(INCLUDES) $(LIBS)
+
+smartdimmer: $(DEPS) $(LIB) smartdimmer.c
+ $(CC) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS)
clean: clean-recursive clean-app
clean-app:
rm -f nvclock *.exe
+ rm -f smartdimmer
distclean: distclean-recursive clean-app
@@ -45,12 +50,13 @@
install: install-recursive install-app
install-app:
mkdir -p $(bindir)
- $(INSTALL) -c nvclock $(bindir)/nvclock
+ $(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock
+ $(INSTALL) -c smartdimmer $(DESTDIR)$(bindir)/smartdimmer
uninstall: uninstall-recursive uninstall-app
uninstall-app:
- rm -f $(bindir)/nvclock
+ rm -f $(bindir)/smartdimmer
# Walk through the sub directories and do what is requested
Modified: packages/nvclock/trunk/src/backend/CVS/Entries
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/CVS/Entries?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/CVS/Entries (original)
+++ packages/nvclock/trunk/src/backend/CVS/Entries Tue Feb 24 05:51:56 2009
@@ -1,32 +1,32 @@
-/Makefile/1.2/Sun Apr 22 18:24:31 2007//
-/error.c/1.3/Sun Apr 22 18:24:32 2007//
-/f75375.c/1.6/Sun Apr 22 18:24:32 2007//
-/f75375.h/1.4/Sun Apr 22 18:24:32 2007//
-/i2c.h/1.8/Sun Apr 22 18:24:32 2007//
-/libc_wrapper.c/1.2/Sun Apr 22 18:24:32 2007//
-/lm99.c/1.6/Sun Apr 22 18:24:32 2007//
-/nvcontrol.c/1.5/Sun Apr 22 18:24:32 2007//
-/w83781d.c/1.2/Sun Apr 22 18:24:32 2007//
-/w83l785r.c/1.5/Sun Apr 22 18:24:32 2007//
-/xf86i2c.c/1.2/Sun Apr 22 18:24:32 2007//
-/xf86i2c.h/1.3/Sun Apr 22 18:24:33 2007//
-/xfree.h/1.1/Sun Apr 22 18:24:33 2007//
-/i2c.c/1.14/Tue Apr 24 08:10:47 2007//
-/adt7473.c/1.5/Fri Nov 2 10:23:00 2007//
-/nvreg.h/1.4/Thu Aug 30 16:47:04 2007//
-/overclock.c/1.19/Fri Nov 2 10:23:01 2007//
-/utils.c/1.3/Sun Dec 2 21:30:17 2007//
-/Makefile.in/1.16/Thu Jan 3 20:08:43 2008//
-/back_bsd.c/1.37/Thu Jan 3 20:08:43 2008//
-/back_linux.c/1.16/Thu Jan 3 20:08:43 2008//
-/back_win32.c/1.10/Thu Jan 3 20:08:43 2008//
-/backend.c/1.56/Thu Jan 3 20:08:43 2008//
-/backend.h/1.28/Thu Jan 3 20:08:43 2008//
-/config.c/1.30/Thu Jan 3 20:08:43 2008//
-/info.c/1.103/Thu Jan 3 20:08:43 2008//
-/nv30.c/1.26/Thu Jan 3 20:08:43 2008//
-/nv50.c/1.10/Thu Jan 3 20:08:43 2008//
-/nvclock.h/1.56/Thu Jan 3 20:08:43 2008//
-/bios.c/1.41/Fri Jan 4 13:05:38 2008//
-/nv40.c/1.66/Fri Jan 4 17:35:39 2008//
+/error.c/1.3/Wed Oct 5 11:27:11 2005//
+/f75375.c/1.6/Thu Mar 23 22:24:23 2006//
+/f75375.h/1.4/Wed Oct 5 11:27:11 2005//
+/libc_wrapper.c/1.2/Wed Oct 5 11:27:11 2005//
+/w83781d.c/1.2/Sun May 7 10:42:12 2006//
+/w83l785r.c/1.5/Wed Oct 5 11:27:11 2005//
+/xf86i2c.c/1.2/Wed Oct 5 11:27:11 2005//
+/xfree.h/1.1/Mon Apr 4 20:04:04 2005//
+/i2c.h/1.8/Fri Mar 23 20:53:10 2007//
+/nvcontrol.c/1.5/Fri Mar 23 20:39:20 2007//
+/i2c.c/1.14/Fri May 4 19:39:10 2007//
+/overclock.c/1.19/Wed Aug 22 09:41:45 2007//
+/Makefile/1.2/Fri Nov 16 21:30:16 2007//
+/Makefile.in/1.16/Thu Dec 27 16:05:38 2007//
+/nv30.c/1.26/Sun Dec 30 14:11:24 2007//
+/backend.c/1.57/Mon Mar 24 17:17:00 2008//
+/back_win32.c/1.11/Sat Oct 25 15:34:41 2008//
+/config.c/1.33/Fri Dec 12 20:14:21 2008//
+/utils.c/1.5/Fri Dec 12 20:14:21 2008//
+/nv40.c/1.67/Fri Dec 12 20:47:13 2008//
+/xf86i2c.h/1.4/Sat Dec 13 20:37:32 2008//
+/lm99.c/1.7/Sat Dec 13 21:56:04 2008//
+/adt7473.c/1.9/Sun Dec 21 16:10:45 2008//
+/back_linux.c/1.18/Tue Dec 23 20:08:47 2008//
+/backend.h/1.29/Tue Dec 23 22:35:15 2008//
+/back_bsd.c/1.40/Sat Dec 27 20:40:06 2008//
+/nvclock.h/1.64/Sun Dec 28 17:53:23 2008//
+/info.c/1.121/Mon Dec 29 00:00:34 2008//
+/nvreg.h/1.9/Mon Dec 29 10:22:29 2008//
+/bios.c/1.47/Sat Jan 3 16:37:18 2009//
+/nv50.c/1.33/Sun Jan 4 10:46:39 2009//
D
Modified: packages/nvclock/trunk/src/backend/adt7473.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/adt7473.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/adt7473.c (original)
+++ packages/nvclock/trunk/src/backend/adt7473.c Tue Feb 24 05:51:56 2009
@@ -84,18 +84,30 @@
I2CByte cfg;
int offset = 0;
- /* We add a 10C offset to the temperature though this isn't conform
- / the ADT7473 datasheet. The reason we add this is to show a temperature
- / similar to the internal gpu sensor. Right now the board and gpu
- / temperature as reported by the sensor are about the same (there's
- / a difference between the two or 3-4C). Most likely the internal gpu
- / temperature is a bit higher and assuming the temperature as reported
- / by the internal sensor is correct adding a 10C offset is a good solution.
- / (The offset seems to be the same independant of the temperature which)
- / Don't do it on NV50, it doesn't have an internal sensor?
+ /* The temperature needs to be corrected using an offset which is stored in the bios.
+ / If no bios has been parsed we fall back to a default value.
*/
- if(dev->arch & NV4X)
- offset = 10;
+ if(nv_card->bios)
+ {
+ offset = nv_card->bios->sensor_cfg.temp_correction;
+ }
+ else
+ {
+ /* We add a 10C offset to the temperature though this isn't conform
+ / the ADT7473 datasheet. The reason we add this is to show a temperature
+ / similar to the internal gpu sensor. Right now the board and gpu
+ / temperature as reported by the sensor are about the same (there's
+ / a difference between the two or 3-4C). Most likely the internal gpu
+ / temperature is a bit higher and assuming the temperature as reported
+ / by the internal sensor is correct adding a 10C offset is a good solution.
+ / Add an offset of 8C for 8*00/GTX2*0 cards but it doesn't seem 100% correct though.
+ / It could be that +7C is more correct for 8800GT cards.
+ */
+ if(dev->arch & NV4X)
+ offset = 10;
+ else if(dev->arch & NV5X)
+ offset = 8;
+ }
xf86I2CReadByte(dev, ADT7473_REG_REMOTE_TEMP, &temp);
@@ -116,7 +128,11 @@
xf86I2CReadByte(dev, ADT7473_REG_TACH1_LB, &count_lb);
xf86I2CReadByte(dev, ADT7473_REG_TACH1_HB, &count_hb);
count = (count_hb << 8) | count_lb;
-
+
+ /* GT200 boards seem to use two phases instead of a single, the fan speed is twice as high */
+ if(dev->arch & GT200)
+ count *= 2;
+
/* RPM = 60*90k pulses / (number of counts that fit in a pulse) */
return 90000*60/count;
}
Modified: packages/nvclock/trunk/src/backend/back_bsd.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/back_bsd.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/back_bsd.c (original)
+++ packages/nvclock/trunk/src/backend/back_bsd.c Tue Feb 24 05:51:56 2009
@@ -48,6 +48,7 @@
NVClock nvclock;
NVCard *nv_card = NULL;
+static int probe_devices();
static void *map_dev_mem (int fd, unsigned long Base, unsigned long Size);
static void unmap_dev_mem (unsigned long Base, unsigned long Size);
@@ -198,11 +199,13 @@
nv_card->PEXTDEV = map_dev_mem(fd, nv_card->reg_address + 0x101000, 0x1000);
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, 0xffff);
+ nv_card->PMC = map_dev_mem(fd, nv_card->reg_address + 0x000000, 0x2ffff);
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);
+ nv_card->PRAMIN = map_dev_mem(fd, nv_card->reg_address + NV_PRAMIN_OFFSET, NV_PRAMIN_SIZE);
nv_card->PROM = map_dev_mem(fd, nv_card->reg_address + 0x300000, 0xffff);
-
+
/* On Geforce 8xxx cards it appears that the pci config header has been moved */
if(nv_card->arch & NV5X)
nv_card->PBUS = map_dev_mem(fd, nv_card->reg_address + 0x88000, 0x100);
@@ -218,9 +221,11 @@
{
unmap_dev_mem((unsigned long)nv_card->PEXTDEV, 0x1000);
unmap_dev_mem((unsigned long)nv_card->PFB, 0x1000);
- unmap_dev_mem((unsigned long)nv_card->PMC, 0x2ffff);
+ unmap_dev_mem((unsigned long)nv_card->PMC, 0xffff);
unmap_dev_mem((unsigned long)nv_card->PCIO, 0x2000);
+ unmap_dev_mem((unsigned long)nv_card->PDISPLAY, NV_PDISPLAY_SIZE);
unmap_dev_mem((unsigned long)nv_card->PRAMDAC, 0x2000);
+ unmap_dev_mem((unsigned long)nv_card->PRAMIN, NV_PRAMIN_SIZE);
unmap_dev_mem((unsigned long)nv_card->PROM, 0xffff);
}
Modified: packages/nvclock/trunk/src/backend/back_linux.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/back_linux.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/back_linux.c (original)
+++ packages/nvclock/trunk/src/backend/back_linux.c Tue Feb 24 05:51:56 2009
@@ -246,7 +246,9 @@
/* normally pmc is till 0x2000 but extended it for nv40 */
nv_card->PMC = map_dev_mem(fd, nv_card->reg_address + 0x000000, 0x2ffff);
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);
+ nv_card->PRAMIN = map_dev_mem(fd, nv_card->reg_address + NV_PRAMIN_OFFSET, NV_PRAMIN_SIZE);
nv_card->PROM = map_dev_mem(fd, nv_card->reg_address + 0x300000, 0xffff);
/* On Geforce 8xxx cards it appears that the pci config header has been moved */
@@ -266,7 +268,9 @@
unmap_dev_mem((unsigned long)nv_card->PFB, 0x1000);
unmap_dev_mem((unsigned long)nv_card->PMC, 0xffff);
unmap_dev_mem((unsigned long)nv_card->PCIO, 0x2000);
+ unmap_dev_mem((unsigned long)nv_card->PDISPLAY, NV_PDISPLAY_SIZE);
unmap_dev_mem((unsigned long)nv_card->PRAMDAC, 0x2000);
+ unmap_dev_mem((unsigned long)nv_card->PRAMIN, NV_PRAMIN_SIZE);
unmap_dev_mem((unsigned long)nv_card->PROM, 0xffff);
}
Modified: packages/nvclock/trunk/src/backend/back_win32.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/back_win32.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/back_win32.c (original)
+++ packages/nvclock/trunk/src/backend/back_win32.c Tue Feb 24 05:51:56 2009
@@ -135,6 +135,7 @@
/* normally pmc is till 0x2000 but extended it for nv40 */
nv_card->PMC = pMapPhysToLinear(nv_card->reg_address + 0x000000, 0x2ffff, &hmem);
nv_card->PCIO = pMapPhysToLinear(nv_card->reg_address + 0x601000, 0x2000, &hmem);
+ nv_card->PDISPLAY = pMapPhysToLinear(nv_card->reg_address + NV_PDISPLAY, NV_PDISPLAY_LENGTH, &hmem);
nv_card->PRAMDAC = pMapPhysToLinear(nv_card->reg_address + 0x680000, 0x2000, &hmem);
nv_card->PROM = pMapPhysToLinear(nv_card->reg_address + 0x300000, 0xffff, &hmem);
Modified: packages/nvclock/trunk/src/backend/backend.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/backend.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/backend.c (original)
+++ packages/nvclock/trunk/src/backend/backend.c Tue Feb 24 05:51:56 2009
@@ -95,7 +95,7 @@
/* Also retrieve the irq which is used to sync nvclock and NV-CONTROL */
NVGetAttribute(nvclock.dpy, 0, 0, NV_IRQ, &irq);
- if(have_coolbits && (nv_card->gpu == DESKTOP) && (nv_card->irq == irq))
+ if(have_coolbits && (nv_card->irq == irq))
{
nv_card->caps |= COOLBITS_OVERCLOCKING;
Modified: packages/nvclock/trunk/src/backend/backend.h
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/backend.h?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/backend.h (original)
+++ packages/nvclock/trunk/src/backend/backend.h Tue Feb 24 05:51:56 2009
@@ -51,8 +51,8 @@
int32_t pciReadLong(unsigned short devbusfn, long offset);
/* Bios related stuff */
-void dump_bios(char *filename);
-struct nvbios* read_bios(char *filename);
+void dump_bios(const char *filename);
+struct nvbios* read_bios(const char *filename);
/* NV-CONTROL overclocking functions */
float nvcontrol_get_gpu_speed();
Modified: packages/nvclock/trunk/src/backend/bios.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/bios.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/bios.c (original)
+++ packages/nvclock/trunk/src/backend/bios.c Tue Feb 24 05:51:56 2009
@@ -30,6 +30,7 @@
#include "backend.h"
#include "nvclock.h"
+#include "nvreg.h"
#include <fcntl.h>
#include <sys/mman.h>
#include <sys/types.h>
@@ -45,7 +46,7 @@
#define READ_LONG(rom, offset) (READ_INT(rom, offset+4)<<32 | READ_INT(rom, offset))
static unsigned int locate(char *rom, char *str, int offset);
-struct nvbios *read_bios(char *file);
+struct nvbios *read_bios(const char *file);
static struct nvbios *parse_bios(char *rom);
typedef struct
@@ -146,7 +147,7 @@
*/
static char *nv40_bios_version_to_str(char *rom, short offset)
{
- char res[15];
+ char res[16];
int version = READ_INT(rom, offset);
unsigned char extra = rom[offset+4];
@@ -357,6 +358,12 @@
printf("'%c'\t%08x %08x\n", id, READ_INT(rom, offset+1), READ_INT(rom, offset+5));
#endif
offset += 18;
+ break;
+ case 0x97: /* 0x97 */
+#if DEBUG
+ printf("'%c'\t%08x %08x\n", id, READ_INT(rom, offset+1), READ_INT(rom, offset+5));
+#endif
+ offset += 13;
break;
default:
printf("Unhandled init script entry with id '%c' at %04x\n", id, offset);
@@ -884,22 +891,131 @@
#else
-void dump_bios(char *filename)
+void dump_bios(const char *filename)
{
int i;
FILE *fp = NULL;
+ char *rom = calloc(NV_PROM_SIZE, sizeof(char));
+
+ if(!rom)
+ {
+ fprintf(stderr, "Unable to allocate memory for shadowing the bios image\n");
+ return;
+ }
+
+ /* Try to obtain a copy of the bios first from PRAMIN later from the (slow) ROM.
+ / Dumping from ROM might fail on laptops as for some reason there is no ROM on some laptops.
+ */
+ if(!load_bios_pramin(rom))
+ {
+ if(!load_bios_prom(rom))
+ {
+ fprintf(stderr, "Unable to shadow the video bios\n");
+ free(rom);
+ return;
+ }
+ }
+
+ /* Try to dump the bios to a file */
+ fp = fopen(filename, "w+");
+ if(!fp) return;
+
+ for(i=0; i<NV_PROM_SIZE; i++)
+ {
+ fprintf(fp, "%c", rom[i]);
+ }
+ fclose(fp);
+
+ free(rom);
+}
+#endif
+
+/* Verify if we are dealing with a valid bios image */
+int verify_bios(char *rom)
+{
+ /* All bioses start with this '0x55 0xAA' signature */
+ if((rom[0] != 0x55) || (rom[1] != (char)0xAA))
+ return 0;
+
+ /* TODO: CRC-check, Nvidia-check */
+
+ return 1;
+}
+
+/* Load the bios image from a file */
+int load_bios_file(const char* filename, char *data)
+{
+ int fd = 0;
+ int i = 0;
+ char *rom = NULL;
+
+ if((fd = open(filename, O_RDONLY)) == -1)
+ return 0;
+
+ rom = mmap(0, NV_PROM_SIZE, PROT_READ, MAP_SHARED, fd, 0);
+ if(!rom)
+ return 0;
+
+ /* Copy bios data */
+ memcpy(data, rom, NV_PROM_SIZE);
+
+ /* Close the bios */
+ close(fd);
+
+ /* Make sure the bios is correct */
+ if(verify_bios(rom))
+ return 1;
+ else
+ return 0;
+}
+
+/* Load the bios from video memory. Note it might not be cached there at all times. */
+int load_bios_pramin(char *data)
+{
+ int i;
+ char *bios;
+ uint32_t old_bar0_pramin = 0;
+
+ /* Don't use this on unknown cards because we don't know if it needs PRAMIN fixups. */
+ if(!nv_card->arch)
+ return 0;
+
+ /* On NV5x cards we need to let pramin point to the bios */
+ if (nv_card->arch & NV5X)
+ {
+ uint32_t vbios_vram = (nv_card->PDISPLAY[0x9f04/4] & ~0xff) << 8;
+
+ if (!vbios_vram)
+ vbios_vram = (nv_card->PMC[0x1700/4] << 16) + 0xf0000;
+
+ old_bar0_pramin = nv_card->PMC[0x1700/4];
+ nv_card->PMC[0x1700/4] = (vbios_vram >> 16);
+ }
+
+ /* Copy bios data */
+ bios = (char*)nv_card->PRAMIN;
+ memcpy(data, bios, NV_PROM_SIZE);
+
+ if (nv_card->arch & NV5X)
+ nv_card->PMC[0x1700/4] = old_bar0_pramin;
+
+ /* Make sure the bios is correct */
+ if(verify_bios(data))
+ return 1;
+ else
+ return 0;
+}
+
+/* Load the video bios from the ROM. Note laptops might not have a ROM which can be accessed from the GPU */
+int load_bios_prom(char *data)
+{
+ int i;
/* enable bios parsing; on some boards the display might turn off */
nv_card->PMC[0x1850/4] = 0x0;
- /* try to dump the bios */
- fp = fopen(filename, "w+");
- if(!fp) return;
-
- for(i=0; i < 0xffff; i++)
- {
- unsigned char data;
-
+ for(i=0; i<NV_PROM_SIZE; i++)
+ {
/* On some 6600GT/6800LE boards bios there are issues with the rom.
/ Normaly when you want to read data from lets say address X, you receive
/ the data when it is ready. For some roms the outputs aren't "stable" yet when
@@ -909,43 +1025,50 @@
/
/ A delay of 4 extra reads helps for most 6600GT cards but for 6800Go cards atleast 5 are needed.
*/
- data = nv_card->PROM[i];
- data = nv_card->PROM[i];
- data = nv_card->PROM[i];
- data = nv_card->PROM[i];
- data = nv_card->PROM[i];
- fprintf(fp, "%c", data);
- }
- fclose(fp);
+ data[i] = nv_card->PROM[i];
+ data[i] = nv_card->PROM[i];
+ data[i] = nv_card->PROM[i];
+ data[i] = nv_card->PROM[i];
+ data[i] = nv_card->PROM[i];
+ }
/* disable the rom; if we don't do it the screens stays black on some cards */
nv_card->PMC[0x1850/4] = 0x1;
-}
-#endif
+
+ /* Make sure the bios is correct */
+ if(verify_bios(data))
+ return 1;
+ else
+ return 0;
+}
/* This function tries to read a copy of the bios from harddrive. If that doesn't
exist it will dump the bios and then read it. You might wonder why we don't read the bios from
card. The reason behind that is that some bioses are slow to read (can take seconds) and second on some
cards (atleast on my gf2mx) the screen becomes black if I enable reading of the rom.
*/
-struct nvbios *read_bios(char *file)
-{
- int fd = 0;
- char *rom = NULL;
+struct nvbios *read_bios(const char *file)
+{
struct nvbios *res;
-
- if((fd = open(file, O_RDONLY)) == -1)
- return NULL; /* We might need to redump the bios */
-
- rom = mmap(0, 0xffff, PROT_READ, MAP_SHARED, fd, 0);
+ char *rom = calloc(NV_PROM_SIZE, sizeof(char));
+
if(!rom)
- return NULL; /* We might need to redump the bios */
+ return NULL;
+
+ if(!load_bios_pramin(rom))
+ {
+ if(!load_bios_file(file, rom))
+ {
+ free(rom);
+ return NULL;
+ }
+ }
/* Do the actual bios parsing */
res = parse_bios(rom);
- /* Close the bios */
- close(fd);
+ /* Cleanup the mess */
+ free(rom);
return res;
}
Modified: packages/nvclock/trunk/src/backend/config.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/config.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/config.c (original)
+++ packages/nvclock/trunk/src/backend/config.c Tue Feb 24 05:51:56 2009
@@ -270,7 +270,10 @@
if(!(home = getenv("HOME")))
{
- /* error */
+ /* This code should only get entered when nvclock is started at system startup.
+ / The rest of the code and mainly the GTK version isn't prepared for this yet.
+ */
+ return 1;
}
nvclock.path = malloc(strlen(home) + strlen("/.nvclock") +1);
@@ -288,6 +291,7 @@
set_error_str(buf);
return 0;
}
+ stat(nvclock.path, &stat_buf);
}
/* Check if .nvclock really is a directory. For some users it was a file and this led to a segfault. */
Modified: packages/nvclock/trunk/src/backend/info.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/info.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/info.c (original)
+++ packages/nvclock/trunk/src/backend/info.c Tue Feb 24 05:51:56 2009
@@ -226,7 +226,9 @@
{ 0x240, "nVidia Geforce 6150", NFORCE },
{ 0x241, "nVidia Geforce 6150LE", NFORCE },
{ 0x242, "nVidia Geforce 6100", NFORCE },
+ { 0x244, "nVidia Geforce Go 6150", NFORCE },
{ 0x245, "nVidia Quadro NVS 210S / Geforce 6150LE", NFORCE },
+ { 0x247, "nVidia Geforce Go 6100", NFORCE },
{ 0x2dd, "nVidia Unknown NV4x", DESKTOP },
{ 0x2de, "nVidia Unknown NV4x", DESKTOP },
{ 0x90, "nVidia G70", DESKTOP },
@@ -242,7 +244,10 @@
{ 0x290, "nVidia Geforce 7900GTX", DESKTOP },
{ 0x291, "nVidia Geforce 7900GT", DESKTOP },
{ 0x292, "nVidia Geforce 7900GS", DESKTOP },
+ { 0x293, "nVidia Geforce 7950GX2", DESKTOP },
+ { 0x294, "nVidia Geforce 7950GX2", DESKTOP },
{ 0x295, "nVidia Geforce 7950GT", DESKTOP },
+ { 0x297, "nVidia Geforce Go 7950GTX", MOBILE },
{ 0x298, "nVidia Geforce Go 7900GS", MOBILE },
{ 0x299, "nVidia Geforce Go 7900GTX", MOBILE },
{ 0x29a, "nVidia QuadroFX 2500M", MOBILE },
@@ -326,23 +331,49 @@
{ 0x53a, "nVidia Geforce 7050PV nForce 630a", NFORCE},
{ 0x53b, "nVidia Geforce 7050PV nForce 630a", NFORCE},
{ 0x53e, "nVidia Geforce 7025 nForce 630a", NFORCE},
+ { 0x5e0, "nvidia GeForce GT200-400", DESKTOP },
+ { 0x5e1, "nvidia GeForce GTX 280", DESKTOP },
+ { 0x5e2, "nvidia GeForce GTX 260", DESKTOP },
+ { 0x5e7, "nvidia Tesla C1060", DESKTOP },
+ { 0x5ed, "nvidia Quadroplex 2200 D2", DESKTOP },
+ { 0x5f8, "nvidia Quadroplex 2200 S4", DESKTOP },
+ { 0x5f9, "nvidia Quadro CX", DESKTOP },
+ { 0x5fd, "nvidia QuadroFX 5800", DESKTOP },
+ { 0x5fe, "nvidia QuadroFX 5800", DESKTOP },
{ 0x600, "nVidia Geforce 8800GTS 512", DESKTOP },
+ { 0x602, "nVidia Geforce 8800GT", DESKTOP },
+ { 0x604, "nVidia Geforce 9800GX2", DESKTOP },
+ { 0x606, "nVidia Geforce 8800GS", DESKTOP },
+ { 0x60d, "nVidia Geforce 8800GS", DESKTOP },
{ 0x609, "nVidia Geforce 8800M GTS", MOBILE },
+ { 0x60c, "nVidia Geforce 8800M GTX", MOBILE },
+ { 0x610, "nVidia Geforce 9600GSO", DESKTOP },
{ 0x611, "nVidia Geforce 8800GT", DESKTOP },
+ { 0x612, "nVidia Geforce 9800GTX", DESKTOP },
+ { 0x614, "nVidia Geforce 9800GT", DESKTOP },
{ 0x61a, "nVidia QuadroFX 3700", DESKTOP },
- { 0x6e0, "nVidia G98", DESKTOP },
- { 0x6e1, "nVidia G98", DESKTOP },
+ { 0x61c, "nVidia QuadroFX 3600M", MOBILE },
+ { 0x622, "nVidia Geforce 9600GT", DESKTOP },
+ { 0x623, "nVidia Geforce 9600GS", DESKTOP },
+ { 0x640, "nVidia Geforce 9500GT", DESKTOP },
+ { 0x643, "nVidia Geforce 9500GT", DESKTOP },
+ { 0x647, "nVidia Geforce 9600M GT", MOBILE },
+ { 0x648, "nVidia Geforce 9600M GS", MOBILE },
+ { 0x649, "nVidia Geforce 9600M GT", MOBILE },
+ { 0x64b, "nVidia Geforce 9500M G", MOBILE },
+ { 0x6e0, "nVidia Geforce 9300GE", DESKTOP },
+ { 0x6e1, "nVidia Geforce 9300GS", DESKTOP },
{ 0x6e2, "nVidia Geforce 8400", DESKTOP },
- { 0x6e3, "nVidia G98", DESKTOP },
+ { 0x6e3, "nVidia Geforce 8400SE", DESKTOP },
{ 0x6e4, "nVidia Geforce 8400GS", DESKTOP },
- { 0x6e5, "nVidia G98", DESKTOP },
- { 0x6e6, "nVidia G98", DESKTOP },
+ { 0x6e5, "nVidia Geforce 9300M GS", MOBILE },
+ { 0x6e6, "nVidia Geforce G100", DESKTOP },
{ 0x6e7, "nVidia G98", DESKTOP },
- { 0x6e8, "nVidia G98", DESKTOP },
- { 0x6e9, "nVidia G98", DESKTOP },
- { 0x6ea, "nVidia G98", DESKTOP },
- { 0x6eb, "nVidia G98", DESKTOP },
- { 0x6ec, "nVidia G98", DESKTOP },
+ { 0x6e8, "nVidia Geforce 9200M GS", MOBILE },
+ { 0x6e9, "nVidia Geforce 9300M GS", MOBILE },
+ { 0x6ea, "nVidia Quadro NVS 150M", MOBILE },
+ { 0x6eb, "nVidia Quadro NVS 160M", MOBILE },
+ { 0x6ec, "nVidia Geforce G105M", MOBILE },
{ 0x6ed, "nVidia G98", DESKTOP },
{ 0x6ee, "nVidia G98", DESKTOP },
{ 0x6ef, "nVidia G98", DESKTOP },
@@ -354,14 +385,19 @@
{ 0x6f5, "nVidia G98", DESKTOP },
{ 0x6f6, "nVidia G98", DESKTOP },
{ 0x6f7, "nVidia G98", DESKTOP },
- { 0x6f8, "nVidia G98", DESKTOP },
- { 0x6f9, "nVidia G98", DESKTOP },
- { 0x6fa, "nVidia G98", DESKTOP },
- { 0x6fb, "nVidia G98", DESKTOP },
+ { 0x6f8, "nVidia Quadro NVS 420", DESKTOP },
+ { 0x6f9, "nVidia QuadroFX 370 LP", DESKTOP },
+ { 0x6fa, "nVidia Quadro NVS 450", DESKTOP },
+ { 0x6fb, "nVidia QuadroFX 370M", MOBILE },
{ 0x6fc, "nVidia G98", DESKTOP },
- { 0x6fd, "nVidia G98", DESKTOP },
+ { 0x6fd, "nVidia Quadro NVS 295", DESKTOP },
{ 0x6fe, "nVidia G98", DESKTOP },
- { 0x6ff, "nVidia G98", DESKTOP },
+ { 0x6ff, "nVidia G98-GL", DESKTOP },
+ { 0x860, "nVidia Geforce 9300", DESKTOP },
+ { 0x861, "nVidia Geforce 9400", DESKTOP },
+ { 0x863, "nVidia Geforce 9400M", MOBILE },
+ { 0x864, "nVidia Geforce 9300", DESKTOP },
+ { 0x865, "nVidia Geforce 9300", DESKTOP },
{ 0, NULL, UNKNOWN }
};
@@ -466,11 +502,24 @@
case 0x420: /* 8500 'G86' */
arch = G86;
break;
+ case 0x5e0: /* GT2x0 */
+ case 0x5f0: /* GT2x0 */
+ arch = GT200;
+ break;
+ case 0x6e0: /* G98 */
+ case 0x6f0: /* G98 */
+ case 0x860: /* C79 */
+ arch = G86;
+ break;
case 0x600: /* G92 */
case 0x610: /* G92 */
- case 0x6e0: /* G98 */
- case 0x6f0: /* G98 */
- arch = G86;
+ arch = G92;
+ break;
+ case 0x620: /* 9600GT 'G94' */
+ arch = G94;
+ break;
+ case 0x640: /* 9500GT */
+ arch = G96;
break;
case 0x240:
case 0x3d0: /* not sure if this is a C51 too */
@@ -545,6 +594,12 @@
static short get_gpu_pci_id()
{
return nv_read_pbus16(PCI_DEVICE_ID);
+}
+
+/* Retrieve the pci subvendor id */
+static short get_pci_subvendor_id()
+{
+ return nv_read_pbus16(PCI_SUBSYSTEM_VENDOR_ID);
}
static int set_gpu_pci_id(short id)
@@ -864,13 +919,23 @@
char rmask, rmask_default;
switch(nv_card->get_rop_units(&rmask, &rmask_default))
{
+ case 32: /* Geforce GTX280 */
+ return 512;
+ case 28: /* Geforce GTX260 */
+ return 448;
case 24: /* 8800GTX */
return 384;
case 20: /* 8800GTS */
return 320;
+ case 16: /* 8800GT */
+ return 256;
+ case 12: /* 8800GS */
+ return 192;
case 8: /* 8600GT/GTS */
- case 4: /* 8500GT */
+ case 4: /* 8500GT; 8400GS boards use the same core and offer 64-bit, how to handle this? */
return 128;
+ case 2: /* 8300GS */
+ return 64;
}
}
/* Generic algorithm for cards up to the Geforce4 */
@@ -986,6 +1051,7 @@
printf("NV_15F4 (0x15f4): %08x\n", nv_card->PMC[0x15f4/4]);
printf("NV_15F8 (0x15f8): %08x\n", nv_card->PMC[0x15f8/4]);
printf("NV_PBUS_PCI_0 (0x1800): %08x\n", nv_read_pbus(PCI_VENDOR_ID));
+ printf("NV_PBUS_PCI_0 (0x182c): %08x\n", nv_read_pbus(PCI_SUBSYSTEM_VENDOR_ID));
if(nv_card->arch & (NV4X | NV5X))
{
@@ -1027,9 +1093,14 @@
if(nv_card->arch & NV5X)
{
printf("NV_E100 (0xe100): %08x\n", nv_card->PMC[0xe100/4]);
+ printf("NV_E114 (0xe114): %08x\n", nv_card->PMC[0xe114/4]);
+ printf("NV_E118 (0xe118): %08x\n", nv_card->PMC[0xe118/4]);
printf("NV_E11C (0xe11c): %08x\n", nv_card->PMC[0xe11c/4]);
printf("NV_E120 (0xe120): %08x\n", nv_card->PMC[0xe120/4]);
+ printf("NV_E300 (0xe300): %08x\n", nv_card->PMC[0xe300/4]);
printf("NV_20008 (0x20008): %08x\n", nv_card->PMC[0x20008/4]);
+ printf("NV_20400 (0x20400): %08x\n", nv_card->PMC[0x20400/4]);
+ printf("NV_PDISPLAY_SOR0_REGS_BRIGHTNESS(%x): %08x\n", NV_PDISPLAY_SOR0_REGS_BRIGHTNESS, nv_card->PDISPLAY[NV_PDISPLAY_SOR0_REGS_BRIGHTNESS/4]);
}
printf("NV_PFB_CFG0 (0x100200): %08x\n", nv_card->PFB[0x200/4]);
@@ -1106,6 +1177,9 @@
nv_card->card_name = (char*)get_card_name(nv_card->device_id, &nv_card->gpu);
}
+ /* Set the pci subvendor id */
+ nv_card->subvendor_id = get_pci_subvendor_id();
+
/* gpu arch/revision */
nv_card->get_gpu_architecture = get_gpu_architecture;
nv_card->get_gpu_revision = get_gpu_revision;
Modified: packages/nvclock/trunk/src/backend/lm99.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/lm99.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/lm99.c (original)
+++ packages/nvclock/trunk/src/backend/lm99.c Tue Feb 24 05:51:56 2009
@@ -76,24 +76,29 @@
xf86I2CReadByte(dev, LM99_REG_REMOTE_TEMP, &temp);
- /* Cards with lm99 chips need an offset of 16C according to the datasheets.
- / Further an extra offset of 10C seems to be needed on Geforce6800 cards to match nvidia-settings.
- / Last but not least Geforce6600GT boards containing an LM99 sensor seem to need a total offset of 21C.
- */
+ /* Cards with lm99 chips need an offset of 16C according to the datasheets. */
if(dev->chip_id == LM99)
{
+ temp += 16;
+ }
+
+ /* The temperature needs to be corrected using an offset which is stored in the bios.
+ / If no bios has been parsed we fall back to a default value.
+ */
+ if(nv_card->bios)
+ {
+ temp += nv_card->bios->sensor_cfg.temp_correction;
+ }
+ else
+ {
+ /* An extra offset of 10C seems to be needed on Geforce6800 cards to match nvidia-settings.
+ / Last but not least Geforce6600GT boards containing an LM99 sensor seem to need a +5C offset.
+ */
if(dev->arch == NV43)
- temp += 21;
+ temp += 5;
else if(dev->arch & NV4X)
- temp += 26;
- else
- temp += 16;
+ temp += 10;
}
- /* Geforce6 boards need an extra offset of +10C on both LM99 and MAX6659 chipsets.
- / The code below is only executed for MAX6659 as we already handle the extra 10C above.
- */
- else if(dev->arch & NV4X)
- temp += 10;
return temp;
}
Modified: packages/nvclock/trunk/src/backend/nv40.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/nv40.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/nv40.c (original)
+++ packages/nvclock/trunk/src/backend/nv40.c Tue Feb 24 05:51:56 2009
@@ -399,6 +399,12 @@
else
temp = nv_card->PMC[0x15b4/4] & 0xff;
+ if(nv_card->debug)
+ {
+ printf("NV_15B4 (0x15B4): %08x\n", nv_card->PMC[0x15b4/4]);
+ printf("slope=%f, offset=%f, correction=%d\n", slope, offset, correction);
+ }
+
return (int)(temp * slope + offset) + correction;
}
Modified: packages/nvclock/trunk/src/backend/nv50.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/nv50.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/nv50.c (original)
+++ packages/nvclock/trunk/src/backend/nv50.c Tue Feb 24 05:51:56 2009
@@ -75,10 +75,19 @@
case G86:
mask = 0x010001;
break;
+ case G92:
+ mask = 0x0f00ff;
+ break;
+ case G94:
+ mask = 0x0f000f;
+ break;
+ case GT200:
+ mask = 0xff03ff;
+ break;
}
if(smask)
- *smask = mask & 0xff;
+ *smask = mask & 0x3ff;
if(rmask)
*rmask = (mask >> 16) & 0xff;
@@ -91,20 +100,24 @@
static int nv50_get_stream_units(char *mask, char *default_mask)
{
int i, stream_units=0;
- unsigned char stream_units_cfg = nv_card->PMC[0x1540/4] & 0xff;
+ int32_t stream_units_cfg = nv_card->PMC[0x1540/4] & 0x3ff;
/* The number of shaders is again stored in 0x1540
- bit7-0: number of unified pixel shaders in blocks of 16
+ bit9-0: number of unified pixel shaders in blocks of 16
bit23-16: number of ROP units in blocks of 4
bit31-24: what's in here?
*/
- for(i=0; i<8; i++)
+ for(i=0; i<10; i++)
if((stream_units_cfg >> i) & 0x1)
stream_units++;
nv50_get_default_mask(default_mask, 0);
*mask = stream_units_cfg;
+
+ if(nv_card->arch == GT200)
+ return (stream_units * 24); /* GT200 stores stream units in blocks of 24 */
+
return (stream_units << 4); /* stream units are stored in blocks of 16 */
}
@@ -126,6 +139,45 @@
return (rop_units << 2); /* rop units are stored in blocks of 4 */
}
+static float g84_get_fanspeed()
+{
+ int pwm_divider = nv_card->PMC[0xe11c/4] & 0x7fff;
+
+ /* On most Geforce8/9 cards I have seen the fanspeed register is 'inverted', so
+ / a low value corresponds with fullspeed (to be exact the register defines the low
+ / period of a pwm pulse. Though some boards aren't inverted like a 8500GT (G86). I'm
+ / not sure what we should do about this. If it is possible to whitelist some generations
+ / or so we should perhaps do that or perhaps there is some setting in the bios? So right
+ / now 100% would show 0% on a 8500GT.
+ /
+ / Further some boards use 0xe114 / 0xe118 instead of 0xe11c / 0xe1220. At least the 9800GTX
+ / seems to do that. When I have a more clear picture of the situation those should receive support too.
+ */
+ float fanspeed = (float)(pwm_divider - (nv_card->PMC[0xe120/4] & 0x7fff)) * 100.0/(float)pwm_divider;
+ return fanspeed;
+}
+
+static void g84_set_fanspeed(float speed)
+{
+ int value;
+ int pwm_divider = nv_card->PMC[0xe11c/4] & 0x7fff;
+
+ /* For safety reasons we should never disable the fan by not putting it below 10%; further negative values don't exist ;) */
+ if(speed < 10 || speed > 100)
+ return;
+
+ /* Bit31 must be set else the hardware doesn't seem to do anything with the changes
+ / Bit30-16 contain some magical bits on 9500GT and other cards which we should preserve.
+ / On a 9500gt the contents of 0xe120 could be e.g. 0x0300010e with a pwm_divider of 0x21d.
+ /
+ / Note Oxe300 is also related to the fanspeed. By default it seems to contain 0x100 on
+ / 9600GT and other cards. Setting this value to 0x300 seems to set the fanspeed to a fixed
+ / value. Apparently 0xe300 acts like a multiplexer?
+ */
+ value = 0x80000000 | (nv_card->PMC[0xe120/4] & 0x7fff0000) | (((int)(100 - speed) * pwm_divider/100) & 0x7fff);
+ nv_card->PMC[0xe120/4] = value;
+}
+
/* Reading of the internal gpu sensor, it not entirely correct yet */
static int nv50_get_gpu_temp(void *sensor)
{
@@ -138,8 +190,67 @@
offset = -227.0;
slope = 430.0/10000.0;
+ if(nv_card->debug)
+ {
+ printf("NV_20008 (0x20008): %08x\n", nv_card->PMC[0x20008/4]);
+ printf("slope=%f, offset=%f, correction=%d\n", slope, offset, correction);
+ }
+
temp = nv_card->PMC[0x20008/4] & 0x1fff;
return (int)(temp * slope + offset) + correction;
+}
+
+static int g84_get_gpu_temp(void *sensor)
+{
+ if(nv_card->debug)
+ {
+ /* A calibrated value of the temperature is stored in 0x20400, raw in 0x20008 it would require bios info to calibrate it */
+ printf("NV_20008 (0x20008): %08x\n", nv_card->PMC[0x20008/4]);
+ printf("NV_20400 (0x20400): %08x\n", nv_card->PMC[0x20400/4]);
+ }
+
+ /* A calibrated value of the temperature is stored in 0x20400 */
+ return nv_card->PMC[0x20400/4];
+}
+
+static int g92_get_gpu_temp(void *sensor)
+{
+ int temp;
+ float offset;
+ float divider;
+
+ /* According to a formula on the rivatuner forum Asus uses the following formula: (-13115 + raw_temp)/18.7 + 1. */
+ offset = -13115 + 18.7;
+ divider = 18.7;
+
+ if(nv_card->debug)
+ {
+ printf("NV_20008 (0x20008): %08x\n", nv_card->PMC[0x20008/4]);
+ printf("divider=%f, offset=%f\n", divider, offset);
+ }
+
+ temp = nv_card->PMC[0x20008/4] & 0x1fff;
+ return (int)(temp + offset)/divider;
+}
+
+
+/* Get current backpanel brightness level on laptops */
+static int nv50_mobile_get_smartdimmer()
+{
+ int val = nv_card->PDISPLAY[NV_PDISPLAY_SOR0_REGS_BRIGHTNESS/4];
+ /* Convert level to a value between 1 and 100 */
+ /* For now assume the maximum value is 1024 */
+ return ((val / 1024.0 * 100) + 0.5);
+}
+
+/* Adjust backpanel brightness on laptops */
+static void nv50_mobile_set_smartdimmer(int level)
+{
+ int val;
+ if(level < 15 || level > 100)
+ return;
+ val = (level * 1024 / 100) | NV_PDIPSLAY_SOR0_REGS_BRIGHTNESS_CONTROL_ENABLED;
+ nv_card->PDISPLAY[NV_PDISPLAY_SOR0_REGS_BRIGHTNESS/4] = val;
}
static int CalcSpeed_nv50(int base_freq, int m1, int m2, int n1, int n2, int p)
@@ -199,7 +310,6 @@
static void nv50_set_memory_speed(unsigned int memclk)
{
- printf("blaat: %d %p %x\n", memclk, nvclock.dpy, nv_card->state);
}
static float nv50_get_shader_speed()
@@ -282,14 +392,65 @@
i2c_sensor_init();
}
+ /* For now unlock laptops of HP, Samsung (Sanyo), Sony and Zepto. Later on we whould find a better way if there is any.
+ / Most likely there is some info in the bios which can help us figuring out what smartdimmer method is used.
+ / The code has been reported to work on the following models:
+ / - Apple Macbook5,1 (Aluminium), Geforce 9400M, dev=0x863, subvendor=0x106b
+ / - HP Compaq 8510W, QuadroFX 570M, dev=0x40c, subvendor=0x103c
+ / - HP Compaq 8710P, QuadroFX 320M, dev=0x40b, subvendor=0x103c
+ / - Samsung Q210 / Q310 / R510, Geforce 9200M, dev=0x6e8, subvendor=0x144d
+ / - Sony Vaio models using 8400/8600 GPUs:
+ / VGN SZ650N, SZ61MN/B, SZ730E, SZ750N, SZ71MN/B, SZ71E, VGN FZ38M, FZ31M, FZ11Z, NR31, AR41E, FZ11S, FZ290, FZ250AE,
+ / FZ21E, FZ21M, FZ470E, FZ340E, FZ190N, FZ18M, FZ31E, FZ18E, FZ31Z, FZ21Z, FZ31S, AR51SU, AR71S
+ / - Zepto (unknown model), Geforce 9600M, dev=0x649, subvendor=0x1a46,
+ */
+ if((nv_card->gpu == MOBILE) &&
+ ((nv_card->subvendor_id == PCI_VENDOR_ID_APPLE) ||
+ (nv_card->subvendor_id == PCI_VENDOR_ID_HP) ||
+ (nv_card->subvendor_id == PCI_VENDOR_ID_SANYO) ||
+ (nv_card->subvendor_id == PCI_VENDOR_ID_SONY) ||
+ (nv_card->subvendor_id == PCI_VENDOR_ID_ZEPTO)))
+ {
+ nv_card->caps |= SMARTDIMMER;
+ nv_card->get_smartdimmer = nv50_mobile_get_smartdimmer;
+ nv_card->set_smartdimmer = nv50_mobile_set_smartdimmer;
+ }
+
/* Temperature monitoring; all NV50 cards feature an internal temperature sensor
/ but only use it when there is no I2C sensor around.
*/
- if(!(nv_card->caps & GPU_TEMP_MONITORING))
+ if((nv_card->arch & NV50) && !(nv_card->caps & GPU_TEMP_MONITORING))
{
nv_card->caps |= GPU_TEMP_MONITORING;
nv_card->sensor_name = (char*)strdup("GPU Internal Sensor");
nv_card->get_gpu_temp = (int(*)(I2CDevPtr))nv50_get_gpu_temp;
+ }
+ else if((nv_card->arch & (G84 | G86 | G94 | G96)) && !(nv_card->caps & GPU_TEMP_MONITORING))
+ {
+ nv_card->caps |= GPU_TEMP_MONITORING;
+ nv_card->sensor_name = (char*)strdup("GPU Internal Sensor");
+ nv_card->get_gpu_temp = (int(*)(I2CDevPtr))g84_get_gpu_temp;
+ }
+ else if((nv_card->arch & G92) && !(nv_card->caps & GPU_TEMP_MONITORING))
+ {
+ /* Nearly all G92 boards use a ADT7473 except some Asus models. They don't use the bios data properly, so give it its own function */
+ nv_card->caps |= GPU_TEMP_MONITORING;
+ nv_card->sensor_name = (char*)strdup("GPU Internal Sensor");
+ nv_card->get_gpu_temp = (int(*)(I2CDevPtr))g92_get_gpu_temp;
+ }
+
+
+ /* Fanspeed adjustment support for several 8600GT 'G84', 9600GT 'G94' and 9600GSO 'G92' boards
+ / For now only support fanspeed adjustment using pwm registers 0xe11c/0xe120. Assume they are
+ / active when 0xe11c (pwm divider) is higher than 1. We need a proper method to distinguish between
+ / the use of 0xe114/0xe118 and 0xe11c/0xe120 and to detect whether the pwm signal needs to be inverted
+ / or not. Likely there is info in the bios for this.
+ */
+ if((nv_card->arch & (G84 | G86 | G92 | G94 | G96)) && !(nv_card->caps & I2C_FANSPEED_MONITORING) && (nv_card->PMC[0xe11c/4] > 1))
+ {
+ nv_card->caps |= GPU_FANSPEED_MONITORING;
+ nv_card->get_fanspeed = g84_get_fanspeed;
+ nv_card->set_fanspeed = g84_set_fanspeed;
}
/* Mobile GPU check; we don't want to overclock those unless the user wants it */
Modified: packages/nvclock/trunk/src/backend/nvclock.h
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/nvclock.h?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/nvclock.h (original)
+++ packages/nvclock/trunk/src/backend/nvclock.h Tue Feb 24 05:51:56 2009
@@ -48,7 +48,11 @@
#define NV50 (1<<17)
#define G84 (1<<18)
#define G86 (1<<19)
-#define NV5X (NV50 | G84 | G86)
+#define G92 (1<<20)
+#define G94 (1<<21)
+#define G96 (1<<22)
+#define GT200 (1<<23)
+#define NV5X (NV50 | G84 | G86 | G92 | G94 | G96 | GT200)
#define NV_ERR_NO_DEVICES_FOUND 1
#define NV_ERR_NO_DRIVERS_FOUND 2
@@ -162,10 +166,10 @@
struct voltage volt_lst[4];
short perf_entries;
- struct performance perf_lst[3];
+ struct performance perf_lst[4];
short pll_entries;
- struct pll pll_lst[8];
+ struct pll pll_lst[16];
struct sensor sensor_cfg;
@@ -182,6 +186,7 @@
short number; /* internal card number; used by the gtk client and set_card to see if we really need to switch cards */
short caps; /* A bitmask that contains what card features are supported; A normal gpu can do gpu/memory overclocking but a nforce can do only gpu. */
short device_id;
+ short subvendor_id;
int arch; /* Architecture NV10, NV15, NV20 ..; for internal use only as we don't list all architectures */
unsigned int reg_address;
char *dev_name; /* /dev/mem or /dev/nvidiaX */
@@ -199,8 +204,10 @@
int mem_mapped; /* Check for set_card to see if the memory has been mapped or not. */
volatile unsigned int *PFB;
volatile unsigned int *PBUS;
+ volatile unsigned int *PDISPLAY; /* NV50 display registers */
volatile unsigned int *PMC;
volatile unsigned int *PRAMDAC;
+ volatile unsigned int *PRAMIN;
volatile unsigned int *PEXTDEV;
volatile unsigned char *PROM; /* Nvidia bios */
volatile unsigned char *PCIO;
Modified: packages/nvclock/trunk/src/backend/nvreg.h
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/nvreg.h?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/nvreg.h (original)
+++ packages/nvclock/trunk/src/backend/nvreg.h Tue Feb 24 05:51:56 2009
@@ -21,7 +21,14 @@
/* PCI stuff */
#define PCI_VENDOR_ID 0x0 /* 16-bit */
+# define PCI_VENDOR_ID_APPLE 0x106b
+# define PCI_VENDOR_ID_HP 0x103c
+# define PCI_VENDOR_ID_SANYO 0x144d /* Samsung laptops use the Sanyo vendor id */
+# define PCI_VENDOR_ID_SONY 0x104d
+# define PCI_VENDOR_ID_ZEPTO 0x1a46
#define PCI_DEVICE_ID 0x2 /* 16-bit */
+#define PCI_SUBSYSTEM_VENDOR_ID 0x2c /* 16-bit */
+#define PCI_SUBSYSTEM_ID 0x2e /* 16-bit */
#define PCI_CAPABILITY_LIST 0x34
#define PCI_CAP_LIST_ID 0x0
#define PCI_CAP_LIST_NEXT 0x1
@@ -58,6 +65,20 @@
# define NV_PMC_BOOT_0_REVISION_MAJOR 0xf0 /* in general A or B, on pre-NV10 it was different */
# define NV_PMC_BOOT_0_REVISION_MASK 0xff
+/* PDISPLAY */
+#define NV_PDISPLAY_OFFSET 0x610000
+#define NV_PDISPLAY_SIZE 0x10000
+#define NV_PDISPLAY_SOR0_REGS_BRIGHTNESS 0xc084
+# define NV_PDIPSLAY_SOR0_REGS_BRIGHTNESS_CONTROL_ENABLED 0x80000000
+
+/* PRAMIN */
+#define NV_PRAMIN_OFFSET 0x00700000
+#define NV_PRAMIN_SIZE 0x00100000
+
+/* PROM */
+#define NV_PROM_OFFSET 0x300000
+#define NV_PROM_SIZE 0xffff /* size in bytes */
+
/* NV4X registers
*
* 0xc040: used to enble/disable parts of the GPU?
Modified: packages/nvclock/trunk/src/backend/utils.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/utils.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/utils.c (original)
+++ packages/nvclock/trunk/src/backend/utils.c Tue Feb 24 05:51:56 2009
@@ -49,6 +49,9 @@
case 0x50:
sprintf(buf, "NV50/G80"); /* 8800 */
break;
+ case 0xa0:
+ sprintf(buf, "GT200"); /* Geforce GTX260/280 */
+ break;
default:
if(arch <= 0x44) /* The NV44/6200TC is the last card with only an NV name */
sprintf(buf, "NV%X", arch);
Modified: packages/nvclock/trunk/src/backend/xf86i2c.h
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/backend/xf86i2c.h?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/backend/xf86i2c.h (original)
+++ packages/nvclock/trunk/src/backend/xf86i2c.h Tue Feb 24 05:51:56 2009
@@ -62,7 +62,7 @@
int StartTimeout; /* usec */
short chip_id; /* type of i2c chip; required atleast by the lm99 to decide whether to add an offset or not */
- short arch; /* architecture to which the gpu belongs; the lm99 code needs this for adding offsets too */
+ int arch; /* architecture to which the gpu belongs; the lm99 code needs this for adding offsets too */
char *chip_name;
I2CSlaveAddr SlaveAddr;
Modified: packages/nvclock/trunk/src/gtk/CVS/Entries
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/gtk/CVS/Entries?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/gtk/CVS/Entries (original)
+++ packages/nvclock/trunk/src/gtk/CVS/Entries Tue Feb 24 05:51:56 2009
@@ -1,5 +1,4 @@
/.cvsignore/1.1/Mon Sep 15 16:40:12 2003//
-/Makefile.in/1.9/Fri Sep 2 08:36:32 2005//
/banner.c/1.3/Sat Dec 10 20:47:25 2005//
/banner.h/1.3/Sat Dec 10 20:47:25 2005//
/banner_gl.h/1.2/Mon Aug 29 11:47:55 2005//
@@ -7,9 +6,10 @@
/interface.h/1.9/Sat Dec 10 20:47:26 2005//
/settings.c/1.6/Sat Dec 10 20:47:26 2005//
/settings.h/1.4/Sat Dec 10 20:47:26 2005//
-/gl.c/1.18/Thu Jan 3 20:08:44 2008//
-/gl.h/1.11/Thu Jan 3 20:08:44 2008//
-/hw.c/1.51/Thu Jan 3 20:08:44 2008//
-/hw.h/1.18/Thu Jan 3 20:08:44 2008//
-/main.c/1.23/Fri Jan 4 17:32:38 2008//
+/gl.h/1.11/Fri Dec 28 17:42:44 2007//
+/hw.h/1.18/Sun Dec 30 15:01:59 2007//
+/Makefile.in/1.10/Sun May 11 10:25:46 2008//
+/hw.c/1.52/Sun May 11 10:25:46 2008//
+/gl.c/1.19/Fri May 30 23:09:19 2008//
+/main.c/1.25/Sat Jan 3 17:11:48 2009//
D
Modified: packages/nvclock/trunk/src/gtk/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/gtk/Makefile.in?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/gtk/Makefile.in (original)
+++ packages/nvclock/trunk/src/gtk/Makefile.in Tue Feb 24 05:51:56 2009
@@ -7,9 +7,9 @@
libbackend=../backend/libbackend.a
libnvcontrol=../nvcontrol/libnvcontrol.a
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
+prefix=$(DESTDIR)@prefix@
+exec_prefix=$(DESTDIR)@exec_prefix@
+bindir=$(DESTDIR)@bindir@
ifeq ($(HAVE_GTK2), yes)
PROGRAM=nvclock_gtk
@@ -46,4 +46,4 @@
$(INSTALL_APP)
uninstall:
- $(UNINSTALL_APP)
+ $(UNINSTALL_APP)
Modified: packages/nvclock/trunk/src/gtk/gl.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/gtk/gl.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/gtk/gl.c (original)
+++ packages/nvclock/trunk/src/gtk/gl.c Tue Feb 24 05:51:56 2009
@@ -136,6 +136,10 @@
/* Wrapper around NVGetAttribute used for configuration file support */
int GLGetAttribute(config *conf, Display *dpy, int screen, unsigned int disp_mask, unsigned int option, int *value)
{
+ /* Verify if the option is available before continuing */
+ if(!NVGetAttribute(dpy, screen, disp_mask, option, value))
+ return 0;
+
/* When initialize is set, we will bypass NVGetAttribute and read the values
/ from the configuration file.
*/
@@ -437,7 +441,7 @@
{
glx_vendor = (char*)pglXQueryServerString(dpy, screen, GLX_VENDOR);
glx_version = (char*)pglXQueryServerString(dpy, screen, GLX_VERSION);
- glx_direct = (char*)pglXIsDirect(dpy, ctx) ? "Yes" : "No";
+ glx_direct = (char*)(pglXIsDirect(dpy, ctx) ? "Yes" : "No");
gl_vendor = (char*)pglGetString(GL_VENDOR);
gl_renderer = (char*)pglGetString(GL_RENDERER);
gl_version = (char*)pglGetString(GL_VERSION);
Modified: packages/nvclock/trunk/src/gtk/hw.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/gtk/hw.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/gtk/hw.c (original)
+++ packages/nvclock/trunk/src/gtk/hw.c Tue Feb 24 05:51:56 2009
@@ -30,6 +30,7 @@
#include <unistd.h>
#include <string.h>
#include <stdio.h>
+#include <stdlib.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
Modified: packages/nvclock/trunk/src/gtk/main.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/gtk/main.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/gtk/main.c (original)
+++ packages/nvclock/trunk/src/gtk/main.c Tue Feb 24 05:51:56 2009
@@ -58,7 +58,7 @@
window_nvclock = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(window_nvclock), 540, 280);
- gtk_window_set_title(GTK_WINDOW(window_nvclock), "NVClock 0.8 (Beta3)");
+ gtk_window_set_title(GTK_WINDOW(window_nvclock), "NVClock 0.8 (Beta4)");
main_window = (struct MainWindow*)calloc(1, sizeof(struct MainWindow));
@@ -255,6 +255,9 @@
{
GtkWidget *window_nvclock;
+ gtk_set_locale ();
+ gtk_init (&argc, &argv);
+
/* Initialize nvclock. This must be done here instead of in the hardware backend
/ because of the configuration file which gets initialized by init_nvclock.
*/
@@ -269,9 +272,6 @@
return 0;
}
- gtk_set_locale ();
- gtk_init (&argc, &argv);
-
window_nvclock = create_window_main ();
gtk_widget_show (window_nvclock);
Modified: packages/nvclock/trunk/src/nvclock.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/nvclock.c?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/nvclock.c (original)
+++ packages/nvclock/trunk/src/nvclock.c Tue Feb 24 05:51:56 2009
@@ -61,7 +61,7 @@
int usage()
{
- printf("NVClock v0.8 (Beta3)\n\n");
+ printf("NVClock v0.8 (Beta4)\n\n");
printf("Using NVClock you can overclock your Nvidia videocard under Linux and FreeBSD.\nUse this program at your own risk, because it can damage your system!\n\n");
printf("Usage: ./nvclock [options]\n\n");
printf("Overclock options:\n");
@@ -78,7 +78,7 @@
printf(" -F --fanspeed speed\t\tAdjust the fanspeed; speed is a value between 10 and 100, a delta +10/-10 or 'auto'\n");
printf(" -P --punit mask\t\tActivate extra pixel pipelines. (NV4X only)\n");
printf(" -Q --deviceid digit\t\tAdjust the last digit of the pci id.\n");
- printf(" -S --smartdimmer level\tAdjust brightness of the backlight; level is a value between 15 and 100 or a delta like +10/-10. (NV4X laptops only for now)\n");
+ printf(" -S --smartdimmer level\tAdjust brightness of the backlight; level is a value between 15 and 100 or a delta like +10/-10.\n");
printf(" -T --temperature\t\tShow the GPU temperatures.\n");
printf(" -V --vunit mask\t\tActivate extra vertex pipelines. (NV4X only)\n");
printf(" -i --info\t\t\tShow detailed card info.\n");
@@ -999,7 +999,7 @@
nv_card->set_i2c_fanspeed_pwm(nv_card->sensor, dutycycle);
/* It takes a short time for the fanspeed to change */
- usleep(100);
+ usleep(10000);
printf("Fanspeed: %d RPM\n", nv_card->get_i2c_fanspeed_rpm(nv_card->sensor));
printf("New PWM duty cycle: %.1f\n", nv_card->get_i2c_fanspeed_pwm(nv_card->sensor));
}
@@ -1034,7 +1034,7 @@
if(!(nv_card->caps & SMARTDIMMER))
{
fprintf(stderr, "Error!\n");
- fprintf(stderr, "Smartdimmer is only supported on certain laptops using a Geforce 6200/7x00Go. If you want support on your laptop contact the author.\n");
+ fprintf(stderr, "Smartdimmer is only supported on certain (HP/Samsung/Sony/Zepto) laptops using a Geforce 6200/7x00Go/8x00Go. If you want support on your laptop contact the author.\n");
return 0;
}
@@ -1061,6 +1061,7 @@
nv_card->set_smartdimmer(brightness);
printf("New Smartdimmer level: %d%%\n", nv_card->get_smartdimmer());
free(smartdimmer);
+ return 0;
}
if(punit_opt && (nv_card->caps & PIPELINE_MODDING) && force_opt)
@@ -1179,6 +1180,18 @@
printf("=> GPU temperature: %dC\n", nv_card->get_gpu_temp(nv_card->sensor));
if(nv_card->caps & (BOARD_TEMP_MONITORING))
printf("=> Board temperature: %dC\n", nv_card->get_board_temp(nv_card->sensor));
+
+#ifdef HAVE_NVCONTROL
+ /* Some NV-CONTROL debugging code useful for calibration */
+ if(nv_card->debug && nvclock.dpy)
+ {
+ int gpu_temp, board_temp;
+ if(NVGetAttribute(nvclock.dpy, 0, 0, NV_GPU_TEMPERATURE, &gpu_temp))
+ printf("=> GPU temperature according to NV-CONTROL: %d\n", gpu_temp);
+ if(NVGetAttribute(nvclock.dpy, 0, 0, NV_AMBIENT_TEMPERATURE, &board_temp))
+ printf("=> Board temperature according to NV-CONTROL: %d\n", board_temp);
+ }
+#endif
}
else
fprintf(stderr, "Error: temperature monitoring isn't supported on your videocard.\n");
@@ -1388,6 +1401,12 @@
if(!backend_opt && nv_card->caps & COOLBITS_OVERCLOCKING)
nv_card->set_state(STATE_BOTH);
+ if((nv_card->state == STATE_LOWLEVEL) && (nv_card->arch & NV5X))
+ {
+ fprintf(stderr, "Error: NVClock doesn't offer lowlevel overclocking on NV50/G8x/G9x/GT200 hardware (yet).\nIf you want to overclock your card using the Nvidia drivers instead add the line:\n Option \"Coolbits\" \"1\" to the screen or device section in your xorg.conf and then try NVClock again.\n");
+ return 0;
+ }
+
if(reset_opt)
{
if(nv_card->gpu == MOBILE && !force_opt)
Modified: packages/nvclock/trunk/src/nvcontrol/CVS/Entries
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/nvcontrol/CVS/Entries?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/nvcontrol/CVS/Entries (original)
+++ packages/nvclock/trunk/src/nvcontrol/CVS/Entries Tue Feb 24 05:51:56 2009
@@ -1,6 +1,6 @@
/Makefile.in/1.3/Fri Dec 9 19:46:05 2005//
/libnvcontrol.c/1.3/Tue Jul 5 13:36:58 2005//
-/nvcontrol.h/1.5/Tue Jul 11 18:18:55 2006//
-/libnvcontrol.h/1.11/Thu Jan 3 20:08:45 2008//
-/nvcontrol.c/1.12/Thu Jan 3 20:08:45 2008//
+/nvcontrol.h/1.5/Sat Jul 15 09:47:09 2006//
+/libnvcontrol.h/1.11/Sun Dec 30 14:12:34 2007//
+/nvcontrol.c/1.12/Sun Dec 30 14:12:43 2007//
D
Modified: packages/nvclock/trunk/src/qt/CVS/Entries
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/qt/CVS/Entries?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/qt/CVS/Entries (original)
+++ packages/nvclock/trunk/src/qt/CVS/Entries Tue Feb 24 05:51:56 2009
@@ -1,5 +1,4 @@
/.cvsignore/1.1/Mon Sep 15 16:38:48 2003//
-/Makefile.in/1.6/Fri Sep 2 08:36:32 2005//
/links.xpm/1.1/Mon Sep 15 16:34:51 2003//
/main.cpp/1.4/Sat Jan 7 21:26:11 2006//
/nv.xpm/1.1/Mon Sep 15 15:40:05 2003//
@@ -9,5 +8,6 @@
/qt_xfree.cpp/1.2/Mon Apr 4 16:16:36 2005//
/qt_xfree.h/1.1/Tue Dec 28 21:41:32 2004//
/x.xpm/1.1/Tue Dec 28 21:41:32 2004//
-/qt_nvclock.cpp/1.10/Sun Aug 20 17:56:16 2006//
+/qt_nvclock.cpp/1.10/Fri Jul 28 19:27:48 2006//
+/Makefile.in/1.7/Sun May 11 10:25:46 2008//
D
Modified: packages/nvclock/trunk/src/qt/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/qt/Makefile.in?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/qt/Makefile.in (original)
+++ packages/nvclock/trunk/src/qt/Makefile.in Tue Feb 24 05:51:56 2009
@@ -8,9 +8,9 @@
HAVE_QT=@HAVE_QT@
libbackend=../backend/libbackend.a
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
+prefix=$(DESTDIR)@prefix@
+exec_prefix=$(DESTDIR)@exec_prefix@
+bindir=$(DESTDIR)@bindir@
ifeq ($(HAVE_QT), yes)
PROGRAM=nvclock_qt
Modified: packages/nvclock/trunk/src/qt/qt_nvclock.moc.cpp
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/qt/qt_nvclock.moc.cpp?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/qt/qt_nvclock.moc.cpp (original)
+++ packages/nvclock/trunk/src/qt/qt_nvclock.moc.cpp Tue Feb 24 05:51:56 2009
@@ -1,8 +1,8 @@
/****************************************************************************
** CTabNVidia meta object code from reading C++ file 'qt_nvclock.h'
**
-** Created: Wed Sep 21 20:00:36 2005
-** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+** Created: Mon Feb 23 21:45:15 2009
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
@@ -14,7 +14,7 @@
#include <private/qucomextra_p.h>
#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
-#error "This file was generated using the moc from 3.3.5. It"
+#error "This file was generated using the moc from 3.3.8b. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
Modified: packages/nvclock/trunk/src/qt/qt_xfree.moc.cpp
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvclock/trunk/src/qt/qt_xfree.moc.cpp?rev=535&op=diff
==============================================================================
--- packages/nvclock/trunk/src/qt/qt_xfree.moc.cpp (original)
+++ packages/nvclock/trunk/src/qt/qt_xfree.moc.cpp Tue Feb 24 05:51:56 2009
@@ -1,8 +1,8 @@
/****************************************************************************
** CTabXFree meta object code from reading C++ file 'qt_xfree.h'
**
-** Created: Wed Sep 21 20:00:43 2005
-** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.5 edited Sep 2 14:41 $)
+** Created: Mon Feb 23 21:45:16 2009
+** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
@@ -14,7 +14,7 @@
#include <private/qucomextra_p.h>
#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
-#error "This file was generated using the moc from 3.3.5. It"
+#error "This file was generated using the moc from 3.3.8b. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
More information about the Pkg-nvidia-devel
mailing list