Commit Graph

70 Commits (d4e9604700a1dbae3dbce58a3be0fda1465fd39c)

Author SHA1 Message Date
Ansariel 02680c6a8f Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/Boost.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llaudio/llaudiodecodemgr.cpp
#	indra/llxml/llxmltree.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llfloaterworldmap.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llinventorygallerymenu.cpp
#	indra/newview/llpanelgroup.cpp
#	indra/newview/llpanelgroup.h
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/viewer_manifest.py
2024-07-30 12:32:41 +02:00
Rye Mutt 3e322df4fb Replace liburiparser with boost::url 2024-07-29 13:33:12 +03:00
Zi Ree 45aef2c318 Linux - make it compile on linux, gstreamer 0.1 for now, needs to be moved to 1.0, cef probably fails when compiled with volume catcher enabled 2022-09-20 19:29:39 +02:00
Ansariel 1fc3aaff9b Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	.gitignore
#	autobuild.xml
#	indra/CMakeLists.txt
#	indra/cmake/00-Common.cmake
#	indra/cmake/Boost.cmake
#	indra/cmake/BuildVersion.cmake
#	indra/cmake/CEFPlugin.cmake
#	indra/cmake/CMakeLists.txt
#	indra/cmake/CURL.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/DBusGlib.cmake
#	indra/cmake/DragDrop.cmake
#	indra/cmake/FMODSTUDIO.cmake
#	indra/cmake/FindHUNSPELL.cmake
#	indra/cmake/FindJsonCpp.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/FindURIPARSER.cmake
#	indra/cmake/FreeType.cmake
#	indra/cmake/GLH.cmake
#	indra/cmake/Hunspell.cmake
#	indra/cmake/JsonCpp.cmake
#	indra/cmake/LLKDU.cmake
#	indra/cmake/LLPhysicsExtensions.cmake
#	indra/cmake/LLPlugin.cmake
#	indra/cmake/LLWindow.cmake
#	indra/cmake/Linking.cmake
#	indra/cmake/MESHOPTIMIZER.cmake
#	indra/cmake/MediaPluginBase.cmake
#	indra/cmake/NGHTTP2.cmake
#	indra/cmake/OPENAL.cmake
#	indra/cmake/OpenGL.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/cmake/OpenSSL.cmake
#	indra/cmake/PNG.cmake
#	indra/cmake/Tracy.cmake
#	indra/cmake/UI.cmake
#	indra/cmake/Variables.cmake
#	indra/cmake/ViewerMiscLibs.cmake
#	indra/cmake/ZLIBNG.cmake
#	indra/cmake/bugsplat.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/linux_crash_logger/CMakeLists.txt
#	indra/llaudio/CMakeLists.txt
#	indra/llcommon/CMakeLists.txt
#	indra/llcommon/llapp.cpp
#	indra/llcorehttp/CMakeLists.txt
#	indra/llimagej2coj/CMakeLists.txt
#	indra/llinventory/CMakeLists.txt
#	indra/llmath/CMakeLists.txt
#	indra/llmath/llcalcparser.h
#	indra/llmessage/CMakeLists.txt
#	indra/llprimitive/CMakeLists.txt
#	indra/llrender/CMakeLists.txt
#	indra/llrender/llglslshader.cpp
#	indra/llwindow/CMakeLists.txt
#	indra/media_plugins/CMakeLists.txt
#	indra/media_plugins/base/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llxmlrpclistener.cpp
#	indra/newview/llxmlrpctransaction.cpp
#	indra/newview/viewer_manifest.py
#	indra/test/CMakeLists.txt
2022-09-17 23:12:34 +02:00
Ansariel 7991aaffa0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-05 09:59:12 +02:00
Ansariel c1a4be7dae Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/Boost.cmake
#	indra/llappearance/lltexlayer.cpp
#	indra/llinventory/llparcel.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
2022-04-19 13:21:52 +02:00
Nicky 2b151e0aef Round one to support conan for 3P packages, this allows to build the viewer on Linux again. 2022-04-18 18:11:43 +02:00
Nicky 363f2df4fa Remove function create_target and instead directly use add_library 2022-04-17 18:28:55 +02:00
Nicky 6d0bba9c03 Switch over to standard target_link_libraries (cmake requirements are high enough now). 2022-04-17 17:32:14 +02:00
Nicky 241919e7f7 Rework cmake, the original plan was to maybe be able to use conan targets with the same name (that's why 3ps had names like apr::apr),
but it's safer and saner to put the LL 3ps under the ll:: prefix.
This also allows means it is possible to get rid of that bad "if( TRAGET ...) return() endif()" pattern and rather use include_guard().
2022-04-13 19:21:55 +02:00
Nicky d3521b4462 Remove obsolete and unmaintained USE_SYSTEMLIBS 2022-04-13 10:28:46 +02:00
Nicky e98a6b52ee Remove boost_signals, it is not included in the 3p package. 2022-04-06 23:33:06 +02:00
Nicky 786b291d9c Move CMake files to modernized cmake syntax, step 1.
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
2022-04-06 16:32:52 +02:00
Ansariel a637e255f3 Merge branch 'DRTVWR-550-mfa' of https://bitbucket.org/lindenlab/viewer 2022-03-25 09:20:10 +01:00
Nicky df00e8a0b2 There seems to be a reluctance to kill boost for VS2005(!), lets get rid
of it.
2022-02-28 23:23:31 +01:00
Brad Kittenbrink 0f9d4dddf0 DRTVWR-550 unbreak debug build linking on DARWIN. -d suffux libs havent existed for a while 2022-01-14 22:56:54 -08:00
Tonya Souther 742813e105 macOS build fixes. 2020-08-07 21:20:05 -05:00
Nicky Dasmijn 0bf7c936e1 Library name needs to be boost_wave-mt rather than libboost_wave-mt. 2020-07-20 19:22:45 +02:00
Nicky Dasmijn 27715d4d03 Merge remote-tracking branch 'll/d476' into fs-eep-vs2017-d476 2020-05-21 06:54:02 +02:00
Nat Goodspeed 56e4a676e9 DRTVWR-476: For Boost 1.72, must suffix lib names with -x{32,64} 2020-04-09 08:49:08 -04:00
Nat Goodspeed 66981fab0b SL-793: Use Boost.Fiber instead of the "dcoroutine" library.
Longtime fans will remember that the "dcoroutine" library is a Google Summer
of Code project by Giovanni P. Deretta. He originally called it
"Boost.Coroutine," and we originally added it to our 3p-boost autobuild
package as such. But when the official Boost.Coroutine library came along
(with a very different API), and we still needed the API of the GSoC project,
we renamed the unofficial one "dcoroutine" to allow coexistence.

The "dcoroutine" library had an internal low-level API more or less analogous
to Boost.Context. We later introduced an implementation of that internal API
based on Boost.Context, a step towards eliminating the GSoC code in favor of
official, supported Boost code.

However, recent versions of Boost.Context no longer support the API on which
we built the shim for "dcoroutine." We started down the path of reimplementing
that shim using the current Boost.Context API -- then realized that it's time
to bite the bullet and replace the "dcoroutine" API with the Boost.Fiber API,
which we've been itching to do for literally years now.

Naturally, most of the heavy lifting is in llcoros.{h,cpp} and
lleventcoro.{h,cpp} -- which is good: the LLCoros layer abstracts away most of
the differences between "dcoroutine" and Boost.Fiber.

The one feature Boost.Fiber does not provide is the ability to forcibly
terminate some other fiber. Accordingly, disable LLCoros::kill() and
LLCoprocedureManager::shutdown(). The only known shutdown() call was in
LLCoprocedurePool's destructor.

We also took the opportunity to remove postAndSuspend2() and its associated
machinery: FutureListener2, LLErrorEvent, errorException(), errorLog(),
LLCoroEventPumps. All that dual-LLEventPump stuff was introduced at a time
when the Responder pattern was king, and we assumed we'd want to listen on one
LLEventPump with the success handler and on another with the error handler. We
have never actually used that in practice. Remove associated tests, of course.

There is one other semantic difference that necessitates patching a number of
tests: with "dcoroutine," fulfilling a future IMMEDIATELY resumes the waiting
coroutine. With Boost.Fiber, fulfilling a future merely marks the fiber as
ready to resume next time the scheduler gets around to it. To observe the test
side effects, we've inserted a number of llcoro::suspend() calls -- also in
the main loop.

For a long time we retained a single unit test exercising the raw "dcoroutine"
API. Remove that.

Eliminate llcoro_get_id.{h,cpp}, which provided llcoro::get_id(), which was a
hack to emulate fiber-local variables. Since Boost.Fiber has an actual API for
that, remove the hack.

In fact, use (new alias) LLCoros::local_ptr for LLSingleton's dependency
tracking in place of llcoro::get_id().

In CMake land, replace BOOST_COROUTINE_LIBRARY with BOOST_FIBER_LIBRARY. We
don't actually use the Boost.Coroutine for anything (though there exist
plausible use cases).
2020-03-25 17:32:45 -04:00
Nicky e6e66a953e Merge with viewer-vs2017 2019-06-06 14:37:27 +02:00
Nat Goodspeed 26570cfd67 SL-793: Use Boost.Fiber instead of the "dcoroutine" library.
Longtime fans will remember that the "dcoroutine" library is a Google Summer
of Code project by Giovanni P. Deretta. He originally called it
"Boost.Coroutine," and we originally added it to our 3p-boost autobuild
package as such. But when the official Boost.Coroutine library came along
(with a very different API), and we still needed the API of the GSoC project,
we renamed the unofficial one "dcoroutine" to allow coexistence.

