@@ -2,6 +2,18 @@ =- 1.2.0 BETA 2 -= =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +2009-10-09 Jacek Antonelli <jacek.antonelli@gmail.com> + + * Updated and added some Linux libs. + Updated: glib, gstreamer, gtk-etc, ogg-vorbis, openal, libxml + Added: gstreamer-plugins, theora + + modified: linden/indra/newview/viewer_manifest.py + modified: linden/indra/cmake/GStreamer.cmake + modified: linden/indra/cmake/UI.cmake + modified: linden/install.xml + + 2009-10-09 McCabe Maxsted <hakushakukun@gmail.com> * Updated version info to 1.2.0 beta 2, added changelog banner. @@ -152,6 +164,13 @@ modified: linden/indra/newview/skins/default/xui/en-us/notify.xml 2009-10-03 Jacek Antonelli <jacek.antonelli@gmail.com> + * Updated and added some Linux libs to install.xml. + Updated: glib, gstreamer, ogg-vorbis, openal + Added: gstreamer-plugins, theora + + modified: linden/install.xml + + * Grid manager no longer appends "/" to URIs. This was causing trouble with URIs that shouldn't end in "/". ChangeLog.txt @@ -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 linden/indra/cmake/GStreamer.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}) linden/indra/cmake/UI.cmake @@ -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") linden/indra/newview/viewer_manifest.py @@ -545,9 +545,9 @@ <key>linux</key> <map> <key>md5sum</key> - <string>2f1a9e14f9213c2c9564c1c1cfdd6d47</string> + <string>674b2a79cef8ddd28f53b28b44dcffe2</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glib-2.0-linux-20080817.tar.bz2</uri> + <uri>http://imprudenceviewer.org/download/libs/glib-2.20.5-linux-20091009.tar.bz2</uri> </map> <key>windows</key> <map> @@ -582,9 +582,9 @@ <key>linux</key> <map> <key>md5sum</key> - <string>c829b638b6eef71ca63418cb9aea46a2</string> + <string>591900261bddbe3d1e579f7e6070081a</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gstreamer-linux-20080613.tar.bz2</uri> + <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux-20091005.tar.bz2</uri> </map> <key>windows</key> <map> @@ -601,6 +601,13 @@ <string>lgpl</string> <key>packages</key> <map> + <key>linux</key> + <map> + <key>md5sum</key> + <string>2cce992f4506fbc11f827aa80eb499f4</string> + <key>url</key> + <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-linux-20091008.tar.bz2</uri> + </map> <key>windows</key> <map> <key>md5sum</key> @@ -610,12 +617,16 @@ </map> </map> </map> - <key>gtk-atk-pango-glib</key> + <key>gtk-etc</key> <map> <key>copyright</key> - <string>Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald</string> + <string>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. + +</string> <key>description</key> - <string>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.</string> + <string>GTK+ and associated libraries (atk, cairo, pango, pixman)</string> <key>license</key> <string>lgpl</string> <key>packages</key> @@ -623,16 +634,9 @@ <key>linux</key> <map> <key>md5sum</key> - <string>21c16a74f8fc9a62e3ab944a6eb7403d</string> + <string>143844d33c5075bf30f8af1fd86a6f09</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-linux-20080616.tar.bz</uri> - </map> - <key>linux32</key> - <map> - <key>md5sum</key> - <string>21c16a74f8fc9a62e3ab944a6eb7403d</string> - <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-linux-20080616.tar.bz</uri> + <uri>http://imprudenceviewer.org/download/libs/gtk-etc-linux-20091008.tar.bz2</uri> </map> </map> </map> @@ -901,9 +905,9 @@ anguage Infrstructure (CLI) international standard</string> <key>linux</key> <map> <key>md5sum</key> - <string>4b5d2dcfe8a49b73fb69f10aab441092</string> + <string>cec4328f5808b49836c467831a5f285e</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux-20080613.tar.bz2</uri> + <uri>http://imprudenceviewer.org/download/libs/libxml2-2.7.4-r1-linux-20091005.tar.bz2</uri> </map> <key>linux32</key> <map> @@ -1080,7 +1084,7 @@ anguage Infrstructure (CLI) international standard</string> <key>description</key> <string>Ogg: container format Vorbis: audio compression scheme</string> <key>license</key> - <string>ogg-vorbis</string> + <string>xiph-bsd</string> <key>packages</key> <map> <key>darwin</key> @@ -1093,9 +1097,9 @@ anguage Infrstructure (CLI) international standard</string> <key>linux</key> <map> <key>md5sum</key> - <string>df1809565b87b1dc28e3ca70db6e7d46</string> + <string>92c614b34fc283588625805076d58e93</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-linux-20080812.tar.bz2</uri> + <uri>http://imprudenceviewer.org/download/libs/ogg-vorbis-linux-20091003.tar.bz2</uri> </map> <key>linux64</key> <map> @@ -1133,9 +1137,9 @@ anguage Infrstructure (CLI) international standard</string> <key>linux</key> <map> <key>md5sum</key> - <string>f0d9a8d1318b519cffe6c40c9cac4e21</string> + <string>6f69d70ec18a3c3c2dee81bf6331c784</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-linux-20081010c-59a71b14-plughw.tar.bz2</uri> + <uri>http://imprudenceviewer.org/download/libs/openal-linux-20091009.tar.bz2</uri> </map> <key>windows</key> <map> @@ -1207,11 +1211,11 @@ anguage Infrstructure (CLI) international standard</string> <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2-darwin-20080812.tar.bz2</uri> </map> <key>linux</key> - <map> - <key>md5sum</key> - <string>02af0dad64803e0d821bc09e6038682c</string> - <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-linux-20081124b.tar.bz2</uri> + <map> + <key>md5sum</key> + <string>02af0dad64803e0d821bc09e6038682c</string> + <key>url</key> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-linux-20081124b.tar.bz2</uri> </map> <key>windows</key> <map> @@ -1281,6 +1285,25 @@ anguage Infrstructure (CLI) international standard</string> </map> </map> </map> + <key>theora</key> + <map> + <key>copyright</key> + <string>Copyright (C) 2002-2009 Xiph.org Foundation</string> + <key>description</key> + <string>Ogg Theora video format</string> + <key>license</key> + <string>xiph-bsd</string> + <key>packages</key> + <map> + <key>linux</key> + <map> + <key>md5sum</key> + <string>a6e6e250efaf3f25db4699d9b5dfec4b</string> + <key>url</key> + <uri>http://imprudenceviewer.org/download/libs/theora-linux-20091003.tar.bz2</uri> + </map> + </map> + </map> <key>tut</key> <map> <key>copyright</key> @@ -1609,7 +1632,7 @@ Cass Everitt - cass@r3.nu <key>url</key> <string>http://www.mozilla.org/MPL/MPL-1.1.html</string> </map> - <key>ogg-vorbis</key> + <key>xiph-bsd</key> <map> <key>url</key> <string>http://www.xiph.org/licenses/bsd/</string> linden/install.xml bbbd923e7a825101a2db2ad6c9757db96a501260 Jacek Antonelli jacek.antonelli@gmail.com http://github.com/jacek/imprudence/commit/ee2ed21aacb473301d36b8f4c450cb96c3ae39d3 ee2ed21aacb473301d36b8f4c450cb96c3ae39d3 2009-10-09T17:53:10-07:00 2009-10-09T17:53:10-07:00 Updated and added some Linux libs. Updated: glib, gstreamer, gtk-etc, ogg-vorbis, openal, libxml Added: gstreamer-plugins, theora cce626317343ba0f23b4af03c2d9b4bf7e7bdf78 Jacek Antonelli jacek.antonelli@gmail.com