Delete deprecated TGLIncludes.h public header

README/ReleaseNotes/v638/index.md

@@ -41,7 +41,8 @@ The following people have contributed to this new version:
 * The `RooDataSet` constructors to construct a dataset from a part of an existing dataset were deprecated in ROOT 6.36 and are now removed. This is to avoid interface duplication. Please use `RooAbsData::reduce()` instead, or if you need to change the weight column, use the universal constructor with the `Import()`, `Cut()`, and `WeightVar()` arguments.
 * The `RooStats::HLFactory` class that was deprecated in ROOT 6.36 is now removed. It provided little advantage over using the RooWorkspace directly or any of the other higher-level frameworks that exist in the RooFit ecosystem.
 * The build options `mysql`, `odbc` and `pgsql`, that were deprecated in ROOT 6.36, are now removed.
-* The `TGLWSIncludes.h` header is deprecated and will be removed in ROOT 6.40
+* The `TGLIncludes.h` and `TGLWSIncludes.h` headers are deprecated and will be removed in ROOT 6.40. Please include your required headers like `<GL/gl.h>` or `<GL/glu.h>` directly.
+* The GLEW headers (`GL/eglew.h`, `GL/glew.h`, `GL/glxew.h`, and `GL/wglew.h`) that are installed when building ROOT with `builtin_glew=ON` are deprecated and will be removed in ROOT 6.40. This is done because ROOT will move away from GLEW for loading OpenGL extensions.
 * The `ROOT::Math::TDataPointN` class that can be used with the `ROOT::Math::KDETree` was removed. Use the templated `TDataPoint<N>` instead.
 * The Parallel ROOT Facility, `PROOF`, has been removed from the repository.
 * After being deprecated for a long period, the `-r` option of `rootcling` has been removed.
@@ -231,7 +232,7 @@ the deprecation period was extended.
    * Support dark mode when store images
    * With 'Shift' key pressed whole graph is moved by dragging action
    * Support `Xall` and `Yall` as projections width
-   * Implement `unzipJSON()` function for data embeding in jupyter
+   * Implement `unzipJSON()` function for data embedding in jupyter
    * Support reading `TBranch` from very old ROOT files with custom streamers
    * Upgrade three.js r174 -> r180
    * Upgrade lil-gui.mjs 0.19.2 -> 0.20.0
