merge in build fixes from branches/pd-extended/0.43

svn path=/trunk/; revision=17014

8 files changed, 130 insertions, 78 deletions

diff --git a/packages/linux_make/pd-extended-48x48.png b/packages/linux_make/48x48/pd-extended.png
index a3ac35d1..a3ac35d1 100644
--- a/packages/linux_make/pd-extended-48x48.png
+++ b/packages/linux_make/48x48/pd-extended.png
diff --git a/packages/linux_make/48x48/text-x-puredata.png b/packages/linux_make/48x48/text-x-puredata.png
new file mode 100644
index 00000000..fd0d97e3
--- /dev/null
+++ b/packages/linux_make/48x48/text-x-puredata.png
diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile
index f427aa23..91fea1a8 100755
--- a/packages/linux_make/Makefile
+++ b/packages/linux_make/Makefile
@@ -32,8 +32,8 @@ endif
 #STRIP = strip --strip-unneeded -R .note -R .comment
 STRIP = echo
 
-DEBUG_CFLAGS = -g -fno-inline-functions -fno-omit-frame-pointer -DDEBUG_SOUNDFILE -Wstrict-aliasing=2
-OPT_CFLAGS = 
+DEBUG_CFLAGS = -g -fno-inline-functions -fno-omit-frame-pointer -Wstrict-aliasing=2
+OPT_CFLAGS = -O3 -funroll-loops
 
 # bash's HOSTTYPE env var seems more reliable in chroots, use it if its set
 ifeq ($(HOSTTYPE),)
@@ -53,11 +53,12 @@ TARGET_PLATFORM := i686
 endif
 
 ifeq ($(TARGET_PLATFORM),i686)
-# Generic x86 (tune for Pentium III, since that's more common these days)
-  OPT_CFLAGS += -mtune=i686 -march=i386
+# Generic x86 (build for Pentium III, since that's the first with SSE)
+  OPT_CFLAGS += -march=pentium3 -msse -mfpmath=sse
+  OPT_CFLAGS += -ftree-vectorize -ftree-vectorizer-verbose=1
 endif
-ifeq ($(TARGET_PLATFORM),amd64)
-  OPT_CFLAGS += -march=k8 -msse -msse2 -mfpmath=sse
+ifeq ($(TARGET_PLATFORM),x86_64)
+  OPT_CFLAGS += -march=k8 -msse -msse2 -msse3 -mfpmath=sse
   OPT_CFLAGS += -ftree-vectorize -ftree-vectorizer-verbose=1
 endif
 ifeq ($(TARGET_PLATFORM),ppc)
@@ -119,14 +120,17 @@ deb: $(bindir)
 	install -p -m0644 $(packages_src)/linux_make/pd-extended.png \
 		$(DESTDIR)/usr/share/icons/hicolor/128x128/apps/pd-extended.png
 	install -d $(DESTDIR)/usr/share/icons/hicolor/48x48/apps/
-	install -p -m0644 $(packages_src)/linux_make/pd-extended-48x48.png \
-		$(DESTDIR)/usr/share/icons/hicolor/48x48/apps/pd-extended.png
+	install -p -m0644 $(packages_src)/linux_make/48x48/pd-extended.png \
+		$(DESTDIR)/usr/share/icons/hicolor/48x48/apps/
 	install -d $(DESTDIR)/usr/share/pixmaps
 	install -p -m0644 $(packages_src)/linux_make/pd-extended.xpm \
 		$(DESTDIR)/usr/share/pixmaps/
 	install -d $(DESTDIR)/usr/share/icons/hicolor/128x128/mimetypes
 	install -p -m0644 $(packages_src)/linux_make/text-x-puredata.png \
 		$(DESTDIR)/usr/share/icons/hicolor/128x128/mimetypes
+	install -d $(DESTDIR)/usr/share/icons/hicolor/48x48/mimetypes
+	install -p -m0644 $(packages_src)/linux_make/48x48/text-x-puredata.png \
+		$(DESTDIR)/usr/share/icons/hicolor/48x48/mimetypes/
 	install -d $(DESTDIR)/usr/share/applications/ 
 	install -p -m0644 $(packages_src)/linux_make/pd-extended.desktop \
 		$(DESTDIR)/usr/share/applications/
