Drop Globe plugin

Dropping Globe plugin from the QGIS sources. It depends on osgearth no newer than version 2.8, released on 2016-09-05, and which is impossible to build against modern (Qt 5.13+) versions of Qt. With this, the optional QGIS dependency on OpenSceneGraph and osgearth is also removed.
qgis · May 24, 2020 · c91e0e8 · c91e0e8
1 parent 817f194
commit c91e0e8
Show file tree

Hide file tree

Showing 69 changed files with 0 additions and 6,359 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -247,16 +247,6 @@ IF(WITH_CORE)
 
   SET (WITH_GEOREFERENCER TRUE CACHE BOOL "Determines whether GeoReferencer plugin should be built")
 
-  SET (WITH_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be built")
-  IF (WITH_GLOBE)
-    SET(QT_USE_QTOPENGL 1)
-    FIND_PACKAGE(OSGEARTH REQUIRED)
-    IF (OSGEARTHQT_LIBRARY)
-      # following variable is used in qgsconfig.h
-      SET(HAVE_OSGEARTHQT TRUE)
-    ENDIF (OSGEARTHQT_LIBRARY)
-  ENDIF (WITH_GLOBE)
-
   SET (WITH_THREAD_LOCAL TRUE CACHE BOOL "Determines whether std::thread_local should be used")
   MARK_AS_ADVANCED(WITH_THREAD_LOCAL)
 
@@ -746,9 +736,6 @@ IF (WITH_CORE)
       # path for framework references when running from build directory
       # changed later to reference in-app resources upon install
       SET (CMAKE_INSTALL_NAME_DIR ${CMAKE_BINARY_DIR}/output/lib)
-      IF (WITH_GLOBE)
-        SET (OSG_PLUGINS_PATH "" CACHE PATH "Path to OSG plugins for bundling")
-      ENDIF (WITH_GLOBE)
       # recent cmakes force SDKs, recent SDKs don't have user symlinks
       # need to find non-system frameworks
       # cmake bug #0007250 - CMAKE_SHARED_LINKER_FLAGS ignored when creating

diff --git a/cmake/FindOSGEARTH.cmake b/cmake/FindOSGEARTH.cmake
diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -43,7 +43,6 @@
 #endif
 
 #define QT_PLUGINS_DIR "${QT_PLUGINS_DIR}"
-#define OSG_PLUGINS_PATH "${OSG_PLUGINS_PATH}"
 
 #cmakedefine USING_NMAKE
 
@@ -55,8 +54,6 @@
 
 #cmakedefine HAVE_ORACLE
 
-#cmakedefine HAVE_OSGEARTHQT
-
 #cmakedefine SERVER_SKIP_ECW
 
 #cmakedefine HAVE_SERVER_PYTHON_PLUGINS

diff --git a/debian/rules b/debian/rules
@@ -92,7 +92,6 @@ CMAKE_OPTS := \
 	-DWITH_APIDOC=TRUE \
 	-DGENERATE_QHP=TRUE \
 	-DWITH_CUSTOM_WIDGETS=TRUE \
-	-DWITH_GLOBE=FALSE \
 	-DWITH_SERVER=TRUE \
 	-DWITH_SERVER_PLUGINS=TRUE \
 	-DWITH_QWTPOLAR=FALSE \

diff --git a/mac/CMakeLists.txt b/mac/CMakeLists.txt
@@ -8,8 +8,6 @@ IF (APPLE AND QGIS_MACAPP_BUNDLE GREATER -1)
   INSTALL (SCRIPT ${CMAKE_BINARY_DIR}/mac/0qgis.cmake)
   IF (QGIS_MACAPP_BUNDLE GREATER 0)
     # start with Qt
-    CONFIGURE_FILE (cmake/1osg.cmake.in 1osg.cmake @ONLY)
-    INSTALL (SCRIPT ${CMAKE_BINARY_DIR}/mac/1osg.cmake)
     CONFIGURE_FILE (cmake/1qt.cmake.in 1qt.cmake @ONLY)
     INSTALL (SCRIPT ${CMAKE_BINARY_DIR}/mac/1qt.cmake)
     IF (QGIS_MACAPP_BUNDLE GREATER 1)

diff --git a/mac/cmake/0vars.cmake.in b/mac/cmake/0vars.cmake.in
@@ -41,7 +41,6 @@ SET (QGIS_DATA_SUBDIR_REV "@QGIS_DATA_SUBDIR_REV@")
 SET (QGIS_SERVER_MODULE_SUBDIR "@QGIS_SERVER_MODULE_SUBDIR@")
 
 # optional components
-SET (WITH_GLOBE "@WITH_GLOBE@")
 SET (WITH_GRASS "@WITH_GRASS@")
 SET (WITH_SERVER "@WITH_SERVER@")
 SET (WITH_POSTGRESQL "@WITH_POSTGRESQL@")

diff --git a/mac/cmake/1osg.cmake.in b/mac/cmake/1osg.cmake.in
diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in
@@ -34,11 +34,6 @@ IF(@WITH_3D@)
     SET (PYQTLIST ${PYQTLIST} Qt3DCore Qt3DRender Qt3DInput Qt3DLogic Qt3DExtras QtGamepad)
 ENDIF ()
 
-IF(@WITH_GLOBE@)
-    SET (QTLISTQG ${QTLISTQG} QtOpenGL)
-    SET (PYQTLIST ${PYQTLIST} QtOpenGL)
-ENDIF ()
-
 # add Qsci.so, if available
 IF (@QSCI_FOUND@)
     SET (PYQTLIST ${PYQTLIST} Qsci)
@@ -482,15 +477,6 @@ FOREACH (QFW ${QTLISTQG})
         ENDIF ()
         INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QFWDIR}/${_qca_libname}.framework/${_qca_libname}")
     ENDIF (ISLIB)
