Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž 'ruskie' Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Andraž 'ruskie' Levstik (9b4c1d6f3a4867b1c79ecf299e8cec8df2a37cdd)
  • Date: Mon, 9 Feb 2009 07:47:23 -0600

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

z-kernels/ati-fglrx/HISTORY | 3 ++-
z-kernels/ati-fglrx/INSTALL | 9 +++++++++
z-kernels/ati-fglrx/POST_RESURRECT | 1 +
z-kernels/nvidia_driver/HISTORY | 3 ++-
z-kernels/nvidia_driver/INSTALL | 13 +------------
z-kernels/nvidia_driver/POST_RESURRECT | 1 +
z-kernels/nvidia_legacy/HISTORY | 2 +-
z-kernels/nvidia_legacy/INSTALL | 11 +++++------
z-kernels/nvidia_legacy/POST_RESURRECT | 1 +
z-kernels/nvidia_legacy_173xx/HISTORY | 3 ++-
z-kernels/nvidia_legacy_173xx/INSTALL | 10 ----------
z-kernels/nvidia_legacy_173xx/POST_RESURRECT | 1 +
z-kernels/nvidia_legacy_96xx/HISTORY | 4 ++--
z-kernels/nvidia_legacy_96xx/INSTALL | 2 +-
z-kernels/nvidia_legacy_96xx/POST_RESURRECT | 1 +
15 files changed, 30 insertions(+), 35 deletions(-)

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

nvidia_legacy_96xx: updates for glselect

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

nvidia_legacy_173xx: updates for glselect

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

nvidia_legacy: updates for glselect

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

nvidia_driver: updates for glselect

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

ati-fglrx: updates for glselect

diff --git a/z-kernels/ati-fglrx/HISTORY b/z-kernels/ati-fglrx/HISTORY
index b5c5948..dd05f3a 100644
--- a/z-kernels/ati-fglrx/HISTORY
+++ b/z-kernels/ati-fglrx/HISTORY
@@ -3,7 +3,8 @@
* FINAL: run internal glselect
* PRE_REMOVE: return back to mesa on dispel
* REPAIR^all^PRE_REMOVE: return back to mesa on dispel
- * POST_RESURRECT: added for glselect
+ * POST_RESURRECT: added for glselect, fixed
+ * INSTALL: fixups