diff --git a/packages/linux_make/debian/pd-extended.postinst b/packages/linux_make/debian/pd-extended.postinst
index 07e831e9..126e38df 100755
--- a/packages/linux_make/debian/pd-extended.postinst
+++ b/packages/linux_make/debian/pd-extended.postinst
@@ -28,3 +28,5 @@ if [ "$1" = "configure" ] || [ "$1" = "upgrade" ]; then
                       --slave /usr/share/man/man1/pdextended.1.gz pdextended.1.gz \
                               /usr/share/man/man1/pd-extended.1.gz
 fi
+
+#DEBHELPER#
diff --git a/packages/linux_make/debian/pd-extended.postrm b/packages/linux_make/debian/pd-extended.postrm
index 84905c06..f55a6e5c 100755
--- a/packages/linux_make/debian/pd-extended.postrm
+++ b/packages/linux_make/debian/pd-extended.postrm
@@ -13,3 +13,5 @@ fi
 if [ -x "`which update-mime-database 2>/dev/null`" ]; then
 	update-mime-database /usr/share/mime
 fi
+
+#DEBHELPER#
diff --git a/packages/linux_make/debian/pd-extended.prerm b/packages/linux_make/debian/pd-extended.prerm
index ecc26dbe..db94b0f1 100755
--- a/packages/linux_make/debian/pd-extended.prerm
+++ b/packages/linux_make/debian/pd-extended.prerm
@@ -4,3 +4,5 @@ if [ "$1" != "upgrade" ]; then
   update-alternatives --remove pd /usr/bin/pd-extended
   update-alternatives --remove pdextended /usr/bin/pd-extended
 fi
+
+#DEBHELPER#
diff --git a/packages/linux_make/pd-extended.desktop b/packages/linux_make/pd-extended.desktop
index 86e4e6a3..01ea74dc 100644
--- a/packages/linux_make/pd-extended.desktop
+++ b/packages/linux_make/pd-extended.desktop
@@ -3,16 +3,23 @@ Encoding=UTF-8
 Name=Pd-extended
 GenericName=Pd
 Comment=Visual dataflow programming platform for multimedia
-Comment[ca]=Plataforma de programació visual per aplicacions multimèdia
-Comment[de]=Grafische Datenflussprogrammierung für Multimedia
-Comment[es]=Plataforma de programación visual para aplicaciones multimedia
-Comment[fr]=Plateforme de programmation visuelle pour applications multimédia
-Comment[it]=Piattaforma di programmazione visuale per applicazioni multimedia
-Comment[pt]=Plataforma de programação visuais para multimedia
-Exec=/usr/lib/pd-extended/tcl/pd-gui.tcl -open %F
+Exec=pasuspender -- /usr/lib/pd-extended/tcl/pd-gui.tcl %F
 Terminal=false
 Type=Application
 Icon=pd-extended.xpm
 Categories=AudioVideo;Audio;Video;Development
 MimeType=text/x-puredata;application/x-maxmsp;text/x-maxmsp;
 StartupNotify=false
+
+# Translations
+Comment[ca]=Plataforma de programació visual per aplicacions multimèdia
+Comment[cs]=Vizuální programovací platforma datového toku pro multimédia
+Comment[da]=Visuel dataflow programmerings platform for multimedie
+Comment[de]=Grafische Datenflussprogrammierung für Multimedia
+Comment[el]=Πλατφόρμα εικονικής ροής προγραμματισμού για πολυμέσα
+Comment[es]=Plataforma de programación visual para aplicaciones multimedia
+Comment[fr]=Plateforme de programmation visuelle pour applications multimédia
+Comment[hu]=Vizuális adatfolyam programozási platform multimédiához
+Comment[it]=Piattaforma di programmazione visuale per applicazioni multimedia
+Comment[ja]=ビジュアルデータフロープログラミング環境
+Comment[pt]=Plataforma de programação visuais para multimedia
diff --git a/packages/linux_make/pd-extended.xml b/packages/linux_make/pd-extended.xml
index 51a5d54d..8ad7c4ea 100644
--- a/packages/linux_make/pd-extended.xml
+++ b/packages/linux_make/pd-extended.xml
@@ -1,63 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">

-  <mime-type type="text/x-puredata">

-    <sub-class-of type="text/plain"/>

-    <glob pattern="*.pd"/>

-	<alias type="application/x-puredata"/>

-	<magic priority="50">

-	  <match type="string" value="#N " offset="0"/>

-	</magic>

-    <comment>Pure Data Document</comment>

