Updated nvclock plug-in.

Package-Manager: portage-2.0.51.22-r3

5 files changed, 110 insertions, 16 deletions

diff --git a/sys-power/cpufreqd/ChangeLog b/sys-power/cpufreqd/ChangeLog
index c9285a738b45..7fba7996c5ac 100644
--- a/sys-power/cpufreqd/ChangeLog
+++ b/sys-power/cpufreqd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/cpufreqd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.15 2005/10/16 21:25:31 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.16 2005/10/17 08:14:28 brix Exp $
+
+*cpufreqd-2.0.0_pre1-r1 (17 Oct 2005)
+
+  17 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  files/cpufreqd-2.0.0-pre1-nv.patch, +cpufreqd-2.0.0_pre1-r1.ebuild:
+  Updated nvclock plug-in.
 
 *cpufreqd-2.0.0_pre1 (16 Oct 2005)
 
diff --git a/sys-power/cpufreqd/Manifest b/sys-power/cpufreqd/Manifest
index 0b0088361106..51ec117c9cd2 100644
--- a/sys-power/cpufreqd/Manifest
+++ b/sys-power/cpufreqd/Manifest
@@ -1,15 +1,17 @@
 MD5 ae4232c6e814691b97c24efa396281bf cpufreqd-1.2.3.ebuild 766
 MD5 c6180b3ca46ef20c71ded9c11eb06847 cpufreqd-2.0.0_beta4.ebuild 1146
+MD5 ebfbcf5011aff3a2b8fac46791c49395 cpufreqd-2.0.0_pre1-r1.ebuild 1953
 MD5 957cdc8541deb498c827b66b7a263bc1 cpufreqd-1.2.2.ebuild 768
 MD5 650534575443da96a38b9d3252cb9c14 cpufreqd-2.0.0_beta4-r1.ebuild 1248
 MD5 faaa8972b6f9c7c1c728bca7948d7427 cpufreqd-2.0.0_pre1.ebuild 1950
-MD5 ec45bdc3cf247e24952ec867252f03bb ChangeLog 4985
+MD5 cd3a9f7c8672d82730b1b0a3a81d0adf ChangeLog 5176
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 4e4afcab33d4f570322c2f9a449adeb4 files/cpufreqd-2.0.0_beta4-init.d 925
 MD5 de1c5ff87e87941d0975a37d0a4c53a7 files/digest-cpufreqd-2.0.0_beta4 72
 MD5 dcec17ebe03bdb9837bfe7285e812a85 files/cpufreqd-2.0.0-beta4-cpu_interval_inconsistency.diff 1276
 MD5 95795535f5a0008b811ee27f41c03906 files/cpufreqd-2.0.0_pre1-init.d 924
-MD5 70d89fafd6f395ce87de3c21dad7dbdc files/cpufreqd-2.0.0-pre1-nv.patch 1098
+MD5 d70bc0faf394553981b6c960b724203b files/digest-cpufreqd-2.0.0_pre1-r1 134
+MD5 1ad2c167e774a2946ea647d8fd203795 files/cpufreqd-2.0.0-pre1-nv.patch 1277
 MD5 d70bc0faf394553981b6c960b724203b files/digest-cpufreqd-2.0.0_pre1 134
 MD5 67d3999fd7d01ffce53d07c879735c6e files/digest-cpufreqd-1.2.2 66
 MD5 df90962c83f1f87437ad708213cfcd23 files/digest-cpufreqd-1.2.3 66
