From 13dc1cce1d2a1fe30cfd92b62e80382f43faf644 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 25 Apr 2022 18:33:50 -0400
Subject: [PATCH] Rip out glod
---
autobuild.xml | 58 -------------------------
indra/cmake/CMakeLists.txt | 1 -
indra/cmake/Copy3rdPartyLibs.cmake | 4 --
indra/cmake/GLOD.cmake | 18 --------
indra/newview/CMakeLists.txt | 8 ----
indra/newview/licenses-win32.txt | 69 ------------------------------
indra/newview/viewer_manifest.py | 6 ---
7 files changed, 164 deletions(-)
delete mode 100644 indra/cmake/GLOD.cmake
diff --git a/autobuild.xml b/autobuild.xml
index 6bec440e391..bb5677ed478 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -771,64 +771,6 @@
<key>version</key>
<string>2.12.1</string>
</map>
- <key>glod</key>
- <map>
- <key>copyright</key>
- <string>Copyright 2003 Jonathan Cohen, Nat Duca, David Luebke, Brenden Schubert - Johns Hopkins University and University of Virginia</string>
- <key>license</key>
- <string>GLOD Open-Source License Version 1.0</string>
- <key>license_file</key>
- <string>LICENSES/GLOD.txt</string>
- <key>name</key>
- <string>glod</string>
- <key>platforms</key>
- <map>
- <key>darwin64</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>999502c58fed6ac261a35394c1f98380c5a4e5991bc0138090a02a9796515a487e33087799fc3ba2bf7df2f62514059f91af4f4fdb71540d2b71ca802afebcc6</string>
- <key>hash_algorithm</key>
- <string>blake2b</string>
- <key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/116/packages/generic/glod/1.0.3.1312/glod-1.0.3-darwin64-1312.tar.zst</string>
- </map>
- <key>name</key>
- <string>darwin64</string>
- </map>
- <key>linux64</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>4a5fa692403499d53b4674b32ff3f4fa1c196e618dd14f1e6327dcd10a9ab7ebf6fd220385a84a1f8629b4d020486eff2ded9bf69e3ef3308fe6a4a304fdb195</string>
- <key>hash_algorithm</key>
- <string>blake2b</string>
- <key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/116/packages/generic/glod/1.0.3.1312/glod-1.0.3-linux64-1312.tar.zst</string>
- </map>
- <key>name</key>
- <string>linux64</string>
- </map>
- <key>windows64</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>4dbbb434b9ee4c99896690eb3b65c54cce553798a00a0c103d3220b8f7445c870c3b7e31dd5874880982569f16c28f5412a4d5c3e9697dbb6ae36e800d693459</string>
- <key>hash_algorithm</key>
- <string>blake2b</string>
- <key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/116/packages/generic/glod/1.0.3.1312/glod-1.0.3-windows64-1312.tar.zst</string>
- </map>
- <key>name</key>
- <string>windows64</string>
- </map>
- </map>
- <key>version</key>
- <string>1.0.3</string>
- </map>
<key>gstreamer</key>
<map>
<key>copyright</key>
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 024e4972dae..b561b437e21 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -33,7 +33,6 @@ set(cmake_SOURCE_FILES
FMODSTUDIO.cmake
FreeType.cmake
GLEXT.cmake
- GLOD.cmake
GStreamer010Plugin.cmake
Hunspell.cmake
JPEG.cmake
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 281e04085b5..2ce9ee73d40 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -79,7 +79,6 @@ if(WINDOWS)
set(debug_files
epoxy-0.dll
libexpatd.dll
- glod.dll
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
@@ -95,7 +94,6 @@ if(WINDOWS)
set(release_files
epoxy-0.dll
libexpat.dll
- glod.dll
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
@@ -148,7 +146,6 @@ elseif(DARWIN)
libaprutil-1.0.dylib
libaprutil-1.dylib
${EXPAT_COPY}
- libGLOD.dylib
libhunspell-1.7.0.dylib
libndofdev.dylib
)
@@ -187,7 +184,6 @@ elseif(LINUX)
libapr-1.so.0
libaprutil-1.so.0
${EXPAT_COPY}
- libGLOD.so
libopenal.so
libepoxy.so
libepoxy.so.0
diff --git a/indra/cmake/GLOD.cmake b/indra/cmake/GLOD.cmake
deleted file mode 100644
index ecd27a0822f..00000000000
--- a/indra/cmake/GLOD.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- cmake -*-
-include(Linking)
-include(Prebuilt)
-
-if (NOT USESYSTEMLIBS)
- use_prebuilt_binary(glod)
-endif (NOT USESYSTEMLIBS)
-
-set(GLODLIB ON CACHE BOOL "Using GLOD library")
-
-set(GLOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-if (WINDOWS)
- set(GLOD_LIBRARIES
- debug ${ARCH_PREBUILT_DIRS_DEBUG}/glod.lib
- optimized ${ARCH_PREBUILT_DIRS_RELEASE}/glod.lib)
-else ()
- set(GLOD_LIBRARIES GLOD)
-endif ()
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index c9023b25387..7e8febe207c 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -19,7 +19,6 @@ include(Epoxy)
include(EXPAT)
include(FMODSTUDIO)
include(Fonts)
-include(GLOD)
include(Hunspell)
include(JPEGEncoderBasic)
include(LibXML2)
@@ -75,7 +74,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${DBUSGLIB_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
- ${GLOD_INCLUDE_DIR}
${LIBXML2_INCLUDE_DIRS}
${LLAUDIO_INCLUDE_DIRS}
${LLCHARACTER_INCLUDE_DIRS}
@@ -1837,10 +1835,6 @@ if (USE_FMODSTUDIO)
set(FMODWRAPPER_LIBRARY ${FMODSTUDIO_LIBRARY})
endif (USE_FMODSTUDIO)
-if (GLODLIB)
- set_source_files_properties(llfloatermodelpreview.cpp PROPERTIES COMPILE_FLAGS "-DLL_GLOD")
-endif (GLODLIB)
-
list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES})
set_source_files_properties(${viewer_HEADER_FILES}
@@ -1920,7 +1914,6 @@ if (WINDOWS)
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/libapr-1.dll
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/libaprutil-1.dll
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/libapriconv-1.dll
- ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/glod.dll
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/openjp2.dll
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/libhunspell.dll
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/epoxy-0.dll
@@ -2182,7 +2175,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${DBUSGLIB_LIBRARIES}
${EPOXY_LIBRARIES}
${FMODWRAPPER_LIBRARY} # must come after LLAudio
- ${GLOD_LIBRARIES}
${SDL_LIBRARIES}
${SMARTHEAP_LIBRARY}
${UI_LIBRARIES}
diff --git a/indra/newview/licenses-win32.txt b/indra/newview/licenses-win32.txt
index 98edd35beaa..cdc50f679d0 100644
--- a/indra/newview/licenses-win32.txt
+++ b/indra/newview/licenses-win32.txt
@@ -769,72 +769,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-=============
-GLOD license
-=============
-The GLOD Open-Source License Version 1.0 June 16, 2004
-
-Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns
-Hopkins University and David Luebke, Brenden Schubert, University of
-Virginia. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, is permitted provided that the following conditions are
-met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer and
- request.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer and
- request in the documentation and/or other materials provided with
- the distribution.
-
-3. The name "GLOD" must not be used to endorse or promote products
- derived from this software without prior written permission.
-
-4. Redistributions of any modified version of this source, whether in
- source or binary form , must include a form of the following
- acknowledgment: "This product is derived from the GLOD library,
- which is available from http://www.cs.jhu.edu/~graphics/GLOD."
-
-5. Redistributions of any modified version of this source in binary
- form must provide, free of charge, access to the modified version
- of the code.
-
-6. This license shall be governed by and construed and enforced in
- accordance with the laws of the State of Maryland, without
- reference to its conflicts of law provisions. The exclusive
- jurisdiction and venue for all legal actions relating to this
- license shall be in courts of competent subject matter jurisdiction
- located in the State of Maryland.
-
-TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, GLOD IS PROVIDED
-UNDER THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND,
-EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-THAT GLOD IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-PURPOSE OR NON-INFRINGING. ALL WARRANTIES ARE DISCLAIMED AND THE
-ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE CODE IS WITH
-YOU. SHOULD ANY CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-COPYRIGHT HOLDER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
-NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY
-CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY CODE IS
-AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR ANY OTHER CONTRIBUTOR BE LIABLE FOR ANY
-SPECIAL, INCIDENTAL, INDIRECT, OR CONSEQUENTIAL DAMAGES FOR LOSS OF
-PROFITS, REVENUE, OR FOR LOSS OF INFORMATION OR ANY OTHER LOSS.
-
-YOU EXPRESSLY AGREE TO FOREVER INDEMNIFY, DEFEND AND HOLD HARMLESS THE
-COPYRIGHT HOLDERS AND CONTRIBUTORS OF GLOD AGAINST ALL CLAIMS,
-DEMANDS, SUITS OR OTHER ACTIONS ARISING DIRECTLY OR INDIRECTLY FROM
-YOUR ACCEPTANCE AND USE OF GLOD.
-
-Although NOT REQUIRED, we would appreciate it if active users of GLOD
-put a link on their web site to the GLOD web site when possible.
-
-
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 8fcdbbb6cbf..48eb0952d6e 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -464,9 +464,6 @@ def construct(self):
self.path("libapriconv-1.dll")
self.path("libaprutil-1.dll")
- # Mesh 3rd party libs needed for auto LOD and collada reading
- self.path("glod.dll")
-
# For image support
self.path("openjp2.dll")
@@ -838,7 +835,6 @@ def construct(self):
'libapr-1.*.dylib',
'libaprutil-1.*.dylib',
'libepoxy.*.dylib',
- 'libGLOD.dylib',
'libhunspell-*.dylib',
'libndofdev.dylib',
):
@@ -1216,7 +1212,6 @@ def construct(self):
self.path("libaprutil-1.so*")
self.path("libdb*.so")
self.path("libexpat.so.*")
- self.path("libGLOD.so")
self.path("libSDL2*.so*")
self.path("libopenjp2.*so*")
self.path("libepoxy.so")
@@ -1258,7 +1253,6 @@ def construct(self):
self.path("libapr-1.so*")
self.path("libaprutil-1.so*")
self.path("libexpat.so.*")
- self.path("libGLOD.so")
self.path("libSDL2*.so*")
self.path("libopenjp2.*so*")
self.path("libepoxy.so")
--
GitLab