-	<comment xml:lang="en">Pure Data Document</comment>

-	<comment xml:lang="de">Pure Data Dokument</comment>

-	<comment xml:lang="cy">Dogfen Pure Data</comment>

-	<comment xml:lang="nb">Pure Data-dokument</comment>

-	<comment xml:lang="nn">Pure Data-dokument</comment>

-	<comment xml:lang="fi">Pure Data-asiakirja</comment>

-	<comment xml:lang="cz">Pure Data Dokument</comment>

-	<comment xml:lang="sl">Dokument Pure Data</comment>

-	<comment xml:lang="fr">Pure Data Document</comment>

-	<comment xml:lang="es">Documento de Pure Data</comment>

-	<comment xml:lang="it">Documento Pure Data</comment>

-	<comment xml:lang="nb">Pure Data dokument</comment>

-	<comment xml:lang="da">Pure Data Dokument</comment>

-	<comment xml:lang="tr">Pure Data Belgesi</comment>

-	<comment xml:lang="ru">Документ Pure Data</comment>

-  </mime-type>

-  <mime-type type="text/x-puredata-help">

-    <sub-class-of type="text/x-puredata"/>

-    <glob pattern="*-help.pd"/>

-    <comment>Pure Data Help</comment>

-  </mime-type>

-  <mime-type type="text/x-puredata-meta">

-    <sub-class-of type="text/x-puredata"/>

-    <glob pattern="*-meta.pd"/>

-    <comment>Pure Data Meta Marker for Libraries</comment>

-  </mime-type>

-  <mime-type type="application/x-puredata-external-linux">

-    <sub-class-of type="application/octet-stream"/>

-    <glob pattern="*.pd_linux"/>

-    <comment>Pure Data External (Linux Binary)</comment>

-  </mime-type>

-  <mime-type type="application/x-puredata-external-darwin">

-    <sub-class-of type="application/octet-stream"/>

-    <glob pattern="*.pd_darwin"/>

-    <comment>Pure Data External (Mac OS X Binary)</comment>

-  </mime-type>

-  <mime-type type="text/x-maxmsp">

-    <sub-class-of type="text/plain"/>

-    <glob pattern="*.mxt"/>

-    <comment>Max/MSP Text Document</comment>

-	<magic priority="50">

-	  <match type="string" value="max v2;" offset="0"/>

-	</magic>

-  </mime-type>

-  <mime-type type="application/x-maxmsp">

-    <sub-class-of type="application/octet-stream"/>

-    <glob pattern="*.mxb"/>

-	<magic priority="50">

-	  <match type="string" value="pmax" offset="4"/>

-	</magic>

-    <comment>Max/MSP Binary Document</comment>

-  </mime-type>

-</mime-info>

