Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Andraž Levstik (fb80d0b23c9039186c28758933f38440c2bf604e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Andraž Levstik (fb80d0b23c9039186c28758933f38440c2bf604e)
  • Date: Sun, 8 Feb 2009 09:35:10 -0600

GIT changes to master z-rejected grimoire by Andraž Levstik
<ruskie AT codemages.net>:

z-kernels/nvidia_legacy/DEPENDS | 3
z-kernels/nvidia_legacy/DETAILS | 26 ++---
z-kernels/nvidia_legacy/HISTORY | 9 +
z-kernels/nvidia_legacy/INSTALL | 95
+++++++------------
z-kernels/nvidia_legacy/POST_REMOVE | 24 ----
z-kernels/nvidia_legacy/PRE_BUILD | 30 ------
z-kernels/nvidia_legacy/glext-redef.patch | 10 --
z-kernels/nvidia_legacy_173xx/DEPENDS | 3
z-kernels/nvidia_legacy_173xx/DETAILS | 10 --
z-kernels/nvidia_legacy_173xx/HISTORY | 10 ++
z-kernels/nvidia_legacy_173xx/INSTALL | 100
++++++++------------
z-kernels/nvidia_legacy_173xx/POST_REMOVE | 24 ----
z-kernels/nvidia_legacy_173xx/PRE_BUILD | 30 ------
z-kernels/nvidia_legacy_173xx/PRE_REMOVE | 12 --
z-kernels/nvidia_legacy_173xx/REPAIR^all^PRE_REMOVE | 12 --
z-kernels/nvidia_legacy_173xx/volatiles | 6 -
z-kernels/nvidia_legacy_96xx/DEPENDS | 3
z-kernels/nvidia_legacy_96xx/DETAILS | 13 +-
z-kernels/nvidia_legacy_96xx/HISTORY | 9 +
z-kernels/nvidia_legacy_96xx/INSTALL | 92 +++++++-----------
z-kernels/nvidia_legacy_96xx/POST_REMOVE | 24 ----
z-kernels/nvidia_legacy_96xx/PRE_BUILD | 30 ------
z-kernels/nvidia_legacy_96xx/glext-redef.patch | 10 --
z-kernels/nvidia_legacy_96xx/volatiles | 6 -
24 files changed, 166 insertions(+), 425 deletions(-)

New commits:
commit 1e933b2f5e9d08fa1716645ddc1aa9f659525527
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

nvidia_legacy_96xx: updated to support smgl-gl_select

commit 0af6849af243675bbbf438a286e9fdc22593511b
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

nvidia_legacy_173xx: updated beta, modified for smgl-gl_select

commit ec76626545e9794c222fe3ba93e4e53ccbae8050
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

nvidia_legacy: updated to latest version and support for smgl-gl_select

diff --git a/z-kernels/nvidia_legacy/DEPENDS b/z-kernels/nvidia_legacy/DEPENDS
index 7bce8e8..eb530e1 100755
--- a/z-kernels/nvidia_legacy/DEPENDS
+++ b/z-kernels/nvidia_legacy/DEPENDS
@@ -1,2 +1,3 @@
-depends X11-SERVER &&
+depends xorg-server &&
+depends smgl-gl_select &&
depends which
diff --git a/z-kernels/nvidia_legacy/DETAILS b/z-kernels/nvidia_legacy/DETAILS
index fef2216..3d2eb14 100755
--- a/z-kernels/nvidia_legacy/DETAILS
+++ b/z-kernels/nvidia_legacy/DETAILS
@@ -1,39 +1,35 @@
. $GRIMOIRE/FUNCTIONS
SPELL=nvidia_legacy
- VERSION=71.86.06
+ VERSION=71.86.08
case "${SMGL_COMPAT_ARCHS[1]}" in
- x86_64)
-
SOURCE_HASH=sha512:dd9bba44934fe7a415c5d906315b4111ca81bd69a319995e99bfb5867706ae848dab607be3f0909171f952a512fed9b9381379f487589b5eb5b31b159b6346c1
- SOURCE=NVIDIA-Linux-x86_64-$VERSION-pkg2.run
-
SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/$SOURCE
+ x86_64)
+
SOURCE_HASH=sha512:907a48f5a2d67a7fe96edfec5e89310995c66ffbf7c524e30a697dcbf078272dc6015d35073f8af7009872658dac194091373ef1ea6208be8a1869ee6ca9d977
+ SOURCE=NVIDIA-Linux-x86_64-$VERSION-pkg2.run
+
SOURCE_URL=ftp://download.nvidia.com/XFree86/Linux-x86_64/$VERSION/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION-pkg2
;;
- ia32)
-
SOURCE_HASH=sha512:e7f6cd1d9086934f513d14f7087943e392b469b27b011206bfc94c59d283df30c754a429fbb5285fc50c9ef5ae3aca4c258f15c54893e41245a020351ce8da99
+ ia32)
+
SOURCE_HASH=sha512:97dc54f3652781a420a13f84d0cb150824329fffe5d590a8efba76aabdc3175f2ccff69ba8382a2ff9bcf5210c0b64a7a148d6a666c9f5b6d4e5f4976b28a4b4
SOURCE=NVIDIA-Linux-x86-$VERSION-pkg1.run
-
SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86/$VERSION/$SOURCE
+ SOURCE_URL=ftp://download.nvidia.com/XFree86/Linux-x86/$VERSION/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION-pkg1
;;
############################################################
# missing ia64 support we don't have an arch spec for it???
############################################################
- *)
- VERSION=${SMGL_COMPAT_ARCHS[0]}
- SOURCE=
+ *)
+ VERSION=${SMGL_COMPAT_ARCHS[0]}
+ SOURCE=
SOURCE_URL=
;;
esac
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://www.nvidia.com/object/unix.html
ENTERED=20030401
- PATCHLEVEL=1
SECURITY_PATCH=1
- ARCHIVE=off
REJECT="Non-GPL compatible software license"
LICENSE[0]=http://www.nvidia.com/object/nv_swlicense.html
SHORT="Driver provided by NVIDIA for NVIDIA GPUs"
- # Remove this when bug #12843 is fixed
- STAGED_INSTALL=off
cat << EOF
NVIDIA
These are the nvidia provided binary X drivers for their graphics cards.
diff --git a/z-kernels/nvidia_legacy/HISTORY b/z-kernels/nvidia_legacy/HISTORY
index 7fd16e1..9089751 100644
--- a/z-kernels/nvidia_legacy/HISTORY
+++ b/z-kernels/nvidia_legacy/HISTORY
@@ -1,3 +1,12 @@
+2009-02-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: drop archive=off and other such useless stuff,
+ updated to latest version
+ * PRE_BUILD: no longer needed to backup stuff
+ * glext-redef.patch: not used, removed
+ * POST_REMOVE: removed
+ * INSTALL: modified for smgl-gl_select
+ * DEPENDS: added smgl-gl_select, xorg-server
+
2009-01-27 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 71.86.06

