adium 3226:8f8c95b280ed: Don't allow copy_frameworks.sh to copy ...

commits at adium.im commits at adium.im
Thu May 20 15:53:16 UTC 2010


details:	http://hg.adium.im/adium/rev/8f8c95b280ed
revision:	3226:8f8c95b280ed
author:		Evan Schoenberg
date:		Thu May 20 10:53:08 2010 -0500

Don't allow copy_frameworks.sh to copy in these libgstreamer plugins (libgsty4menc, libgstwayparse, and libgstwavenc) which will make Adium crash in gst_init during initialization. Their removal was noted by sholt in a commit message, but it's easy to get messed up again if you copy newly built framework into place.

diffs (16 lines):

diff -r 3d6cae74ceb4 -r 8f8c95b280ed Dependencies/copy_frameworks.sh
--- a/Dependencies/copy_frameworks.sh	Wed May 19 07:14:35 2010 -0500
+++ b/Dependencies/copy_frameworks.sh	Thu May 20 10:53:08 2010 -0500
@@ -10,6 +10,12 @@
 
 cp -R "$ROOTDIR"/Frameworks/*.subproj/*.framework "$ADIUM/Frameworks/"
 
+# These libgst plugins cause problems in gst_init if present; we shouldn't
+# be building them at all.
+rm "$ADIUM/Frameworks/libgstreamer.framework/PlugIns/libgstwavenc.so"
+rm "$ADIUM/Frameworks/libgstreamer.framework/PlugIns/libgstwavparse.so"
+rm "$ADIUM/Frameworks/libgstreamer.framework/PlugIns/libgsty4menc.so"
+
 pushd "$ADIUM/build" > /dev/null 2>&1
 	rm -rf */AdiumLibpurple.framework 
 	rm -rf */*/Adium.app/Contents/Frameworks/lib*




More information about the commits mailing list