From fe0b30183bd9643d2c8e4bcb812817388787c4dc Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 1 Feb 2013 16:41:13 +0000 Subject: merge in build fixes from branches/pd-extended/0.43 svn path=/trunk/; revision=17014 --- packages/linux_make/48x48/pd-extended.png | Bin 0 -> 2614 bytes packages/linux_make/48x48/text-x-puredata.png | Bin 0 -> 2885 bytes packages/linux_make/Makefile | 20 +-- packages/linux_make/debian/pd-extended.postinst | 2 + packages/linux_make/debian/pd-extended.postrm | 2 + packages/linux_make/debian/pd-extended.prerm | 2 + packages/linux_make/pd-extended-48x48.png | Bin 2614 -> 0 bytes packages/linux_make/pd-extended.desktop | 21 ++-- packages/linux_make/pd-extended.xml | 161 ++++++++++++++---------- 9 files changed, 130 insertions(+), 78 deletions(-) create mode 100644 packages/linux_make/48x48/pd-extended.png create mode 100644 packages/linux_make/48x48/text-x-puredata.png delete mode 100644 packages/linux_make/pd-extended-48x48.png diff --git a/packages/linux_make/48x48/pd-extended.png b/packages/linux_make/48x48/pd-extended.png new file mode 100644 index 00000000..a3ac35d1 Binary files /dev/null and b/packages/linux_make/48x48/pd-extended.png differ 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 Binary files /dev/null and b/packages/linux_make/48x48/text-x-puredata.png differ 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-48x48.png b/packages/linux_make/pd-extended-48x48.png deleted file mode 100644 index a3ac35d1..00000000 Binary files a/packages/linux_make/pd-extended-48x48.png and /dev/null differ 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 @@ - - - - - - - - - - Pure Data Document - Pure Data Document - Pure Data Dokument - Dogfen Pure Data - Pure Data-dokument - Pure Data-dokument - Pure Data-asiakirja - Pure Data Dokument - Dokument Pure Data - Pure Data Document - Documento de Pure Data - Documento Pure Data - Pure Data dokument - Pure Data Dokument - Pure Data Belgesi - Документ Pure Data - - - - - Pure Data Help - - - - - Pure Data Meta Marker for Libraries - - - - - Pure Data External (Linux Binary) - - - - - Pure Data External (Mac OS X Binary) - - - - - Max/MSP Text Document - - - - - - - - - - - Max/MSP Binary Document - - + + + + + + + + + + Pure Data Document + Pure Data Document + Pure Data Dokument + Pure Data Dokument + Dogfen Pure Data + Έγγραφο Pure Data + Fichier de Pure Data + Pure Data dokumentum + Pure Dataドキュメント + Pure Data-dokument + Pure Data-dokument + Pure Data-asiakirja + Pure Data Dokument + Dokument Pure Data + Pure Data Document + Documento de Pure Data + Documento Pure Data + Pure Data dokument + Pure Data Dokument + Pure Data Belgesi + Документ Pure Data + + + + + Pure Data Help + Pure Data Hjælp + Βοήθεια Pure Data + Aide de Pure Data + Pure Data súgó + Pure Dataヘルプファイル + + + + + Pure Data Meta Marker for Libraries + Pure Data Meta Marker for Biblioteker + Μέτα Δείκτης Pure Data για Βιβλιοθήκες + Balise Meta pour librairie de Pure Data + Pure Data meta jelölő könyvárakhoz + ライブラリ用Pure Dataメタマーカー + + + + + Pure Data External (Linux Binary) + Pure Data Udvidelse (Linux Binary) + Εξωτερικό Pure Data (Δυαδικό Linux) + Extra de Pure Data (binaire pour Linux) + Pure Data external (Linux bináris) + Pure Dataエクスターナル(Linuxバイナリ) + + + + + Pure Data External (Mac OS X Binary) + Pure Data External (Mac OS X Binary) + Εξωτερικό Pure Data (Δυαδικό Mac OS X) + Extra de Pure Data (binaire pour Mac OS X) + Pure Data external (Mac OS X bináris) + Pure Dataエクスターナル(Mac OS Xバイナリ) + + + + + Max/MSP Text Document + Max/MSP Έγγραφο κειμένου + Max/MSP Tekstdokument + Fichier texte pour Max/MSP + Max/MSP szöveg dokumentum + Max/MSPテキストドキュメント + + + + + + + + + + + Max/MSP Binary Document + Max/MSP Binarydokument + Max/MSP Δυαδικό Έγγραφο + Fichier binaire pour Max/MSP + Max/MSP bináris dokumentum + Max/MSPバイナリドキュメント + + -- cgit v1.2.1