diff --git a/z-kernels/nvidia_legacy/INSTALL b/z-kernels/nvidia_legacy/INSTALL
index e1bd7b9..baf37c0 100755
--- a/z-kernels/nvidia_legacy/INSTALL
+++ b/z-kernels/nvidia_legacy/INSTALL
@@ -1,14 +1,6 @@
-local X_PRE X_MOD KVER &&
+local X_MOD KVER &&
KVER=$(get_kernel_version) &&

-if test "$(get_spell_provider $SPELL X11-SERVER)" = xorg-server; then
- X_PRE="${INSTALL_ROOT}$(pkg-config --variable=prefix xorg-server)" &&
- X_MOD="${INSTALL_ROOT}$(pkg-config --variable=moduledir xorg-server)"
-else
- X_PRE="${INSTALL_ROOT}/usr/X11R6" &&
- X_MOD="${INSTALL_ROOT}/usr/X11R6/lib/modules"
-fi &&
-
#
# Install kernel module 'nvidia.ko'
#
@@ -24,21 +16,18 @@ popd &&
#
pushd $SOURCE_DIRECTORY/usr/bin &&
for file in nvidia-bug-report.sh nvidia-settings; do
- install -m 0755 -o root -g root $file $INSTALL_ROOT/usr/bin
+ install -v -m 0755 -o root -g root $file $INSTALL_ROOT/usr/bin
done &&
popd &&
-install -m 0766 -o root -g root nvidia-installer $INSTALL_ROOT/usr/bin
&&
+install -v -m 0766 -o root -g root nvidia-installer
$INSTALL_ROOT/usr/bin &&

#
# Install OpenGL headers
#
pushd $SOURCE_DIRECTORY/usr/include/GL &&
-if [ ! -d $X_PRE/include/GL ]; then
- mkdir -p $X_PRE/include/GL
-fi &&
-#patch -p0 < ${SPELL_DIRECTORY}/glext-redef.patch &&
+mkdir -vp $INSTALL_ROOT/usr/include/GL/nvidia
for file in glext.h gl.h glx.h; do
- install -m 0644 -o root -g root $file $X_PRE/include/GL/
+ install -v -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/include/GL/nvidia/
done &&
popd &&

@@ -49,26 +38,25 @@ pushd $SOURCE_DIRECTORY/usr/lib &&

# Fill in the path to libGL.so
sed -i 's|__LIBGL_PATH__|/usr/lib|' libGL.la
-for lib in libGLcore.so.${VERSION/-/.} libGL.la libGL.so.${VERSION/-/.} \
- libnvidia-tls.so.${VERSION/-/.} ; do
- install -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
+for lib in libGL.la libGLcore.so.${VERSION/-/.} \
+ libnvidia-tls.so.${VERSION/-/.}; do
+ install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
done &&
-
-if [ ! -d $INSTALL_ROOT/usr/lib/tls ]; then
- mkdir -p $INSTALL_ROOT/usr/lib/tls
-fi &&
-
-install -m 0644 -o root -g root tls/libnvidia-tls.so.${VERSION/-/.} \
+mkdir -vp $INSTALL_ROOT/usr/lib/nvidia \
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia/ &&
+cp -vr libGL.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/nvidia/ &&
+mkdir -vp $INSTALL_ROOT/usr/lib/tls &&
+install -v -m 0644 -o root -g root tls/libnvidia-tls.so.${VERSION/-/.} \
$INSTALL_ROOT/usr/lib/tls &&
#
# Create library symlinks
#
- pushd $INSTALL_ROOT/usr/lib &&
- ln -sfn libGLcore.so.${VERSION/-/.} libGLcore.so.1 &&
+ pushd $INSTALL_ROOT/usr/lib/nvidia &&
ln -sfn libGL.so.${VERSION/-/.} libGL.so.1 &&
ln -sfn libGL.so.1 libGL.so &&
- ln -sfn libnvidia-cfg.so.${VERSION/-/.} libnvidia-cfg.so.1 &&
- ln -sfn libnvidia-cfg.so.1 libnvidia-cfg.so &&
+ popd
+ pushd $INSTALL_ROOT/usr/lib &&
+ ln -sfn libGLcore.so.${VERSION/-/.} libGLcore.so.1 &&
ln -sfn libnvidia-tls.so.${VERSION/-/.} libnvidia-tls.so.1 &&
popd &&
pushd $INSTALL_ROOT/usr/lib/tls &&
@@ -81,12 +69,12 @@ popd &&
#
pushd $SOURCE_DIRECTORY/usr/X11R6/lib &&
for lib in libXvMCNVIDIA.a libXvMCNVIDIA.so.${VERSION/-/.}; do
- install -m 0644 -o root -g root $lib $X_PRE/lib
+ install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
done &&
#
# Setup symlinks
#
- pushd $X_PRE/lib &&
+ pushd $INSTALL_ROOT/usr/lib &&
ln -sfn libXvMCNVIDIA.so.${VERSION/-/.} libXvMCNVIDIA_dynamic.so.1 &&
popd &&
popd &&
@@ -94,34 +82,28 @@ popd &&
#
# Install X11 modules
#
-pushd $SOURCE_DIRECTORY/usr/X11R6/lib/modules &&
-#cp libnvidia-wfb.so.${VERSION/-/.} "$X_MOD/" &&
-mkdir -p $X_MOD/drivers &&
+pushd $SOURCE_DIRECTORY/usr/X11R6/lib/modules/ &&
+mkdir -vp $INSTALL_ROOT/usr/lib/xorg/modules/nvidia/ &&
+mkdir -vp $INSTALL_ROOT/usr/lib/xorg/modules/drivers
&&
for driver in nvidia_drv.o nvidia_drv.so; do
- install -m 0644 -o root -g root \
- drivers/$driver $X_MOD/drivers
+ install -v -m 0644 -o root -g root \
+ drivers/$driver $INSTALL_ROOT/usr/lib/xorg/modules/drivers/
done &&
-mkdir -p "$X_MOD/extensions" &&
-install -m 0644 -o root -g root \
-extensions/libglx.so.${VERSION/-/.} \
- $X_MOD/extensions &&
- #
- # Setup symlinks
- #
-# ln -sfn "$X_MOD/libnvidia-wfb.so.${VERSION/-/.}" \
-# "$X_MOD/libnvidia-wfb.so" &&
- pushd $X_MOD/extensions &&
- ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
- popd &&
+install -v -m 0644 -o root -g root extensions/libglx.so.${VERSION/-/.} \
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+#
+# Setup symlinks
+#
+pushd $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
+popd &&
popd &&
+popd

