Skip to Content.
Sympa Menu

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

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 (0998464d71da6f94caef98614fce5172a9c0a8cb)
  • Date: Fri, 12 Nov 2010 14:13:14 -0600

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

ChangeLog | 3 +++
glselect.function | 24 ++++++++++++------------
z-kernels/ati-fglrx/HISTORY | 3 +++
z-kernels/ati-fglrx/INSTALL | 28 ++++++++++++++--------------
z-kernels/nvidia_driver/HISTORY | 3 +++
z-kernels/nvidia_driver/INSTALL | 16 ++++++++--------
z-kernels/nvidia_legacy/HISTORY | 3 +++
z-kernels/nvidia_legacy/INSTALL | 22 +++++++++++-----------
z-kernels/nvidia_legacy_173xx/HISTORY | 3 +++
z-kernels/nvidia_legacy_173xx/INSTALL | 16 ++++++++--------
z-kernels/nvidia_legacy_96xx/HISTORY | 3 +++
z-kernels/nvidia_legacy_96xx/INSTALL | 22 +++++++++++-----------
12 files changed, 82 insertions(+), 64 deletions(-)

New commits:
commit 0998464d71da6f94caef98614fce5172a9c0a8cb
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

nvidia_legacy_96xx: updated for glselect

commit 0794b51a26f179a10a24de97b066c6fefe2473d1
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

nvidia_legacy_173xx: updated for glselect

commit a8413783376d3ccdc039c34dc68f4c1c4ece7441
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

nvidia_legacy: updated for glselect

commit fcf9e67fc7ae8fccba75bbf72131bd1dc480dafa
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

nvidia_driver: updated for glselect

commit f4e0b7b80b3b897a2b7739e00aa3ece2c1c11180
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

ati-fglrx: updated for glselect

commit 5dca68d0dabf7e77b91a8f2b5706938ea840739b
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

updated glselect for stupid X

diff --git a/ChangeLog b/ChangeLog
index 997c34f..2a8c4bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-11-12 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * glselect.function: fixes for stupid xorg
+
2010-05-19 Arjan Bouter <abouter AT sourcemage.org>
* z-kernels/radeon-ucode: Added IRQ microcode for AMD radeon cards