+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="text/x-puredata">
+    <sub-class-of type="text/plain"/>
+    <glob pattern="*.pd"/>
+	<alias type="application/x-puredata"/>
+	<magic priority="50">
+	  <match type="string" value="#N " offset="0"/>
+	</magic>
+    <comment>Pure Data Document</comment>
+	<comment xml:lang="en">Pure Data Document</comment>
+	<comment xml:lang="da">Pure Data Dokument</comment>
+	<comment xml:lang="de">Pure Data Dokument</comment>
+	<comment xml:lang="cy">Dogfen Pure Data</comment>
+    <comment xml:lang="el">Έγγραφο Pure Data</comment>
+	<comment xml:lang="fr">Fichier de Pure Data</comment>
+	<comment xml:lang="hu">Pure Data dokumentum</comment>
+	<comment xml:lang="ja">Pure Dataドキュメント</comment>
+	<comment xml:lang="nb">Pure Data-dokument</comment>
+	<comment xml:lang="nn">Pure Data-dokument</comment>
+	<comment xml:lang="fi">Pure Data-asiakirja</comment>
+	<comment xml:lang="cz">Pure Data Dokument</comment>
+	<comment xml:lang="sl">Dokument Pure Data</comment>
+	<comment xml:lang="fr">Pure Data Document</comment>
+	<comment xml:lang="es">Documento de Pure Data</comment>
+	<comment xml:lang="it">Documento Pure Data</comment>
+	<comment xml:lang="nb">Pure Data dokument</comment>
+	<comment xml:lang="da">Pure Data Dokument</comment>
+	<comment xml:lang="tr">Pure Data Belgesi</comment>
+	<comment xml:lang="ru">Документ Pure Data</comment>
+  </mime-type>
+  <mime-type type="text/x-puredata-help">
+    <sub-class-of type="text/x-puredata"/>
+    <glob pattern="*-help.pd"/>
+    <comment>Pure Data Help</comment>
+	<comment xml:lang="da">Pure Data Hjælp</comment>
+    <comment xml:lang="el">Βοήθεια Pure Data</comment>
+    <comment xml:lang="fr">Aide de Pure Data</comment>
+    <comment xml:lang="hu">Pure Data súgó</comment>
+    <comment xml:lang="ja">Pure Dataヘルプファイル</comment>
+  </mime-type>
+  <mime-type type="text/x-puredata-meta">
+    <sub-class-of type="text/x-puredata"/>
+    <glob pattern="*-meta.pd"/>
+    <comment>Pure Data Meta Marker for Libraries</comment>
+	<comment xml:lang="da">Pure Data Meta Marker for Biblioteker</comment>
+    <comment xml:lang="el">Μέτα Δείκτης Pure Data για Βιβλιοθήκες</comment>
+    <comment xml:lang="fr">Balise Meta pour librairie de Pure Data</comment>
+    <comment xml:lang="hu">Pure Data meta jelölő könyvárakhoz</comment>
+    <comment xml:lang="ja">ライブラリ用Pure Dataメタマーカー</comment>
+  </mime-type>
+  <mime-type type="application/x-puredata-external-linux">
+    <sub-class-of type="application/octet-stream"/>
+    <glob pattern="*.pd_linux"/>
+    <comment>Pure Data External (Linux Binary)</comment>
+	<comment xml:lang="da">Pure Data Udvidelse (Linux Binary)</comment>
+    <comment xml:lang="el">Εξωτερικό Pure Data (Δυαδικό Linux)</comment>
+    <comment xml:lang="fr">Extra de Pure Data (binaire pour Linux)</comment>
+    <comment xml:lang="hu">Pure Data external (Linux bináris)</comment>
+    <comment xml:lang="ja">Pure Dataエクスターナル(Linuxバイナリ)</comment>
+  </mime-type>
+  <mime-type type="application/x-puredata-external-darwin">
+    <sub-class-of type="application/octet-stream"/>
+    <glob pattern="*.pd_darwin"/>
+    <comment>Pure Data External (Mac OS X Binary)</comment>
+	<comment xml:lang="da">Pure Data External (Mac OS X Binary)</comment>
+    <comment xml:lang="el">Εξωτερικό Pure Data (Δυαδικό Mac OS X)</comment>
+    <comment xml:lang="fr">Extra de Pure Data (binaire pour Mac OS X)</comment>
+    <comment xml:lang="hu">Pure Data external (Mac OS X bináris)</comment>
+    <comment xml:lang="ja">Pure Dataエクスターナル(Mac OS Xバイナリ)</comment>
+  </mime-type>
+  <mime-type type="text/x-maxmsp">
+    <sub-class-of type="text/plain"/>
+    <glob pattern="*.mxt"/>
+    <comment>Max/MSP Text Document</comment>
+    <comment xml:lang="el">Max/MSP Έγγραφο κειμένου</comment>
+	<comment xml:lang="da">Max/MSP Tekstdokument</comment>
+    <comment xml:lang="fr">Fichier texte pour Max/MSP</comment>
+    <comment xml:lang="hu">Max/MSP szöveg dokumentum</comment>
+    <comment xml:lang="ja">Max/MSPテキストドキュメント</comment>
+	<magic priority="50">
+	  <match type="string" value="max v2;" offset="0"/>
+	</magic>
+  </mime-type>
+  <mime-type type="application/x-maxmsp">
+    <sub-class-of type="application/octet-stream"/>
+    <glob pattern="*.mxb"/>
+	<magic priority="50">
+	  <match type="string" value="pmax" offset="4"/>
+	</magic>
+    <comment>Max/MSP Binary Document</comment>
+	<comment xml:lang="da">Max/MSP Binarydokument</comment>
+    <comment xml:lang="el">Max/MSP Δυαδικό Έγγραφο</comment>
+    <comment xml:lang="fr">Fichier binaire pour Max/MSP</comment>
+    <comment xml:lang="hu">Max/MSP bináris dokumentum</comment>
+    <comment xml:lang="ja">Max/MSPバイナリドキュメント</comment>
+  </mime-type>
+</mime-info>