#
# Install Freedesktop.org spec
#
-if [[ ! -d $INSTALL_ROOT/usr/share/applications ]]; then
- mkdir -p $INSTALL_ROOT/usr/share/applications
-fi &&
-
+mkdir -vp $INSTALL_ROOT/usr/share/applications
install -m 0644 -o root -g root \
$SOURCE_DIRECTORY/usr/share/applications/nvidia-settings.desktop \
$INSTALL_ROOT/usr/share/applications &&
@@ -135,14 +117,7 @@ if [ ! -d $INSTALL_ROOT/usr/share/doc/NVIDIA_GLX-1.0
]; then
fi &&
cp -a * $INSTALL_ROOT/usr/share/doc/NVIDIA_GLX-1.0 &&

-# Install pixmap
-popd &&
-mkdir -p $INSTALL_ROOT/usr/share/pixmaps/ &&
-cp usr/share/pixmaps/nvidia-settings.png $INSTALL_ROOT/usr/share/pixmaps/
&&
-
-if [ ! -d $INSTALL_ROOT/usr/share/doc/$SPELL ]; then
- mkdir -p $INSTALL_ROOT/usr/share/doc/$SPELL
-fi &&
+mkdir -p $INSTALL_ROOT/usr/share/doc/$SPELL
install -m 0644 -o root -g root $SOURCE_DIRECTORY/LICENSE \
$INSTALL_ROOT/usr/share/doc/$SPELL &&
install -m 0644 -o root -g root $SOURCE_DIRECTORY/LICENSE \
diff --git a/z-kernels/nvidia_legacy/POST_REMOVE
b/z-kernels/nvidia_legacy/POST_REMOVE
deleted file mode 100755
index eb3214a..0000000
--- a/z-kernels/nvidia_legacy/POST_REMOVE
+++ /dev/null
@@ -1,24 +0,0 @@
-local i X_DIR GL_DIR GL_LIB &&
-X_DIR=$INSTALL_ROOT/usr/include/GL/x &&
-GL_DIR=$INSTALL_ROOT/usr/include/GL/ &&
-
-if spell_ok mesalib; then
- GL_LIB=$INSTALL_ROOT/usr/lib
-else
- GL_LIB=$INSTALL_ROOT/usr/X11R6/lib
-fi &&
-
-message "${MESSAGE_COLOR}Restoring X/mesalib headers and libs${SPELL_COLOR}"
&&
-
-for i in gl.h glext.h glx.h glxext.h; do
- if [ -e $X_DIR/$i ]; then
- mv -v $X_DIR/$i $GL_DIR
- fi
-done &&
-for i in $X-DIR/libGL.so.*; do
- if [ -e $i ]; then
- mv -v $i $GL_LIB
- fi
-done &&
-
-rm -rf $X_DIR
diff --git a/z-kernels/nvidia_legacy/PRE_BUILD
b/z-kernels/nvidia_legacy/PRE_BUILD
index a7e031e..d92e707 100755
--- a/z-kernels/nvidia_legacy/PRE_BUILD
+++ b/z-kernels/nvidia_legacy/PRE_BUILD
@@ -1,35 +1,5 @@
unpack_file '' &&

-message "${MESSAGE_COLOR}Backing up existing X/mesalib headers and
libs${DEFAULT_COLOR}" &&
-
-local i X_DIR GL_DIR GL_LIB &&
-X_DIR=$INSTALL_ROOT/usr/include/GL/x &&
-GL_DIR=$INSTALL_ROOT/usr/include/GL &&
-
-if spell_ok mesalib; then
- GL_LIB=$INSTALL_ROOT/usr/lib
-else
- GL_LIB=$INSTALL_ROOT/usr/X11R6/lib
-fi &&
-
-mkdir -p $X_DIR &&
-
-if ! [[ -f $X_DIR/done ]]; then
- for i in gl.h glext.h glx.h glxext.h; do
- if [ -e $GL_DIR/$i ]; then
- mv -v $GL_DIR/$i $X_DIR
- fi
- done
- for i in $GL_LIB/libGL.so.*; do
- if [ -e $i ]; then
- mv -v $i $X_DIR
- fi
- done
- touch $X_DIR/done
-else
- message "${SPELL_COLOR}X/mesalib headers and libs already backed
up${DEFAULT_COLOR}"
-fi &&
-
sh $SOURCE_CACHE/$SOURCE --extract-only \
--target $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
diff --git a/z-kernels/nvidia_legacy/glext-redef.patch
b/z-kernels/nvidia_legacy/glext-redef.patch
deleted file mode 100644
index 3fb0be4..0000000
--- a/z-kernels/nvidia_legacy/glext-redef.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- glext.h~ 2006-11-08 22:09:16.000000000 -0800
-+++ glext.h 2006-11-08 22:09:16.000000000 -0800
-@@ -6938,7 +6938,6 @@
- extern void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname,
GLint *params);
- extern void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname,
GLuint *params);
- #endif /* GL_GLEXT_PROTOTYPES */
--typedef void (APIENTRY * PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint
location, GLuint *params);
- typedef void (APIENTRY * PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program,
GLuint color, const GLchar *name);
- typedef GLint (APIENTRY * PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program,
const GLchar *name);
- typedef void (APIENTRY * PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint
v0);
diff --git a/z-kernels/nvidia_legacy_173xx/DEPENDS
b/z-kernels/nvidia_legacy_173xx/DEPENDS
index 7bce8e8..eb530e1 100755
--- a/z-kernels/nvidia_legacy_173xx/DEPENDS
+++ b/z-kernels/nvidia_legacy_173xx/DEPENDS
@@ -1,2 +1,3 @@
-depends X11-SERVER &&
+depends xorg-server &&
+depends smgl-gl_select &&
depends which
diff --git a/z-kernels/nvidia_legacy_173xx/DETAILS
b/z-kernels/nvidia_legacy_173xx/DETAILS
index 146019a..3085c8b 100755
--- a/z-kernels/nvidia_legacy_173xx/DETAILS
+++ b/z-kernels/nvidia_legacy_173xx/DETAILS
@@ -1,7 +1,7 @@
. $GRIMOIRE/FUNCTIONS
SPELL=nvidia_legacy_173xx
if [[ $NVIDIA_BETA == y ]]; then
- VERSION=173.14.15
+ VERSION=173.14.16
else
VERSION=173.14.12
fi
@@ -9,7 +9,7 @@ case "${SMGL_COMPAT_ARCHS[1]}" in
x86_64)
SOURCE=NVIDIA-Linux-x86_64-$VERSION-pkg2.run
if [[ $NVIDIA_BETA == y ]]; then
-
SOURCE_HASH=sha512:2d89faf6cc87861ba5dc8296a9b1622d4aa21fc598d49d8d96f8cdb9e4dfb9a183627434df3a95e7c42f9ee6f18ccbda276ca5a8df955cbd26a11bad40352dba
+
SOURCE_HASH=sha512:4c4dde74ae6897c5ff4c0dc6abf42433fafa975504a460d48aa4520b022f5000170f881a812b4f1a95553f143e17d05f1bfc55ef1f3390192823abdf6cc2f1ed

