From d5cfd302587a6eaaafc2a5d06763b1b9366a7873 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 7 Mar 2009 22:07:58 -0600 Subject: Moved Info-SecondLife.plist to Info-Imprudence.plist --- linden/indra/newview/Info-Imprudence.plist | 39 ++++++++++++++++++++++++++++++ linden/indra/newview/Info-SecondLife.plist | 39 ------------------------------ linden/indra/newview/viewer_manifest.py | 2 +- 3 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 linden/indra/newview/Info-Imprudence.plist delete mode 100644 linden/indra/newview/Info-SecondLife.plist (limited to 'linden') diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist new file mode 100644 index 0000000..32bba70 --- /dev/null +++ b/linden/indra/newview/Info-Imprudence.plist @@ -0,0 +1,39 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + Imprudence + CFBundleIconFile + secondlife.icns + CFBundleIdentifier + com.secondlife.indra.viewer + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Imprudence + CFBundlePackageType + APPL + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleURLName + Second Life URL + CFBundleURLSchemes + + secondlife + + LSIsAppleDefaultForScheme + + + + CFBundleVersion + 1.0.0 + CSResourcesFileMapped + + + diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist deleted file mode 100644 index 32bba70..0000000 --- a/linden/indra/newview/Info-SecondLife.plist +++ /dev/null @@ -1,39 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - Imprudence - CFBundleIconFile - secondlife.icns - CFBundleIdentifier - com.secondlife.indra.viewer - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Imprudence - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleURLTypes - - - CFBundleURLName - Second Life URL - CFBundleURLSchemes - - secondlife - - LSIsAppleDefaultForScheme - - - - CFBundleVersion - 1.0.0 - CSResourcesFileMapped - - - diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 3583726..ba4c8a2 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -403,7 +403,7 @@ class DarwinManifest(ViewerManifest): # /Contents/MacOS/ self.contents_of_tar(self.args['source']+'/mozilla-universal-darwin.tgz', 'MacOS') - self.path("Info-SecondLife.plist", dst="Info.plist") + self.path("Info-Imprudence.plist", dst="Info.plist") # copy additional libs in /Contents/MacOS/ self.path("../../libraries/universal-darwin/lib_release/libndofdev.dylib", dst="MacOS/libndofdev.dylib") -- cgit v1.1 From 94ba8cdc2ab88697abb339829590776ec9b2843e Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 8 Mar 2009 14:59:57 -0500 Subject: Tweaked GStreamer.cmake to work on Mac --- linden/indra/cmake/GStreamer.cmake | 44 ++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 14 deletions(-) (limited to 'linden') diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake index b4b984d..8467dcd 100644 --- a/linden/indra/cmake/GStreamer.cmake +++ b/linden/indra/cmake/GStreamer.cmake @@ -54,10 +54,6 @@ if (WINDOWS) else (WINDOWS) - include(FindPkgConfig) - - pkg_check_modules(GSTREAMER REQUIRED gstreamer-0.10) - pkg_check_modules(GSTREAMER_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10) set(GSTREAMER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 @@ -66,16 +62,36 @@ else (WINDOWS) ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2 ) - # We don't need to explicitly link against gstreamer itself, because - # LLMediaImplGStreamer probes for the system's copy at runtime. - set(GSTREAMER_LIBRARIES - gobject-2.0 - gmodule-2.0 - dl - gthread-2.0 - rt - glib-2.0 - ) + if (DARWIN) + + set(GSTREAMER_LIBRARIES + xml2 + glib-2.0 + gobject-2.0 + gmodule-2.0 + gthread-2.0 + gstreamer-0.10 + ) + + else (DARWIN) + + include(FindPkgConfig) + + pkg_check_modules(GSTREAMER REQUIRED gstreamer-0.10) + pkg_check_modules(GSTREAMER_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10) + + # We don't need to explicitly link against gstreamer itself, because + # LLMediaImplGStreamer probes for the system's copy at runtime. + set(GSTREAMER_LIBRARIES + gobject-2.0 + gmodule-2.0 + dl + gthread-2.0 + rt + glib-2.0 + ) + + endif (DARWIN) endif (WINDOWS) -- cgit v1.1 From 1ca12fe0e8ddf29538d8c0462a337e99395db8d9 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 8 Mar 2009 23:50:56 -0500 Subject: Load the proper gstreamer lib type (dylib) on Mac --- linden/indra/llmedia/llmediaimplgstreamer.cpp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'linden') diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp index 30706f1..cd6c91b 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp @@ -166,19 +166,26 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data) g_type_init(); // Get symbols! + if ( #if LL_WINDOWS - if (! grab_gst_syms("libgstreamer-0.10.dll", "libgstvideo-0.10.dll", "libgstaudio-0.10.dll") ) - { - LL_WARNS("MediaImpl") << "Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled." << LL_ENDL; - return false; - } + ! grab_gst_syms("libgstreamer-0.10.dll", + "libgstvideo-0.10.dll", + "libgstaudio-0.10.dll") +#elif LL_DARWIN + ! grab_gst_syms("libgstreamer-0.10.dylib", + "libgstvideo-0.10.dylib", + "libgstaudio-0.10.dylib") #else - if (! grab_gst_syms("libgstreamer-0.10.so.0", "libgstvideo-0.10.so.0", "libgstaudio-0.10.so.0") ) + ! grab_gst_syms("libgstreamer-0.10.so.0", + "libgstvideo-0.10.so.0", + "libgstaudio-0.10.so.0") +#endif + ) { - LL_WARNS("MediaImpl") << "Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled." << LL_ENDL; + LL_WARNS("MediaImpl") << "Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled." << LL_ENDL; return false; } -#endif + if (llgst_segtrap_set_enabled) llgst_segtrap_set_enabled(FALSE); else -- cgit v1.1 From f440829158cb6a78322d13237b00a08c6437705f Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 9 Mar 2009 23:56:20 -0500 Subject: Mac app icon will be called viewer.icns instead of secondlife.icns --- linden/indra/newview/CMakeLists.txt | 4 ++-- linden/indra/newview/Info-Imprudence.plist | 2 +- linden/indra/newview/viewer_manifest.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 1e48d28..2bda223 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt @@ -849,7 +849,7 @@ if (DARWIN) # Add resource files to the project. set(viewer_RESOURCE_FILES - secondlife.icns + viewer.icns macview.r gpu_table.txt Info-Imprudence.plist @@ -1447,7 +1447,7 @@ if (DARWIN) PROPERTIES OUTPUT_NAME "${product}" MACOSX_BUNDLE_INFO_STRING "info string - localize me" - MACOSX_BUNDLE_ICON_FILE "secondlife.icns" + MACOSX_BUNDLE_ICON_FILE "viewer.icns" MACOSX_BUNDLE_GUI_IDENTIFIER "Imprudence" MACOSX_BUNDLE_LONG_VERSION_STRING "ververver" MACOSX_BUNDLE_BUNDLE_NAME "Imprudence" diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist index 32bba70..357d171 100644 --- a/linden/indra/newview/Info-Imprudence.plist +++ b/linden/indra/newview/Info-Imprudence.plist @@ -7,7 +7,7 @@ CFBundleExecutable Imprudence CFBundleIconFile - secondlife.icns + viewer.icns CFBundleIdentifier com.secondlife.indra.viewer CFBundleInfoDictionaryVersion diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index ba4c8a2..acc7fba 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -432,7 +432,7 @@ class DarwinManifest(ViewerManifest): self.path("featuretable_mac.txt") self.path("SecondLife.nib") - self.path("secondlife.icns") + self.path("viewer.icns") # Translations self.path("English.lproj") -- cgit v1.1 From a593806bf4c43afab52af1ee5bbd792de1ca26f1 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 9 Mar 2009 23:59:00 -0500 Subject: Manifest includes openal and gstreamer libs in Mac package --- linden/indra/newview/viewer_manifest.py | 38 ++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index acc7fba..259249a 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -406,7 +406,39 @@ class DarwinManifest(ViewerManifest): self.path("Info-Imprudence.plist", dst="Info.plist") # copy additional libs in /Contents/MacOS/ - self.path("../../libraries/universal-darwin/lib_release/libndofdev.dylib", dst="MacOS/libndofdev.dylib") + if self.prefix(src="../../libraries/universal-darwin/lib_release", dst="MacOS/"): + + self.path("libndofdev.dylib") + + self.path("libopenal.1.dylib") + self.path("libalut.0.dylib") + + self.path("libglib-2.0.dylib") + self.path("libgmodule-2.0.dylib") + self.path("libgobject-2.0.dylib") + self.path("libgthread-2.0.dylib") + self.path("libintl.3.dylib") + + self.path("libgstreamer-0.10.dylib") + self.path("libgstapp-0.10.dylib") + self.path("libgstaudio-0.10.dylib") + self.path("libgstbase-0.10.dylib") + self.path("libgstcdda-0.10.dylib") + self.path("libgstcontroller-0.10.dylib") + self.path("libgstdataprotocol-0.10.dylib") + self.path("libgstfft-0.10.dylib") + self.path("libgstinterfaces-0.10.dylib") + self.path("libgstnet-0.10.dylib") + self.path("libgstnetbuffer-0.10.dylib") + self.path("libgstpbutils-0.10.dylib") + self.path("libgstriff-0.10.dylib") + self.path("libgstrtp-0.10.dylib") + self.path("libgstrtsp-0.10.dylib") + self.path("libgstsdp-0.10.dylib") + self.path("libgsttag-0.10.dylib") + self.path("libgstvideo-0.10.dylib") + + self.end_prefix("../../libraries/universal-darwin/lib_release") # replace the default theme with our custom theme (so scrollbars work). if self.prefix(src="mozilla-theme", dst="MacOS/chrome"): @@ -442,8 +474,8 @@ class DarwinManifest(ViewerManifest): # SLVoice and vivox lols - self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib") - self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib") + #self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib") + #self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib") #self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib") #self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib") #self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice") -- cgit v1.1 From 629af1f4df0f1df3c3258e1eb21ee9966171ab3d Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 11 Mar 2009 14:16:02 -0500 Subject: Removed Quicktime-related cmake code --- linden/indra/cmake/LLMedia.cmake | 2 -- linden/indra/cmake/QuickTime.cmake | 49 ------------------------------------- linden/indra/llmedia/CMakeLists.txt | 13 ---------- linden/indra/newview/CMakeLists.txt | 1 - 4 files changed, 65 deletions(-) delete mode 100644 linden/indra/cmake/QuickTime.cmake (limited to 'linden') diff --git a/linden/indra/cmake/LLMedia.cmake b/linden/indra/cmake/LLMedia.cmake index b7bf11c..8a36a69 100644 --- a/linden/indra/cmake/LLMedia.cmake +++ b/linden/indra/cmake/LLMedia.cmake @@ -1,7 +1,6 @@ # -*- cmake -*- include(GStreamer) -include(QuickTime) set(LLMEDIA_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llmedia @@ -11,5 +10,4 @@ set(LLMEDIA_LIBRARIES llmedia ${GSTREAMER_LIBRARIES} ${GSTREAMER_PLUGINS_BASE_LIBRARIES} - ${QUICKTIME_LIBRARY} ) diff --git a/linden/indra/cmake/QuickTime.cmake b/linden/indra/cmake/QuickTime.cmake deleted file mode 100644 index 4352709..0000000 --- a/linden/indra/cmake/QuickTime.cmake +++ /dev/null @@ -1,49 +0,0 @@ -# -*- cmake -*- - -if(INSTALL_PROPRIETARY) - include(Prebuilt) - use_prebuilt_binary(quicktime) -endif(INSTALL_PROPRIETARY) - -if (DARWIN) - include(CMakeFindFrameworks) - find_library(QUICKTIME_LIBRARY QuickTime) -elseif (WINDOWS) - set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK" - CACHE PATH "Location of the QuickTime SDK.") - - find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient - PATHS - ${ARCH_PREBUILT_DIRS_DEBUG} - "${QUICKTIME_SDK_DIR}\\libraries" - ) - - find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient - PATHS - ${ARCH_PREBUILT_DIRS_RELEASE} - "${QUICKTIME_SDK_DIR}\\libraries" - ) - - if (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY) - set(QUICKTIME_LIBRARY - optimized ${RELEASE_QUICKTIME_LIBRARY} - debug ${DEBUG_QUICKTIME_LIBRARY} - ) - - endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY) - - include_directories( - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime - "${QUICKTIME_SDK_DIR}\\CIncludes" - ) -endif (DARWIN) - -mark_as_advanced(QUICKTIME_LIBRARY) - -if (QUICKTIME_LIBRARY) - set(QUICKTIME ON CACHE BOOL "Build with QuickTime streaming media support.") -endif (QUICKTIME_LIBRARY) - -if (QUICKTIME) - add_definitions(-DLL_QUICKTIME_ENABLED=1) -endif (QUICKTIME) diff --git a/linden/indra/llmedia/CMakeLists.txt b/linden/indra/llmedia/CMakeLists.txt index 026afc1..084a80b 100644 --- a/linden/indra/llmedia/CMakeLists.txt +++ b/linden/indra/llmedia/CMakeLists.txt @@ -65,19 +65,6 @@ if (MOZLIB) list(APPEND llmedia_HEADER_FILES llmediaimplllmozlib.h) endif (MOZLIB) -if (QUICKTIME) - list(APPEND llmedia_SOURCE_FILES llmediaimplquicktime.cpp) - list(APPEND llmedia_HEADER_FILES llmediaimplquicktime.h) - - # We use a bunch of deprecated system APIs. - if (DARWIN) - set_source_files_properties( - llmediaimplquicktime.cpp PROPERTIES - COMPILE_FLAGS -Wno-deprecated-declarations - ) - endif (DARWIN) -endif (QUICKTIME) - set_source_files_properties(${llmedia_HEADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 2bda223..f971f97 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt @@ -1393,7 +1393,6 @@ target_link_libraries(imprudence-bin ${SMARTHEAP_LIBRARY} ${UI_LIBRARIES} ${NDOF_LIBRARY} - ${QUICKTIME_LIBRARY} ${WINDOWS_LIBRARIES} ${XMLRPCEPI_LIBRARIES} ${ZLIB_LIBRARIES} -- cgit v1.1 From e8a3a66bfadcbdac11f2cd542a2e0c4e137f14f4 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 11 Mar 2009 16:58:26 -0500 Subject: LLAudio's CMakeLists should include OPENAL --- linden/indra/llaudio/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'linden') diff --git a/linden/indra/llaudio/CMakeLists.txt b/linden/indra/llaudio/CMakeLists.txt index aa15a9d..8a26e54 100644 --- a/linden/indra/llaudio/CMakeLists.txt +++ b/linden/indra/llaudio/CMakeLists.txt @@ -4,6 +4,7 @@ project(llaudio) include(00-Common) include(Audio) +include(OPENAL) include(FMOD) include(LLCommon) include(LLMath) -- cgit v1.1 From 2ab904cf8765c339acca3979f6acc0ed4d5e1604 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 11 Mar 2009 17:46:33 -0500 Subject: Added Mac gstreamer plugins to viewer manifest --- linden/indra/newview/viewer_manifest.py | 62 +++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) (limited to 'linden') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 259249a..1d81ebd 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -473,6 +473,68 @@ class DarwinManifest(ViewerManifest): self.path("Korean.lproj") + if self.prefix(src="../../libraries/universal-darwin/lib_release/gstreamer-plugins", dst="lib/gstreamer-plugins"): + self.path("libgstaacparse.so") + self.path("libgstadder.so") + self.path("libgstaiffparse.so") + self.path("libgstamrparse.so") + self.path("libgstapp.so") + self.path("libgstaudioconvert.so") + self.path("libgstaudiorate.so") + self.path("libgstaudioresample.so") + self.path("libgstautodetect.so") + self.path("libgstavi.so") + self.path("libgstcoreelements.so") + self.path("libgstcoreindexers.so") + self.path("libgstdebug.so") + self.path("libgstdecodebin2.so") + self.path("libgstdeinterlace2.so") + self.path("libgstequalizer.so") + self.path("libgstffmpeg.so") + self.path("libgstffmpegcolorspace.so") + self.path("libgstffmpegscale.so") + self.path("libgstflac.so") + self.path("libgstflv.so") + self.path("libgstgdp.so") + self.path("libgsth264parse.so") + self.path("libgsticydemux.so") + self.path("libgstid3demux.so") + self.path("libgstinterleave.so") + self.path("libgstjpeg.so") + self.path("libgstlevel.so") + self.path("libgstmetadata.so") + self.path("libgstmpeg4videoparse.so") + self.path("libgstmpegdemux.so") + self.path("libgstmpegvideoparse.so") + self.path("libgstmultipart.so") + self.path("libgstneonhttpsrc.so") + self.path("libgstogg.so") + self.path("libgstosxaudio.so") + self.path("libgstosxvideosink.so") + self.path("libgstpango.so") + self.path("libgstplaybin.so") + self.path("libgstpng.so") + self.path("libgstpostproc.so") + self.path("libgstqtdemux.so") + self.path("libgstqueue2.so") + self.path("libgstreal.so") + self.path("libgstrtp.so") + self.path("libgstrtpmanager.so") + self.path("libgstrtsp.so") + self.path("libgstsdpelem.so") + self.path("libgstselector.so") + self.path("libgsttcp.so") + self.path("libgsttheora.so") + self.path("libgsttypefindfunctions.so") + self.path("libgstudp.so") + self.path("libgstvideoscale.so") + self.path("libgstvolume.so") + self.path("libgstvorbis.so") + self.path("libgstwavparse.so") + + self.end_prefix("../../libraries/universal-darwin/lib_release/gstreamer-plugins") + + # SLVoice and vivox lols #self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib") #self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib") -- cgit v1.1 From 3f9182bfc935860d523a1a2c5917409138813e0f Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 11 Mar 2009 20:39:15 -0500 Subject: Better indentation in OPENAL.cmake. --- linden/indra/cmake/OPENAL.cmake | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'linden') diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake index 5e71f66..a5e966f 100644 --- a/linden/indra/cmake/OPENAL.cmake +++ b/linden/indra/cmake/OPENAL.cmake @@ -10,16 +10,15 @@ if (OPENAL) # OPENAL_LIB if (WINDOWS) - find_library(OPENAL_LIB - NAMES openal openal32 OpenAL OpenAL32 wrap_oal - PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release - ) - + find_library(OPENAL_LIB + NAMES openal openal32 OpenAL OpenAL32 wrap_oal + PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release + ) else (WINDOWS) - find_library(OPENAL_LIB - NAMES openal openal32 OpenAL OpenAL32 wrap_oal - PATHS ${ARCH_PREBUILT_DIRS_RELEASE} - ) + find_library(OPENAL_LIB + NAMES openal openal32 OpenAL OpenAL32 wrap_oal + PATHS ${ARCH_PREBUILT_DIRS_RELEASE} + ) endif (WINDOWS) if (NOT OPENAL_LIB) @@ -49,15 +48,14 @@ if (OPENAL) if (WINDOWS) find_library(ALUT_LIB - NAMES alut freealut - PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release - ) - + NAMES alut freealut + PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release + ) else (WINDOWS) - find_library(ALUT_LIB - NAMES alut freealut - PATHS ${ARCH_PREBUILT_DIRS_RELEASE} - ) + find_library(ALUT_LIB + NAMES alut freealut + PATHS ${ARCH_PREBUILT_DIRS_RELEASE} + ) endif (WINDOWS) if (NOT ALUT_LIB) -- cgit v1.1 From 51081c09ae8d186c1ca5e61d19a73e01b8120c8a Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 11 Mar 2009 20:41:00 -0500 Subject: Removed redundant/unnecessary OpenAL lib names and paths --- linden/indra/cmake/OPENAL.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'linden') diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake index a5e966f..2ebee01 100644 --- a/linden/indra/cmake/OPENAL.cmake +++ b/linden/indra/cmake/OPENAL.cmake @@ -11,12 +11,12 @@ if (OPENAL) if (WINDOWS) find_library(OPENAL_LIB - NAMES openal openal32 OpenAL OpenAL32 wrap_oal + NAMES openal32 PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release ) else (WINDOWS) find_library(OPENAL_LIB - NAMES openal openal32 OpenAL OpenAL32 wrap_oal + NAMES openal PATHS ${ARCH_PREBUILT_DIRS_RELEASE} ) endif (WINDOWS) @@ -33,7 +33,7 @@ if (OPENAL) find_path(OPENAL_INCLUDE_DIR NAMES al.h - PATHS ${LIBS_PREBUILT_DIR}/include/AL /usr/include/AL + PATHS ${LIBS_PREBUILT_DIR}/include/AL ) if (NOT OPENAL_INCLUDE_DIR) @@ -53,7 +53,7 @@ if (OPENAL) ) else (WINDOWS) find_library(ALUT_LIB - NAMES alut freealut + NAMES alut PATHS ${ARCH_PREBUILT_DIRS_RELEASE} ) endif (WINDOWS) @@ -70,7 +70,7 @@ if (OPENAL) find_path(ALUT_INCLUDE_DIR NAMES alut.h - PATHS ${LIBS_PREBUILT_DIR}/include/AL /usr/include/AL + PATHS ${LIBS_PREBUILT_DIR}/include/AL ) if (NOT ALUT_INCLUDE_DIR) -- cgit v1.1 From 4932af1c6806c351aa687433c10ba57d2a502c59 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 12 Mar 2009 09:16:53 -0500 Subject: Don't find specific OpenAL lib locations on Mac/Linux. Linking that way is bad. Just use -lopenal -lalut instead. --- linden/indra/cmake/OPENAL.cmake | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'linden') diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake index 2ebee01..11dcdc7 100644 --- a/linden/indra/cmake/OPENAL.cmake +++ b/linden/indra/cmake/OPENAL.cmake @@ -15,10 +15,7 @@ if (OPENAL) PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release ) else (WINDOWS) - find_library(OPENAL_LIB - NAMES openal - PATHS ${ARCH_PREBUILT_DIRS_RELEASE} - ) + set(OPENAL_LIB openal) endif (WINDOWS) if (NOT OPENAL_LIB) @@ -52,10 +49,7 @@ if (OPENAL) PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release ) else (WINDOWS) - find_library(ALUT_LIB - NAMES alut - PATHS ${ARCH_PREBUILT_DIRS_RELEASE} - ) + set(ALUT_LIB alut) endif (WINDOWS) if (NOT ALUT_LIB) -- cgit v1.1 From 7ee91c387e3d530c721a0bbbb2343bbce4b27730 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 13 Mar 2009 21:39:24 -0500 Subject: Added error checking when generating an OpenAL source --- linden/indra/llaudio/audioengine_openal.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'linden') diff --git a/linden/indra/llaudio/audioengine_openal.cpp b/linden/indra/llaudio/audioengine_openal.cpp index 8f836a6..6d9a242 100644 --- a/linden/indra/llaudio/audioengine_openal.cpp +++ b/linden/indra/llaudio/audioengine_openal.cpp @@ -172,6 +172,17 @@ LLAudioChannelOpenAL::LLAudioChannelOpenAL() mLastSamplePos(0) { alGenSources(1, &mALSource); + + if( mALSource == AL_NONE ) + { + ALenum error = alGetError(); + if( error == AL_NO_ERROR ) + { + LL_WARNS("OpenAL") << "LLAudioChannelOpenAL::LLAudioChannelOpenAL() Could not generate mALSource, but no error is indicated!" << LL_ENDL; + } + LL_WARNS("OpenAL") << "LLAudioChannelOpenAL::LLAudioChannelOpenAL() Could not generate mALSource: (" << error << ") " << alGetString( error ) << LL_ENDL; + } + } LLAudioChannelOpenAL::~LLAudioChannelOpenAL() -- cgit v1.1 From 0723652717a0ece33dffab6fea884ffd55b43611 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 16 Mar 2009 04:05:54 -0500 Subject: Added more Mac dylibs to manifest. --- linden/indra/newview/viewer_manifest.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'linden') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 1d81ebd..69f4d20 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -417,7 +417,6 @@ class DarwinManifest(ViewerManifest): self.path("libgmodule-2.0.dylib") self.path("libgobject-2.0.dylib") self.path("libgthread-2.0.dylib") - self.path("libintl.3.dylib") self.path("libgstreamer-0.10.dylib") self.path("libgstapp-0.10.dylib") @@ -438,6 +437,16 @@ class DarwinManifest(ViewerManifest): self.path("libgsttag-0.10.dylib") self.path("libgstvideo-0.10.dylib") + self.path("libintl.3.dylib") + self.path("libjpeg.62.dylib") + self.path("libogg.0.dylib") + self.path("liboil-0.3.0.dylib") + self.path("libpango-1.0.0.dylib") + self.path("libpangoft2-1.0.0.dylib") + self.path("libtheora.0.dylib") + self.path("libvorbis.0.dylib") + self.path("libvorbisenc.2.dylib") + self.end_prefix("../../libraries/universal-darwin/lib_release") # replace the default theme with our custom theme (so scrollbars work). -- cgit v1.1 From dfdf5dab6e58fced71eb1dda99029308af480cb5 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 16 Mar 2009 04:32:13 -0500 Subject: Symlinks for Mac glib dylibs (2.0.0 -> 2.0). --- linden/indra/newview/viewer_manifest.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'linden') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 69f4d20..637f07a 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -413,6 +413,12 @@ class DarwinManifest(ViewerManifest): self.path("libopenal.1.dylib") self.path("libalut.0.dylib") + self.path("libglib-2.0.0.dylib") + self.path("libgmodule-2.0.0.dylib") + self.path("libgobject-2.0.0.dylib") + self.path("libgthread-2.0.0.dylib") + + # Symlinks to satisfy different name dependencies. self.path("libglib-2.0.dylib") self.path("libgmodule-2.0.dylib") self.path("libgobject-2.0.dylib") -- cgit v1.1 From aa99e93a7f11fc162bbd0b14783b8ef9bbc82b77 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 29 Mar 2009 00:36:40 -0500 Subject: Removed the "2.0.0" named glib libs. Only using "2.0" now. --- linden/indra/newview/viewer_manifest.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 637f07a..69f4d20 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -413,12 +413,6 @@ class DarwinManifest(ViewerManifest): self.path("libopenal.1.dylib") self.path("libalut.0.dylib") - self.path("libglib-2.0.0.dylib") - self.path("libgmodule-2.0.0.dylib") - self.path("libgobject-2.0.0.dylib") - self.path("libgthread-2.0.0.dylib") - - # Symlinks to satisfy different name dependencies. self.path("libglib-2.0.dylib") self.path("libgmodule-2.0.dylib") self.path("libgobject-2.0.dylib") -- cgit v1.1 From 707b458bd41888dda11b86dfaec95a131843792c Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 29 Mar 2009 00:38:23 -0500 Subject: Tweaked the list of linked-in gstreamer libs for Mac. --- linden/indra/cmake/GStreamer.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'linden') diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake index f790e19..c1bbc57 100644 --- a/linden/indra/cmake/GStreamer.cmake +++ b/linden/indra/cmake/GStreamer.cmake @@ -65,12 +65,15 @@ else (WINDOWS) if (DARWIN) set(GSTREAMER_LIBRARIES - xml2 - glib-2.0 + gstvideo-0.10 + gstaudio-0.10 + gstbase-0.10 + gstreamer-0.10 gobject-2.0 gmodule-2.0 gthread-2.0 - gstreamer-0.10 + glib-2.0 + xml2 ) else (DARWIN) -- cgit v1.1 From 5207b3893ad2214ce8aad3a720d087d566738bdc Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 29 Mar 2009 14:59:54 -0500 Subject: Using OpenAL framework on Mac after all. Maybe. --- linden/indra/cmake/OPENAL.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'linden') diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake index 11dcdc7..f06a38e 100644 --- a/linden/indra/cmake/OPENAL.cmake +++ b/linden/indra/cmake/OPENAL.cmake @@ -14,8 +14,14 @@ if (OPENAL) NAMES openal32 PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release ) + elseif (DARWIN) + # Look for for system's OpenAL.framework + find_library(OPENAL_LIB + NAMES OpenAL openal + PATHS ${ARCH_PREBUILT_DIRS_RELEASE} + ) else (WINDOWS) - set(OPENAL_LIB openal) + set(OPENAL_LIB openal) endif (WINDOWS) if (NOT OPENAL_LIB) -- cgit v1.1 From 26c2ddb4a16030d48a763325ff9c492c3618f39b Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 29 Mar 2009 22:24:30 -0500 Subject: Improved set_gst_plugin_path, now sets path on Mac too. --- linden/indra/llmedia/llmediaimplgstreamer.cpp | 103 +++++++++++++++++--------- 1 file changed, 67 insertions(+), 36 deletions(-) (limited to 'linden') diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp index 9a51b7f..20b89f5 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp @@ -47,6 +47,10 @@ extern "C" { #include "llerror.h" #include "linden_common.h" +#if LL_DARWIN +#include // For CF functions used in set_gst_plugin_path +#endif + // register this impl with media manager factory static LLMediaImplRegister sLLMediaImplGStreamerReg( "LLMediaImplGStreamer", new LLMediaImplGStreamerMaker() ); @@ -203,55 +207,82 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data) void LLMediaImplGStreamer::set_gst_plugin_path() { - // Only needed for Windows. - // Linux sets in wrapper.sh, Mac sets in Info-Imprudence.plist -#ifdef LL_WINDOWS + // Linux sets GST_PLUGIN_PATH in wrapper.sh, not here. +#if LL_WINDOWS || LL_DARWIN - char* imp_cwd; + std::string imp_dir = ""; // Get the current working directory: - imp_cwd = _getcwd(NULL,0); - - if(imp_cwd == NULL) +#if LL_WINDOWS + char* raw_dir; + raw_dir = _getcwd(NULL,0); + if( raw_dir != NULL ) { - LL_DEBUGS("LLMediaImpl") << "_getcwd failed, not setting GST_PLUGIN_PATH." - << LL_ENDL; + imp_dir = std::string( raw_dir ); } - else +#elif LL_DARWIN + CFBundleRef main_bundle = CFBundleGetMainBundle(); + if( main_bundle != NULL ) { - LL_DEBUGS("LLMediaImpl") << "Imprudence is installed at " - << imp_cwd << LL_ENDL; - - // Grab the current path, if it's set. - std::string old_plugin_path = ""; - char *old_path = getenv("GST_PLUGIN_PATH"); - if(old_path == NULL) - { - LL_DEBUGS("LLMediaImpl") << "Did not find user-set GST_PLUGIN_PATH." - << LL_ENDL; - } - else + CFURLRef bundle_url = CFBundleCopyBundleURL( main_bundle ); + if( bundle_url != NULL ) { - old_plugin_path = std::string( old_path ) + ":"; + #ifndef MAXPATHLEN + #define MAXPATHLEN 1024 + #endif + char raw_dir[MAXPATHLEN]; + if( CFURLGetFileSystemRepresentation( bundle_url, true, (UInt8 *)raw_dir, MAXPATHLEN) ) + { + imp_dir = std::string( raw_dir ) + "/Contents/MacOS/"; + } + CFRelease(bundle_url); } + } +#endif + if( imp_dir == "" ) + { + LL_DEBUGS("MediaImpl") << "Could not get application directory, not setting GST_PLUGIN_PATH." + << LL_ENDL; + return; + } - // Search both Imprudence and Imprudence\lib\gstreamer-plugins. - // But we also want to first search the path the user has set, if any. - std::string plugin_path = - "GST_PLUGIN_PATH=" + - old_plugin_path + - std::string(imp_cwd) + ":" + - std::string(imp_cwd) + "\\lib\\gstreamer-plugins"; - - // Place GST_PLUGIN_PATH in the environment settings for imprudence.exe - putenv( (char*)plugin_path.c_str() ); + LL_DEBUGS("MediaImpl") << "Imprudence is installed at " + << imp_dir << LL_ENDL; - LL_DEBUGS("LLMediaImpl") << "GST_PLUGIN_PATH set to " - << getenv("GST_PLUGIN_PATH") << LL_ENDL; + // Grab the current path, if it's set. + std::string old_plugin_path = ""; + char *old_path = getenv("GST_PLUGIN_PATH"); + if(old_path == NULL) + { + LL_DEBUGS("MediaImpl") << "Did not find user-set GST_PLUGIN_PATH." + << LL_ENDL; + } + else + { + old_plugin_path = std::string( old_path ) + ":"; } -#endif //LL_WINDOWS + + // Search both Imprudence and Imprudence\lib\gstreamer-plugins. + // But we also want to first search the path the user has set, if any. + std::string plugin_path = + "GST_PLUGIN_PATH=" + + old_plugin_path + + imp_dir + ":" + +#if LL_WINDOWS + imp_dir + "\\lib\\gstreamer-plugins"; +#elif LL_DARWIN + imp_dir + "/../Resources/lib/gstreamer-plugins"; +#endif + + // Place GST_PLUGIN_PATH in the environment settings + putenv( (char*)plugin_path.c_str() ); + + LL_DEBUGS("MediaImpl") << "GST_PLUGIN_PATH set to " + << getenv("GST_PLUGIN_PATH") << LL_ENDL; + +#endif // LL_WINDOWS || LL_DARWIN } -- cgit v1.1 From b1412201b6e44c1a304acd70d9104d3a2034da52 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 29 Mar 2009 22:28:41 -0500 Subject: set_gst_plugin_path now sets GST_PLUGIN_SYSTEM_PATH="". This prevents GStreamer from looking for system-installed plugins, which can have conflicts with our packaged ones. --- linden/indra/llmedia/llmediaimplgstreamer.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'linden') diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp index 20b89f5..270b08b 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp @@ -282,6 +282,9 @@ void LLMediaImplGStreamer::set_gst_plugin_path() LL_DEBUGS("MediaImpl") << "GST_PLUGIN_PATH set to " << getenv("GST_PLUGIN_PATH") << LL_ENDL; + // Disable loading system plugins. We only want to use ours, to avoid conflicts. + putenv( "GST_PLUGIN_SYSTEM_PATH=\"\"" ); + #endif // LL_WINDOWS || LL_DARWIN } -- cgit v1.1 From d06b985a3b67d2dc2bf1a41e6a9ca1e60d59c1ac Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 30 Mar 2009 00:02:37 -0500 Subject: Added libgstdecodebin.so plugin to Mac manifest. --- linden/indra/newview/viewer_manifest.py | 1 + 1 file changed, 1 insertion(+) (limited to 'linden') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 69f4d20..71c07b6 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -496,6 +496,7 @@ class DarwinManifest(ViewerManifest): self.path("libgstcoreelements.so") self.path("libgstcoreindexers.so") self.path("libgstdebug.so") + self.path("libgstdecodebin.so") self.path("libgstdecodebin2.so") self.path("libgstdeinterlace2.so") self.path("libgstequalizer.so") -- cgit v1.1