The "dcoroutine" library had an internal low-level API more or less analogous
to Boost.Context. We later introduced an implementation of that internal API
based on Boost.Context, a step towards eliminating the GSoC code in favor of
official, supported Boost code.

However, recent versions of Boost.Context no longer support the API on which
we built the shim for "dcoroutine." We started down the path of reimplementing
that shim using the current Boost.Context API -- then realized that it's time
to bite the bullet and replace the "dcoroutine" API with the Boost.Fiber API,
which we've been itching to do for literally years now.

Naturally, most of the heavy lifting is in llcoros.{h,cpp} and
lleventcoro.{h,cpp} -- which is good: the LLCoros layer abstracts away most of
the differences between "dcoroutine" and Boost.Fiber.

The one feature Boost.Fiber does not provide is the ability to forcibly
terminate some other fiber. Accordingly, disable LLCoros::kill() and
LLCoprocedureManager::shutdown(). The only known shutdown() call was in
LLCoprocedurePool's destructor.

We also took the opportunity to remove postAndSuspend2() and its associated
machinery: FutureListener2, LLErrorEvent, errorException(), errorLog(),
LLCoroEventPumps. All that dual-LLEventPump stuff was introduced at a time
when the Responder pattern was king, and we assumed we'd want to listen on one
LLEventPump with the success handler and on another with the error handler. We
have never actually used that in practice. Remove associated tests, of course.

