From 5748de1f9d50e5e59e14ce6cfaacc6eb1d0dd470 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Wed, 4 Jul 2012 04:41:33 +0000 Subject: [PATCH] More changes for lib and packaging update --- indra/cmake/DBusGlib.cmake | 7 +++---- indra/cmake/ELFIO.cmake | 2 +- indra/cmake/FindJsonCpp.cmake | 4 ++-- indra/cmake/FindLLQtWebkit.cmake | 2 +- indra/cmake/FreeType.cmake | 2 +- indra/cmake/Hunspell.cmake | 2 +- indra/cmake/LLWindow.cmake | 4 ++-- indra/cmake/NDOF.cmake | 2 +- indra/cmake/OpenGL.cmake | 2 +- indra/cmake/PulseAudio.cmake | 2 +- indra/newview/viewer_manifest.py | 2 +- install.xml | 32 ++++++++++++++++---------------- 12 files changed, 31 insertions(+), 32 deletions(-) diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake index b78a0b1e7..05266eb9c 100644 --- a/indra/cmake/DBusGlib.cmake +++ b/indra/cmake/DBusGlib.cmake @@ -7,15 +7,14 @@ if (STANDALONE) pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1) elseif (LINUX) - use_prebuilt_binary(glib) # dbusglib needs glib use_prebuilt_binary(dbusglib) set(DBUSGLIB_FOUND ON FORCE BOOL) set(DBUSGLIB_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 + ${LIBS_PREBUILT_DIR}/${LL_ARCH_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 - dbus-glib-1 gobject-2.0 glib-2.0 ) diff --git a/indra/cmake/ELFIO.cmake b/indra/cmake/ELFIO.cmake index e51993b0f..fbde78311 100644 --- a/indra/cmake/ELFIO.cmake +++ b/indra/cmake/ELFIO.cmake @@ -8,7 +8,7 @@ if (STANDALONE) elseif (LINUX) use_prebuilt_binary(elfio) set(ELFIO_LIBRARIES ELFIO) - set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) + set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) set(ELFIO_FOUND "YES") endif (STANDALONE) diff --git a/indra/cmake/FindJsonCpp.cmake b/indra/cmake/FindJsonCpp.cmake index 7dfc2b097..44ab0e769 100644 --- a/indra/cmake/FindJsonCpp.cmake +++ b/indra/cmake/FindJsonCpp.cmake @@ -24,8 +24,8 @@ EXEC_PROGRAM(${CMAKE_CXX_COMPILER} # Try to find a library that was compiled with the same compiler version as we currently use. SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so) IF (STANDALONE) - # On standalone, assume that the system installed library was compiled with the used compiler. - SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so) + # On standalone, assume that the system installed library was compiled with the used compiler. + SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so) ENDIF (STANDALONE) FIND_LIBRARY(JSONCPP_LIBRARY NAMES ${JSONCPP_NAMES} diff --git a/indra/cmake/FindLLQtWebkit.cmake b/indra/cmake/FindLLQtWebkit.cmake index c747ec32a..731ae67d7 100644 --- a/indra/cmake/FindLLQtWebkit.cmake +++ b/indra/cmake/FindLLQtWebkit.cmake @@ -35,7 +35,7 @@ find_path(LLQTWEBKIT_INCLUDE_DIR llqtwebkit.h NO_SYSTEM_ENVIRONMENT_PATH HINTS $ find_library(LLQTWEBKIT_LIBRARY NAMES llqtwebkit NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_LIBRARY_DIRS}) -if (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND) # If pkg-config couldn't find it, pretend we don't have pkg-config. +if (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND) # If pkg-config couldn't find it, pretend we don't have pkg-config. set(LLQTWEBKIT_LIBRARIES llqtwebkit) get_filename_component(LLQTWEBKIT_LIBRARY_DIRS ${LLQTWEBKIT_LIBRARY} PATH) endif (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND) diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake index 5f1aa26e8..e9d4d8093 100644 --- a/indra/cmake/FreeType.cmake +++ b/indra/cmake/FreeType.cmake @@ -11,7 +11,7 @@ else (STANDALONE) set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) else (LINUX) - set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif (LINUX) set(FREETYPE_LIBRARIES freetype) diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake index cd5d7e00b..365df6783 100644 --- a/indra/cmake/Hunspell.cmake +++ b/indra/cmake/Hunspell.cmake @@ -9,7 +9,7 @@ else (STANDALONE) set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell) if (LINUX OR DARWIN) - set(HUNSPELL_LIBRARY hunspell-1.2) + set(HUNSPELL_LIBRARY hunspell-1.3) else (LINUX OR DARWIN) set(HUNSPELL_LIBRARY libhunspell) endif (LINUX OR DARWIN) diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake index 5cf92335e..e32409020 100644 --- a/indra/cmake/LLWindow.cmake +++ b/indra/cmake/LLWindow.cmake @@ -19,8 +19,8 @@ else (STANDALONE) if (LINUX AND VIEWER) use_prebuilt_binary(SDL) set (SDL_FOUND TRUE) - set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux) - set (SDL_LIBRARY SDL) + set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}) + set (SDL_LIBRARY SDL directfb fusion direct) endif (LINUX AND VIEWER) endif (STANDALONE) diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake index bdf5db130..a4e210405 100644 --- a/indra/cmake/NDOF.cmake +++ b/indra/cmake/NDOF.cmake @@ -15,7 +15,7 @@ else (STANDALONE) set(NDOF_LIBRARY ndofdev) endif (WINDOWS) - set(NDOF_INCLUDE_DIR ${ARCH_PREBUILT_DIRS}/include/ndofdev) + set(NDOF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ndofdev) set(NDOF_FOUND 1) endif (STANDALONE) diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake index 5ba730c4a..91d949409 100644 --- a/indra/cmake/OpenGL.cmake +++ b/indra/cmake/OpenGL.cmake @@ -6,5 +6,5 @@ if (NOT (STANDALONE OR DARWIN)) # possible glh_linear should have its own .cmake file instead #use_prebuilt_binary(glh_linear) # actually... not any longer, it's now in git -SG - set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) + set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) endif () diff --git a/indra/cmake/PulseAudio.cmake b/indra/cmake/PulseAudio.cmake index e918de019..dafdd4163 100644 --- a/indra/cmake/PulseAudio.cmake +++ b/indra/cmake/PulseAudio.cmake @@ -13,7 +13,7 @@ if (PULSEAUDIO) use_prebuilt_binary(pulseaudio) set(PULSEAUDIO_FOUND ON FORCE BOOL) set(PULSEAUDIO_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/include + ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include ) # We don't need to explicitly link against pulseaudio itself, because # the viewer probes for the system's copy at runtime. diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 6fe1ef0e2..402fb836d 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -801,7 +801,7 @@ class Linux_i686Manifest(LinuxManifest): self.path("libdirectfb-1.*.so*") self.path("libfusion-1.*.so*") self.path("libexpat.so*") - self.path("libhunspell-1.2.so.0.0.0", "libhunspell-1.2.so.0") + self.path("libhunspell-*.so.*") self.path("libssl.so*") self.path("libuuid.so*") self.path("libalut.so") diff --git a/install.xml b/install.xml index fea7efb08..e290aaa47 100644 --- a/install.xml +++ b/install.xml @@ -278,9 +278,9 @@ linux md5sum - 5bbf7e33dadc7d046dcf44883a9ec3d0 + e4a22c3401a0f938ee0a6a2becfa7840 url - http://imprudenceviewer.org/download/libs/dbusglib-linux-20101031.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/dbus_glib-0.76-linux-20110310.tar.bz2 linux64 @@ -300,9 +300,9 @@ linux md5sum - 048f301afc327d4502d2e5111c0dcba0 + fb4e8f07c7f3e86cc8baa73f8c02f777 url - https://github.com/downloads/LightDrake/Public-Libraries/elfio-1.0.3-linux-20110225.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/elfio-1.0.3-linux-20080812.tar.bz2 linux64 @@ -407,9 +407,9 @@ linux md5sum - efc845cf291073b1e4d381a271f194eb + 155c50560099db8a37540c50d9ee48d0 url - http://imprudenceviewer.org/download/libs/freetype-2.3.11-linux-20091103.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/freetype-2.3.11-linux-20091103_1.tar.bz2 linux64 @@ -511,9 +511,9 @@ linux md5sum - 566cc47a572303bc4aef12ca02670902 + bc5bf517ada0a3a1036e7e193884db79 url - http://imprudenceviewer.org/download/libs/glib-2.20.5-linux32-20100529.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/glib-2.20.5-linux32-20100529.tar.bz2 linux64 @@ -643,9 +643,9 @@ linux md5sum - dbe264ef2e932980e31db646ea29bbe7 + bc470ff6673553c5580ccb47958d7789 url - http://imprudenceviewer.org/download/libs/hunspell-1.2-linux32-20100902.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/libhunspell-1.3.2-linux-20120616.tar.bz2 linux64 @@ -866,9 +866,9 @@ linux md5sum - 70d0bbe1145fff29a0131349c898260e + a816df4887085fb0f0d301336d87cd70 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-linux-20080812.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/mesa-7.0-linux-20100930.tar.bz2 linux64 @@ -906,9 +906,9 @@ linux md5sum - 38abfe002ba073b6824016db98269972 + c366f71de80a56c7336c5166520b40a5 url - http://imprudenceviewer.org/download/libs/ndofdev-linux32-0.3.1-20100817.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/ndofdev-linux32-0.3.1_1-20100817.tar.bz2 linux64 @@ -1055,9 +1055,9 @@ linux md5sum - 30cb00069fe2a545fbf7be1070386236 + 6c7325be47ddce71a3fbbd24621f86e1 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2 + https://github.com/downloads/LightDrake/Public-Libraries/linux-pulse-headers-0.9.14_1.tar.bz2