[Lunar-commits] <moonbase> NVIDIA(beta): remove outdated GL header files. This patch removes all GL headers which were installed by Nvidia to protect users against the junk they contain. Since new driver release Nvidia stops including any include files. When I analyzed the content of Nvidia GL headers I realized this is old crap. The most ugly was gl.h - it was designed exclusively for M$ Windows not Linux!

[Zbigniew Luszpinski]

commit ebfc7555ebab411dcd79e75be290edf81ded6b96
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Tue Sep 28 01:45:07 2010 +0000

    NVIDIA(beta): remove outdated GL header files.
    This patch removes all GL headers which were installed by Nvidia
    to protect users against the junk they contain.
    Since new driver release Nvidia stops including any include files.
    When I analyzed the content of Nvidia GL headers I realized this is old crap.
    The most ugly was gl.h - it was designed exclusively for M$ Windows not Linux!
---
 x11/NVIDIA-beta/BUILD        |    7 +------
 x11/NVIDIA-beta/POST_INSTALL |    7 -------
 x11/NVIDIA-beta/POST_REMOVE  |    7 -------
 x11/NVIDIA/BUILD             |    7 +------
 x11/NVIDIA/POST_INSTALL      |    7 -------
 x11/NVIDIA/POST_REMOVE       |    7 -------
 6 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/x11/NVIDIA-beta/BUILD b/x11/NVIDIA-beta/BUILD
index 15fab63..c81d9fc 100644
--- a/x11/NVIDIA-beta/BUILD
+++ b/x11/NVIDIA-beta/BUILD
@@ -6,7 +6,7 @@
   rm -f .manifest libvdpau.so* libvdpau_trace.so* \
   vdpau*.h pkg-history.txt nvidia-installer{,.*} \
   mkprecompiled nvidia-xconfig{,.*} nvidia-settings{,.*} \
-  libnvidia-wfb* tls_test* libGL.la &&
+  libnvidia-wfb* tls_test* libGL.la gl*.h &&
 
   # Temporary paths and symlinks to make sources compilable
   LD_LIBRARY_PATH="$SOURCE_DIRECTORY:$LD_LIBRARY_PATH" &&
@@ -14,8 +14,6 @@
   ln -s libGL.so.$VERSION nvidia-installer-$VERSION/libGL.so &&
   ln -s libnvidia-glcore.so.$VERSION nvidia-installer-$VERSION/libGLcore.so.1 &&
   ln -s libnvidia-tls.so.$VERSION nvidia-installer-$VERSION/libnvidia-tls.so.1 &&
-  mkdir GL &&
-  cp gl*.h GL &&
 
   echo libXvMCNVIDIA_dynamic.so.1 > XvMCConfig &&
  
@@ -115,9 +113,6 @@
   mkdir -p /usr/include/cuda &&
   install -m0444 cuda*.h /usr/include/cuda &&
 
-  mkdir -p /usr/include/GL/nvidia &&
-  install -m0444 gl*.h /usr/include/GL/nvidia &&
-
   install -m0755 libnvidia-*.so.$VERSION /usr/lib &&
   ln -sf /usr/lib/libnvidia-cfg.so.$VERSION /usr/lib/libnvidia-cfg.so.1 &&
   ln -sf /usr/lib/libnvidia-cfg.so.1 /usr/lib/libnvidia-cfg.so &&
diff --git a/x11/NVIDIA-beta/POST_INSTALL b/x11/NVIDIA-beta/POST_INSTALL
index 88564a4..f9a0e4c 100644
--- a/x11/NVIDIA-beta/POST_INSTALL
+++ b/x11/NVIDIA-beta/POST_INSTALL
@@ -1,10 +1,3 @@
-# Make Nvidia OpenGL headers default:
-# This section is commented out because some applications require Mesa headers
-# Average Lunar user may not be able to handle broken compilations so we avoid this.
-#for file in `ls /usr/include/GL/nvidia`;
-#do ln -sf /usr/include/GL/nvidia/$file /usr/include/GL/$file;
-#done
-
 # Make Nvidia OpenGL libraries default:
 cd /usr/lib
 ln -sf libGL.so.$VERSION libGL.so.1