There is one other semantic difference that necessitates patching a number of
tests: with "dcoroutine," fulfilling a future IMMEDIATELY resumes the waiting
coroutine. With Boost.Fiber, fulfilling a future merely marks the fiber as
ready to resume next time the scheduler gets around to it. To observe the test
side effects, we've inserted a number of llcoro::suspend() calls -- also in
the main loop.

For a long time we retained a single unit test exercising the raw "dcoroutine"
API. Remove that.

Eliminate llcoro_get_id.{h,cpp}, which provided llcoro::get_id(), which was a
hack to emulate fiber-local variables. Since Boost.Fiber has an actual API for
that, remove the hack.

In fact, use (new alias) LLCoros::local_ptr for LLSingleton's dependency
tracking in place of llcoro::get_id().

In CMake land, replace BOOST_COROUTINE_LIBRARY with BOOST_FIBER_LIBRARY. We
don't actually use the Boost.Coroutine for anything (though there exist
plausible use cases).
2018-05-10 21:46:07 -04:00
Ansariel 2797c5938a Merge Firestorm LGPL 2016-04-05 10:47:23 +02:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Nicky aedbb55de4 Merge. 2015-12-22 09:04:18 +01:00
Rider Linden 3edc3c5554 CMake fixes for Linux build 2015-12-21 14:26:41 -08:00
Nicky c20277f2f5 Merge. 2015-12-21 20:52:46 +01:00
Rider Linden 7900e2ee77 Another rt link for linux 2015-12-18 15:06:24 -08:00
Rider Linden b98469bd7d Disable unit test on Linux only 2015-12-18 13:53:03 -08:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nicky 55eb540c8e Post-merge; compare with indra\cmake from LL. 2015-05-05 18:59:52 +02:00
Nicky a2034b47d2 Add BOOST_ALL_NO_LIB to prevent boost-autolink. 2015-05-05 18:12:23 +02:00
Ansariel 74fec467dc Backout the library updates and revert to ours for the time being so we don't block further merging up 2015-01-14 00:44:48 +01:00
Ansariel eb2f35764e Merge LL V3.7.14 2015-01-13 23:04:32 +01:00
Ansariel a45088cb6b Merge LL V3.7.11 2015-01-12 12:54:15 +01:00
Monty Brandenberg 29bea5a6b9 Merge. Refresh from viewer-release after 3.7.11 release. 2014-07-08 17:29:48 -04:00
Monty Brandenberg 1422f89612 Linux: Finish new Boost dependencies to get Linux building again. 2014-04-04 21:59:15 +00:00
Monty Brandenberg 469438707d Library updates and switch to 3d-llqtwebkit2 build products.
SDL to 1.2.15, c-ares to latest 1.10.0 build, Boost to 1.55.0
with coroutine updates/fixes, curl to 7.34.0, libpng to 1.6.8,
openssl to 1.0.1e, zlib to latest 1.2.8 build, llqtwebkit
built from 4.7.1 sources refactored and tested in 3p-llqtwebkit2
repository.

