Adding patches for 2.6.10/11 closes bug 82350 by Félix Dewaleyne <draco.brasier@gmail.com>, thanks to Bols <bols2000@ibelgique.com> and Paul Marks <pmarks@purdue.edu> for the patches in bug 81838 by Alain <myth.384@wanadoo.nl>

Package-Manager: portage-2.0.51.19

6 files changed, 160 insertions, 2 deletions

diff --git a/media-sound/nforce-audio/ChangeLog b/media-sound/nforce-audio/ChangeLog
index 7d0fac22589f..777f8259464d 100644
--- a/media-sound/nforce-audio/ChangeLog
+++ b/media-sound/nforce-audio/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/nforce-audio
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/nforce-audio/ChangeLog,v 1.6 2005/02/04 19:47:45 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/nforce-audio/ChangeLog,v 1.7 2005/03/07 21:19:58 genstef Exp $
+
+*nforce-audio-1.0.0292-r1 (07 Mar 2005)
+
+  07 Mar 2005; Stefan Schweizer <genstef@gentoo.org>
+  +files/nforce-2.6.10.patch, +files/nforce-2.6.11.patch,
+  +nforce-audio-1.0.0292-r1.ebuild:
+  Adding patches for 2.6.10/11 closes bug 82350 by Félix Dewaleyne
+  <draco.brasier@gmail.com>, thanks to Bols <bols2000@ibelgique.com> and Paul
+  Marks <pmarks@purdue.edu> for the patches in bug 81838 by Alain
+  <myth.384@wanadoo.nl>
 
 *nforce-audio-1.0.0292 (04 Feb 2005)
 
diff --git a/media-sound/nforce-audio/Manifest b/media-sound/nforce-audio/Manifest
index 06269bed4b97..2a3b8a4abfeb 100644
--- a/media-sound/nforce-audio/Manifest
+++ b/media-sound/nforce-audio/Manifest
@@ -1,8 +1,12 @@
 MD5 a7d878d8d41bff19d6dc9d415e68be7c nforce-audio-1.0.0261.ebuild 1852
+MD5 440d02ceb5ee355505438774261e84be nforce-audio-1.0.0292-r1.ebuild 1887
 MD5 c3515f3956a2b52d3ebf6c07d512739c nforce-audio-1.0.0292.ebuild 1737
-MD5 e027fdc775a9533c6db8480e9a42b529 ChangeLog 1318
+MD5 41fb880ae8b6aedc1cada1b4396643ed ChangeLog 1742
 MD5 a8a3a864359297b9273c46e53f5fb776 nforce-audio-1.0.0256.ebuild 1395
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 f4086b92b1ebc4bcb2c158a4562c0c76 files/digest-nforce-audio-1.0.0292-r1 163
+MD5 f0522771af3cee1921f08aa5b46f930a files/nforce-2.6.10.patch 1437
 MD5 03580a26c5b10797541c68e7473510bf files/digest-nforce-audio-1.0.0256 73
 MD5 c94d06d6f883700d21e346d79589b307 files/digest-nforce-audio-1.0.0261 73
 MD5 f4086b92b1ebc4bcb2c158a4562c0c76 files/digest-nforce-audio-1.0.0292 163
