adium 3227:7d015353a2ef: copy_frameworks.sh now gives better fee...

commits at adium.im commits at adium.im
Thu May 20 17:10:13 UTC 2010


details:	http://hg.adium.im/adium/rev/7d015353a2ef
revision:	3227:7d015353a2ef
author:		Evan Schoenberg
date:		Thu May 20 12:01:18 2010 -0500

copy_frameworks.sh now gives better feedback and runs to completion
Subject: adium 3228:cdf3d954d403: Don't let gstreamer load its 'system path' plugins. This fixes what has been confusing me most of the morning - gstreamer was loading plugins out of my development build directory.

details:	http://hg.adium.im/adium/rev/cdf3d954d403
revision:	3228:cdf3d954d403
author:		Evan Schoenberg
date:		Thu May 20 12:10:06 2010 -0500

Don't let gstreamer load its 'system path' plugins. This fixes what has been confusing me most of the morning - gstreamer was loading plugins out of my development build directory.

diffs (41 lines):

diff -r 8f8c95b280ed -r cdf3d954d403 Dependencies/copy_frameworks.sh
--- a/Dependencies/copy_frameworks.sh	Thu May 20 10:53:08 2010 -0500
+++ b/Dependencies/copy_frameworks.sh	Thu May 20 12:10:06 2010 -0500
@@ -8,7 +8,10 @@
 
 ADIUM="`dirname $0`/.."
 
-cp -R "$ROOTDIR"/Frameworks/*.subproj/*.framework "$ADIUM/Frameworks/"
+# Don't allow any out-of-date plugins to hang around and be subsequently laoded
+rm -rf "$ADIUM/Frameworks/libgstreamer.framework/PlugIns"
+
+cp -Rf "$ROOTDIR"/Frameworks/*.subproj/*.framework "$ADIUM/Frameworks/" || TRUE
 
 # These libgst plugins cause problems in gst_init if present; we shouldn't
 # be building them at all.
@@ -16,6 +19,8 @@
 rm "$ADIUM/Frameworks/libgstreamer.framework/PlugIns/libgstwavparse.so"
 rm "$ADIUM/Frameworks/libgstreamer.framework/PlugIns/libgsty4menc.so"
 
+echo "Cleaning the Adium built products"
+
 pushd "$ADIUM/build" > /dev/null 2>&1
 	rm -rf */AdiumLibpurple.framework 
 	rm -rf */*/Adium.app/Contents/Frameworks/lib*
diff -r 8f8c95b280ed -r cdf3d954d403 Plugins/Purple Service/SLPurpleCocoaAdapter.m
--- a/Plugins/Purple Service/SLPurpleCocoaAdapter.m	Thu May 20 10:53:08 2010 -0500
+++ b/Plugins/Purple Service/SLPurpleCocoaAdapter.m	Thu May 20 12:10:06 2010 -0500
@@ -174,8 +174,11 @@
 	setenv("GST_PLUGIN_PATH", 
 				 [[[NSBundle bundleWithIdentifier:@"com.googlepages.openspecies.rtool.libgstreamer"] builtInPlugInsPath] fileSystemRepresentation],
 				 1);
-	AILog(@"Set GST plugin path to %s",
-				[[[NSBundle bundleWithIdentifier:@"com.googlepages.openspecies.rtool.libgstreamer"] builtInPlugInsPath] fileSystemRepresentation]);
+	/* Don't let gstreamer load 'system path' plugins - if the user has gstreamer installed elsewhere,
+	 * or if this is a poor, confused developer who has built gstreamer locally, this will lead to very
+	 * bad behavior.
+	 */
+	setenv("GST_PLUGIN_SYSTEM_PATH", " ", 1);
 	
 	GError *error = NULL;
 	if (!gst_init_check(NULL, NULL, &error)) {



More information about the commits mailing list