Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More changes for lib and packaging update

Browse Source
This commit is contained in:
Drake Arconis
2012-07-04 04:41:33 +00:00
parent d0c1c4d753
commit 5748de1f9d
12 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/cmake/DBusGlib.cmake
View File

@@ -7,15 +7,14 @@ if (STANDALONE)
pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1) pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1)
elseif (LINUX) elseif (LINUX)
use_prebuilt_binary(glib) # dbusglib needs glib
use_prebuilt_binary(dbusglib) use_prebuilt_binary(dbusglib)
set(DBUSGLIB_FOUND ON FORCE BOOL) set(DBUSGLIB_FOUND ON FORCE BOOL)
set(DBUSGLIB_INCLUDE_DIRS 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 set(DBUSGLIB_LIBRARIES
dbus-glib-1
gobject-2.0 gobject-2.0
glib-2.0 glib-2.0
) )

2
indra/cmake/ELFIO.cmake
View File

@@ -8,7 +8,7 @@ if (STANDALONE)
elseif (LINUX) elseif (LINUX)
use_prebuilt_binary(elfio) use_prebuilt_binary(elfio)
set(ELFIO_LIBRARIES 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") set(ELFIO_FOUND "YES")
endif (STANDALONE) endif (STANDALONE)

4
indra/cmake/FindJsonCpp.cmake
View File

@@ -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. # 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) SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so)
IF (STANDALONE) IF (STANDALONE)
# On standalone, assume that the system installed library was compiled with the used compiler. # On standalone, assume that the system installed library was compiled with the used compiler.
SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so) SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so)
ENDIF (STANDALONE) ENDIF (STANDALONE)
FIND_LIBRARY(JSONCPP_LIBRARY FIND_LIBRARY(JSONCPP_LIBRARY
NAMES ${JSONCPP_NAMES} NAMES ${JSONCPP_NAMES}

2
indra/cmake/FindLLQtWebkit.cmake
View File

@@ -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}) 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) set(LLQTWEBKIT_LIBRARIES llqtwebkit)
get_filename_component(LLQTWEBKIT_LIBRARY_DIRS ${LLQTWEBKIT_LIBRARY} PATH) get_filename_component(LLQTWEBKIT_LIBRARY_DIRS ${LLQTWEBKIT_LIBRARY} PATH)
endif (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND) endif (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND)

2
indra/cmake/FreeType.cmake
View File

@@ -11,7 +11,7 @@ else (STANDALONE)
set(FREETYPE_INCLUDE_DIRS set(FREETYPE_INCLUDE_DIRS
${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include) ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
else (LINUX) else (LINUX)
set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
endif (LINUX) endif (LINUX)
set(FREETYPE_LIBRARIES freetype) set(FREETYPE_LIBRARIES freetype)

2
indra/cmake/Hunspell.cmake
View File

@@ -9,7 +9,7 @@ else (STANDALONE)
set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell) set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell)
if (LINUX OR DARWIN) if (LINUX OR DARWIN)
set(HUNSPELL_LIBRARY hunspell-1.2) set(HUNSPELL_LIBRARY hunspell-1.3)
else (LINUX OR DARWIN) else (LINUX OR DARWIN)
set(HUNSPELL_LIBRARY libhunspell) set(HUNSPELL_LIBRARY libhunspell)
endif (LINUX OR DARWIN) endif (LINUX OR DARWIN)

4
indra/cmake/LLWindow.cmake
View File

@@ -19,8 +19,8 @@ else (STANDALONE)
if (LINUX AND VIEWER) if (LINUX AND VIEWER)
use_prebuilt_binary(SDL) use_prebuilt_binary(SDL)
set (SDL_FOUND TRUE) set (SDL_FOUND TRUE)
set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux) set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR})
set (SDL_LIBRARY SDL) set (SDL_LIBRARY SDL directfb fusion direct)
endif (LINUX AND VIEWER) endif (LINUX AND VIEWER)
endif (STANDALONE) endif (STANDALONE)

2
indra/cmake/NDOF.cmake
View File

@@ -15,7 +15,7 @@ else (STANDALONE)
set(NDOF_LIBRARY ndofdev) set(NDOF_LIBRARY ndofdev)
endif (WINDOWS) 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) set(NDOF_FOUND 1)
endif (STANDALONE) endif (STANDALONE)

2
indra/cmake/OpenGL.cmake
View File

@@ -6,5 +6,5 @@ if (NOT (STANDALONE OR DARWIN))
# possible glh_linear should have its own .cmake file instead # possible glh_linear should have its own .cmake file instead
#use_prebuilt_binary(glh_linear) #use_prebuilt_binary(glh_linear)
# actually... not any longer, it's now in git -SG # 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 () endif ()

2
indra/cmake/PulseAudio.cmake
View File