+MD5 30f72f2393d741767765a6e7fd6ca8d0 files/nforce-2.6.11.patch 1222
diff --git a/media-sound/nforce-audio/files/digest-nforce-audio-1.0.0292-r1 b/media-sound/nforce-audio/files/digest-nforce-audio-1.0.0292-r1
new file mode 100644
index 000000000000..27b67a6c5101
--- /dev/null
+++ b/media-sound/nforce-audio/files/digest-nforce-audio-1.0.0292-r1
@@ -0,0 +1,2 @@
+MD5 a25ed74c1cfdd80363db88f3d027a455 NFORCE-Linux-x86-1.0-0292-pkg1.run 5613674
+MD5 fd571c820762755011003509ce2ddd5f NFORCE-Linux-x86_64-1.0-0292-pkg1.run 3341216
diff --git a/media-sound/nforce-audio/files/nforce-2.6.10.patch b/media-sound/nforce-audio/files/nforce-2.6.10.patch
new file mode 100644
index 000000000000..8c863972f118
--- /dev/null
+++ b/media-sound/nforce-audio/files/nforce-2.6.10.patch
@@ -0,0 +1,36 @@
+diff -Nru NFORCE-Linux-x86-1.0-0292-pkg1/nvnet/nvenet.c NFORCE-Linux-x86-1.0-0292-pkgz/nvnet/nvenet.c
+--- NFORCE-Linux-x86-1.0-0292-pkg1/nvnet/nvenet.c	2004-10-08 22:10:57.000000000 +0200
++++ NFORCE-Linux-x86-1.0-0292-pkgz/nvnet/nvenet.c	2005-01-04 18:47:06.000000000 +0100
+@@ -1315,7 +1315,7 @@
+     if (dev && dev->priv)
+     {
+ 
+-        pci_save_state(priv->pdev, priv->pci_state);
++        pci_save_state(priv->pdev);
+         priv->pADApi->pfnGetPowerState(priv->pADApi->pADCX, &power_state);
+         if (netif_running(dev))
+         {
+@@ -1371,7 +1371,7 @@
+     if (dev && dev->priv)
+     {
+         pci_set_power_state(priv->pdev, 0);
+-        pci_restore_state(priv->pdev, priv->pci_state);
++        pci_restore_state(priv->pdev);
+         pci_enable_wake(priv->pdev, 3, 0);
+         pci_enable_wake(priv->pdev, 4, 0);
+ 
+diff -Nru NFORCE-Linux-x86-1.0-0292-pkg1/nvsound/main/Makefile.kbuild NFORCE-Linux-x86-1.0-0292-pkgz/nvsound/main/Makefile.kbuild
+--- NFORCE-Linux-x86-1.0-0292-pkg1/nvsound/main/Makefile.kbuild	2004-10-08 22:10:57.000000000 +0200
++++ NFORCE-Linux-x86-1.0-0292-pkgz/nvsound/main/Makefile.kbuild	2005-01-04 14:58:19.000000000 +0100
+@@ -51,9 +51,9 @@
+ 
+ REMAP_PAGE_RANGE := $(shell sh $(src)/conftest.sh "$(CC)" "$(KERNEL_SOURCES)" "$(KERNEL_OUTPUT)" remap_page_range)
+ 
+-ifeq ($(REMAP_PAGE_RANGE),5)
++#ifeq ($(REMAP_PAGE_RANGE),5)
+ EXTRA_CFLAGS += -DREMAP_NEW
+-endif
++#endif
+ 
+ #
+ # KBUILD build parameters.
diff --git a/media-sound/nforce-audio/files/nforce-2.6.11.patch b/media-sound/nforce-audio/files/nforce-2.6.11.patch
new file mode 100644
index 000000000000..9f7689a812e0
--- /dev/null
+++ b/media-sound/nforce-audio/files/nforce-2.6.11.patch
@@ -0,0 +1,28 @@
+--- NFORCE-Linux-x86-1.0-0292-pkg1/nvsound/main/nvmain.c	2004-10-08 15:10:57.000000000 -0500
++++ nvmain.c	2005-03-06 03:39:31.000000000 -0500
+@@ -824,11 +824,7 @@
+             unlock_kernel();
+             return -EINVAL;
+         }
+-#if(REMAP_NEW)
+-        if (remap_page_range(vma, vma->vm_start, virt_to_phys(nvstream->vir_dmabuf), size, vma->vm_page_prot)) {
+-#else
+-        if (remap_page_range(vma->vm_start, virt_to_phys(nvstream->vir_dmabuf), size, vma->vm_page_prot)) {
+-#endif
++        if (remap_pfn_range(vma, vma->vm_start, virt_to_phys(nvstream->vir_dmabuf)>>PAGE_SHIFT, size, vma->vm_page_prot)) {
+             unlock_kernel();
+             return -EAGAIN;
+         }
+@@ -847,11 +843,7 @@
+             unlock_kernel();
+             return -EINVAL;
+         }
+-#if(REMAP_NEW)
+-        if (remap_page_range(vma, vma->vm_start, virt_to_phys(nvstream->vir_dmabuf), size, vma->vm_page_prot)) {
+-#else
+-        if (remap_page_range(vma->vm_start, virt_to_phys(nvstream->vir_dmabuf), size, vma->vm_page_prot)) {
+-#endif
++        if (remap_pfn_range(vma, vma->vm_start, virt_to_phys(nvstream->vir_dmabuf)>>PAGE_SHIFT, size, vma->vm_page_prot)) {
+             unlock_kernel();
+             return -EAGAIN;
+         }
diff --git a/media-sound/nforce-audio/nforce-audio-1.0.0292-r1.ebuild b/media-sound/nforce-audio/nforce-audio-1.0.0292-r1.ebuild
new file mode 100644
index 000000000000..c3ecfb940333
--- /dev/null
+++ b/media-sound/nforce-audio/nforce-audio-1.0.0292-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/nforce-audio/nforce-audio-1.0.0292-r1.ebuild,v 1.1 2005/03/07 21:19:58 genstef Exp $
+
+inherit eutils linux-mod
+
+PKG_V="pkg1"
+NV_V="${PV/1.0./1.0-}"
+X86_NV_PACKAGE="NFORCE-Linux-x86-${NV_V}"
+AMD64_NV_PACKAGE="NFORCE-Linux-x86_64-${NV_V}"
+
+DESCRIPTION="Linux kernel module for the NVIDIA's nForce SoundStorm audio chipset"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="x86? (http://download.nvidia.com/XFree86/nforce/${NV_V}/${X86_NV_PACKAGE}-${PKG_V}.run)
+	amd64? (http://download.nvidia.com/XFree86/nforce/amd64/${NV_V}/${AMD64_NV_PACKAGE}-${PKG_V}.run)"
+
+if use x86; then
+	NV_PACKAGE="${X86_NV_PACKAGE}"
+elif use amd64; then
+	NV_PACKAGE="${AMD64_NV_PACKAGE}"
+fi
+
+S=${WORKDIR}/${NV_PACKAGE}-${PKG_V}/nvsound
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+RESTRICT="nostrip"
+IUSE=""
+
+MODULE_NAMES="nvsound(:${S}/main)"
+BUILD_PARAMS="SYSSRC=${KV_DIR}"
+BUILD_TARGETS=" "
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${WORKDIR}
+	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
+	if kernel_is 2 6 10; then
+		epatch ${FILESDIR}/nforce-2.6.10.patch
+	fi
+	if kernel_is gt 2 6 10; then
+		epatch ${FILESDIR}/nforce-2.6.11.patch
+	fi
+}
+
+src_compile() {
+	cd ${S}/main
+
+	if kernel_is 2 6
+	then
+		rm makefile
+		ln -snf Makefile.kbuild Makefile
+	fi
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+	dodir /etc/modules.d
+	cat > ${D}/etc/modules.d/nvsound << EOF
+# change spdif_status to 1 to enable digital out; this will cause audio
+# playback to be clamped to 48KHz which can cause some programs to play
+# back audio at the wrong speed.
+options nvsound spdif_status=0
+EOF
+
+	dobin nvmixer
+	dodoc ${S}/ReleaseNotes.html
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo "You may also be interested in media-sound/nforce-nvmixer"
+}