[packages/psensor] build with libXNVCtrl

[glen]

commit 069706fa1d611b3b1e5cf8db77d7de731ec4521e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Feb 8 14:28:34 2013 +0200

    build with libXNVCtrl

 make.patch   | 40 +++++++++++++++++++++++++++++++---------
 psensor.spec |  2 ++
 2 files changed, 33 insertions(+), 9 deletions(-)
---
diff --git a/psensor.spec b/psensor.spec
index ecf66b9..7788756 100644
--- a/psensor.spec
+++ b/psensor.spec
@@ -12,6 +12,7 @@ BuildRequires:	GConf2-devel
 BuildRequires:	cairo-devel
 BuildRequires:	gcc
 BuildRequires:	gtk+2-devel
+BuildRequires:	libXNVCtrl-devel
 BuildRequires:	lm_sensors-devel
 Requires:	hddtemp
 Requires:	lm_sensors
@@ -34,6 +35,7 @@ It is based on:
 
 %build
 %{__make} \
+	LIB=%{_lib} \
 	CC="%{__cc}" \
 	OPTFLAGS="%{rpmcflags}"
 
diff --git a/make.patch b/make.patch
index 152e6f9..2f4f66a 100644
--- a/make.patch
+++ b/make.patch
@@ -1,18 +1,40 @@
-diff -ur -x .svn -x .git -x .bzr -x CVS psensor-0.4.4/Makefile psensor-0.4.4-make/Makefile
---- psensor-0.4.4/Makefile	2010-10-01 13:18:06.000000000 +0300
-+++ psensor-0.4.4-make/Makefile	2013-02-08 14:24:09.907759921 +0200
-@@ -29,7 +29,7 @@
- #OBJS+= nvidia.o
- #CC_D+= -D NVIDIA_SUPPORT
+--- psensor-0.4.4/Makefile	2013-02-08 14:25:54.022571318 +0200
++++ psensor-0.4.4/Makefile	2013-02-08 14:27:49.654581619 +0200
+@@ -1,6 +1,8 @@
+ # Released under GPLv2 license terms, read LICENSE file
+ 
+ PREFIX=/usr
++LIB=lib
++LIBDIR=$(PREFIX)/$(LIB)
+ 
+ CC=gcc
+ 
+@@ -25,11 +27,11 @@
+ OBJS=main.o graph.o psensor.o ui_sensorlist.o config.o color.o hdd.o ui_color.o
+ 
+ # uncomments for compilation with nvidia thermal sensor support
+-#LD_OPTS+= /usr/lib/libXNVCtrl.a
+-#OBJS+= nvidia.o
+-#CC_D+= -D NVIDIA_SUPPORT
++LD_OPTS+= $(LIBDIR)/libXNVCtrl.a
++OBJS+= nvidia.o
++CC_D+= -D NVIDIA_SUPPORT
  
 -CC_OPTS=-Wall -O3 `pkg-config --cflags --libs ${PKG_CONFIG_LIBRARIES}` ${CC_D} 
 +CC_OPTS=$(OPTFLAGS) `pkg-config --cflags --libs ${PKG_CONFIG_LIBRARIES}` ${CC_D} 
  
  ################### PSensor Server ######################
  
-@@ -42,7 +42,7 @@
- #CC_D_SERVER+= -D NVIDIA_SUPPORT
- #LD_OPTS_SERVER+= -lX11 -lXext /usr/lib/libXNVCtrl.a
+@@ -38,11 +40,11 @@
+ LD_OPTS_SERVER= -lsensors
+ 
+ # uncomments for compilation with nvidia thermal sensor support
+-#OBJS_SERVER+= nvidia.o 
+-#CC_D_SERVER+= -D NVIDIA_SUPPORT
+-#LD_OPTS_SERVER+= -lX11 -lXext /usr/lib/libXNVCtrl.a
++OBJS_SERVER+= nvidia.o 
++CC_D_SERVER+= -D NVIDIA_SUPPORT
++LD_OPTS_SERVER+= -lX11 -lXext $(LIBDIR)/libXNVCtrl.a
  
 -CC_OPTS_SERVER=-Wall -O3 ${CC_D_SERVER}
 +CC_OPTS_SERVER=$(OPTFLAGS) ${CC_D_SERVER}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/psensor.git/commitdiff/069706fa1d611b3b1e5cf8db77d7de731ec4521e