@@ -13,7 +13,7 @@ if (PULSEAUDIO)
use_prebuilt_binary(pulseaudio) use_prebuilt_binary(pulseaudio)
set(PULSEAUDIO_FOUND ON FORCE BOOL) set(PULSEAUDIO_FOUND ON FORCE BOOL)
set(PULSEAUDIO_INCLUDE_DIRS 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 # We don't need to explicitly link against pulseaudio itself, because
# the viewer probes for the system's copy at runtime. # the viewer probes for the system's copy at runtime.

2
indra/newview/viewer_manifest.py
View File

@@ -801,7 +801,7 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libdirectfb-1.*.so*") self.path("libdirectfb-1.*.so*")
self.path("libfusion-1.*.so*") self.path("libfusion-1.*.so*")
self.path("libexpat.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("libssl.so*")
self.path("libuuid.so*") self.path("libuuid.so*")
self.path("libalut.so") self.path("libalut.so")

32
install.xml
View File

@@ -278,9 +278,9 @@
<key>linux</key> <key>linux</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>5bbf7e33dadc7d046dcf44883a9ec3d0</string> <string>e4a22c3401a0f938ee0a6a2becfa7840</string>
<key>url</key> <key>url</key>
<uri>http://imprudenceviewer.org/download/libs/dbusglib-linux-20101031.tar.bz2</uri> <uri>https://github.com/downloads/LightDrake/Public-Libraries/dbus_glib-0.76-linux-20110310.tar.bz2</uri>
</map> </map>
<key>linux64</key> <key>linux64</key>
<map> <map>
@@ -300,9 +300,9 @@
<key>linux</key> <key>linux</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>048f301afc327d4502d2e5111c0dcba0</string> <string>fb4e8f07c7f3e86cc8baa73f8c02f777</string>
<key>url</key> <key>url</key>
<uri>https://github.com/downloads/LightDrake/Public-Libraries/elfio-1.0.3-linux-20110225.tar.bz2</uri> <uri>https://github.com/downloads/LightDrake/Public-Libraries/elfio-1.0.3-linux-20080812.tar.bz2</uri>
</map> </map>
<key>linux64</key> <key>linux64</key>
<map> <map>
@@ -407,9 +407,9 @@
<key>linux</key> <key>linux</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>efc845cf291073b1e4d381a271f194eb</string> <string>155c50560099db8a37540c50d9ee48d0</string>
<key>url</key> <key>url</key>
<uri>http://imprudenceviewer.org/download/libs/freetype-2.3.11-linux-20091103.tar.bz2</uri> <uri>https://github.com/downloads/LightDrake/Public-Libraries/freetype-2.3.11-linux-20091103_1.tar.bz2</uri>
</map> </map>
<key>linux64</key> <key>linux64</key>
<map> <map>
@@ -511,9 +511,9 @@
<key>linux</key> <key>linux</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>566cc47a572303bc4aef12ca02670902</string> <string>bc5bf517ada0a3a1036e7e193884db79</string>
<key>url</key> <key>url</key>
<uri>http://imprudenceviewer.org/download/libs/glib-2.20.5-linux32-20100529.tar.bz2</uri> <uri>https://github.com/downloads/LightDrake/Public-Libraries/glib-2.20.5-linux32-20100529.tar.bz2</uri>
</map> </map>
<key>linux64</key> <key>linux64</key>
<map> <map>
@@ -643,9 +643,9 @@
<key>linux</key> <key>linux</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>dbe264ef2e932980e31db646ea29bbe7</string> <string>bc470ff6673553c5580ccb47958d7789</string>
<key>url</key> <key>url</key>
<uri>http://imprudenceviewer.org/download/libs/hunspell-1.2-linux32-20100902.tar.bz2</uri> <uri>https://github.com/downloads/LightDrake/Public-Libraries/libhunspell-1.3.2-linux-20120616.tar.bz2</uri>
</map> </map>
<key>linux64</key> <key>linux64</key>
<map> <map>
@@ -866,9 +866,9 @@
<key>linux</key> <key>linux</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>70d0bbe1145fff29a0131349c898260e</string> <string>a816df4887085fb0f0d301336d87cd70</string>
<key>url</key> <key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-linux-20080812.tar.bz2</uri> <uri>https://github.com/downloads/LightDrake/Public-Libraries/mesa-7.0-linux-20100930.tar.bz2</uri>
</map> </map>
<key>linux64</key> <key>linux64</key>
<map> <map>
@@ -906,9 +906,9 @@
<key>linux</key> <key>linux</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>38abfe002ba073b6824016db98269972</string> <string>c366f71de80a56c7336c5166520b40a5</string>
<key>url</key> <key>url</key>
<uri>http://imprudenceviewer.org/download/libs/ndofdev-linux32-0.3.1-20100817.tar.bz2</uri> <uri>https://github.com/downloads/LightDrake/Public-Libraries/ndofdev-linux32-0.3.1_1-20100817.tar.bz2</uri>
</map> </map>
<key>linux64</key> <key>linux64</key>
<map> <map>
@@ -1055,9 +1055,9 @@
<key>linux</key> <key>linux</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>30cb00069fe2a545fbf7be1070386236</string> <string>6c7325be47ddce71a3fbbd24621f86e1</string>
<key>url</key> <key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2</uri> <uri>https://github.com/downloads/LightDrake/Public-Libraries/linux-pulse-headers-0.9.14_1.tar.bz2</uri>
</map> </map>
</map> </map>
</map> </map>