diff --git a/glselect.function b/glselect.function
index 00690b8..b2dddd5 100755
--- a/glselect.function
+++ b/glselect.function
@@ -23,15 +23,15 @@ function glselect(){
/usr/include/GL/glxext.h
"
local dir_list=( \
- "/usr/lib/ati" \
- "/usr/lib/nvidia" \
- "/usr/lib/mesa" \
- "/usr/include/GL/ati" \
- "/usr/include/GL/nvidia" \
- "/usr/include/GL/mesa" \
- "/usr/lib/xorg/modules/extensions/ati" \
- "/usr/lib/xorg/modules/extensions/nvidia" \
- "/usr/lib/xorg/modules/extensions/mesa" \
+ "/usr/lib/.ati" \
+ "/usr/lib/.nvidia" \
+ "/usr/lib/.mesa" \
+ "/usr/include/GL/.ati" \
+ "/usr/include/GL/.nvidia" \
+ "/usr/include/GL/.mesa" \
+ "/usr/lib/xorg/modules/extensions/.ati" \
+ "/usr/lib/xorg/modules/extensions/.nvidia" \
+ "/usr/lib/xorg/modules/extensions/.mesa" \
)
local rm_file orig_dir
local gl_lib=$1
@@ -95,9 +95,9 @@ nvidia)
message "You can manage the libGL providers at runtime by using"
message "either smgl-gl_select or manually by symlinking the files"
message "from their respective directories i.e.:"
- message "/usr/lib/[nvidia|ati|mesa]/libGL.so"
- message
"/usr/lib/xorg/modules/extensions/[nvidia,ati,mesa]/lib{glx,dri}.so"
- message "/usr/include/GL/[nvidia|ati|mesa]/gl{x,xext,ext}.h"
+ message "/usr/lib/.[nvidia|ati|mesa]/libGL.so"
+ message
"/usr/lib/xorg/modules/extensions/.[nvidia,ati,mesa]/lib{glx,dri}.so"
+ message "/usr/include/GL/.[nvidia|ati|mesa]/gl{x,xext,ext}.h"
message ""
message "To:"
message "/usr/lib/libGL.so"
diff --git a/z-kernels/ati-fglrx/HISTORY b/z-kernels/ati-fglrx/HISTORY
index 515f8a4..85205ec 100644
--- a/z-kernels/ati-fglrx/HISTORY
+++ b/z-kernels/ati-fglrx/HISTORY
@@ -1,3 +1,6 @@
+2010-11-12 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * INSTALL: fix for gl_select
+
2010-10-29 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: added SOURCE_HINTS="no-check-certificate"
* DOWNLOAD: removed, no longer needed
diff --git a/z-kernels/ati-fglrx/INSTALL b/z-kernels/ati-fglrx/INSTALL
index 5f690ec..68f9b84 100755
--- a/z-kernels/ati-fglrx/INSTALL
+++ b/z-kernels/ati-fglrx/INSTALL
@@ -26,17 +26,17 @@ mkdir -vp $INSTALL_ROOT/usr/share/applications/ \
$INSTALL_ROOT/usr/share/man/man8/ \
$INSTALL_ROOT/usr/include/GL/ \
$INSTALL_ROOT/usr/include/X11/extensions/ \
- $INSTALL_ROOT/usr/lib/ati/ \
+ $INSTALL_ROOT/usr/lib/.ati/ \
$INSTALL_ROOT/usr/lib/xorg/modules/ \
$INSTALL_ROOT/usr/lib/xorg/modules/dri/ \
$INSTALL_ROOT/usr/lib/xorg/modules/drivers/ \
- $INSTALL_ROOT/usr/lib/xorg/modules/extensions/ati \
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/.ati \
$INSTALL_ROOT/usr/lib/xorg/modules/linux &&
cp -vr etc/ati $INSTALL_ROOT/etc/ &&
cp -vr usr/X11R6/$ARCHLIB/modules/linux/* \
$INSTALL_ROOT/usr/lib/xorg/modules/linux &&
cp -vr usr/X11R6/$ARCHLIB/modules/extensions/* \
- $INSTALL_ROOT/usr/lib/xorg/modules/extensions/ati &&
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/.ati &&
cp -vr usr/X11R6/$ARCHLIB/modules/drivers/* \
$INSTALL_ROOT/usr/lib/xorg/modules/drivers/ &&
cp -vr usr/X11R6/$ARCHLIB/modules/dri/* \
@@ -48,8 +48,8 @@ cp -vr usr/X11R6/$ARCHLIB/modules/* \
$INSTALL_ROOT/usr/lib/xorg/modules/ &&
rm -rf usr/X11R6/$ARCHLIB/modules &&
cp -vr usr/X11R6/$ARCHLIB/libGL.so.1.2 \
- $INSTALL_ROOT/usr/lib/ati/ &&
-pushd $INSTALL_ROOT/usr/lib/ati &&
+ $INSTALL_ROOT/usr/lib/.ati/ &&
+pushd $INSTALL_ROOT/usr/lib/.ati &&
ln -sfv libGL.so.1.2 libGL.so &&
popd &&
rm -f usr/X11R6/$ARCHLIB/libGL.so.1.2 &&
@@ -75,13 +75,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/
+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/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 6455e7b..d1287a5 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,6 @@
+2010-11-12 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * INSTALL: fix for gl_select
+
2010-10-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 260.19.12 (ia32 & x86_64)
* INSTALL: cuda, vdpau and CL headers no more included
diff --git a/z-kernels/nvidia_driver/INSTALL b/z-kernels/nvidia_driver/INSTALL
index 970ebc9..c0456a4 100755
--- a/z-kernels/nvidia_driver/INSTALL
+++ b/z-kernels/nvidia_driver/INSTALL
@@ -22,9 +22,9 @@ 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
+mkdir -vp $INSTALL_ROOT/usr/include/GL/.nvidia
for file in glext.h gl.h glxext.h glx.h; do
- install -v -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/include/GL/nvidia/
+ install -v -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/include/GL/.nvidia/
done &&

#
@@ -38,16 +38,16 @@ for lib in libGL.la libnvidia-glcore.so.${VERSION/-/.} \
libnvidia-compiler.so.${VERSION/-/.}
libnvidia-wfb.so.${VERSION/-/.}; do
install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
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 &&
+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/nvidia &&
+ pushd $INSTALL_ROOT/usr/lib/.nvidia &&
ln -sfn libGL.so.${VERSION/-/.} libGL.so.1 &&
ln -sfn libGL.so.1 libGL.so &&
popd
@@ -83,11 +83,11 @@ for driver in nvidia_drv.so; do
$driver $INSTALL_ROOT/usr/lib/xorg/modules/drivers/
done &&
install -v -m 0644 -o root -g root libglx.so.${VERSION/-/.} \
- $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/.nvidia &&
#
# Setup symlinks
#
-pushd $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+pushd $INSTALL_ROOT/usr/lib/xorg/modules/extensions/.nvidia &&
ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
popd &&

diff --git a/z-kernels/nvidia_legacy/HISTORY b/z-kernels/nvidia_legacy/HISTORY
index 2406051..f71188f 100644
--- a/z-kernels/nvidia_legacy/HISTORY
+++ b/z-kernels/nvidia_legacy/HISTORY
@@ -1,3 +1,6 @@
+2010-11-12 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * INSTALL: fix for gl_select
+
2010-03-11 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 71.86.13

diff --git a/z-kernels/nvidia_legacy/INSTALL b/z-kernels/nvidia_legacy/INSTALL
index b24c348..dc309f7 100755
--- a/z-kernels/nvidia_legacy/INSTALL
+++ b/z-kernels/nvidia_legacy/INSTALL
@@ -24,13 +24,13 @@ 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 &&
+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/ &&
+cp $INSTALL_ROOT/usr/include/GL/.mesa/glxext.h \
+ $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/
+ install -v -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/include/GL/.nvidia/
done &&
popd &&

@@ -45,16 +45,16 @@ 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 &&
-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/.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/nvidia &&
+ pushd $INSTALL_ROOT/usr/lib/.nvidia &&
ln -sfn libGL.so.${VERSION/-/.} libGL.so.1 &&
ln -sfn libGL.so.1 libGL.so &&
popd
@@ -87,17 +87,17 @@ popd &&
#
pushd $SOURCE_DIRECTORY/usr/X11R6/lib/modules/ &&
mkdir -vp $INSTALL_ROOT/usr/lib/xorg/modules/drivers &&
-mkdir -vp $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+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/
done &&
install -v -m 0644 -o root -g root extensions/libglx.so.${VERSION/-/.} \
- $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/.nvidia &&
#
# Setup symlinks
#
-pushd $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+pushd $INSTALL_ROOT/usr/lib/xorg/modules/extensions/.nvidia &&
ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
popd &&
popd &&
diff --git a/z-kernels/nvidia_legacy_173xx/HISTORY
b/z-kernels/nvidia_legacy_173xx/HISTORY
index 300f059..902f8d9 100644
--- a/z-kernels/nvidia_legacy_173xx/HISTORY
+++ b/z-kernels/nvidia_legacy_173xx/HISTORY
@@ -1,3 +1,6 @@
+2010-11-12 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * INSTALL: fix for gl_select
+
2010-03-11 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated stable and Beta to 173.14.25
Does not not seem to be a beta version at this time
diff --git a/z-kernels/nvidia_legacy_173xx/INSTALL
b/z-kernels/nvidia_legacy_173xx/INSTALL
index 0ca998c..0ffb06f 100755
--- a/z-kernels/nvidia_legacy_173xx/INSTALL
+++ b/z-kernels/nvidia_legacy_173xx/INSTALL
@@ -25,9 +25,9 @@ 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
+mkdir -vp $INSTALL_ROOT/usr/include/GL/.nvidia
for file in glext.h gl.h glxext.h glx.h; do
- install -v -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/include/GL/nvidia/
+ install -v -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/include/GL/.nvidia/
done &&
popd &&

@@ -42,16 +42,16 @@ for lib in libGL.la libGLcore.so.${VERSION/-/.} \
libnvidia-tls.so.${VERSION/-/.} libnvidia-cfg.so.${VERSION/-/.};
do
install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
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 &&
+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/nvidia &&
+ pushd $INSTALL_ROOT/usr/lib/.nvidia &&
ln -sfn libGL.so.${VERSION/-/.} libGL.so.1 &&
ln -sfn libGL.so.1 libGL.so &&
popd
@@ -91,11 +91,11 @@ for driver in nvidia_drv.o nvidia_drv.so; do
drivers/$driver $INSTALL_ROOT/usr/lib/xorg/modules/drivers/
done &&
install -v -m 0644 -o root -g root extensions/libglx.so.${VERSION/-/.} \
- $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/.nvidia &&
#
# Setup symlinks
#
-pushd $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+pushd $INSTALL_ROOT/usr/lib/xorg/modules/extensions/.nvidia &&
ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
popd &&
popd &&
diff --git a/z-kernels/nvidia_legacy_96xx/HISTORY
b/z-kernels/nvidia_legacy_96xx/HISTORY
index b3ac08f..a8ad0e8 100644
--- a/z-kernels/nvidia_legacy_96xx/HISTORY
+++ b/z-kernels/nvidia_legacy_96xx/HISTORY
@@ -1,3 +1,6 @@
+2010-11-12 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * INSTALL: fix for gl_select
+
2010-03-11 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 96.43.16

diff --git a/z-kernels/nvidia_legacy_96xx/INSTALL
b/z-kernels/nvidia_legacy_96xx/INSTALL
index 2321196..54270a6 100755
--- a/z-kernels/nvidia_legacy_96xx/INSTALL
+++ b/z-kernels/nvidia_legacy_96xx/INSTALL
@@ -25,12 +25,12 @@ 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 &&
+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/ &&
+cp $INSTALL_ROOT/usr/include/GL/.mesa/glxext.h \
+ $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/
+ install -v -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/include/GL/.nvidia/
done &&
popd &&

@@ -45,16 +45,16 @@ 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 &&
-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/.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/nvidia &&
+ pushd $INSTALL_ROOT/usr/lib/.nvidia &&
ln -sfn libGL.so.${VERSION/-/.} libGL.so.1 &&
ln -sfn libGL.so.1 libGL.so &&
popd
@@ -86,18 +86,18 @@ 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/.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 \
drivers/$driver $INSTALL_ROOT/usr/lib/xorg/modules/drivers/
done &&
install -v -m 0644 -o root -g root extensions/libglx.so.${VERSION/-/.} \
- $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/.nvidia &&
#
# Setup symlinks
#
-pushd $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+pushd $INSTALL_ROOT/usr/lib/xorg/modules/extensions/.nvidia &&
ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
popd &&
popd &&



  • [SM-Commit] GIT changes to master z-rejected grimoire by Andraž Levstik (0998464d71da6f94caef98614fce5172a9c0a8cb), Andraž Levstik, 11/12/2010

Archive powered by MHonArc 2.6.24.

Top of Page