2009-02-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 9.1, patchlevel++
diff --git a/z-kernels/ati-fglrx/INSTALL b/z-kernels/ati-fglrx/INSTALL
index fee8b19..974991c 100755
--- a/z-kernels/ati-fglrx/INSTALL
+++ b/z-kernels/ati-fglrx/INSTALL
@@ -65,4 +65,13 @@ cp -vr usr/share/gnome/apps/*
$INSTALL_ROOT/usr/share/applications/ &&
cp -vr usr/share/ati $INSTALL_ROOT/usr/share/ &&
cp -vr usr/share/applnk/* $INSTALL_ROOT/usr/share/applnk/ &&
cp -vr opt/kde3/share/applnk/* $INSTALL_ROOT/usr/share/applications/
+mkdir -vp $INSTALL_ROOT/usr/include/GL/ati/ &&
+cp -vr $INSTALL_ROOT/usr/include/GL/mesa/gl.h \
+ $INSTALL_ROOT/usr/include/GL/ati/ &&
+cp -vr $INSTALL_ROOT/usr/include/GL/mesa/glext.h \
+ $INSTALL_ROOT/usr/include/GL/ati/ &&
+cp -vr $INSTALL_ROOT/usr/include/GL/mesa/glx.h \
+ $INSTALL_ROOT/usr/include/GL/ati/ &&
+cp -vr $INSTALL_ROOT/usr/include/GL/mesa/glxext.h \
+ $INSTALL_ROOT/usr/include/GL/ati/

diff --git a/z-kernels/ati-fglrx/POST_RESURRECT
b/z-kernels/ati-fglrx/POST_RESURRECT
index a851806..08ff180 100755
--- a/z-kernels/ati-fglrx/POST_RESURRECT
+++ b/z-kernels/ati-fglrx/POST_RESURRECT
@@ -1 +1,2 @@
+. $GRIMOIRE/FUNCTIONS
glselect ati
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 01e4e94..d9e413a 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -3,7 +3,8 @@
* FINAL: run internal glselect
* PRE_REMOVE: return back to mesa on dispel
* REPAIR^all^PRE_REMOVE: return back to mesa on dispel
- * POST_RESURRECT: added for glselect
+ * POST_RESURRECT: added for glselect, fixed
+ * INSTALL: fixup

2009-02-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: xorg-server
diff --git a/z-kernels/nvidia_driver/INSTALL b/z-kernels/nvidia_driver/INSTALL
index 61b0422..88c5ad3 100755
--- a/z-kernels/nvidia_driver/INSTALL
+++ b/z-kernels/nvidia_driver/INSTALL
@@ -45,8 +45,6 @@ done &&
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 &&
@@ -72,8 +70,7 @@ popd &&
# Install X11 OpenGL libraries
#
pushd $SOURCE_DIRECTORY/usr/X11R6/lib &&
-for lib in libGLcore.so.${VERSION/-/.} \
- libXvMCNVIDIA.a
libXvMCNVIDIA.so.${VERSION/-/.}; do
+for lib in libXvMCNVIDIA.a libXvMCNVIDIA.so.${VERSION/-/.}; do
install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
done &&
#
@@ -88,9 +85,6 @@ popd &&
# Install X11 modules
#
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 -v -m 0644 -o root -g root \
@@ -101,11 +95,6 @@ install -v -m 0644 -o root -g root
extensions/libglx.so.${VERSION/-/.} \
#
# 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 &&
diff --git a/z-kernels/nvidia_driver/POST_RESURRECT
b/z-kernels/nvidia_driver/POST_RESURRECT
index 7c7887f..9bbc0f8 100755
--- a/z-kernels/nvidia_driver/POST_RESURRECT
+++ b/z-kernels/nvidia_driver/POST_RESURRECT
@@ -1 +1,2 @@
+. $GRIMOIRE/FUNCTIONS
glselect nvidia
diff --git a/z-kernels/nvidia_legacy/HISTORY b/z-kernels/nvidia_legacy/HISTORY
index b8afa7a..d9c467f 100644
--- a/z-kernels/nvidia_legacy/HISTORY
+++ b/z-kernels/nvidia_legacy/HISTORY
@@ -3,7 +3,7 @@
* FINAL: run internal glselect
* PRE_REMOVE: return back to mesa on dispel
* REPAIR^all^PRE_REMOVE: return back to mesa on dispel
- * POST_RESURRECT: added for glselect
+ * POST_RESURRECT: added for glselect, fixed
* INSTALL: workaround for missing glxext.h

2009-02-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
diff --git a/z-kernels/nvidia_legacy/INSTALL b/z-kernels/nvidia_legacy/INSTALL
index 4fb74a9..b24c348 100755
--- a/z-kernels/nvidia_legacy/INSTALL
+++ b/z-kernels/nvidia_legacy/INSTALL
@@ -24,11 +24,11 @@ install -v -m 0766 -o root -g root nvidia-installer
$INSTALL_ROOT/usr/bin &
#
# Install OpenGL headers
#
+mkdir -vp $INSTALL_ROOT/usr/include/GL/nvidia &&
pushd $SOURCE_DIRECTORY/usr/include/GL &&
# workaround absent file from legacy
cp $INSTALL_ROOT/usr/include/GL/mesa/glxext.h \
$INSTALL_ROOT/usr/include/GL/nvidia/ &&
-mkdir -vp $INSTALL_ROOT/usr/include/GL/nvidia &&
for file in glext.h gl.h glx.h; do
install -v -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/include/GL/nvidia/
done &&
@@ -40,8 +40,8 @@ popd &&
pushd $SOURCE_DIRECTORY/usr/lib &&

# Fill in the path to libGL.so
-sed -i 's|__LIBGL_PATH__|/usr/lib|' libGL.la
-for lib in libGL.la libGLcore.so.${VERSION/-/.} \
+sed -i 's|__LIBGL_PATH__|/usr/lib|' libGL.la
+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 &&
@@ -86,8 +86,8 @@ popd &&
# Install X11 modules
#
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
&&
+mkdir -vp $INSTALL_ROOT/usr/lib/xorg/modules/drivers &&
+mkdir -vp $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
for driver in nvidia_drv.o nvidia_drv.so; do
install -v -m 0644 -o root -g root \
drivers/$driver $INSTALL_ROOT/usr/lib/xorg/modules/drivers/
@@ -101,7 +101,6 @@ pushd
$INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
popd &&
popd &&
-popd

#
# Install Freedesktop.org spec
diff --git a/z-kernels/nvidia_legacy/POST_RESURRECT
b/z-kernels/nvidia_legacy/POST_RESURRECT
index 7c7887f..9bbc0f8 100755
--- a/z-kernels/nvidia_legacy/POST_RESURRECT
+++ b/z-kernels/nvidia_legacy/POST_RESURRECT
@@ -1 +1,2 @@
+. $GRIMOIRE/FUNCTIONS
glselect nvidia
diff --git a/z-kernels/nvidia_legacy_173xx/HISTORY
b/z-kernels/nvidia_legacy_173xx/HISTORY
index 666de19..c288e2e 100644
--- a/z-kernels/nvidia_legacy_173xx/HISTORY
+++ b/z-kernels/nvidia_legacy_173xx/HISTORY
@@ -3,7 +3,8 @@
* FINAL: run internal glselect
* PRE_REMOVE: return back to mesa on dispel
* REPAIR^all^PRE_REMOVE: return back to mesa on dispel
- * POST_RESURRECT: added for glselect
+ * POST_RESURRECT: added for glselect, fixed
+ * INSTALL: fixups

2009-02-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: use xorg-server and smgl-gl_select
diff --git a/z-kernels/nvidia_legacy_173xx/INSTALL
b/z-kernels/nvidia_legacy_173xx/INSTALL
index c80bb3f..0ca998c 100755
--- a/z-kernels/nvidia_legacy_173xx/INSTALL
+++ b/z-kernels/nvidia_legacy_173xx/INSTALL
@@ -45,8 +45,6 @@ done &&
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 &&
@@ -87,9 +85,6 @@ popd &&
# Install X11 modules
#
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 -v -m 0644 -o root -g root \
@@ -100,11 +95,6 @@ install -v -m 0644 -o root -g root
extensions/libglx.so.${VERSION/-/.} \
#
# 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 &&
diff --git a/z-kernels/nvidia_legacy_173xx/POST_RESURRECT
b/z-kernels/nvidia_legacy_173xx/POST_RESURRECT
index 7c7887f..9bbc0f8 100755
--- a/z-kernels/nvidia_legacy_173xx/POST_RESURRECT
+++ b/z-kernels/nvidia_legacy_173xx/POST_RESURRECT
@@ -1 +1,2 @@
+. $GRIMOIRE/FUNCTIONS
glselect nvidia
diff --git a/z-kernels/nvidia_legacy_96xx/HISTORY
b/z-kernels/nvidia_legacy_96xx/HISTORY
index 1453d8e..8aa6aa4 100644
--- a/z-kernels/nvidia_legacy_96xx/HISTORY
+++ b/z-kernels/nvidia_legacy_96xx/HISTORY
@@ -3,8 +3,8 @@
* FINAL: run internal glselect
* PRE_REMOVE: return back to mesa on dispel
* REPAIR^all^PRE_REMOVE: return back to mesa on dispel
- * POST_RESURRECT: added for glselect
- * INSTALL: copy glxext.h from mesa to avoid a bad link
+ * POST_RESURRECT: added for glselect, fixed
+ * INSTALL: copy glxext.h from mesa to avoid a bad link, fixups

2009-02-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: use xorg-server and added smgl-gl_select
diff --git a/z-kernels/nvidia_legacy_96xx/INSTALL
b/z-kernels/nvidia_legacy_96xx/INSTALL
index 8ce42c0..2321196 100755
--- a/z-kernels/nvidia_legacy_96xx/INSTALL
+++ b/z-kernels/nvidia_legacy_96xx/INSTALL
@@ -25,10 +25,10 @@ install -v -m 0766 -o root -g root nvidia-installer
$INSTALL_ROOT/usr/bin &
# Install OpenGL headers
#
pushd $SOURCE_DIRECTORY/usr/include/GL &&
+mkdir -vp $INSTALL_ROOT/usr/include/GL/nvidia &&
# workaround absent file from legacy
cp $INSTALL_ROOT/usr/include/GL/mesa/glxext.h \
$INSTALL_ROOT/usr/include/GL/nvidia/ &&
-mkdir -vp $INSTALL_ROOT/usr/include/GL/nvidia &&
for file in glext.h gl.h glx.h; do
install -v -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/include/GL/nvidia/
done &&
diff --git a/z-kernels/nvidia_legacy_96xx/POST_RESURRECT
b/z-kernels/nvidia_legacy_96xx/POST_RESURRECT
index 7c7887f..9bbc0f8 100755
--- a/z-kernels/nvidia_legacy_96xx/POST_RESURRECT
+++ b/z-kernels/nvidia_legacy_96xx/POST_RESURRECT
@@ -1 +1,2 @@
+. $GRIMOIRE/FUNCTIONS
glselect nvidia



  • [SM-Commit] GIT changes to master z-rejected grimoire by Andraž 'ruskie' Levstik (9b4c1d6f3a4867b1c79ecf299e8cec8df2a37cdd), Andraž 'ruskie' Levstik, 02/09/2009

Archive powered by MHonArc 2.6.24.

Top of Page