-    # osgEarthQt
-    IF (@HAVE_OSGEARTHQT@)
-        IF (@OSX_HAVE_LOADERPATH@)
-            SET (QFW_CHG_TO "${ATLOADER}/../../../${LIBPOST}")
-        ENDIF ()
-        FOREACH (OSGFW osgQt osgEarthQt)
-            INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QFWDIR}/${OSGFW}.framework/${OSGFW}")
-        ENDFOREACH (OSGFW)
-    ENDIF (@HAVE_OSGEARTHQT@)
     # QScintilla2
     IF (@OSX_HAVE_LOADERPATH@)
         SET (QFW_CHG_TO "${ATLOADER}/${QGIS_LIB_SUBDIR_REV}/${QGIS_FW_SUBDIR}/${LIBPOST}")
@@ -504,10 +490,6 @@ FOREACH (QFW ${QTLISTQG})
     FOREACH (qca_plugin ${QCA_PLUGINS})
         INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../crypto/libqca-${qca_plugin}.dylib")
     ENDFOREACH ()
-    # osg qfont plugin
-    IF (@HAVE_OSGEARTHQT@)
-        INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../osgPlugins/osgdb_qfont.so")
-    ENDIF (@HAVE_OSGEARTHQT@)
     FOREACH (QI qgif;qico;qjpeg;qsvg;qtiff)
         INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../imageformats/lib${QI}.dylib")
     ENDFOREACH (QI)

diff --git a/ms-windows/cygwin/package.sh b/ms-windows/cygwin/package.sh
@@ -27,12 +27,10 @@ cmake -D BUILDNAME="cygwin" \
         -D WITH_SPATIALITE=TRUE \
         -D WITH_QSPATIALITE=TRUE \
         -D WITH_SERVER=TRUE \
-        -D WITH_GLOBE=TRUE \
         -D WITH_ORACLE=FALSE \
 	-D CMAKE_LEGACY_CYGWIN_WIN32=0 \
 	-D PYUIC4_PROGRAM=/usr/lib/python2.7/site-packages/PyQt4/pyuic4 \
 	-D PYRCC4_PROGRAM=/usr/lib/python2.7/site-packages/PyQt4/pyrcc4.exe \
-	-D WITH_GLOBE=NO \
 	-D ENABLE_TESTS=YES \
 	-D CMAKE_INSTALL_PREFIX=/usr \
 	-D WITH_CUSTOM_WIDGETS=TRUE \

diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -127,7 +127,6 @@ cmake -G "%CMAKEGEN%" ^
 	-D WITH_3D=TRUE ^
 	-D WITH_GRASS7=TRUE ^
 	-D GRASS_PREFIX7=%GRASS_PREFIX:\=/% ^
-	-D WITH_GLOBE=FALSE ^
 	-D WITH_ORACLE=TRUE ^
 	-D WITH_CUSTOM_WIDGETS=TRUE ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -130,7 +130,6 @@ cmake -G "%CMAKEGEN%" ^
 	-D WITH_3D=TRUE ^
 	-D WITH_GRASS7=TRUE ^
 	-D GRASS_PREFIX7=%GRASS_PREFIX:\=/% ^
-	-D WITH_GLOBE=FALSE ^
 	-D WITH_ORACLE=TRUE ^
 	-D WITH_CUSTOM_WIDGETS=TRUE ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^

diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
@@ -21,10 +21,6 @@ IF (WITH_GEOREFERENCER)
   ADD_SUBDIRECTORY(georeferencer)
 ENDIF (WITH_GEOREFERENCER)
 
-IF (WITH_GLOBE)
-  ADD_SUBDIRECTORY(globe)
-ENDIF (WITH_GLOBE)
-
 IF (CUSTOM_PLUGINS)
   ADD_SUBDIRECTORY(${CUSTOM_PLUGINS})
 ENDIF (CUSTOM_PLUGINS)