Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Flavien Bridault (0ed03e2c9eb631449addc857b561053dd01b542c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master z-rejected grimoire by Flavien Bridault (0ed03e2c9eb631449addc857b561053dd01b542c)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Flavien Bridault <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Flavien Bridault (0ed03e2c9eb631449addc857b561053dd01b542c)
  • Date: Tue, 5 Dec 2006 13:51:54 -0600
GIT changes to master z-rejected grimoire by Flavien Bridault
<vlaaad AT sourcemage.org>:

ChangeLog | 4 +++
dev/null |binary
z-kernels/nvidia_driver/CONFLICTS | 1
z-kernels/nvidia_driver/DETAILS | 9
+++-----
z-kernels/nvidia_driver/HISTORY | 5 ++++
z-kernels/nvidia_driver/NVIDIA-Linux-x86-1.0-9629-pkg1.run.sig | 0
z-kernels/nvidia_driver/NVIDIA-Linux-x86-1.0-9631-pkg1.run.sig |binary
z-kernels/nvidia_driver/NVIDIA-Linux-x86_64-1.0-9629-pkg2.run.sig | 0
z-kernels/nvidia_driver/NVIDIA-Linux-x86_64-1.0-9631-pkg2.run.sig |binary
z-x11/nvidia-settings/BUILD | 8
-------
z-x11/nvidia-settings/DEPENDS | 3 --
z-x11/nvidia-settings/DETAILS | 8
+++----
z-x11/nvidia-settings/HISTORY | 3 ++
z-x11/nvidia-settings/INSTALL | 11
----------
z-x11/nvidia-settings/PRE_BUILD | 1
z-x11/nvidia-settings/TRIGGERS | 1
16 files changed, 26 insertions(+), 28 deletions(-)

New commits:
commit 0ed03e2c9eb631449addc857b561053dd01b542c
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

nvidia-settings: deprecated spell as it is included in the nvidia_driver
spell.

commit 49c52786ba16180d97b1e1401548c77ce154f01f
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

nvidia_driver: conflicts with nvidia-settings

commit 37760938a1f22d825f40bc722b8cea813d8253b4
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

nvidia_driver: Forgot to add the sig in the repository for x86_64

commit 8101bea07626c74af61f36db1ccd6543e2d1cc52
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

nvidia_driver: updated to 1.0-9631

diff --git a/ChangeLog b/ChangeLog
index 4a99c20..8e2ef68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-05 Flavien Bridault <vlaaad AT sourcemage.org>
+ * z-x11/nvidia-settingsv: deprecated because it has been included for
+ a while in the nvidia_driver spell
+
2006-11-08 David Brown <dmlb2000 AT gmail.com>
* .gitignore: added

diff --git a/z-kernels/nvidia_driver/CONFLICTS
b/z-kernels/nvidia_driver/CONFLICTS
new file mode 100755
index 0000000..356e089
--- /dev/null
+++ b/z-kernels/nvidia_driver/CONFLICTS
@@ -0,0 +1 @@
+conflicts nvidia-settings y
diff --git a/z-kernels/nvidia_driver/DETAILS b/z-kernels/nvidia_driver/DETAILS
index fbfbcea..73c6b87 100755
--- a/z-kernels/nvidia_driver/DETAILS
+++ b/z-kernels/nvidia_driver/DETAILS
@@ -2,15 +2,15 @@
SPELL=nvidia_driver
case "${SMGL_COMPAT_ARCHS[1]}" in
x86_64)
- VERSION=1.0-9629
+ VERSION=1.0-9631
SOURCE=NVIDIA-Linux-x86_64-$VERSION-pkg2.run
-
SOURCE_URL=http://download.nvidia.com/XFree86/Linux-x86_64/$VERSION/$SOURCE
+
SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION-pkg2
;;
ia32)
- VERSION=1.0-9629
+ VERSION=1.0-9631
SOURCE=NVIDIA-Linux-x86-$VERSION-pkg1.run
-
SOURCE_URL=http://download.nvidia.com/XFree86/Linux-x86/$VERSION/$SOURCE
+
SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86/$VERSION/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION-pkg1
;;
############################################################
@@ -25,7 +25,6 @@ esac
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://www.nvidia.com/object/unix.html
ENTERED=20030401
- PATCHLEVEL=0
SECURITY_PATCH=1
ARCHIVE=off
REJECT="Non-GPL compatible software license"
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 20c6a25..7f186a5 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,8 @@
+2006-12-05 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 1.0-9631, updated both SOURCE_URL
+ * CONFLICTS: Conflicts with nvidia-settings spell since it is now
+ included in the driver
+
2006-11-08 David Brown <dmlb2000 AT gmail.com>
* INSTALL: added patch for glext.h fixed -p value
* glext-redef.patch: removes a redefinition of something so glut can
diff --git a/z-kernels/nvidia_driver/NVIDIA-Linux-x86-1.0-9629-pkg1.run.sig
b/z-kernels/nvidia_driver/NVIDIA-Linux-x86-1.0-9629-pkg1.run.sig
deleted file mode 100644
index ae3fa9a..0000000
Binary files a/z-kernels/nvidia_driver/NVIDIA-Linux-x86-1.0-9629-pkg1.run.sig
and /dev/null differ
diff --git a/z-kernels/nvidia_driver/NVIDIA-Linux-x86-1.0-9631-pkg1.run.sig
b/z-kernels/nvidia_driver/NVIDIA-Linux-x86-1.0-9631-pkg1.run.sig
new file mode 100644
index 0000000..546a046
Binary files /dev/null and
b/z-kernels/nvidia_driver/NVIDIA-Linux-x86-1.0-9631-pkg1.run.sig differ
diff --git
a/z-kernels/nvidia_driver/NVIDIA-Linux-x86_64-1.0-9629-pkg2.run.sig
b/z-kernels/nvidia_driver/NVIDIA-Linux-x86_64-1.0-9629-pkg2.run.sig
deleted file mode 100644
index e450fb7..0000000
Binary files
a/z-kernels/nvidia_driver/NVIDIA-Linux-x86_64-1.0-9629-pkg2.run.sig and
/dev/null differ
diff --git
a/z-kernels/nvidia_driver/NVIDIA-Linux-x86_64-1.0-9631-pkg2.run.sig
b/z-kernels/nvidia_driver/NVIDIA-Linux-x86_64-1.0-9631-pkg2.run.sig
new file mode 100644
index 0000000..afc4bd7
Binary files /dev/null and
b/z-kernels/nvidia_driver/NVIDIA-Linux-x86_64-1.0-9631-pkg2.run.sig differ
diff --git a/z-x11/nvidia-settings/BUILD b/z-x11/nvidia-settings/BUILD
index 0e35f0f..27ba77d 100755
--- a/z-x11/nvidia-settings/BUILD
+++ b/z-x11/nvidia-settings/BUILD
@@ -1,7 +1 @@
-sedit 's/-Wl,-Bstatic//' Makefile &&
-sedit 's/-Wl,-Bdynamic//' Makefile &&
-sedit 's:/usr/local:/usr:' Makefile &&
-
-make
-
-
+true
diff --git a/z-x11/nvidia-settings/DEPENDS b/z-x11/nvidia-settings/DEPENDS
index 3825218..03cf07e 100755
--- a/z-x11/nvidia-settings/DEPENDS
+++ b/z-x11/nvidia-settings/DEPENDS
@@ -1,2 +1 @@
-depends nvidia_driver &&
-depends gtk+2
+depends nvidia_driver
diff --git a/z-x11/nvidia-settings/DETAILS b/z-x11/nvidia-settings/DETAILS
index 12f915a..3e014ad 100755
--- a/z-x11/nvidia-settings/DETAILS
+++ b/z-x11/nvidia-settings/DETAILS
@@ -1,12 +1,12 @@
SPELL=nvidia-settings
VERSION=1.0
- SOURCE=$SPELL-$VERSION.tar.gz
+# SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://download.nvidia.com/XFree86/nvidia-settings/$SOURCE
-
SOURCE_HASH=sha512:e0f73d01b8a01a3e21a535197c9a9d80afd22e0eeb2f0613b49c050c9181e42eeec4288b305a5fcb4f17b99f5bea092d70a7a635f31dc98992289a4777a9eb49
+# SOURCE_URL[0]=http://download.nvidia.com/XFree86/nvidia-settings/$SOURCE
+#
SOURCE_HASH=sha512:e0f73d01b8a01a3e21a535197c9a9d80afd22e0eeb2f0613b49c050c9181e42eeec4288b305a5fcb4f17b99f5bea092d70a7a635f31dc98992289a4777a9eb49
WEB_SITE=http://www.nvidia.com
ENTERED=20040918
- PATCHLEVEL=2
+ PATCHLEVEL=3
LICENSE=GPL
REJECT="depends on the closed-source driver"
KEYWORDS="x11"
diff --git a/z-x11/nvidia-settings/HISTORY b/z-x11/nvidia-settings/HISTORY
index 00b3c2b..bfc1e06 100644
--- a/z-x11/nvidia-settings/HISTORY
+++ b/z-x11/nvidia-settings/HISTORY
@@ -1,3 +1,6 @@
+2006-11-20 Flavien Bridault <vlaaad AT sourcemage.org>
+ * Deprecated because nvidia_driver spell now installs nvidia-settings
itself
+
2006-08-08 Flavien Bridault <vlaaad AT sourcemage.org>
* INSTALL: fixed, added $INSTALL_ROOT
* DETAILS: updated PATCHLEVEL
diff --git a/z-x11/nvidia-settings/INSTALL b/z-x11/nvidia-settings/INSTALL
index 2c11cbf..27ba77d 100755
--- a/z-x11/nvidia-settings/INSTALL
+++ b/z-x11/nvidia-settings/INSTALL
@@ -1,10 +1 @@
-default_install &&
-if [ "$(get_spell_provider $X11)" = xorg-server ]; then
- local X11_PREFIX=$INSTALL_ROOT/usr
-else
- local X11_PREFIX=$INSTALL_ROOT/usr/X11R6
-fi &&
-install -d -m 0755 $X11_PREFIX/include/NVCtrl &&
-install -m 0444 src/libXNVCtrl/NVCtrlLib.h $X11_PREFIX/include/NVCtrl/ &&
-install -m 0444 src/libXNVCtrl/NVCtrl.h $X11_PREFIX/include/NVCtrl/ &&
-install -m 0444 src/libXNVCtrl/libXNVCtrl.a $X11_PREFIX/lib/
+true
diff --git a/z-x11/nvidia-settings/PRE_BUILD b/z-x11/nvidia-settings/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/z-x11/nvidia-settings/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/z-x11/nvidia-settings/TRIGGERS b/z-x11/nvidia-settings/TRIGGERS
new file mode 100755
index 0000000..cc7509a
--- /dev/null
+++ b/z-x11/nvidia-settings/TRIGGERS
@@ -0,0 +1 @@
+on_cast nvidia-settings dispel_self


  • [SM-Commit] GIT changes to master z-rejected grimoire by Flavien Bridault (0ed03e2c9eb631449addc857b561053dd01b542c), Flavien Bridault, 12/05/2006

Archive powered by MHonArc 2.6.24.

Top of Page