@@ -302,7 +303,7 @@ More than 240 items were addressed for this release:
   * [[#19867](https://github.com/root-project/root/issues/19867)] - ROOT dictionary crash related to default template arguments
   * [[#19850](https://github.com/root-project/root/issues/19850)] - Error: "no member named 'getenv' in the global namespace" during the compilation with libc++
   * [[#19834](https://github.com/root-project/root/issues/19834)] - HasColumn crashing for an empty RDataFrame
-  * [[#19820](https://github.com/root-project/root/issues/19820)] - Name collisions in Workspace when using RooAbsPdf.derviative()
+  * [[#19820](https://github.com/root-project/root/issues/19820)] - Name collisions in Workspace when using RooAbsPdf.derivative()
   * [[#19814](https://github.com/root-project/root/issues/19814)] - Regression in 6.34: segfault when using TTreeReader on partially initialized TChain
   * [[#19777](https://github.com/root-project/root/issues/19777)] - Complete roottest/root/meta/callfunc runmemberFunc.C
   * [[#19776](https://github.com/root-project/root/issues/19776)] - “HIST” option for TRatioPlot(TH1*, THStack)
@@ -332,7 +333,7 @@ More than 240 items were addressed for this release:
   * [[#19362](https://github.com/root-project/root/issues/19362)] - [RDF] Automatic axis extension not working with weighted filling
   * [[#19359](https://github.com/root-project/root/issues/19359)] - Incorrect bin error with `TH1::SetBuffer` and `TH1::Sumw2`
   * [[#19349](https://github.com/root-project/root/issues/19349)] - typo: documentation for RooCrystalBall mathematical implementation does not match code implementation
-  * [[#19346](https://github.com/root-project/root/issues/19346)] - Duplicated tests in tree/treeplayer/test lead to ramdom failures
+  * [[#19346](https://github.com/root-project/root/issues/19346)] - Duplicated tests in tree/treeplayer/test lead to random failures
   * [[#19338](https://github.com/root-project/root/issues/19338)] - Feature Request ( Functions for Acoplanarity, Vector and Scalar Pt asymmetries)
   * [[#19333](https://github.com/root-project/root/issues/19333)] - Ninja build cannot start if `builtin_xrootd=ON`
   * [[#19330](https://github.com/root-project/root/issues/19330)] - A partial merge in TFileMerger creates directories that users didn't ask for
@@ -500,7 +501,7 @@ More than 240 items were addressed for this release:
   * [[ROOT-8093](https://its.cern.ch/jira/browse/8093)] - Gaussian with exponential tail(s) in roofit
   * [[ROOT-7973](https://its.cern.ch/jira/browse/7973)] - TChain::LoadTree() can crash when a different tree is read from the same file
   * [[ROOT-7743](https://its.cern.ch/jira/browse/7743)] - TTree AddFriend not working
-  * [[ROOT-7686](https://its.cern.ch/jira/browse/7686)] - TTreeFormula and function arguements
+  * [[ROOT-7686](https://its.cern.ch/jira/browse/7686)] - TTreeFormula and function arguments
   * [[ROOT-7465](https://its.cern.ch/jira/browse/7465)] - TTreeFormula unable to access all but first index of vector branch
   * [[ROOT-7439](https://its.cern.ch/jira/browse/7439)] - Missing TMethodCall::Execute signature
   * [[ROOT-6960](https://its.cern.ch/jira/browse/6960)] - TFormula/TTreeFormula: Virtualize Optimize() and part of AnalyzeFunction()

README/ReleaseNotes/v640/index.md

@@ -36,6 +36,8 @@ The following people have contributed to this new version:
 
 * The `TObject` equality operator pythonization (`TObject.__eq__`) that was deprecated in ROOT 6.38 and scheduled for removal in ROOT 6.40 is removed
 * Comparing C++ `nullptr` objects with `None` in Python now raises a `TypeError`, as announced in the ROOT 6.38 release notes. Use truth-value checks like `if not x` or `x is None` instead.
+* The `TGLIncludes.h` and `TGLWSIncludes.h` that were deprecated in ROOT 6.38 and scheduled for removal are gone now. Please include your required headers like `<GL/gl.h>` or `<GL/glu.h>` directly.
+* The GLEW headers (`GL/eglew.h`, `GL/glew.h`, `GL/glxew.h`, and `GL/wglew.h`) that were installed when building ROOT with `builtin_glew=ON` are no longer installed. This is done because ROOT is moving away from GLEW for loading OpenGL extensions.
 
 ## Build System
 

graf3d/CMakeLists.txt

@@ -15,7 +15,6 @@ if (opengl)
   if(builtin_ftgl)
     add_subdirectory(ftgl)
   endif()
-  add_subdirectory(rglew)
   if(geom)
     add_subdirectory(eve)
     add_subdirectory(gviz3d)

graf3d/eve/CMakeLists.txt

@@ -229,7 +229,7 @@ if(MSVC)
       OpenGL::GL
       OpenGL::GLU
       ${FTGL_LIBRARIES}
-      RGlew
+      GLEW::GLEW
     DEPENDENCIES
       Core
       EG
@@ -264,7 +264,7 @@ else()
       OpenGL::GL
       OpenGL::GLU
       ${FTGL_LIBRARIES}
-      RGlew
+      GLEW::GLEW
     DEPENDENCIES
       Core
       EG

graf3d/eve/src/TGLIncludes.h

@@ -0,0 +1,5 @@
+#ifdef WIN32
+#include "Windows4Root.h"
+#endif
+
+#include <GL/glew.h>

graf3d/ftgl/CMakeLists.txt

@@ -40,7 +40,7 @@ ROOT_LINKER_LIBRARY(FTGL
     OpenGL::GLU
     ${FREETYPE_LIBRARIES}
     ZLIB::ZLIB
-    RGlew
+    GLEW::GLEW
   BUILTINS
     FREETYPE
 )

graf3d/ftgl/inc/FTGL.h

@@ -18,7 +18,11 @@ typedef float    FTGL_FLOAT;
     #define FT_RENDER_MODE_NORMAL ft_render_mode_normal
 #endif
 
-#include "TGLIncludes.h"
+#ifdef WIN32
+#include "Windows4Root.h"
+#endif
+
+#include <GL/glew.h>
 
 #ifndef WIN32
     // Required for compatibility with glext.h style function definitions of

graf3d/gl/CMakeLists.txt

@@ -210,7 +210,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RGL
     ${FTGL_LIBRARIES}
     ${GL2PS_LIBRARIES}
     ${X11_LIBRARIES}
-    RGlew
+    GLEW::GLEW
   DEPENDENCIES
     Hist
     Gui

graf3d/gl/src/TGLIncludes.h

@@ -0,0 +1,5 @@
+#ifdef WIN32
+#include "Windows4Root.h"
+#endif
+
+#include <GL/glew.h>

graf3d/gl/src/TGLOverlayButton.cxx

@@ -14,7 +14,7 @@
 #include "TMath.h"
 
 #include <TGLRnrCtx.h>
-#include <TGLIncludes.h>
+#include "TGLIncludes.h"
 #include <TGLSelectRecord.h>
 #include <TGLUtil.h>
 #include <TGLCamera.h>

graf3d/gl/src/TPointSet3DGL.cxx

@@ -18,7 +18,7 @@
 
 #include <TGLRnrCtx.h>
 #include <TGLSelectRecord.h>
-#include <TGLIncludes.h>
+#include "TGLIncludes.h"
 
 /** \class TPointSet3DGL
 \ingroup opengl

graf3d/gl/src/gl2ps/gl2ps.h

@@ -38,7 +38,7 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include <TGLIncludes.h>
+#include "../TGLIncludes.h"
 
 #define GL2PSDLL_API