SOURCE_URL=ftp://download.nvidia.com/XFree86/Linux-x86_64/$VERSION/$SOURCE
else

SOURCE_HASH=sha512:eb94d7cce96e330ef6d1ef60342d1fb8459e5a4d156408ea9cd3d68cff0a6a346ba3ad9508fed2ad88b4666522e82c235e88698a4d8116881af8d8533c988923
@@ -20,7 +20,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION-pkg2
ia32)
SOURCE=NVIDIA-Linux-x86-$VERSION-pkg1.run
if [[ $NVIDIA_BETA == y ]]; then
-
SOURCE_HASH=sha512:e78d1d4ee731f398d28b60b34302272e1716922b4dc358b125fa8736d62810e2df5972662d7cc953ffe07f1c8218752b9c9adcc942cf86f03dfcc6a9dd837cc7
+
SOURCE_HASH=sha512:cc3c631fa47d4ae3deb762f9ca2178dbdbab20120a223e538dcc97ed26b319c4df9c40c336d9b64e84f4c044e3db8c62019d886a5d0ce30d84f40e8c4e7ca2b4
SOURCE_URL=ftp://download.nvidia.com/XFree86/Linux-x86/$VERSION/$SOURCE
else

SOURCE_HASH=sha512:8e1393c99e673337fef164d9cbe9f9e16e6292bba4d5233a261bcee72cf174c6991bec25579c05f08a013d5caa0812005379b53996f157816bf71c0804c09db9
@@ -40,14 +40,10 @@ 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"
LICENSE[0]=http://www.nvidia.com/object/nv_swlicense.html
SHORT="Driver provided by NVIDIA for NVIDIA GPUs"
- # Remove this when bug #12843 is fixed
- STAGED_INSTALL=off
cat << EOF
NVIDIA
These are the nvidia provided binary X drivers for their graphics cards.
diff --git a/z-kernels/nvidia_legacy_173xx/HISTORY
b/z-kernels/nvidia_legacy_173xx/HISTORY
index 537d48c..48f5b5e 100644
--- a/z-kernels/nvidia_legacy_173xx/HISTORY
+++ b/z-kernels/nvidia_legacy_173xx/HISTORY
@@ -1,3 +1,13 @@
+2009-02-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: use xorg-server and smgl-gl_select
+ * DETAILS: updated beta to .16
+ * INSTALL: modified for smgl-gl_select
+ * PRE_BUILD: no longer backup
+ * POST_REMOVE: removed
+ * PRE_REMOVE: removed
+ * REPAIR^all^PRE_REMOVE: removed
+ * volatiles: removed
+
2009-01-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: NVIDIA_BETA 173.14.15, updated SOURCE_URL
* PRE_BUILD: patch only stable version
diff --git a/z-kernels/nvidia_legacy_173xx/INSTALL
b/z-kernels/nvidia_legacy_173xx/INSTALL
index fa57b06..c80bb3f 100755
--- a/z-kernels/nvidia_legacy_173xx/INSTALL
+++ b/z-kernels/nvidia_legacy_173xx/INSTALL
@@ -1,14 +1,6 @@
-local X_PRE X_MOD KVER &&
+local X_MOD KVER &&
KVER=$(get_kernel_version) &&

-if test "$(get_spell_provider $SPELL X11-SERVER)" = xorg-server; then
- X_PRE="${INSTALL_ROOT}$(pkg-config --variable=prefix xorg-server)" &&
- X_MOD="${INSTALL_ROOT}$(pkg-config --variable=moduledir xorg-server)"
-else
- X_PRE="${INSTALL_ROOT}/usr/X11R6" &&
- X_MOD="${INSTALL_ROOT}/usr/X11R6/lib/modules"
-fi &&
-
#
# Install kernel module 'nvidia.ko'
#
@@ -24,21 +16,18 @@ popd &&
#
pushd $SOURCE_DIRECTORY/usr/bin &&
for file in nvidia-bug-report.sh nvidia-settings nvidia-xconfig; do
- install -m 0755 -o root -g root $file $INSTALL_ROOT/usr/bin
+ install -v -m 0755 -o root -g root $file $INSTALL_ROOT/usr/bin
done &&
popd &&
-install -m 0766 -o root -g root nvidia-installer $INSTALL_ROOT/usr/bin
&&
+install -v -m 0766 -o root -g root nvidia-installer
$INSTALL_ROOT/usr/bin &&

#
# Install OpenGL headers
#
pushd $SOURCE_DIRECTORY/usr/include/GL &&
-if [ ! -d $X_PRE/include/GL ]; then
- mkdir -p $X_PRE/include/GL
-fi &&
-
+mkdir -vp $INSTALL_ROOT/usr/include/GL/nvidia
for file in glext.h gl.h glxext.h glx.h; do
- install -m 0644 -o root -g root $file $X_PRE/include/GL/
+ install -v -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/include/GL/nvidia/
done &&
popd &&

@@ -49,24 +38,27 @@ pushd $SOURCE_DIRECTORY/usr/lib &&

