diff options
Diffstat (limited to 'system/nvidia-driver/nvidia-switch')
| -rw-r--r-- | system/nvidia-driver/nvidia-switch | 51 |
1 files changed, 3 insertions, 48 deletions
diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch index b700fb2f5d..41c9c23857 100644 --- a/system/nvidia-driver/nvidia-switch +++ b/system/nvidia-driver/nvidia-switch @@ -20,7 +20,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# nvidia-switch utility 0.8.2 +# nvidia-switch utility 0.9.0 # # A tool to switch between nvidia-binary-driver and stock xorg-driver # if both are installed in parallel. @@ -114,8 +114,8 @@ done } libs_basic(){ -for i in libGL.so libGLcore.so; do - #if this link exists, remove it, if it's a file, move it to *.nvidia +for i in libGL.so; do + #if this link exists, remove it, if it's a file, move it to *-nvidia if [ -L "$LIB/$i.$NV_VERSION" ]; then rm -f "$LIB/$i.$NV_VERSION" elif [ -e "$LIB/$i.$NV_VERSION" ]; then @@ -152,17 +152,6 @@ fi } -libglcore_nvidia(){ -#If libGLcore.so.$NV_VERSION-nvidia does exists, then remove the -nvidia and make it usable that way -if [ -e "$LIB/libGLcore.so.$NV_VERSION-nvidia" ]; then - cd "$LIB" - rm -f libGLcore.so.$NV_VERSION libGLcore.so.1 - ln -s libGLcore.so.$NV_VERSION-nvidia libGLcore.so.$NV_VERSION - ln -s libGLcore.so.$NV_VERSION libGLcore.so.1 - cd "$CWD" -fi -} - lib_nvidia(){ for i in libGL.so libglx.so; do if [ "$i" = "libGL.so" ]; then @@ -240,13 +229,6 @@ nvidia_ldconfig(){ /sbin/ldconfig #Generate correct symink for that lib /sbin/ldconfig -l $1 - -if [ "$2" = "xorg" ]; then - #Remove so-link, recreated by ldconfig - cd $LIB - remove_link "libGLcore.so.1" - cd $CWD -fi } check(){ @@ -294,26 +276,6 @@ check_includes(){ done } -check_glcore(){ - if [ "$1" = "nvidia" ]; then - CHECK="link" - else - CHECK="exist" - fi - - for i in libGLcore.so.1 libGLcore.so.$NV_VERSION libGLcore.so.$NV_VERSION-nvidia; do - if [ "$i" = "libGLcore.so.1" ]; then - check $LIB $i $CHECK - elif [ "$i" = "libGLcore.so.$NV_VERSION" ]; then - check $LIB $i $CHECK - else - check $LIB $i - fi - done - - echo "" -} - check_glx(){ if [ "$1" = "xorg" ]; then xorg="exist" @@ -392,8 +354,6 @@ nvidia_check(){ check_gl "nvidia" - check_glcore "nvidia" - check_glx check_wfb @@ -404,8 +364,6 @@ xorg_check(){ check_gl - check_glcore - check_glx "xorg" check_wfb @@ -416,8 +374,6 @@ cleanup_check(){ check_gl - check_glcore - check_glx "cleanup" check_wfb @@ -431,7 +387,6 @@ nvidia(){ incs "xorg" "nvidia" lib_nvidia libgl_nvidia - libglcore_nvidia libs "nvidia" libglx_nvidia |