From eceee44dd3c990c536574aafa0a0084e9c8c7c57 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Fri, 8 Jul 2011 16:43:43 +0200 Subject: Linux: update OpenAL to 1.13.0 for Linux64 the 32bit compatibility libs (32bit openal et al.) are now integrated into the openal package. --- linden/indra/cmake/ViewerMiscLibs.cmake | 6 ----- linden/indra/newview/viewer_manifest.py | 23 +++++++++++++----- linden/install.xml | 41 ++++----------------------------- 3 files changed, 21 insertions(+), 49 deletions(-) diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake index 38d0444..bf33490 100644 --- a/linden/indra/cmake/ViewerMiscLibs.cmake +++ b/linden/indra/cmake/ViewerMiscLibs.cmake @@ -5,18 +5,12 @@ if (NOT STANDALONE) use_prebuilt_binary(libuuid) use_prebuilt_binary(vivox) if(LINUX) - if (${ARCH} STREQUAL "x86_64") - use_prebuilt_binary(32bitcompatibilitylibs) - endif (${ARCH} STREQUAL "x86_64") use_prebuilt_binary(fontconfig) endif(LINUX) else (NOT STANDALONE) # Download there even when using standalone. set(STANDALONE OFF) use_prebuilt_binary(vivox) - if(LINUX AND ${ARCH} STREQUAL "x86_64") - use_prebuilt_binary(32bitcompatibilitylibs) - endif(LINUX AND ${ARCH} STREQUAL "x86_64") set(STANDALONE ON) endif(NOT STANDALONE) diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index a0b9d77..190b48a 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -938,8 +938,12 @@ class Linux_i686Manifest(LinuxManifest): self.path("libz.so.1") # OpenAL - self.path("libopenal.so.1.12.854", "libopenal.so.1") - self.path("libalut.so.0.1.0", "libalut.so.0") + self.path("libalut.so") + self.path("libalut.so.0") + self.path("libalut.so.0.0.0") + self.path("libopenal.so") + self.path("libopenal.so.1") + self.path("libopenal.so.1.13.0") # GTK+ and dependencies ## Lets just use the system libraries for all of these: @@ -1028,7 +1032,6 @@ class Linux_i686Manifest(LinuxManifest): self.end_prefix("bin") if self.prefix(src="vivox-runtime/i686-linux", dst="lib"): - self.path("libalut.so") self.path("libortp.so") self.path("libvivoxsdk.so") self.end_prefix("lib") @@ -1071,8 +1074,13 @@ class Linux_x86_64Manifest(LinuxManifest): #self.path("libz.so.1") #not needed # OpenAL - self.path("libopenal.so.1.12.854", "libopenal.so.1") - self.path("libalut.so.0.1.0", "libalut.so.0") + self.path("libopenal.so") + self.path("libopenal.so.1") + self.path("libopenal.so.1.13.0") + self.path("libalut.so") + self.path("libalut.so.0") + self.path("libalut.so.0.0.0") + # GTK+ and dependencies ## Lets just use the system libraries for all of these: ##self.path("libatk-1.0.so.0") @@ -1169,9 +1177,12 @@ class Linux_x86_64Manifest(LinuxManifest): # 32bit libs needed for voice if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"): self.path("libalut.so") + self.path("libalut.so.0") + self.path("libalut.so.0.0.0") self.path("libidn.so.11") + self.path("libopenal.so") self.path("libopenal.so.1") - # self.path("libortp.so") + self.path("libopenal.so.1.13.0") self.path("libuuid.so.1") self.end_prefix("lib32") diff --git a/linden/install.xml b/linden/install.xml index f757d80..8327c13 100755 --- a/linden/install.xml +++ b/linden/install.xml @@ -1205,29 +1205,19 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn url http://imprudenceviewer.org/download/libs/openal-darwin-20091118.tar.bz2 - - - linux - - md5sum - 44f9bacc69a3d29ae0b46ed69ad7c2ce - url - http://download.kokuaviewer.org/files/libs/openal-linux32-20110304.tar.bz2 + http://download.kokuaviewer.org/files/libs/openal-1.13-Linux-i686-20110708.tar.bz2 linux64 md5sum - 032848c2591a15e26c71998df3644cfc + 7b1039886ab997d2926604540426961f url - http://download.kokuaviewer.org/files/libs/openal-linux64-pulse0.9.21-20110304.tar.bz2 + http://download.kokuaviewer.org/files/libs/openal-1.13-Linux-x86_64-20110708.tar.bz2 windows @@ -1508,29 +1498,6 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn - 32bitcompatibilitylibs - - copyright - Copyrights: Libidn: Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 - Simon Josefsson. License GPL v3.0. - Freealut, libuuid, openal-soft: see copyright and license of the - according main packages. - - description - 32bit libraries needed for using voice - license - gpl - packages - - linux64 - - md5sum - cbaafc55fb8b14283541791e82f13462 - url - http://imprudenceviewer.org/download/libs/linux64-32bitcompatibilitylibs-20100903.tar.bz2 - - - xmlrpc-epi copyright -- cgit v1.1