# Fill in the path to libGL.so
sed -i 's|__LIBGL_PATH__|/usr/lib|' libGL.la
-for lib in libGLcore.so.${VERSION/-/.} libGL.la libGL.so.${VERSION/-/.} \
+for lib in libGL.la libGLcore.so.${VERSION/-/.} \
libnvidia-tls.so.${VERSION/-/.} libnvidia-cfg.so.${VERSION/-/.};
do
- install -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
+ install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
done &&
-
-if [ ! -d $INSTALL_ROOT/usr/lib/tls ]; then
- mkdir -p $INSTALL_ROOT/usr/lib/tls
-fi &&
-
-install -m 0644 -o root -g root tls/libnvidia-tls.so.${VERSION/-/.} \
+mkdir -vp $INSTALL_ROOT/usr/lib/nvidia \
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia/ &&
+cp -vr libGL.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/nvidia &&
+cp -vr libGLcore.so.${VERSION/-/.} \
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia/ &&
+mkdir -vp $INSTALL_ROOT/usr/lib/tls &&
+install -v -m 0644 -o root -g root tls/libnvidia-tls.so.${VERSION/-/.} \
$INSTALL_ROOT/usr/lib/tls &&
#
# Create library symlinks
#
- pushd $INSTALL_ROOT/usr/lib &&
- ln -sfn libGLcore.so.${VERSION/-/.} libGLcore.so.1 &&
+ pushd $INSTALL_ROOT/usr/lib/nvidia &&
ln -sfn libGL.so.${VERSION/-/.} libGL.so.1 &&
ln -sfn libGL.so.1 libGL.so &&
+ popd
+ pushd $INSTALL_ROOT/usr/lib &&
+ ln -sfn libGLcore.so.${VERSION/-/.} libGLcore.so.1 &&
ln -sfn libnvidia-cfg.so.${VERSION/-/.} libnvidia-cfg.so.1 &&
ln -sfn libnvidia-cfg.so.1 libnvidia-cfg.so &&
ln -sfn libnvidia-tls.so.${VERSION/-/.} libnvidia-tls.so.1 &&
@@ -81,12 +73,12 @@ popd &&
#
pushd $SOURCE_DIRECTORY/usr/X11R6/lib &&
for lib in libXvMCNVIDIA.a libXvMCNVIDIA.so.${VERSION/-/.}; do
- install -m 0644 -o root -g root $lib $X_PRE/lib
+ install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
done &&
#
# Setup symlinks
#
- pushd $X_PRE/lib &&
+ pushd $INSTALL_ROOT/usr/lib &&
ln -sfn libXvMCNVIDIA.so.${VERSION/-/.} libXvMCNVIDIA_dynamic.so.1 &&
popd &&
popd &&
@@ -94,43 +86,35 @@ popd &&
#
# Install X11 modules
#
-pushd $SOURCE_DIRECTORY/usr/X11R6/lib/modules &&
-cp libnvidia-wfb.so.${VERSION/-/.} "$X_MOD/" &&
-mkdir -p $X_MOD/drivers &&
+pushd $SOURCE_DIRECTORY/usr/X11R6/lib/modules/ &&
+mkdir -vp $INSTALL_ROOT/usr/lib/xorg/modules/nvidia/ &&
+cp -v libnvidia-wfb.so.${VERSION/-/.} \
+ $INSTALL_ROOT/usr/lib/xorg/modules/nvidia/ &&
+mkdir -vp $INSTALL_ROOT/usr/lib/xorg/modules/drivers
&&
for driver in nvidia_drv.o nvidia_drv.so; do
- install -m 0644 -o root -g root \
- drivers/$driver $X_MOD/drivers
+ install -v -m 0644 -o root -g root \
+ drivers/$driver $INSTALL_ROOT/usr/lib/xorg/modules/drivers/
done &&
-mkdir -p "$X_MOD/extensions" &&
-install -m 0644 -o root -g root \
-extensions/libglx.so.${VERSION/-/.} \
- $X_MOD/extensions &&
- #
- # Setup symlinks
- #
- ln -sfn "$X_MOD/libnvidia-wfb.so.${VERSION/-/.}" \
- "$X_MOD/libnvidia-wfb.so" &&
-
- #
- # If libwfb.so is a file, it's probably from xorg-server, leave alone
- # Bug #14819
- #
- if [[ ! -f "$X_MOD/libwfb.so" ]]; then
- ln -sfn "$X_MOD/libnvidia-wfb.so.${VERSION/-/.}" \
- "$X_MOD/libwfb.so"
- fi &&
- pushd $X_MOD/extensions &&
- ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
- popd &&
+install -v -m 0644 -o root -g root extensions/libglx.so.${VERSION/-/.} \
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+#
+# Setup symlinks
+#
+pushd $INSTALL_ROOT/usr/lib/xorg/modules/nvidia/ &&
+ln -sfn "libnvidia-wfb.so.${VERSION/-/.}" \
+ "libnvidia-wfb.so" &&
+ln -sfn "libnvidia-wfb.so.${VERSION/-/.}" \
+ "libwfb.so" &&
+pushd $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
+popd &&
popd &&
+popd

#
# Install Freedesktop.org spec
#
-if [[ ! -d $INSTALL_ROOT/usr/share/applications ]]; then
- mkdir -p $INSTALL_ROOT/usr/share/applications
-fi &&
-
+mkdir -p $INSTALL_ROOT/usr/share/applications &&
install -m 0644 -o root -g root \
$SOURCE_DIRECTORY/usr/share/applications/nvidia-settings.desktop \
$INSTALL_ROOT/usr/share/applications &&
diff --git a/z-kernels/nvidia_legacy_173xx/POST_REMOVE
b/z-kernels/nvidia_legacy_173xx/POST_REMOVE
deleted file mode 100755
index eb3214a..0000000
--- a/z-kernels/nvidia_legacy_173xx/POST_REMOVE
+++ /dev/null
@@ -1,24 +0,0 @@
-local i X_DIR GL_DIR GL_LIB &&
-X_DIR=$INSTALL_ROOT/usr/include/GL/x &&
-GL_DIR=$INSTALL_ROOT/usr/include/GL/ &&
-
-if spell_ok mesalib; then
- GL_LIB=$INSTALL_ROOT/usr/lib
-else
- GL_LIB=$INSTALL_ROOT/usr/X11R6/lib
-fi &&
-
-message "${MESSAGE_COLOR}Restoring X/mesalib headers and libs${SPELL_COLOR}"
&&
-
-for i in gl.h glext.h glx.h glxext.h; do
- if [ -e $X_DIR/$i ]; then
- mv -v $X_DIR/$i $GL_DIR
- fi
-done &&
-for i in $X-DIR/libGL.so.*; do
- if [ -e $i ]; then
- mv -v $i $GL_LIB
- fi
-done &&
-
-rm -rf $X_DIR
diff --git a/z-kernels/nvidia_legacy_173xx/PRE_BUILD
b/z-kernels/nvidia_legacy_173xx/PRE_BUILD
index 729512a..a9c67e1 100755
--- a/z-kernels/nvidia_legacy_173xx/PRE_BUILD
+++ b/z-kernels/nvidia_legacy_173xx/PRE_BUILD
@@ -1,35 +1,5 @@
unpack_file '' &&