diff --git a/x11/NVIDIA-beta/POST_REMOVE b/x11/NVIDIA-beta/POST_REMOVE
index c2138ce..6fef4e1 100644
--- a/x11/NVIDIA-beta/POST_REMOVE
+++ b/x11/NVIDIA-beta/POST_REMOVE
@@ -1,10 +1,3 @@
-# Restore Mesa OpenGL headers:
-if [ -d /usr/include/GL/mesa ] ; then
-for file in `ls /usr/include/GL/mesa`;
-do ln -sf /usr/include/GL/mesa/$file /usr/include/GL/$file;
-done
-fi
-
 # Restore Mesa OpenGL libraries:
 cd /usr/lib
 ln -sf libGL.so.1.2 libGL.so.1
diff --git a/x11/NVIDIA/BUILD b/x11/NVIDIA/BUILD
index 7207ac4..6b4731d 100644
--- a/x11/NVIDIA/BUILD
+++ b/x11/NVIDIA/BUILD
@@ -17,7 +17,7 @@
   rm -f .manifest libvdpau.so* libvdpau_trace.so* \
   vdpau*.h pkg-history.txt nvidia-installer{,.*} \
   mkprecompiled nvidia-xconfig{,.*} nvidia-settings{,.*} \
-  libnvidia-wfb* tls_test* libGL.la &&
+  libnvidia-wfb* tls_test* libGL.la gl*.h &&
 
   # Temporary paths and symlinks to make sources compilable
   LD_LIBRARY_PATH="$SOURCE_DIRECTORY:$LD_LIBRARY_PATH" &&
@@ -25,8 +25,6 @@
   ln -s libGL.so.$VERSION nvidia-installer-$VERSION/libGL.so &&
   ln -s libnvidia-glcore.so.$VERSION nvidia-installer-$VERSION/libGLcore.so.1 &&
   ln -s libnvidia-tls.so.$VERSION nvidia-installer-$VERSION/libnvidia-tls.so.1 &&
-  mkdir GL &&
-  cp gl*.h GL &&
 
   echo libXvMCNVIDIA_dynamic.so.1 > XvMCConfig &&
  
@@ -126,9 +124,6 @@
   mkdir -p /usr/include/cuda &&
   install -m0444 cuda*.h /usr/include/cuda &&
 
-  mkdir -p /usr/include/GL/nvidia &&
-  install -m0444 gl*.h /usr/include/GL/nvidia &&
-
   install -m0755 libnvidia-*.so.$VERSION /usr/lib &&
   ln -sf /usr/lib/libnvidia-cfg.so.$VERSION /usr/lib/libnvidia-cfg.so.1 &&
   ln -sf /usr/lib/libnvidia-cfg.so.1 /usr/lib/libnvidia-cfg.so &&
diff --git a/x11/NVIDIA/POST_INSTALL b/x11/NVIDIA/POST_INSTALL
index c890232..dbb0b1f 100644
--- a/x11/NVIDIA/POST_INSTALL
+++ b/x11/NVIDIA/POST_INSTALL
@@ -1,10 +1,3 @@
-# Make Nvidia OpenGL headers default:
-# This section is commented out because some applications require Mesa headers
-# Average Lunar user may not be able to handle broken compilations so we avoid this.
-#for file in `ls /usr/include/GL/nvidia`;
-#do ln -sf /usr/include/GL/nvidia/$file /usr/include/GL/$file;
-#done
-
 # Make Nvidia OpenGL libraries default:
 cd /usr/lib
 ln -sf libGL.so.$VERSION libGL.so.1
diff --git a/x11/NVIDIA/POST_REMOVE b/x11/NVIDIA/POST_REMOVE
index 884d32d..6fef4e1 100644
--- a/x11/NVIDIA/POST_REMOVE
+++ b/x11/NVIDIA/POST_REMOVE
@@ -1,10 +1,3 @@
-# Restore Mesa OpenGL headers:
-#if [[ -e /usr/include/GL/mesa ]] ; then
-#for file in `ls /usr/include/GL/mesa`;
-#do ln -sf /usr/include/GL/mesa/$file /usr/include/GL/$file;
-#done
-#fi
-
 # Restore Mesa OpenGL libraries:
 cd /usr/lib
 ln -sf libGL.so.1.2 libGL.so.1