From ee2ed21aacb473301d36b8f4c450cb96c3ae39d3 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 9 Oct 2009 19:53:10 -0500 Subject: Updated and added some Linux libs. Updated: glib, gstreamer, gtk-etc, ogg-vorbis, openal, libxml Added: gstreamer-plugins, theora --- linden/indra/cmake/GStreamer.cmake | 15 +++--- linden/indra/cmake/UI.cmake | 7 ++- linden/indra/newview/viewer_manifest.py | 16 +------ linden/install.xml | 81 +++++++++++++++++++++------------ 4 files changed, 68 insertions(+), 51 deletions(-) (limited to 'linden') diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake index 8bfad11..51e1550 100644 --- a/linden/indra/cmake/GStreamer.cmake +++ b/linden/indra/cmake/GStreamer.cmake @@ -1,18 +1,19 @@ # -*- cmake -*- include(Prebuilt) - # possible libxml should have its own .cmake file instead + # Maybe libxml and glib should have their own .cmake files use_prebuilt_binary(libxml) + use_prebuilt_binary(glib) + set(GSTREAMER_FOUND ON FORCE BOOL) set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL) + use_prebuilt_binary(gstreamer) + use_prebuilt_binary(gstreamer-plugins) if (WINDOWS) - use_prebuilt_binary(libxml) use_prebuilt_binary(iconv) - use_prebuilt_binary(glib) - use_prebuilt_binary(gstreamer-plugins) set(GSTREAMER_FOUND ON FORCE BOOL) set(GSTREAMER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib @@ -63,7 +64,7 @@ else (WINDOWS) ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2 ) - if (DARWIN) + if (DARWIN) # Mac find_library( XML2_LIB NAMES xml2.2 @@ -89,7 +90,9 @@ else (WINDOWS) ${XML2_LIB} ) - else (DARWIN) + else (DARWIN) # Linux + + use_prebuilt_binary(theora) set(GSTREAMER_LIBRARIES gstvideo-0.10 diff --git a/linden/indra/cmake/UI.cmake b/linden/indra/cmake/UI.cmake index f529f5b..b70a531 100644 --- a/linden/indra/cmake/UI.cmake +++ b/linden/indra/cmake/UI.cmake @@ -31,13 +31,13 @@ if (STANDALONE) add_definitions(${${pkg}_CFLAGS_OTHERS}) endforeach(pkg) else (STANDALONE) - use_prebuilt_binary(gtk-atk-pango-glib) + use_prebuilt_binary(gtk-etc) if (LINUX) set(UI_LIBRARIES atk-1.0 + cairo gdk-x11-2.0 gdk_pixbuf-2.0 - Xinerama glib-2.0 gmodule-2.0 gobject-2.0 @@ -47,11 +47,14 @@ else (STANDALONE) pangoft2-1.0 pangox-1.0 pangoxft-1.0 + pixman-1 ) endif (LINUX) include_directories ( ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include + ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/cairo + ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/pixman-1 ${LIBS_PREBUILT_DIR}/include ) foreach(include ${${LL_ARCH}_INCLUDES}) diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 6ae5b80..b4a0b6c 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -798,14 +798,11 @@ class Linux_i686Manifest(LinuxManifest): self.path("libELFIO.so") self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3") - self.path("libopenal.so") # symlink self.path("libopenal.so.1") - self.path("libalut.so") + self.path("libalut.so.0") # Gstreamer libs - self.path("libgstbase-0.10.so") # symlink self.path("libgstbase-0.10.so.0") - self.path("libgstreamer-0.10.so") # symlink self.path("libgstreamer-0.10.so.0") self.path("libgstaudio-0.10.so.0") self.path("libgstbase-0.10.so.0") @@ -822,18 +819,10 @@ class Linux_i686Manifest(LinuxManifest): self.path("libgstvideo-0.10.so.0") # Gstreamer plugin dependencies - self.path("libavcodec.so.52") - self.path("libavformat.so.52") - self.path("libavutil.so.49") - self.path("libxvidcore.so.4") - self.path("libfaac.so.0") - self.path("libfaad.so.1") - self.path("libmp3lame.so.0") self.path("libogg.so.0") + self.path("libtheora.so.0") self.path("libvorbis.so.0") self.path("libvorbisenc.so.2") - self.path("libxml2.so.2") - self.path("libxvidcore.so.4") # Gstreamer plugins if self.prefix("gstreamer-plugins"): @@ -848,7 +837,6 @@ class Linux_i686Manifest(LinuxManifest): self.path("libgstdecodebin2.so") self.path("libgstdecodebin.so") self.path("libgstesd.so") - self.path("libgstffmpegcolorspace.so") self.path("libgstffmpeg.so") self.path("libgstgnomevfs.so") self.path("libgsticydemux.so") diff --git a/linden/install.xml b/linden/install.xml index a713b0e..455c7df 100644 --- a/linden/install.xml +++ b/linden/install.xml @@ -545,9 +545,9 @@ linux md5sum - 2f1a9e14f9213c2c9564c1c1cfdd6d47 + 674b2a79cef8ddd28f53b28b44dcffe2 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glib-2.0-linux-20080817.tar.bz2 + http://imprudenceviewer.org/download/libs/glib-2.20.5-linux-20091009.tar.bz2 windows @@ -582,9 +582,9 @@ linux md5sum - c829b638b6eef71ca63418cb9aea46a2 + 591900261bddbe3d1e579f7e6070081a url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gstreamer-linux-20080613.tar.bz2 + http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux-20091005.tar.bz2 windows @@ -601,6 +601,13 @@ lgpl packages + linux + + md5sum + 2cce992f4506fbc11f827aa80eb499f4 + url + http://imprudenceviewer.org/download/libs/gstreamer-plugins-linux-20091008.tar.bz2 + windows md5sum @@ -610,12 +617,16 @@ - gtk-atk-pango-glib + gtk-etc copyright - Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald +atk: Copyright 2001 Sun Microsystems Inc. +cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Red Hat, Inc. + + description - Libraries associated with GTK for gui features. atk: interfaces for accessibility; glib: low-level core functionality for using GTK+ and GNOME; pango: layout/rendering of text w/ emphasis on internationalization. + GTK+ and associated libraries (atk, cairo, pango, pixman) license lgpl packages @@ -623,16 +634,9 @@ linux md5sum - 21c16a74f8fc9a62e3ab944a6eb7403d + 143844d33c5075bf30f8af1fd86a6f09 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-linux-20080616.tar.bz - - linux32 - - md5sum - 21c16a74f8fc9a62e3ab944a6eb7403d - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-linux-20080616.tar.bz + http://imprudenceviewer.org/download/libs/gtk-etc-linux-20091008.tar.bz2 @@ -901,9 +905,9 @@ anguage Infrstructure (CLI) international standard linux md5sum - 4b5d2dcfe8a49b73fb69f10aab441092 + cec4328f5808b49836c467831a5f285e url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux-20080613.tar.bz2 + http://imprudenceviewer.org/download/libs/libxml2-2.7.4-r1-linux-20091005.tar.bz2 linux32 @@ -1080,7 +1084,7 @@ anguage Infrstructure (CLI) international standard description Ogg: container format Vorbis: audio compression scheme license - ogg-vorbis + xiph-bsd packages darwin @@ -1093,9 +1097,9 @@ anguage Infrstructure (CLI) international standard linux md5sum - df1809565b87b1dc28e3ca70db6e7d46 + 92c614b34fc283588625805076d58e93 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-linux-20080812.tar.bz2 + http://imprudenceviewer.org/download/libs/ogg-vorbis-linux-20091003.tar.bz2 linux64 @@ -1133,9 +1137,9 @@ anguage Infrstructure (CLI) international standard linux md5sum - f0d9a8d1318b519cffe6c40c9cac4e21 + 6f69d70ec18a3c3c2dee81bf6331c784 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-linux-20081010c-59a71b14-plughw.tar.bz2 + http://imprudenceviewer.org/download/libs/openal-linux-20091009.tar.bz2 windows @@ -1207,11 +1211,11 @@ anguage Infrstructure (CLI) international standard http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2-darwin-20080812.tar.bz2 linux - - md5sum - 02af0dad64803e0d821bc09e6038682c - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-linux-20081124b.tar.bz2 + + md5sum + 02af0dad64803e0d821bc09e6038682c + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-linux-20081124b.tar.bz2 windows @@ -1281,6 +1285,25 @@ anguage Infrstructure (CLI) international standard + theora + + copyright + Copyright (C) 2002-2009 Xiph.org Foundation + description + Ogg Theora video format + license + xiph-bsd + packages + + linux + + md5sum + a6e6e250efaf3f25db4699d9b5dfec4b + url + http://imprudenceviewer.org/download/libs/theora-linux-20091003.tar.bz2 + + + tut copyright @@ -1609,7 +1632,7 @@ Cass Everitt - cass@r3.nu url http://www.mozilla.org/MPL/MPL-1.1.html - ogg-vorbis + xiph-bsd url http://www.xiph.org/licenses/bsd/ -- cgit v1.1