-message "${MESSAGE_COLOR}Backing up existing X/mesalib headers and
libs${DEFAULT_COLOR}" &&
-
-local i X_DIR GL_DIR GL_LIB &&
-X_DIR=$INSTALL_ROOT/usr/include/GL/x &&
-GL_DIR=$INSTALL_ROOT/usr/include/GL &&
-
-if spell_ok mesalib; then
- GL_LIB=$INSTALL_ROOT/usr/lib
-else
- GL_LIB=$INSTALL_ROOT/usr/X11R6/lib
-fi &&
-
-mkdir -p $X_DIR &&
-
-if ! [[ -f $X_DIR/done ]]; then
- for i in gl.h glext.h glx.h glxext.h; do
- if [ -e $GL_DIR/$i ]; then
- mv -v $GL_DIR/$i $X_DIR
- fi
- done
- for i in $GL_LIB/libGL.so.*; do
- if [ -e $i ]; then
- mv -v $i $X_DIR
- fi
- done
- touch $X_DIR/done
-else
- message "${SPELL_COLOR}X/mesalib headers and libs already backed
up${DEFAULT_COLOR}"
-fi &&
-
sh $SOURCE_CACHE/$SOURCE --extract-only \
--target $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
diff --git a/z-kernels/nvidia_legacy_173xx/PRE_REMOVE
b/z-kernels/nvidia_legacy_173xx/PRE_REMOVE
deleted file mode 100755
index f76ec4c..0000000
--- a/z-kernels/nvidia_legacy_173xx/PRE_REMOVE
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# If libwfb.so is a file and not a symlink it's from xorg-server, remove
-# from this spell's install log
-# Bug #14819
-#
-if [[ -f $INSTALL_ROOT/usr/lib/xorg/modules/libwfb.so &&
- ! -h $INSTALL_ROOT/usr/lib/xorg/modules/libwfb.so ]]; then
- sedit '/\/usr\/lib\/xorg\/modules\/libwfb.so/d'
$INSTALL_LOGS/$SPELL-$(installed_version $SPELL)
-
-fi &&
-
-default_pre_remove
diff --git a/z-kernels/nvidia_legacy_173xx/REPAIR^all^PRE_REMOVE
b/z-kernels/nvidia_legacy_173xx/REPAIR^all^PRE_REMOVE
deleted file mode 100755
index f76ec4c..0000000
--- a/z-kernels/nvidia_legacy_173xx/REPAIR^all^PRE_REMOVE
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# If libwfb.so is a file and not a symlink it's from xorg-server, remove
-# from this spell's install log
-# Bug #14819
-#
-if [[ -f $INSTALL_ROOT/usr/lib/xorg/modules/libwfb.so &&
- ! -h $INSTALL_ROOT/usr/lib/xorg/modules/libwfb.so ]]; then
- sedit '/\/usr\/lib\/xorg\/modules\/libwfb.so/d'
$INSTALL_LOGS/$SPELL-$(installed_version $SPELL)
-
-fi &&
-
-default_pre_remove
diff --git a/z-kernels/nvidia_legacy_173xx/volatiles
b/z-kernels/nvidia_legacy_173xx/volatiles
deleted file mode 100755
index 246e956..0000000
--- a/z-kernels/nvidia_legacy_173xx/volatiles
+++ /dev/null
@@ -1,6 +0,0 @@
-^/lib/modules/*/modules.*
-^/usr/lib/libGL.so.*
-^/usr/include/GL/gl.h
-^/usr/include/GL/glext.h
-^/usr/include/GL/glx.h
-^/usr/include/GL/glxext.h
diff --git a/z-kernels/nvidia_legacy_96xx/DEPENDS
b/z-kernels/nvidia_legacy_96xx/DEPENDS
index 7bce8e8..eb530e1 100755
--- a/z-kernels/nvidia_legacy_96xx/DEPENDS
+++ b/z-kernels/nvidia_legacy_96xx/DEPENDS
@@ -1,2 +1,3 @@
-depends X11-SERVER &&
+depends xorg-server &&
+depends smgl-gl_select &&
depends which
diff --git a/z-kernels/nvidia_legacy_96xx/DETAILS
b/z-kernels/nvidia_legacy_96xx/DETAILS
index 9f19ab7..5a6b20e 100755
--- a/z-kernels/nvidia_legacy_96xx/DETAILS
+++ b/z-kernels/nvidia_legacy_96xx/DETAILS
@@ -1,17 +1,17 @@
. $GRIMOIRE/FUNCTIONS
SPELL=nvidia_legacy_96xx
- VERSION=96.43.07
+ VERSION=96.43.10
case "${SMGL_COMPAT_ARCHS[1]}" in
x86_64)
-
SOURCE_HASH=sha512:b5b2a6b8c243fc968662479598b5420b15b15a8a0412e97586c63c8e8be43a422165ca5acbb98ba610f77273f53d029bb63388d01b03844d726527d604e7928c
+
SOURCE_HASH=sha512:0b5ec79441b3f47fa04573cc02b4c40a1f38a81200f1852b714474aad262f7fc4265a02f43600e16b1ccd09efc112432b6147702f4a1e02d73b39619969cdd08
SOURCE=NVIDIA-Linux-x86_64-$VERSION-pkg2.run
-
SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/$SOURCE
+
SOURCE_URL=http://download.nvidia.com/XFree86/Linux-x86_64/$VERSION/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION-pkg2
;;
ia32)
-
SOURCE_HASH=sha512:7b5bab3dbb8173e422231f0cf18b74c6588f91ec0643045c0deee0cbe65a31b9a529283b25cbfef7d80a8b75ccde8893056a34155eaa892b51891afb1eae345a
+
SOURCE_HASH=sha512:80ee48aab7077d1042f5759a6b2036cb9d6efd8ee54571cfe2e45a6c0566b40f5690774024255d1e37eb1415653fe581764679fb1ac69ec716c4885ce6f468b4
SOURCE=NVIDIA-Linux-x86-$VERSION-pkg1.run
-
SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86/$VERSION/$SOURCE
+
SOURCE_URL=http://download.nvidia.com/XFree86/Linux-x86/$VERSION/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION-pkg1
;;
############################################################
@@ -28,12 +28,9 @@ esac
ENTERED=20030401
PATCHLEVEL=1
SECURITY_PATCH=1
- ARCHIVE=off
REJECT="Non-GPL compatible software license"
LICENSE[0]=http://www.nvidia.com/object/nv_swlicense.html
SHORT="Driver provided by NVIDIA for NVIDIA GPUs"
- # Remove this when bug #12843 is fixed
- STAGED_INSTALL=off
cat << EOF
NVIDIA
These are the nvidia provided binary X drivers for their graphics cards.
diff --git a/z-kernels/nvidia_legacy_96xx/HISTORY
b/z-kernels/nvidia_legacy_96xx/HISTORY
index 740299b..6e30327 100644
--- a/z-kernels/nvidia_legacy_96xx/HISTORY
+++ b/z-kernels/nvidia_legacy_96xx/HISTORY
@@ -1,3 +1,12 @@
+2009-02-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: use xorg-server and added smgl-gl_select
+ * DETAILS: updated to .10
+ * INSTALL: modified for smgl-gl_select
+ * POST_REMOVE: removed
+ * PRE_BUILD: no longer backup
+ * glext-redef.patch: removed
+ * volatiles: removed
+
2009-01-27 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 96.43.07, fixed bug #14483

diff --git a/z-kernels/nvidia_legacy_96xx/INSTALL
b/z-kernels/nvidia_legacy_96xx/INSTALL
index e1bd7b9..e330eef 100755
--- a/z-kernels/nvidia_legacy_96xx/INSTALL
+++ b/z-kernels/nvidia_legacy_96xx/INSTALL
@@ -1,14 +1,6 @@
-local X_PRE X_MOD KVER &&
+local X_MOD KVER &&
KVER=$(get_kernel_version) &&

-if test "$(get_spell_provider $SPELL X11-SERVER)" = xorg-server; then
- X_PRE="${INSTALL_ROOT}$(pkg-config --variable=prefix xorg-server)" &&
- X_MOD="${INSTALL_ROOT}$(pkg-config --variable=moduledir xorg-server)"
-else
- X_PRE="${INSTALL_ROOT}/usr/X11R6" &&
- X_MOD="${INSTALL_ROOT}/usr/X11R6/lib/modules"
-fi &&
-
#
# Install kernel module 'nvidia.ko'
#
@@ -24,21 +16,18 @@ popd &&
#
pushd $SOURCE_DIRECTORY/usr/bin &&
for file in nvidia-bug-report.sh nvidia-settings; do
- install -m 0755 -o root -g root $file $INSTALL_ROOT/usr/bin
+ install -v -m 0755 -o root -g root $file $INSTALL_ROOT/usr/bin
done &&
popd &&
-install -m 0766 -o root -g root nvidia-installer $INSTALL_ROOT/usr/bin
&&
+install -v -m 0766 -o root -g root nvidia-installer
$INSTALL_ROOT/usr/bin &&

#
# Install OpenGL headers
#
pushd $SOURCE_DIRECTORY/usr/include/GL &&
-if [ ! -d $X_PRE/include/GL ]; then
- mkdir -p $X_PRE/include/GL
-fi &&
-#patch -p0 < ${SPELL_DIRECTORY}/glext-redef.patch &&
+mkdir -vp $INSTALL_ROOT/usr/include/GL/nvidia
for file in glext.h gl.h glx.h; do
- install -m 0644 -o root -g root $file $X_PRE/include/GL/
+ install -v -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/include/GL/nvidia/
done &&
popd &&

@@ -49,26 +38,25 @@ pushd $SOURCE_DIRECTORY/usr/lib &&

# Fill in the path to libGL.so
sed -i 's|__LIBGL_PATH__|/usr/lib|' libGL.la
-for lib in libGLcore.so.${VERSION/-/.} libGL.la libGL.so.${VERSION/-/.} \
- libnvidia-tls.so.${VERSION/-/.} ; do
- install -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
+for lib in libGL.la libGLcore.so.${VERSION/-/.} \
+ libnvidia-tls.so.${VERSION/-/.}; do
+ install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
done &&
-
-if [ ! -d $INSTALL_ROOT/usr/lib/tls ]; then
- mkdir -p $INSTALL_ROOT/usr/lib/tls
-fi &&
-
-install -m 0644 -o root -g root tls/libnvidia-tls.so.${VERSION/-/.} \
+mkdir -vp $INSTALL_ROOT/usr/lib/nvidia \
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia/ &&
+cp -vr libGL.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/nvidia/ &&
+mkdir -vp $INSTALL_ROOT/usr/lib/tls &&
+install -v -m 0644 -o root -g root tls/libnvidia-tls.so.${VERSION/-/.} \
$INSTALL_ROOT/usr/lib/tls &&
#
# Create library symlinks
#
- pushd $INSTALL_ROOT/usr/lib &&
- ln -sfn libGLcore.so.${VERSION/-/.} libGLcore.so.1 &&
+ pushd $INSTALL_ROOT/usr/lib/nvidia &&
ln -sfn libGL.so.${VERSION/-/.} libGL.so.1 &&
ln -sfn libGL.so.1 libGL.so &&
- ln -sfn libnvidia-cfg.so.${VERSION/-/.} libnvidia-cfg.so.1 &&
- ln -sfn libnvidia-cfg.so.1 libnvidia-cfg.so &&
+ popd
+ pushd $INSTALL_ROOT/usr/lib &&
+ ln -sfn libGLcore.so.${VERSION/-/.} libGLcore.so.1 &&
ln -sfn libnvidia-tls.so.${VERSION/-/.} libnvidia-tls.so.1 &&
popd &&
pushd $INSTALL_ROOT/usr/lib/tls &&
@@ -81,12 +69,12 @@ popd &&
#
pushd $SOURCE_DIRECTORY/usr/X11R6/lib &&
for lib in libXvMCNVIDIA.a libXvMCNVIDIA.so.${VERSION/-/.}; do
- install -m 0644 -o root -g root $lib $X_PRE/lib
+ install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
done &&
#
# Setup symlinks
#
- pushd $X_PRE/lib &&
+ pushd $INSTALL_ROOT/usr/lib &&
ln -sfn libXvMCNVIDIA.so.${VERSION/-/.} libXvMCNVIDIA_dynamic.so.1 &&
popd &&
popd &&
@@ -94,39 +82,33 @@ popd &&
#
# Install X11 modules
#
-pushd $SOURCE_DIRECTORY/usr/X11R6/lib/modules &&
-#cp libnvidia-wfb.so.${VERSION/-/.} "$X_MOD/" &&
-mkdir -p $X_MOD/drivers &&
+pushd $SOURCE_DIRECTORY/usr/X11R6/lib/modules/ &&
+mkdir -vp $INSTALL_ROOT/usr/lib/xorg/modules/nvidia/ &&
+mkdir -vp $INSTALL_ROOT/usr/lib/xorg/modules/drivers
&&
for driver in nvidia_drv.o nvidia_drv.so; do
- install -m 0644 -o root -g root \
- drivers/$driver $X_MOD/drivers
+ install -v -m 0644 -o root -g root \
+ drivers/$driver $INSTALL_ROOT/usr/lib/xorg/modules/drivers/
done &&
-mkdir -p "$X_MOD/extensions" &&
-install -m 0644 -o root -g root \
-extensions/libglx.so.${VERSION/-/.} \
- $X_MOD/extensions &&
- #
- # Setup symlinks
- #
-# ln -sfn "$X_MOD/libnvidia-wfb.so.${VERSION/-/.}" \
-# "$X_MOD/libnvidia-wfb.so" &&
- pushd $X_MOD/extensions &&
- ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
- popd &&
+install -v -m 0644 -o root -g root extensions/libglx.so.${VERSION/-/.} \
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+#
+# Setup symlinks
+#
+pushd $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
+popd &&
popd &&
+popd

#
# Install Freedesktop.org spec
#
-if [[ ! -d $INSTALL_ROOT/usr/share/applications ]]; then
- mkdir -p $INSTALL_ROOT/usr/share/applications
-fi &&
-
+mkdir -vp $INSTALL_ROOT/usr/share/applications
install -m 0644 -o root -g root \
$SOURCE_DIRECTORY/usr/share/applications/nvidia-settings.desktop \
$INSTALL_ROOT/usr/share/applications &&

-#
+
# Install documentation
#
pushd $SOURCE_DIRECTORY/usr/share/doc &&
@@ -140,9 +122,7 @@ popd
&&
mkdir -p $INSTALL_ROOT/usr/share/pixmaps/ &&
cp usr/share/pixmaps/nvidia-settings.png $INSTALL_ROOT/usr/share/pixmaps/
&&

-if [ ! -d $INSTALL_ROOT/usr/share/doc/$SPELL ]; then
- mkdir -p $INSTALL_ROOT/usr/share/doc/$SPELL
-fi &&
+mkdir -p $INSTALL_ROOT/usr/share/doc/$SPELL
install -m 0644 -o root -g root $SOURCE_DIRECTORY/LICENSE \
$INSTALL_ROOT/usr/share/doc/$SPELL &&
install -m 0644 -o root -g root $SOURCE_DIRECTORY/LICENSE \
diff --git a/z-kernels/nvidia_legacy_96xx/POST_REMOVE
b/z-kernels/nvidia_legacy_96xx/POST_REMOVE
deleted file mode 100755
index eb3214a..0000000
--- a/z-kernels/nvidia_legacy_96xx/POST_REMOVE
+++ /dev/null
@@ -1,24 +0,0 @@
-local i X_DIR GL_DIR GL_LIB &&
-X_DIR=$INSTALL_ROOT/usr/include/GL/x &&
-GL_DIR=$INSTALL_ROOT/usr/include/GL/ &&
-
-if spell_ok mesalib; then
- GL_LIB=$INSTALL_ROOT/usr/lib
-else
- GL_LIB=$INSTALL_ROOT/usr/X11R6/lib
-fi &&
-
-message "${MESSAGE_COLOR}Restoring X/mesalib headers and libs${SPELL_COLOR}"
&&
-
-for i in gl.h glext.h glx.h glxext.h; do
- if [ -e $X_DIR/$i ]; then
- mv -v $X_DIR/$i $GL_DIR
- fi
-done &&
-for i in $X-DIR/libGL.so.*; do
- if [ -e $i ]; then
- mv -v $i $GL_LIB
- fi
-done &&
-
-rm -rf $X_DIR
diff --git a/z-kernels/nvidia_legacy_96xx/PRE_BUILD
b/z-kernels/nvidia_legacy_96xx/PRE_BUILD
index a7e031e..d92e707 100755
--- a/z-kernels/nvidia_legacy_96xx/PRE_BUILD
+++ b/z-kernels/nvidia_legacy_96xx/PRE_BUILD
@@ -1,35 +1,5 @@
unpack_file '' &&

-message "${MESSAGE_COLOR}Backing up existing X/mesalib headers and
libs${DEFAULT_COLOR}" &&
-
-local i X_DIR GL_DIR GL_LIB &&
-X_DIR=$INSTALL_ROOT/usr/include/GL/x &&
-GL_DIR=$INSTALL_ROOT/usr/include/GL &&
-
-if spell_ok mesalib; then
- GL_LIB=$INSTALL_ROOT/usr/lib
-else
- GL_LIB=$INSTALL_ROOT/usr/X11R6/lib
-fi &&
-
-mkdir -p $X_DIR &&
-
-if ! [[ -f $X_DIR/done ]]; then
- for i in gl.h glext.h glx.h glxext.h; do
- if [ -e $GL_DIR/$i ]; then
- mv -v $GL_DIR/$i $X_DIR
- fi
- done
- for i in $GL_LIB/libGL.so.*; do
- if [ -e $i ]; then
- mv -v $i $X_DIR
- fi
- done
- touch $X_DIR/done
-else
- message "${SPELL_COLOR}X/mesalib headers and libs already backed
up${DEFAULT_COLOR}"
-fi &&
-
sh $SOURCE_CACHE/$SOURCE --extract-only \
--target $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
diff --git a/z-kernels/nvidia_legacy_96xx/glext-redef.patch
b/z-kernels/nvidia_legacy_96xx/glext-redef.patch
deleted file mode 100644
index 3fb0be4..0000000
--- a/z-kernels/nvidia_legacy_96xx/glext-redef.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- glext.h~ 2006-11-08 22:09:16.000000000 -0800
-+++ glext.h 2006-11-08 22:09:16.000000000 -0800
-@@ -6938,7 +6938,6 @@
- extern void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname,
GLint *params);
- extern void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname,
GLuint *params);
- #endif /* GL_GLEXT_PROTOTYPES */
--typedef void (APIENTRY * PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint
location, GLuint *params);
- typedef void (APIENTRY * PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program,
GLuint color, const GLchar *name);
- typedef GLint (APIENTRY * PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program,
const GLchar *name);
- typedef void (APIENTRY * PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint
v0);
diff --git a/z-kernels/nvidia_legacy_96xx/volatiles
b/z-kernels/nvidia_legacy_96xx/volatiles
deleted file mode 100755
index 246e956..0000000
--- a/z-kernels/nvidia_legacy_96xx/volatiles
+++ /dev/null
@@ -1,6 +0,0 @@
-^/lib/modules/*/modules.*
-^/usr/lib/libGL.so.*
-^/usr/include/GL/gl.h
-^/usr/include/GL/glext.h
-^/usr/include/GL/glx.h
-^/usr/include/GL/glxext.h



  • [SM-Commit] GIT changes to master z-rejected grimoire by Andraž Levstik (fb80d0b23c9039186c28758933f38440c2bf604e), Andraž Levstik, 02/08/2009

Archive powered by MHonArc 2.6.24.

Top of Page