diff --git a/sys-power/cpufreqd/cpufreqd-2.0.0_pre1-r1.ebuild b/sys-power/cpufreqd/cpufreqd-2.0.0_pre1-r1.ebuild
new file mode 100644
index 000000000000..547bbc98551d
--- /dev/null
+++ b/sys-power/cpufreqd/cpufreqd-2.0.0_pre1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/cpufreqd-2.0.0_pre1-r1.ebuild,v 1.1 2005/10/17 08:14:28 brix Exp $
+
+inherit eutils
+
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+NVCLOCK_VERSION="0.8b"
+
+DESCRIPTION="CPU Frequency Daemon"
+HOMEPAGE="http://cpufreqd.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+		nvidea? ( http://www.linuxhardware.org/nvclock/nvclock${NVCLOCK_VERSION}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="acpi apm lm_sensors nforce2 nvidea pmu"
+DEPEND="sys-power/cpufrequtils
+		lm_sensors? ( sys-apps/lm_sensors )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${WORKDIR}/nvclock${NVCLOCK_VERSION}
+	epatch ${FILESDIR}/nvclock${NVCLOCK_VERSION}-fd.patch
+
+	cd ${S}
+	epatch ${FILESDIR}/${MY_P}-nv.patch
+}
+
+src_compile() {
+	local config
+
+	if use nvidea; then
+		cd ${WORKDIR}/nvclock${NVCLOCK_VERSION}
+		econf \
+			--disable-gtk \
+			--disable-qt \
+			--disable-nvcontrol \
+			|| die "econf nvclock failed"
+		emake -j1 || die "emake nvclock failed"
+		config="--enable-nvclock=${WORKDIR}/nvclock${NVCLOCK_VERSION}"
+	fi
+
+	cd ${S}
+	econf \
+		$(use_enable acpi) \
+		$(use_enable apm) \
+		$(use_enable lm_sensors sensors) \
+		$(use_enable nforce2) \
+		$(use_enable pmu) \
+		${config} \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	newinitd ${FILESDIR}/${P}-init.d ${PN}
+
+	insinto /etc
+	newins ${FILESDIR}/${MY_P}-cpufreqd.conf cpufreqd.conf
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Significant changes have happened since the 1.x releases, including"
+	einfo "changes in the configuration file format."
+	einfo
+	einfo "Make sure you update your /etc/cpufreqd.conf file before starting"
+	einfo "${PN}. You can use 'etc-update' to accomplish this:"
+	einfo
+	einfo "  # etc-update"
+	einfo
+}
diff --git a/sys-power/cpufreqd/files/cpufreqd-2.0.0-pre1-nv.patch b/sys-power/cpufreqd/files/cpufreqd-2.0.0-pre1-nv.patch
index 3e8f36e02f45..ef077e3445ca 100644
--- a/sys-power/cpufreqd/files/cpufreqd-2.0.0-pre1-nv.patch
+++ b/sys-power/cpufreqd/files/cpufreqd-2.0.0-pre1-nv.patch
@@ -1,28 +1,30 @@
 diff -urp cpufreqd-2.0.0-pre1/src/cpufreqd_nvclock.c cpufreqd-2.0.0-pre1-nv/src/cpufreqd_nvclock.c
 --- cpufreqd-2.0.0-pre1/src/cpufreqd_nvclock.c	2005-09-24 20:13:53.000000000 +0200
-+++ cpufreqd-2.0.0-pre1-nv/src/cpufreqd_nvclock.c	2005-10-17 00:58:41.000000000 +0200
-@@ -106,11 +106,11 @@ static void nvcore_change(void *obj, con
- 	
++++ cpufreqd-2.0.0-pre1-nv/src/cpufreqd_nvclock.c	2005-10-17 10:08:19.000000000 +0200
+@@ -107,10 +107,9 @@ static void nvcore_change(void *obj, con
  	if (nv->card < nvclock.num_cards) {
  		clog(LOG_INFO, "Setting nv_core for card %i to (%u)\n", nv->card, nv->value);
--		set_card(nv->card);
- 		nvclock.card[nv->card].gpu = DESKTOP;
- 		nv_card.number = -1; /* Force a re-init of the function pointers */
  		set_card(nv->card);
- 		nv_card.set_gpu_speed(nv->value);
+-		nvclock.card[nv->card].gpu = DESKTOP;
+-		nv_card.number = -1; /* Force a re-init of the function pointers */
+-		set_card(nv->card);
+-		nv_card.set_gpu_speed(nv->value);
++		if(nv_card.supported & GPU_OVERCLOCKING_SUPPORTED)
++			nv_card.set_gpu_speed(nv->value);
 +		unset_card(nv->card);
  	}
  }
  
-@@ -119,11 +119,11 @@ static void nvmem_change(void *obj, cons
- 	
+@@ -120,10 +119,9 @@ static void nvmem_change(void *obj, cons
  	if (nv->card < nvclock.num_cards) {
  		clog(LOG_INFO, "Setting nv_mem for card %i to (%u)\n", nv->card, nv->value);
--		set_card(nv->card);
- 		nvclock.card[nv->card].gpu = DESKTOP;
- 		nv_card.number = -1; /* Force a re-init of the function pointers */
  		set_card(nv->card);
- 		nv_card.set_memory_speed(nv->value);
+-		nvclock.card[nv->card].gpu = DESKTOP;
+-		nv_card.number = -1; /* Force a re-init of the function pointers */
+-		set_card(nv->card);
+-		nv_card.set_memory_speed(nv->value);
++		if(nv_card.supported & MEM_OVERCLOCKING_SUPPORTED)
++			nv_card.set_memory_speed(nv->value);
 +		unset_card(nv->card);
  	}
  }
diff --git a/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0_pre1-r1 b/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0_pre1-r1
new file mode 100644
index 000000000000..8b9b27aed009
--- /dev/null
+++ b/sys-power/cpufreqd/files/digest-cpufreqd-2.0.0_pre1-r1
@@ -0,0 +1,2 @@
+MD5 5a3b7315b06c1c68d3998f0cbb73783b cpufreqd-2.0.0-pre1.tar.gz 362917
+MD5 df36711124e08b3349692a8788755d14 nvclock0.8b.tar.gz 353127