From d6997696014b5f81cd6d7a110455ac2b7ca9701a Mon Sep 17 00:00:00 2001 From: Nicky Date: Mon, 17 Aug 2020 21:43:43 +0200 Subject: [PATCH] Add glib package and use this instead of the old glib+gtk+atk+... --- autobuild.xml | 28 +++++++++++++++++++ indra/cmake/00-Common.cmake | 11 -------- indra/cmake/DBusGlib.cmake | 9 ++---- indra/cmake/GLIB.cmake | 11 ++++++++ indra/cmake/GStreamer010Plugin.cmake | 9 +++--- indra/cmake/GStreamer10Plugin.cmake | 9 +++--- indra/media_plugins/CMakeLists.txt | 3 +- .../media_plugins/gstreamer10/CMakeLists.txt | 1 + indra/newview/CMakeLists.txt | 2 +- 9 files changed, 55 insertions(+), 28 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index e77bc889e5..ba2e20ca20 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3,6 +3,34 @@ installables + glib + + copyright + Copyright (C) glib project + license + LGPL + license_file + LICENSES/glib.txt + name + glib + platforms + + linux64 + + archive + + hash + 9c93ba8b8af97fc8379f77de77e1540a + url + http://3p.firestormviewer.org/glib-2.48.0.202301938-linux64-202301938.tar.bz2 + + name + linux + + + version + 2.48.0 + fltk copyright diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 34aed62ba0..f7b68aa76d 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -270,17 +270,6 @@ if (USESYSTEMLIBS) if (LINUX AND ADDRESS_SIZE EQUAL 32) add_definitions(-march=pentiumpro) endif (LINUX AND ADDRESS_SIZE EQUAL 32) - -else (USESYSTEMLIBS) - set(${ARCH}_linux_INCLUDES - atk-1.0 - cairo - freetype - glib-2.0 - gstreamer-0.10 - gtk-2.0 - pango-1.0 - ) endif (USESYSTEMLIBS) endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake index 0010c48c52..d0f6c221cc 100644 --- a/indra/cmake/DBusGlib.cmake +++ b/indra/cmake/DBusGlib.cmake @@ -12,14 +12,11 @@ elseif (LINUX) use_prebuilt_binary(dbus_glib) set(DBUSGLIB_FOUND ON FORCE BOOL) set(DBUSGLIB_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/include/dbus - ) + ${GLIB_INCLUDE_DIRS} + ${LIBS_PREBUILT_DIR}/include/dbus + ) # We don't need to explicitly link against dbus-glib itself, because # the viewer probes for the system's copy at runtime. - set(DBUSGLIB_LIBRARIES - gobject-2.0 - glib-2.0 - ) endif (USESYSTEMLIBS) if (DBUSGLIB_FOUND) diff --git a/indra/cmake/GLIB.cmake b/indra/cmake/GLIB.cmake index e69de29bb2..0024cb26ac 100644 --- a/indra/cmake/GLIB.cmake +++ b/indra/cmake/GLIB.cmake @@ -0,0 +1,11 @@ + +include(Prebuilt) + +if( LINUX ) + use_prebuilt_binary(glib) + set(GLIB_FOUND ON CACHE BOOL "Build against glib 2") + set(GLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/glib-2.0 ${LIBS_PREBUILT_DIR}/lib/release/glib-2.0/include ) + set(GLIB_LIBRARIES libgobject-2.0.a libglib-2.0.a libffi.a libpcre.a) + + add_definitions(-DLL_GLIB=1) +endif() diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake index 3fbc40ef8f..2a41cc5314 100644 --- a/indra/cmake/GStreamer010Plugin.cmake +++ b/indra/cmake/GStreamer010Plugin.cmake @@ -1,5 +1,6 @@ # -*- cmake -*- include(Prebuilt) +include(GLIB) if (USESYSTEMLIBS) include(FindPkgConfig) @@ -13,10 +14,10 @@ elseif (LINUX) set(GSTREAMER010_FOUND ON FORCE BOOL) set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL) set(GSTREAMER010_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/include/gstreamer-0.10 - ${LIBS_PREBUILT_DIR}/include/glib-2.0 - ${LIBS_PREBUILT_DIR}/include/libxml2 - ) + ${GLIB_INCLUDE_DIRS} + ${LIBS_PREBUILT_DIR}/include/gstreamer-0.10 + ${LIBS_PREBUILT_DIR}/include/libxml2 + ) # We don't need to explicitly link against gstreamer itself, because # LLMediaImplGStreamer probes for the system's copy at runtime. set(GSTREAMER010_LIBRARIES diff --git a/indra/cmake/GStreamer10Plugin.cmake b/indra/cmake/GStreamer10Plugin.cmake index 4f9d255436..ded45da610 100644 --- a/indra/cmake/GStreamer10Plugin.cmake +++ b/indra/cmake/GStreamer10Plugin.cmake @@ -1,5 +1,6 @@ # -*- cmake -*- include(Prebuilt) +include(GLIB) if (USESYSTEMLIBS) include(FindPkgConfig) @@ -12,10 +13,10 @@ elseif (LINUX OR WINDOWS) set(GSTREAMER10_FOUND ON FORCE BOOL) set(GSTREAMER10_PLUGINS_BASE_FOUND ON FORCE BOOL) set(GSTREAMER10_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/include/gstreamer-1.0 - ${LIBS_PREBUILT_DIR}/include/glib-2.0 - ${LIBS_PREBUILT_DIR}/include/libxml2 - ) + ${GLIB_INCLUDE_DIRS} + ${LIBS_PREBUILT_DIR}/include/gstreamer-1.0 + ${LIBS_PREBUILT_DIR}/include/libxml2 + ) # We don't need to explicitly link against gstreamer itself, because # LLMediaImplGStreamer probes for the system's copy at runtime. set(GSTREAMER10_LIBRARIES) diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt index ac4bbecc76..b12382c814 100644 --- a/indra/media_plugins/CMakeLists.txt +++ b/indra/media_plugins/CMakeLists.txt @@ -8,9 +8,8 @@ if (LINUX) add_subdirectory(example) if( GLIB_FOUND ) add_subdirectory(gstreamer10) - else() - add_subdirectory(libvlc) endif() + add_subdirectory(libvlc) add_subdirectory(cef) endif (LINUX) diff --git a/indra/media_plugins/gstreamer10/CMakeLists.txt b/indra/media_plugins/gstreamer10/CMakeLists.txt index 3a98df5da1..730a2c27fb 100644 --- a/indra/media_plugins/gstreamer10/CMakeLists.txt +++ b/indra/media_plugins/gstreamer10/CMakeLists.txt @@ -13,6 +13,7 @@ include(Linking) include(PluginAPI) include(MediaPluginBase) include(OpenGL) +include(GLIB) include(GStreamer10Plugin) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 638a2fdb0a..f9e63ea261 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2438,7 +2438,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${BOOST_WAVE_LIBRARY} #FS specific ${BOOST_THREAD_LIBRARY} #FS specific ${BOOST_CONTEXT_LIBRARY} - ${DBUSGLIB_LIBRARIES} + ${GLIB_LIBRARIES} ${OPENGL_LIBRARIES} ${FMODWRAPPER_LIBRARY} # must come after LLAudio ${OPENAL_LIBRARIES}