Windows is functional with a good number of warning messages
at runtime from libpng and KDU.  MoaP/slplugin functioning.
2014-04-04 16:30:50 -04:00
Oz Linden 776aadf4ef OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS 2014-03-19 17:30:07 -04:00
Oz Linden 545e033d1e merge changes for DRTVWR-299 2013-05-07 15:11:55 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Nat Goodspeed 54e2d2b000 MAINT-2389: Change viewer to Boost package without ucontext.h.
In autobuild.xml, specify today's build of the Boost package that includes the
Boost.Context library, and whose boost::dcoroutines library uses Boost.Context
exclusively instead of its previous context-switching underpinnings (source of
the ucontext.h dependency).
Add BOOST_CONTEXT_LIBRARY to Boost.cmake and Copy3rdPartyLibs.cmake. Link it
with the viewer and with the lllogin.cpp test executable.
Track new Boost package convention that our (early, unofficial) Boost.Coroutine
library is now accessed as boost/dcoroutine/etc.h and boost::dcoroutines::etc.
Remove #include <boost/coroutine/coroutine.hpp> from
llviewerprecompiledheaders.h and lllogin.cpp: old rule that Boost.Coroutine
header must be #included before anything else that might use ucontext.h is
gone now that we no longer depend on ucontext.h. In fact remove
-D_XOPEN_SOURCE in 00-Common.cmake because that was inserted specifically to
work around a known problem with the ucontext.h facilities.
2013-02-21 01:13:24 -05:00
Tonya Souther a732be02cd Since we don't use boost::context for anything anyway, don't try to link it when building standalone. 2013-07-12 17:49:57 -05:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Nat Goodspeed 3581bba282 Fix Boost shared-library version suffixes in Copy3rdPartyLibs.cmake. 2012-11-16 15:39:58 -05:00
Nat Goodspeed eca0637d15 Automated merge with http://hg.secondlife.com/viewer-development 2012-11-16 11:07:36 -05:00
callum_linden dfdab39c5e Stupid typo in Boost Cmake file 2012-11-13 14:58:43 -08:00
callum_linden f4d30bd1ed Update Windows lib names for new Boost package 2012-11-13 14:25:01 -08:00