Update mac installer building scripts

git-svn-id: svn+ssh://svn.gna.org/svn/advene/trunk@7274 3fb6f576-06d4-0310-ad11-a4b695aa9f05

Author: oaubert

bin/advene

@@ -120,7 +120,7 @@ if not os.path.exists(config.data.path['resources']):
             # Pango hack
             os.environ['PANGO_SYSCONF_DIR'] = d
             os.environ['PANGO_LIB_DIR'] = d
-
+            os.environ['XDG_DATA_DIRS'] = d
             os.environ['GST_PLUGIN_PATH'] = os.path.join(d, 'gst-plugins')
 
             # Let us fix the pango.modules and pixbuf.loaders files if necessary

mac/create_app_bundle

@@ -27,7 +27,7 @@ rm -rf build dist
 /opt/local/bin/python -m compileall lib/advene
 
 # Add advene, simpletal and cherrypy, which do not seem to be taken into account automatically. Should investigate this...
-(cd lib ; zip -r ../dist/Advene.app/Contents/Resources/lib/python2.5/site-packages.zip  advene  simpletal cherrypy -i \*.pyc )
+(cd lib ; zip -r ../dist/Advene.app/Contents/Resources/lib/python2.6/site-packages.zip  advene  simpletal cherrypy -i \*.pyc )
 # Now try to copy the necessary gtk/pango data files (etc, lib)
 
 # Let us put pango and pixbuf loader modules in the same modules directory
@@ -38,6 +38,8 @@ cp -R /opt/local/lib/pango/1.6.0/modules/*.so $Frameworks/modules
 
 echo "Copying GTK modules"
 cp -r /opt/local/lib/gtk-2.0 $Resources/lib
+# Remove printbackends, there are issues when otool-ing them
+rm ${Resources}/lib/gtk-2.0/2.10.0/printbackends/*
 
 # generate new pango.modules file
 cat > pangorc <<EOF 
@@ -55,13 +57,16 @@ ModulesPath=@executable_path/../Frameworks/modules
 EOF
 
 # Copy the fonts.conf file
-cp /etc/fonts/fonts.conf $Resources/fonts.conf
+cp /opt/local/etc/fonts/fonts.conf $Resources/fonts.conf
 
 # Remove any reference to Verdana, since it makes Pango unusable
 perl -pi -e 's/.*verdana.*//i' $Resources/fonts.conf
 
+# Copy pixbuf loaders to gtk 2.10 dir
+cp -r /opt/local/lib/gdk-pixbuf-2.0/2.10.0/loaders ${Resources}/lib/gtk-2.0/2.10.0
+
 # generate a new GDK pixbufs loaders file
-sed "s?/opt/local/lib/gtk-2.0/2.10.0/loaders/?@executable_path/../Resources/lib/gtk-2.0/2.10.0/loaders/?" < /opt/local/etc/gtk-2.0/gdk-pixbuf.loaders > $Resources/gdk-pixbuf.loaders.in
+sed "s?/opt/local/lib/gdk-pixbuf-2.0/2.10.0/loaders/?@executable_path/../Resources/lib/gtk-2.0/2.10.0/loaders/?" < /opt/local/etc/gtk-2.0/gdk-pixbuf.loaders > $Resources/gdk-pixbuf.loaders.in
 
 # Copy the theme
 [ ! -z "$THEMENAME" ] && cp -r mac/${THEMENAME} ${Resources}/theme
@@ -76,7 +81,10 @@ otool -L ${MacOS}/f/librsvg-2.2.dylib  | perl -lne 'print $1 if m!/opt/local/lib
 
 
 # Copy gtk python modules. This will override the py2app way (creating a _gtk.pyc wrapper in the site-packages.zip, which tries to load _gtk.so from lib-dynload, but it crashes)
-cp -r /opt/local/lib/python2.5/site-packages/gtk-2.0/* $Resources/lib/python2.5
+#cp -r /opt/local/lib/python2.6/site-packages/gtk-2.0/* $Resources/lib/python2.6
+# FIXME: now in /opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/gtk-2.0/
+cp -r  /opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/gtk-2.0/* $Resources/lib/python2.6
+
 
 # Copy gstreamer libs
 cp /opt/local/lib/libgst*-0.10.0.dylib ${Frameworks}
@@ -89,13 +97,14 @@ do
    otool -L /opt/local/lib/gstreamer-0.10/${n} | perl -lne 'print $1 if m!/opt/local/lib/(.+?\.dylib)!'
 done) | sort -u | ( while read a
 do
-  echo "Copying $a deps"
+  echo "Copying $a dep" 
   cp /opt/local/lib/${a} ${Frameworks}
 done )
 
 echo "Fixing library names ..."
 # fix the libraries we include
-for dylib in $Frameworks/*.dylib $Frameworks/modules/*.so $Resources/lib/gtk-2.0/2.10.0/*/*.so $Resources/lib/python2.5/*.so $Resources/lib/python2.5/*/*.so ${Resources}/gst-plugins/*.so
+for dylib in $Frameworks/*.dylib $Frameworks/modules/*.so $Resources/lib/gtk-2.0/2.10.0/*/*.so $Resources/lib/python2.6/*.so $Resources/lib/python2.6/*/*.so ${Resources}/gst-plugins/*.so
+#for dylib in $Frameworks/*.dylib $Frameworks/modules/*.so $Resources/lib/gtk-2.0/2.10.0/*/*.so $Resources/lib/python2.6/*/*.so ${Resources}/gst-plugins/*.so
 do
     # skip symlinks
     if test ! -L $dylib ; then

mac/gst-plugins.txt

@@ -50,7 +50,6 @@ libgstflac.so
 libgstflv.so
 libgstflxdec.so
 libgstfreeze.so
-libgstgamma.so
 libgstgdkpixbuf.so
 libgstgdp.so
 libgstgio.so
@@ -69,7 +68,6 @@ libgstlevel.so
 libgstliveadder.so
 libgstmad.so
 libgstmatroska.so
-libgstmetadata.so
 libgstmms.so
 libgstmpeg2dec.so
 libgstmpeg4videoparse.so
@@ -112,15 +110,12 @@ libgstrtpmanager.so
 libgstrtpmux.so
 libgstrtsp.so
 libgstscaletempoplugin.so
-libgstschro.so
 libgstsdpelem.so
-libgstselector.so
 libgstshapewipe.so
 libgstshout2.so
 libgstsiren.so
 libgstsmpte.so
 libgstsndfile.so
-libgstsoundtouch.so
 libgstspectrum.so
 libgstspeed.so
 libgststereo.so
@@ -132,11 +127,8 @@ libgsttta.so
 libgsttwolame.so
 libgsttypefindfunctions.so
 libgstudp.so
-libgstvalve.so
-libgstvideobalance.so
 libgstvideobox.so
 libgstvideocrop.so
-libgstvideoflip.so
 libgstvideomeasure.so
 libgstvideomixer.so
 libgstvideorate.so