Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 34179 Details for
Bug 55212
opengl-update, staticly shared /usr partition, and diskless nodes with different gl setups don't get along.
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Context diffs of my changes to /usr/sbin/opengl-update
new_opengl-update.diff (text/plain), 5.79 KB, created by
Edward A. Hasley III
on 2004-06-25 22:26:43 UTC
(
hide
)
Description:
Context diffs of my changes to /usr/sbin/opengl-update
Filename:
MIME Type:
Creator:
Edward A. Hasley III
Created:
2004-06-25 22:26:43 UTC
Size:
5.79 KB
patch
obsolete
>*** /usr/sbin/opengl-update Fri Jun 25 20:29:23 2004 >--- /usr/sbin/opengl-update.new Fri Jun 25 22:25:34 2004 >*************** >*** 104,169 **** > ebegin "Switching to ${GL_IMPLEM} OpenGL interface" > > #setup the $LDPATH >! echo "LDPATH=/usr/lib/opengl/${GL_IMPLEM}/lib" >/etc/env.d/09opengl > /usr/sbin/env-update &>/dev/null > >! #setup the /usr/lib/libGL.so symlink >! if [ -e /usr/lib/libGL.so ] > then >! rm -f /usr/lib/libGL.so > fi >! if [ -e /usr/lib/libGL.so.1 ] > then >! rm -f /usr/lib/libGL.so.1 > fi > realname="$(readlink /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.so)" > ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \ >! /usr/lib/libGL.so > ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \ >! /usr/lib/libGL.so.1 > > #setup the /usr/X11R6/lib/libMesaGL.so symlink > if [ -e /usr/X11R6/lib/libMesaGL.so ] > then > rm -f /usr/X11R6/lib/libMesaGL.so > fi > realname="$(readlink /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.so)" > ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \ > /usr/X11R6/lib/libMesaGL.so > >! #setup the /usr/lib/libGLcore.so symlink >! if [ -e /usr/lib/libGLcore.so ] > then >! rm -f /usr/lib/libGLcore.so > fi >! if [ -e /usr/lib/libGLcore.so.1 ] > then >! rm -f /usr/lib/libGLcore.so.1 > fi > if [ -e /usr/lib/opengl/${GL_IMPLEM}/lib/libGLcore.so ] > then > realname="$(readlink /usr/lib/opengl/${GL_IMPLEM}/lib/libGLcore.so)" > ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \ >! /usr/lib/libGLcore.so > ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \ >! /usr/lib/libGLcore.so.1 > fi > >! #setup the /usr/lib/libGL.la symlink >! if [ -e /usr/lib/libGL.la ] > then >! rm -f /usr/lib/libGL.la > fi > if [ -e /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.la ] > then > ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.la \ >! /usr/lib/libGL.la > fi > > #fix libtool archives (#48297) > CURDIR="$(pwd)" > cd /usr/lib >! sed -i 's:/usr/lib/opengl/[^/]*/lib/libGL.la:/usr/lib/libGL.la:' \ > `grep -l /usr/lib/opengl *.la` > cd ${CURDIR} > >--- 104,177 ---- > ebegin "Switching to ${GL_IMPLEM} OpenGL interface" > > #setup the $LDPATH >! echo "LDPATH=/usr/lib/opengl/${GL_IMPLEM}/lib:/usr/local/lib/opengl" >/etc/env.d/09opengl > /usr/sbin/env-update &>/dev/null > >! if [ ! -d /usr/local/lib/opengl ] > then >! mkdir /usr/local/lib/opengl > fi >! >! #setup the /usr/local/lib/opengl/libGL.so symlink >! if [ -e /usr/local/lib/opengl/libGL.so ] >! then >! rm -f /usr/local/lib/opengl/libGL.so >! fi >! if [ -e /usr/local/lib/opengl/libGL.so.1 ] > then >! rm -f /usr/local/lib/opengl/libGL.so.1 > fi > realname="$(readlink /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.so)" > ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \ >! /usr/local/lib/opengl/libGL.so > ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \ >! /usr/local/lib/opengl/libGL.so.1 > > #setup the /usr/X11R6/lib/libMesaGL.so symlink > if [ -e /usr/X11R6/lib/libMesaGL.so ] > then > rm -f /usr/X11R6/lib/libMesaGL.so >+ rm -f /usr/local/lib/opengl/libMesaGL.so > fi > realname="$(readlink /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.so)" > ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \ >+ /usr/local/lib/opengl/libMesaGL.so >+ ln -sf /usr/local/lib/opengl/libMesaGL.so \ > /usr/X11R6/lib/libMesaGL.so > >! #setup the /usr/local/lib/opengl/libGLcore.so symlink >! if [ -e /usr/local/lib/opengl/libGLcore.so ] > then >! rm -f /usr/local/lib/opengl/libGLcore.so > fi >! if [ -e /usr/local/lib/opengl/libGLcore.so.1 ] > then >! rm -f /usr/local/lib/opengl/libGLcore.so.1 > fi > if [ -e /usr/lib/opengl/${GL_IMPLEM}/lib/libGLcore.so ] > then > realname="$(readlink /usr/lib/opengl/${GL_IMPLEM}/lib/libGLcore.so)" > ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \ >! /usr/local/lib/opengl/libGLcore.so > ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \ >! /usr/local/lib/opengl/libGLcore.so.1 > fi > >! #setup the /usr/local/lib/opengl/libGL.la symlink >! if [ -e /usr/local/lib/opengl/libGL.la ] > then >! rm -f /usr/local/lib/opengl/libGL.la > fi > if [ -e /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.la ] > then > ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.la \ >! /usr/local/lib/opengl/libGL.la > fi > > #fix libtool archives (#48297) > CURDIR="$(pwd)" > cd /usr/lib >! sed -i 's:/usr/lib/opengl/[^/]*/lib/libGL.la:/usr/local/lib/opengl/libGL.la:' \ > `grep -l /usr/lib/opengl *.la` > cd ${CURDIR} > >*************** >*** 171,201 **** >--- 179,223 ---- > if [ -e /usr/X11R6/lib/modules/extensions/libglx.so ] > then > rm -f /usr/X11R6/lib/modules/extensions/libglx.so >+ rm -f /usr/local/lib/opengl/libglx.so > fi > if [ -e /usr/lib/opengl/${GL_IMPLEM}/extensions/libglx.so ] > then > ln -sf /usr/lib/opengl/${GL_IMPLEM}/extensions/libglx.so \ >+ /usr/local/lib/opengl/libglx.so >+ ln -sf /usr/local/lib/opengl/libglx.so \ > /usr/X11R6/lib/modules/extensions/libglx.so > fi > #setup the /usr/X11R6/lib/modules/extensions/libglx.a symlink > if [ -e /usr/X11R6/lib/modules/extensions/libglx.a ] > then > rm -f /usr/X11R6/lib/modules/extensions/libglx.a >+ rm -f /usr/local/lib/opengl/libglx.a > fi > if [ -e /usr/lib/opengl/${GL_IMPLEM}/extensions/libglx.a ] > then > ln -sf /usr/lib/opengl/${GL_IMPLEM}/extensions/libglx.a \ >+ /usr/local/lib/opengl/libglx.a >+ ln -sf /usr/local/lib/opengl/libglx.a \ > /usr/X11R6/lib/modules/extensions/libglx.a > fi > > #setup the includes >+ if [ ! -d /usr/local/lib/opengl/include ] >+ then >+ mkdir /usr/local/lib/opengl/include >+ fi >+ > for x in gl.h glx.h glxtokens.h > do > if [ -e /usr/X11R6/include/GL/${x} ] > then > rm -f /usr/X11R6/include/GL/${x} >+ rm -f /usr/local/lib/opengl/include/${x} > fi > ln -sf /usr/lib/opengl/${GL_IMPLEM}/include/${x} \ >+ /usr/local/lib/opengl/include/${x} >+ ln -sf /usr/local/lib/opengl/include/${x} \ > /usr/X11R6/include/GL/${x} > done >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 55212
:
34179
|
34209
|
34239