From 0e1bfaa5cddccb6b5e8b3fc7cc538249910a81b6 Mon Sep 17 00:00:00 2001 From: Cyrille Henry Date: Wed, 6 Jan 2010 11:06:29 +0000 Subject: depreciate an old abstraction svn path=/trunk/abstractions/nusmuk/; revision=12909 --- deprecated/distortion-help.pd | 35 +++++++++++++++++++++++++++++++++++ deprecated/distortion.pd | 22 ++++++++++++++++++++++ distortion-help.pd | 35 ----------------------------------- distortion.pd | 22 ---------------------- 4 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 deprecated/distortion-help.pd create mode 100644 deprecated/distortion.pd delete mode 100644 distortion-help.pd delete mode 100644 distortion.pd diff --git a/deprecated/distortion-help.pd b/deprecated/distortion-help.pd new file mode 100644 index 0000000..c3e8a62 --- /dev/null +++ b/deprecated/distortion-help.pd @@ -0,0 +1,35 @@ +#N canvas 468 234 684 571 10; +#X obj 78 262 distortion; +#X obj 77 302 dac~; +#X msg 143 133 \$1 20; +#X obj 143 155 line~; +#X floatatom 143 109 5 0 0 0 - - -; +#X obj 77 194 osc~ 80; +#X obj 198 132 osc~ 30; +#X floatatom 77 164 5 0 0 0 - - -; +#X floatatom 198 111 5 0 0 0 - - -; +#X floatatom 222 157 5 0 0 0 - - -; +#X obj 199 178 *~ 0; +#X text 134 24 simple distortion with audio input for the distortion +ratio; +#X text 169 51 Left inlet : audio in; +#X text 168 71 Right inlet : distortion (0 to 1). gives oposit result +with (-1 to 0); +#X obj 143 235 min~ 1; +#X obj 142 211 max~ -1; +#X text 338 141 dependency : abs~ and pow~; +#X obj 158 315 oscillo~; +#X connect 0 0 1 0; +#X connect 0 0 1 1; +#X connect 0 0 17 0; +#X connect 2 0 3 0; +#X connect 3 0 15 0; +#X connect 4 0 2 0; +#X connect 5 0 0 0; +#X connect 6 0 10 0; +#X connect 7 0 5 0; +#X connect 8 0 6 0; +#X connect 9 0 10 1; +#X connect 10 0 15 0; +#X connect 14 0 0 1; +#X connect 15 0 14 0; diff --git a/deprecated/distortion.pd b/deprecated/distortion.pd new file mode 100644 index 0000000..623edf7 --- /dev/null +++ b/deprecated/distortion.pd @@ -0,0 +1,22 @@ +#N canvas 500 108 372 321 10; +#X obj 29 217 outlet~; +#X obj 29 132 /~; +#X obj 46 104 abs~; +#X obj 29 181 *~; +#X obj 46 156 pow~ 2; +#X obj 30 20 inlet~; +#X obj 123 52 inlet~; +#X text 87 20 audio in; +#X obj 123 97 +~ 1; +#X text 179 53 distortion (0 to 1); +#X obj 122 73 *~ -1; +#X connect 1 0 3 0; +#X connect 2 0 1 1; +#X connect 2 0 4 1; +#X connect 3 0 0 0; +#X connect 4 0 3 1; +#X connect 5 0 1 0; +#X connect 5 0 2 0; +#X connect 6 0 10 0; +#X connect 8 0 4 0; +#X connect 10 0 8 0; diff --git a/distortion-help.pd b/distortion-help.pd deleted file mode 100644 index c3e8a62..0000000 --- a/distortion-help.pd +++ /dev/null @@ -1,35 +0,0 @@ -#N canvas 468 234 684 571 10; -#X obj 78 262 distortion; -#X obj 77 302 dac~; -#X msg 143 133 \$1 20; -#X obj 143 155 line~; -#X floatatom 143 109 5 0 0 0 - - -; -#X obj 77 194 osc~ 80; -#X obj 198 132 osc~ 30; -#X floatatom 77 164 5 0 0 0 - - -; -#X floatatom 198 111 5 0 0 0 - - -; -#X floatatom 222 157 5 0 0 0 - - -; -#X obj 199 178 *~ 0; -#X text 134 24 simple distortion with audio input for the distortion -ratio; -#X text 169 51 Left inlet : audio in; -#X text 168 71 Right inlet : distortion (0 to 1). gives oposit result -with (-1 to 0); -#X obj 143 235 min~ 1; -#X obj 142 211 max~ -1; -#X text 338 141 dependency : abs~ and pow~; -#X obj 158 315 oscillo~; -#X connect 0 0 1 0; -#X connect 0 0 1 1; -#X connect 0 0 17 0; -#X connect 2 0 3 0; -#X connect 3 0 15 0; -#X connect 4 0 2 0; -#X connect 5 0 0 0; -#X connect 6 0 10 0; -#X connect 7 0 5 0; -#X connect 8 0 6 0; -#X connect 9 0 10 1; -#X connect 10 0 15 0; -#X connect 14 0 0 1; -#X connect 15 0 14 0; diff --git a/distortion.pd b/distortion.pd deleted file mode 100644 index 623edf7..0000000 --- a/distortion.pd +++ /dev/null @@ -1,22 +0,0 @@ -#N canvas 500 108 372 321 10; -#X obj 29 217 outlet~; -#X obj 29 132 /~; -#X obj 46 104 abs~; -#X obj 29 181 *~; -#X obj 46 156 pow~ 2; -#X obj 30 20 inlet~; -#X obj 123 52 inlet~; -#X text 87 20 audio in; -#X obj 123 97 +~ 1; -#X text 179 53 distortion (0 to 1); -#X obj 122 73 *~ -1; -#X connect 1 0 3 0; -#X connect 2 0 1 1; -#X connect 2 0 4 1; -#X connect 3 0 0 0; -#X connect 4 0 3 1; -#X connect 5 0 1 0; -#X connect 5 0 2 0; -#X connect 6 0 10 0; -#X connect 8 0 4 0; -#X connect 10 0 8 0; -- cgit v1.2.1 From 05681548ba7824da0acab9b7c92133b75d5f25a0 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sat, 21 Aug 2010 23:45:40 +0000 Subject: debianized using library template 1.0.1 svn path=/trunk/abstractions/nusmuk/; revision=13885 --- LICENSE.txt | 290 +++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 297 +++++++++++++++++++++++++++++++++++++++++++++++++++ README.txt | 1 + debian/changelog | 5 + debian/compat | 1 + debian/control | 13 +++ debian/copyright | 16 +++ debian/gbp.conf | 7 ++ debian/links | 2 + debian/rules | 18 ++++ debian/source/format | 1 + nusmuk-meta.pd | 7 ++ 12 files changed, 658 insertions(+) create mode 100644 LICENSE.txt create mode 100644 Makefile create mode 100644 README.txt create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/gbp.conf create mode 100644 debian/links create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 nusmuk-meta.pd diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..fa0bef4 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,290 @@ +GNU GENERAL PUBLIC LICENSE + +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom +to share and change it. By contrast, the GNU General Public License is +intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This General +Public License applies to most of the Free Software Foundation's +software and to any other program whose authors commit to using it. +(Some other Free Software Foundation software is covered by the +GNU Library General Public License instead.) You can apply it to your +programs, too. + +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new free +programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone +to deny you these rights or to ask you to surrender the rights. These +restrictions translate to certain responsibilities for you if you distribute +copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis +or for a fee, you must give the recipients all the rights that you have. You +must make sure that they, too, receive or can get the source code. And +you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, +we want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + +Finally, any free program is threatened constantly by software patents. +We wish to avoid the danger that redistributors of a free program will +individually obtain patent licenses, in effect making the program +proprietary. To prevent this, we have made it clear that any patent must +be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and +modification follow. + +TERMS AND CONDITIONS FOR +COPYING, DISTRIBUTION AND +MODIFICATION + +0. This License applies to any program or other work which contains a +notice placed by the copyright holder saying it may be distributed under +the terms of this General Public License. The "Program", below, refers +to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, either +verbatim or with modifications and/or translated into another language. +(Hereinafter, translation is included without limitation in the term +"modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of running +the Program is not restricted, and the output from the Program is +covered only if its contents constitute a work based on the Program +(independent of having been made by running the Program). Whether +that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the notices +that refer to this License and to the absence of any warranty; and give +any other recipients of the Program a copy of this License along with the +Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but does + not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, and +can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based on +the Program, the distribution of the whole must be on the terms of this +License, whose permissions for other licensees extend to the entire +whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise the +right to control the distribution of derivative or collective works based +on the Program. + +In addition, mere aggregation of another work not based on the +Program with the Program (or with a work based on the Program) on a +volume of a storage or distribution medium does not bring the other +work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding + machine-readable source code, which must be distributed under + the terms of Sections 1 and 2 above on a medium customarily + used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your cost + of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a + medium customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with + such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to control +compilation and installation of the executable. However, as a special +exception, the source code distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies the +executable. + +If distribution of executable or object code is made by offering access to +copy from a designated place, then offering equivalent access to copy +the source code from the same place counts as distribution of the source +code, even though third parties are not compelled to copy the source +along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt otherwise +to copy, modify, sublicense or distribute the Program is void, and will +automatically terminate your rights under this License. However, parties +who have received copies, or rights, from you under this License will not +have their licenses terminated so long as such parties remain in full +compliance. + +5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and all +its terms and conditions for copying, distributing or modifying the +Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these terms +and conditions. You may not impose any further restrictions on the +recipients' exercise of the rights granted herein. You are not responsible +for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot distribute +so as to satisfy simultaneously your obligations under this License and +any other pertinent obligations, then as a consequence you may not +distribute the Program at all. For example, if a patent license would not +permit royalty-free redistribution of the Program by all those who +receive copies directly or indirectly through you, then the only way you +could satisfy both it and this License would be to refrain entirely from +distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents +or other property right claims or to contest validity of any such claims; +this section has the sole purpose of protecting the integrity of the free +software distribution system, which is implemented by public license +practices. Many people have made generous contributions to the wide +range of software distributed through that system in reliance on +consistent application of that system; it is up to the author/donor to +decide if he or she is willing to distribute software through any other +system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be +a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original +copyright holder who places the Program under this License may add an +explicit geographical distribution limitation excluding those countries, so +that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new +versions of the General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may differ in +detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number +of this License, you may choose any version ever published by the Free +Software Foundation. + +10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be guided by the +two goals of preserving the free status of all derivatives of our free +software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF +CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, +TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT +WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE +PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, +EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD +THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE +COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW +OR AGREED TO IN WRITING WILL ANY COPYRIGHT +HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED +ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING +ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR +INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT +LIMITED TO LOSS OF DATA OR DATA BEING RENDERED +INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE +WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR +OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY +OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..76157be --- /dev/null +++ b/Makefile @@ -0,0 +1,297 @@ +## Pd library template version 1.0.1 +# For instructions on how to use this template, see: +# http://puredata.info/docs/developer/MakefileTemplate +LIBRARY_NAME = nusmuk + +# add your .c source files to the SOURCES variable, help files will be +# included automatically +SOURCES = + +# For objects that only build on certain platforms, add those to the SOURCES +# line for the right platforms. +SOURCES_android = +SOURCES_cygwin = +SOURCES_macosx = +SOURCES_iphoneos = +SOURCES_linux = +SOURCES_windows = + +# list all pd objects (i.e. myobject.pd) files here, and their helpfiles will +# be included automatically +PDOBJECTS = additive.pd between.pd granulator.pd lfo.pd many_bang.pd oscillo~.pd rnd_metro.pd spatialisation.pd + +# example patches and related files, in the 'examples' subfolder +EXAMPLES = + +# manuals and related files, in the 'manual' subfolder +MANUAL = + +# if you want to include any other files in the source and binary tarballs, +# list them here. This can be anything from header files, example patches, +# documentation, etc. README.txt and LICENSE.txt are required and therefore +# automatically included +EXTRA_DIST = hanning.wav + + + +#------------------------------------------------------------------------------# +# +# you shouldn't need to edit anything below here, if we did it right :) +# +#------------------------------------------------------------------------------# + +# get library version from meta file +LIBRARY_VERSION = $(shell sed -n 's|^\#X text [0-9][0-9]* [0-9][0-9]* VERSION \(.*\);|\1|p' $(LIBRARY_NAME)-meta.pd) + +# where Pd lives +PD_PATH = ../../pd +# where to install the library +prefix = /usr/local +libdir = $(prefix)/lib +pkglibdir = $(libdir)/pd-externals +objectsdir = $(pkglibdir) + + +INSTALL = install +INSTALL_FILE = $(INSTALL) -p -m 644 +INSTALL_DIR = $(INSTALL) -p -m 755 -d + +CFLAGS = -DPD -I$(PD_PATH)/src -Wall -W -g +LDFLAGS = +LIBS = +ALLSOURCES := $(SOURCES) $(SOURCES_android) $(SOURCES_cygwin) $(SOURCES_macosx) \ + $(SOURCES_iphoneos) $(SOURCES_linux) $(SOURCES_windows) + +DISTDIR=$(LIBRARY_NAME)-$(LIBRARY_VERSION) +ORIGDIR=pd-$(LIBRARY_NAME)_$(LIBRARY_VERSION) + +UNAME := $(shell uname -s) +ifeq ($(UNAME),Darwin) + CPU := $(shell uname -p) + ifeq ($(CPU),arm) # iPhone/iPod Touch + SOURCES += $(SOURCES_iphoneos) + EXTENSION = pd_darwin + OS = iphoneos + IPHONE_BASE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin + CC=$(IPHONE_BASE)/gcc + CPP=$(IPHONE_BASE)/cpp + CXX=$(IPHONE_BASE)/g++ + ISYSROOT = -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS3.0.sdk + IPHONE_CFLAGS = -miphoneos-version-min=3.0 $(ISYSROOT) -arch armv6 + OPT_CFLAGS = -fast -funroll-loops -fomit-frame-pointer + CFLAGS := $(IPHONE_CFLAGS) $(OPT_CFLAGS) $(CFLAGS) \ + -I/Applications/Pd-extended.app/Contents/Resources/include + LDFLAGS += -arch armv6 -bundle -undefined dynamic_lookup $(ISYSROOT) + LIBS += -lc + STRIP = strip -x + DISTBINDIR=$(DISTDIR)-$(OS) + else # Mac OS X + SOURCES += $(SOURCES_macosx) + EXTENSION = pd_darwin + OS = macosx + OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast +# build universal 32-bit on 10.4 and 32/64 on newer + ifeq ($(shell uname -r | sed 's|\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*|\1|'), 8) + FAT_FLAGS = -arch ppc -arch i386 -mmacosx-version-min=10.4 + else + FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4 + SOURCES += $(SOURCES_iphoneos) + endif + CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include \ + -I/Applications/Pd-extended.app/Contents/Resources/include + LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/sw/lib + # if the 'pd' binary exists, check the linking against it to aid with stripping + LDFLAGS += $(shell test -e $(PD_PATH)/bin/pd && echo -bundle_loader $(PD_PATH)/bin/pd) + LIBS += -lc + STRIP = strip -x + DISTBINDIR=$(DISTDIR)-$(OS) +# install into ~/Library/Pd on Mac OS X since /usr/local isn't used much + pkglibdir=$(HOME)/Library/Pd + endif +endif +ifeq ($(UNAME),Linux) + SOURCES += $(SOURCES_linux) + EXTENSION = pd_linux + OS = linux + OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer + CFLAGS += -fPIC + LDFLAGS += -Wl,--export-dynamic -shared -fPIC + LIBS += -lc + STRIP = strip --strip-unneeded -R .note -R .comment + DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m) +endif +ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME))) + SOURCES += $(SOURCES_cygwin) + EXTENSION = dll + OS = cygwin + OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer + CFLAGS += + LDFLAGS += -Wl,--export-dynamic -shared -L$(PD_PATH)/src + LIBS += -lc -lpd + STRIP = strip --strip-unneeded -R .note -R .comment + DISTBINDIR=$(DISTDIR)-$(OS) +endif +ifeq (MINGW,$(findstring MINGW,$(UNAME))) + SOURCES += $(SOURCES_windows) + EXTENSION = dll + OS = windows + OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -march=i686 -mtune=pentium4 + CFLAGS += -mms-bitfields + LDFLAGS += -s -shared -Wl,--enable-auto-import + LIBS += -L$(PD_PATH)/src -L$(PD_PATH)/bin -L$(PD_PATH)/obj -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 + STRIP = strip --strip-unneeded -R .note -R .comment + DISTBINDIR=$(DISTDIR)-$(OS) +endif + +CFLAGS += $(OPT_CFLAGS) + + +.PHONY = install libdir_install single_install install-doc install-exec install-examples install-manual clean dist etags + +all: $(SOURCES:.c=.$(EXTENSION)) + +%.o: %.c + $(CC) $(CFLAGS) -o "$*.o" -c "$*.c" + +%.$(EXTENSION): %.o + $(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o" $(LIBS) + chmod a-x "$*.$(EXTENSION)" + +# this links everything into a single binary file +$(LIBRARY_NAME): $(SOURCES:.c=.o) $(LIBRARY_NAME).o + $(CC) $(LDFLAGS) -o $(LIBRARY_NAME).$(EXTENSION) $(SOURCES:.c=.o) $(LIBRARY_NAME).o $(LIBS) + chmod a-x $(LIBRARY_NAME).$(EXTENSION) + + +install: libdir_install + +# The meta and help files are explicitly installed to make sure they are +# actually there. Those files are not optional, then need to be there. +libdir_install: $(SOURCES:.c=.$(EXTENSION)) install-doc install-examples install-manual + $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + $(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd \ + $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + test -z "$(strip $(SOURCES))" || (\ + $(INSTALL_FILE) $(SOURCES:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) && \ + $(STRIP) $(addprefix $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/,$(SOURCES:.c=.$(EXTENSION)))) + test -z "$(strip $(PDOBJECTS))" || \ + $(INSTALL_FILE) $(PDOBJECTS) \ + $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + +# install library linked as single binary +single_install: $(LIBRARY_NAME) install-doc install-exec + $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + $(INSTALL_FILE) $(LIBRARY_NAME).$(EXTENSION) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + $(STRIP) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/$(LIBRARY_NAME).$(EXTENSION) + +install-doc: + $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + test -z "$(strip $(SOURCES))" || \ + $(INSTALL_FILE) $(SOURCES:.c=-help.pd) \ + $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + test -z "$(strip $(PDOBJECTS))" || \ + $(INSTALL_FILE) $(PDOBJECTS:.pd=-help.pd) \ + $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + $(INSTALL_FILE) README.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/README.txt + $(INSTALL_FILE) LICENSE.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/LICENSE.txt + +install-examples: + test -z "$(strip $(EXAMPLES))" || \ + $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/examples && \ + for file in $(EXAMPLES); do \ + $(INSTALL_FILE) examples/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/examples; \ + done + +install-manual: + test -z "$(strip $(MANUAL))" || \ + $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/manual && \ + for file in $(MANUAL); do \ + $(INSTALL_FILE) manual/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/manual; \ + done + + +clean: + -rm -f -- $(SOURCES:.c=.o) + -rm -f -- $(SOURCES:.c=.$(EXTENSION)) + -rm -f -- $(LIBRARY_NAME).o + -rm -f -- $(LIBRARY_NAME).$(EXTENSION) + +distclean: clean + -rm -f -- $(DISTBINDIR).tar.gz + -rm -rf -- $(DISTBINDIR) + -rm -f -- $(DISTDIR).tar.gz + -rm -rf -- $(DISTDIR) + -rm -f -- $(ORIGDIR).tar.gz + -rm -rf -- $(ORIGDIR) + + +$(DISTBINDIR): + $(INSTALL_DIR) $(DISTBINDIR) + +libdir: all $(DISTBINDIR) + $(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd $(DISTBINDIR) + $(INSTALL_FILE) $(SOURCES) $(DISTBINDIR) + $(INSTALL_FILE) $(SOURCES:.c=-help.pd) $(DISTBINDIR) + test -z "$(strip $(EXTRA_DIST))" || \ + $(INSTALL_FILE) $(EXTRA_DIST) $(DISTBINDIR) +# tar --exclude-vcs -czpf $(DISTBINDIR).tar.gz $(DISTBINDIR) + +$(DISTDIR): + $(INSTALL_DIR) $(DISTDIR) + +$(ORIGDIR): + $(INSTALL_DIR) $(ORIGDIR) + +dist: $(DISTDIR) + $(INSTALL_FILE) Makefile $(DISTDIR) + $(INSTALL_FILE) README.txt $(DISTDIR) + $(INSTALL_FILE) LICENSE.txt $(DISTDIR) + $(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd $(DISTDIR) + test -z "$(strip $(ALLSOURCES))" || \ + $(INSTALL_FILE) $(ALLSOURCES) $(DISTDIR) + test -z "$(strip $(ALLSOURCES))" || \ + $(INSTALL_FILE) $(ALLSOURCES:.c=-help.pd) $(DISTDIR) + test -z "$(strip $(PDOBJECTS))" || \ + $(INSTALL_FILE) $(PDOBJECTS) $(DISTDIR) + test -z "$(strip $(PDOBJECTS))" || \ + $(INSTALL_FILE) $(PDOBJECTS:.pd=-help.pd) $(DISTDIR) + test -z "$(strip $(EXTRA_DIST))" || \ + $(INSTALL_FILE) $(EXTRA_DIST) $(DISTDIR) + test -z "$(strip $(EXAMPLES))" || \ + $(INSTALL_DIR) $(DISTDIR)/examples && \ + for file in $(EXAMPLES); do \ + $(INSTALL_FILE) examples/$$file $(DISTDIR)/examples; \ + done + test -z "$(strip $(MANUAL))" || \ + $(INSTALL_DIR) $(DISTDIR)/manual && \ + for file in $(MANUAL); do \ + $(INSTALL_FILE) manual/$$file $(DISTDIR)/manual; \ + done + tar --exclude-vcs -czpf $(DISTDIR).tar.gz $(DISTDIR) + +# make a Debian source package +dpkg-source: + debclean + make distclean dist + mv $(DISTDIR) $(ORIGDIR) + tar --exclude-vcs -czpf ../$(ORIGDIR).orig.tar.gz $(ORIGDIR) + rm -f -- $(DISTDIR).tar.gz + rm -rf -- $(DISTDIR) $(ORIGDIR) + cd .. && dpkg-source -b $(LIBRARY_NAME) + +etags: + etags *.h $(SOURCES) ../../pd/src/*.[ch] /usr/include/*.h /usr/include/*/*.h + +showsetup: + @echo "PD_PATH: $(PD_PATH)" + @echo "objectsdir: $(objectsdir)" + @echo "LIBRARY_NAME: $(LIBRARY_NAME)" + @echo "LIBRARY_VERSION: $(LIBRARY_VERSION)" + @echo "SOURCES: $(SOURCES)" + @echo "PDOBJECTS: $(PDOBJECTS)" + @echo "ALLSOURCES: $(ALLSOURCES)" + @echo "UNAME: $(UNAME)" + @echo "CPU: $(CPU)" + @echo "pkglibdir: $(pkglibdir)" + @echo "DISTDIR: $(DISTDIR)" + @echo "ORIGDIR: $(ORIGDIR)" diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..31a2fa4 --- /dev/null +++ b/README.txt @@ -0,0 +1 @@ +This is a collection of objects written by Cyrille Henry. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..7491177 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +pd-nusmuk (0.0-1) unstable; urgency=low + + * Initial release (Closes: #nnnn) + + -- Hans-Christoph Steiner Thu, 21 Jan 2010 23:27:04 -0500 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..3a2bb97 --- /dev/null +++ b/debian/control @@ -0,0 +1,13 @@ +Source: pd-nusmuk +Section: sound +Priority: optional +Maintainer: Debian Multimedia Maintainers +Uploaders: Hans-Christoph Steiner +Build-Depends: debhelper (>= 7.0.50~), puredata (>= 0.42.5-3.1~) +Standards-Version: 3.9.1 +Homepage: http://puredata.info + +Package: pd-nusmuk +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, pd +Description: diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..242ac0f --- /dev/null +++ b/debian/copyright @@ -0,0 +1,16 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135 +Name: nusmuk +Debianized-By: Hans-Christoph Steiner +Debianized-Date: Sat, 3 Apr 2010 17:14:25 -0400 +Files: * +Copyright: 2001-2003, Free Software Foundation + +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in file "/usr/share/common-licenses/GPL-2". + diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..baae294 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,7 @@ +[DEFAULT] +upstream-branch = upstream +debian-branch = master +upstream-tag = upstream/%(version)s +debian-tag = debian/%(version)s +pristine-tar = True + diff --git a/debian/links b/debian/links new file mode 100644 index 0000000..4d0e3d1 --- /dev/null +++ b/debian/links @@ -0,0 +1,2 @@ +usr/lib/pd/extra/nusmuk/README.txt usr/share/doc/pd-nusmuk/README +usr/share/common-licenses/GPL-2 usr/lib/pd/extra/nusmuk/LICENSE.txt diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..14714fa --- /dev/null +++ b/debian/rules @@ -0,0 +1,18 @@ +#!/usr/bin/make -f + +LIBRARY_NAME = nusmuk +PACKAGE = pd-$(LIBRARY_NAME) +pkglibdir = /usr/lib/pd/extra + +%: + dh $@ + +override_dh_auto_install: + make DESTDIR=$(CURDIR)/debian/$(PACKAGE) pkglibdir=$(pkglibdir) install +# replace license file with link to the Debian license file + rm -f -- $(CURDIR)/debian/$(PACKAGE)/$(pkglibdir)/$(LIBRARY_NAME)/LICENSE.txt + +override_dh_shlibdeps: + dpkg-shlibdeps $(CURDIR)/debian/$(PACKAGE)$(pkglibdir)/$(LIBRARY_NAME)/*.pd_linux \ + -T$(CURDIR)/debian/$(PACKAGE).substvars + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/nusmuk-meta.pd b/nusmuk-meta.pd new file mode 100644 index 0000000..f9b266b --- /dev/null +++ b/nusmuk-meta.pd @@ -0,0 +1,7 @@ +#N canvas 10 10 200 200 10; +#N canvas 20 20 420 300 META 0; +#X text 10 10 VERSION 0.1; +#X text 10 30 NAME nusmuk; +#X text 10 50 AUTHOR Cyrille Henry; +#X text 10 70 DESCRIPTION a collection of objects for physical modelling; +#X restore 10 10 pd META; -- cgit v1.2.1 From 27db36512aa87619c03532034223d85cba8761fe Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 24 Aug 2010 04:46:07 +0000 Subject: updated to Makefile version 1.0.2 svn path=/trunk/abstractions/nusmuk/; revision=13928 --- Makefile | 57 +++++++++++++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index 76157be..1a6aab8 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,12 @@ -## Pd library template version 1.0.1 +## Pd library template version 1.0.2 # For instructions on how to use this template, see: # http://puredata.info/docs/developer/MakefileTemplate LIBRARY_NAME = nusmuk -# add your .c source files to the SOURCES variable, help files will be -# included automatically +# add your .c source files, one object per file, to the SOURCES +# variable, help files will be included automatically SOURCES = -# For objects that only build on certain platforms, add those to the SOURCES -# line for the right platforms. -SOURCES_android = -SOURCES_cygwin = -SOURCES_macosx = -SOURCES_iphoneos = -SOURCES_linux = -SOURCES_windows = - # list all pd objects (i.e. myobject.pd) files here, and their helpfiles will # be included automatically PDOBJECTS = additive.pd between.pd granulator.pd lfo.pd many_bang.pd oscillo~.pd rnd_metro.pd spatialisation.pd @@ -27,13 +18,23 @@ EXAMPLES = MANUAL = # if you want to include any other files in the source and binary tarballs, -# list them here. This can be anything from header files, example patches, +# list them here. This can be anything from header files, test patches, # documentation, etc. README.txt and LICENSE.txt are required and therefore # automatically included EXTRA_DIST = hanning.wav +#------------------------------------------------------------------------------# +# +# things you might need to edit if you are using other C libraries +# +#------------------------------------------------------------------------------# + +CFLAGS = -DPD -I$(PD_PATH)/src -Wall -W -g +LDFLAGS = +LIBS = + #------------------------------------------------------------------------------# # # you shouldn't need to edit anything below here, if we did it right :) @@ -51,14 +52,10 @@ libdir = $(prefix)/lib pkglibdir = $(libdir)/pd-externals objectsdir = $(pkglibdir) - INSTALL = install INSTALL_FILE = $(INSTALL) -p -m 644 INSTALL_DIR = $(INSTALL) -p -m 755 -d -CFLAGS = -DPD -I$(PD_PATH)/src -Wall -W -g -LDFLAGS = -LIBS = ALLSOURCES := $(SOURCES) $(SOURCES_android) $(SOURCES_cygwin) $(SOURCES_macosx) \ $(SOURCES_iphoneos) $(SOURCES_linux) $(SOURCES_windows) @@ -110,6 +107,7 @@ ifeq ($(UNAME),Darwin) endif endif ifeq ($(UNAME),Linux) + CPU := $(shell uname -m) SOURCES += $(SOURCES_linux) EXTENSION = pd_linux OS = linux @@ -121,6 +119,7 @@ ifeq ($(UNAME),Linux) DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m) endif ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME))) + CPU := $(shell uname -m) SOURCES += $(SOURCES_cygwin) EXTENSION = dll OS = cygwin @@ -132,6 +131,7 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME))) DISTBINDIR=$(DISTDIR)-$(OS) endif ifeq (MINGW,$(findstring MINGW,$(UNAME))) + CPU := $(shell uname -m) SOURCES += $(SOURCES_windows) EXTENSION = dll OS = windows @@ -143,10 +143,13 @@ ifeq (MINGW,$(findstring MINGW,$(UNAME))) DISTBINDIR=$(DISTDIR)-$(OS) endif +# in case somebody manually set the HELPPATCHES above +HELPPATCHES ?= $(SOURCES:.c=-help.pd) $(PDOBJECTS:.c=-help.pd) + CFLAGS += $(OPT_CFLAGS) -.PHONY = install libdir_install single_install install-doc install-exec install-examples install-manual clean dist etags +.PHONY = install libdir_install single_install install-doc install-exec install-examples install-manual clean dist etags $(LIBRARY_NAME) all: $(SOURCES:.c=.$(EXTENSION)) @@ -162,7 +165,6 @@ $(LIBRARY_NAME): $(SOURCES:.c=.o) $(LIBRARY_NAME).o $(CC) $(LDFLAGS) -o $(LIBRARY_NAME).$(EXTENSION) $(SOURCES:.c=.o) $(LIBRARY_NAME).o $(LIBS) chmod a-x $(LIBRARY_NAME).$(EXTENSION) - install: libdir_install # The meta and help files are explicitly installed to make sure they are @@ -186,11 +188,8 @@ single_install: $(LIBRARY_NAME) install-doc install-exec install-doc: $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - test -z "$(strip $(SOURCES))" || \ - $(INSTALL_FILE) $(SOURCES:.c=-help.pd) \ - $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - test -z "$(strip $(PDOBJECTS))" || \ - $(INSTALL_FILE) $(PDOBJECTS:.pd=-help.pd) \ + test -z "$(strip $(SOURCES) $(PDOBJECTS))" || \ + $(INSTALL_FILE) $(HELPPATCHES) \ $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) $(INSTALL_FILE) README.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/README.txt $(INSTALL_FILE) LICENSE.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/LICENSE.txt @@ -211,7 +210,7 @@ install-manual: clean: - -rm -f -- $(SOURCES:.c=.o) + -rm -f -- $(SOURCES:.c=.o) $(SOURCES_LIB:.c=.o) -rm -f -- $(SOURCES:.c=.$(EXTENSION)) -rm -f -- $(LIBRARY_NAME).o -rm -f -- $(LIBRARY_NAME).$(EXTENSION) @@ -231,7 +230,7 @@ $(DISTBINDIR): libdir: all $(DISTBINDIR) $(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd $(DISTBINDIR) $(INSTALL_FILE) $(SOURCES) $(DISTBINDIR) - $(INSTALL_FILE) $(SOURCES:.c=-help.pd) $(DISTBINDIR) + $(INSTALL_FILE) $(HELPPATCHES) $(DISTBINDIR) test -z "$(strip $(EXTRA_DIST))" || \ $(INSTALL_FILE) $(EXTRA_DIST) $(DISTBINDIR) # tar --exclude-vcs -czpf $(DISTBINDIR).tar.gz $(DISTBINDIR) @@ -249,12 +248,10 @@ dist: $(DISTDIR) $(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd $(DISTDIR) test -z "$(strip $(ALLSOURCES))" || \ $(INSTALL_FILE) $(ALLSOURCES) $(DISTDIR) - test -z "$(strip $(ALLSOURCES))" || \ - $(INSTALL_FILE) $(ALLSOURCES:.c=-help.pd) $(DISTDIR) test -z "$(strip $(PDOBJECTS))" || \ $(INSTALL_FILE) $(PDOBJECTS) $(DISTDIR) - test -z "$(strip $(PDOBJECTS))" || \ - $(INSTALL_FILE) $(PDOBJECTS:.pd=-help.pd) $(DISTDIR) + test -z "$(strip $(HELPPATCHES))" || \ + $(INSTALL_FILE) $(HELPPATCHES) $(DISTDIR) test -z "$(strip $(EXTRA_DIST))" || \ $(INSTALL_FILE) $(EXTRA_DIST) $(DISTDIR) test -z "$(strip $(EXAMPLES))" || \ -- cgit v1.2.1 From 014aa123fb48941d0a65daffa489b3fb08593a7c Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 7 Sep 2010 23:27:26 +0000 Subject: updated to Makefile version 1.0.3 svn path=/trunk/abstractions/nusmuk/; revision=13994 --- Makefile | 79 ++++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 1a6aab8..68c6d23 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -## Pd library template version 1.0.2 +## Pd library template version 1.0.3 # For instructions on how to use this template, see: # http://puredata.info/docs/developer/MakefileTemplate LIBRARY_NAME = nusmuk @@ -31,7 +31,7 @@ EXTRA_DIST = hanning.wav # #------------------------------------------------------------------------------# -CFLAGS = -DPD -I$(PD_PATH)/src -Wall -W -g +CFLAGS = -DPD -I"$(PD_INCLUDE)" -Wall -W -g LDFLAGS = LIBS = @@ -44,16 +44,18 @@ LIBS = # get library version from meta file LIBRARY_VERSION = $(shell sed -n 's|^\#X text [0-9][0-9]* [0-9][0-9]* VERSION \(.*\);|\1|p' $(LIBRARY_NAME)-meta.pd) -# where Pd lives -PD_PATH = ../../pd -# where to install the library +CFLAGS += -DVERSION='"$(LIBRARY_VERSION)"' + +PD_INCLUDE = $(PD_PATH)/include +# where to install the library, overridden below depending on platform prefix = /usr/local libdir = $(prefix)/lib pkglibdir = $(libdir)/pd-externals objectsdir = $(pkglibdir) INSTALL = install -INSTALL_FILE = $(INSTALL) -p -m 644 +INSTALL_PROGRAM = $(INSTALL) -p -m 644 +INSTALL_DATA = $(INSTALL) -p -m 644 INSTALL_DIR = $(INSTALL) -p -m 755 -d ALLSOURCES := $(SOURCES) $(SOURCES_android) $(SOURCES_cygwin) $(SOURCES_macosx) \ @@ -69,6 +71,7 @@ ifeq ($(UNAME),Darwin) SOURCES += $(SOURCES_iphoneos) EXTENSION = pd_darwin OS = iphoneos + PD_PATH = /Applications/Pd-extended.app/Contents/Resources IPHONE_BASE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin CC=$(IPHONE_BASE)/gcc CPP=$(IPHONE_BASE)/cpp @@ -76,8 +79,7 @@ ifeq ($(UNAME),Darwin) ISYSROOT = -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS3.0.sdk IPHONE_CFLAGS = -miphoneos-version-min=3.0 $(ISYSROOT) -arch armv6 OPT_CFLAGS = -fast -funroll-loops -fomit-frame-pointer - CFLAGS := $(IPHONE_CFLAGS) $(OPT_CFLAGS) $(CFLAGS) \ - -I/Applications/Pd-extended.app/Contents/Resources/include + CFLAGS := $(IPHONE_CFLAGS) $(OPT_CFLAGS) $(CFLAGS) LDFLAGS += -arch armv6 -bundle -undefined dynamic_lookup $(ISYSROOT) LIBS += -lc STRIP = strip -x @@ -86,6 +88,7 @@ ifeq ($(UNAME),Darwin) SOURCES += $(SOURCES_macosx) EXTENSION = pd_darwin OS = macosx + PD_PATH = /Applications/Pd-extended.app/Contents/Resources OPT_CFLAGS = -ftree-vectorize -ftree-vectorizer-verbose=2 -fast # build universal 32-bit on 10.4 and 32/64 on newer ifeq ($(shell uname -r | sed 's|\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*|\1|'), 8) @@ -94,8 +97,7 @@ ifeq ($(UNAME),Darwin) FAT_FLAGS = -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4 SOURCES += $(SOURCES_iphoneos) endif - CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include \ - -I/Applications/Pd-extended.app/Contents/Resources/include + CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/sw/lib # if the 'pd' binary exists, check the linking against it to aid with stripping LDFLAGS += $(shell test -e $(PD_PATH)/bin/pd && echo -bundle_loader $(PD_PATH)/bin/pd) @@ -111,6 +113,7 @@ ifeq ($(UNAME),Linux) SOURCES += $(SOURCES_linux) EXTENSION = pd_linux OS = linux + PD_PATH = /usr OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer CFLAGS += -fPIC LDFLAGS += -Wl,--export-dynamic -shared -fPIC @@ -123,9 +126,10 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME))) SOURCES += $(SOURCES_cygwin) EXTENSION = dll OS = cygwin + PD_PATH = $(cygpath $(PROGRAMFILES))/pd OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer CFLAGS += - LDFLAGS += -Wl,--export-dynamic -shared -L$(PD_PATH)/src + LDFLAGS += -Wl,--export-dynamic -shared -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin" LIBS += -lc -lpd STRIP = strip --strip-unneeded -R .note -R .comment DISTBINDIR=$(DISTDIR)-$(OS) @@ -135,10 +139,11 @@ ifeq (MINGW,$(findstring MINGW,$(UNAME))) SOURCES += $(SOURCES_windows) EXTENSION = dll OS = windows + PD_PATH = $(shell cd "$(PROGRAMFILES)"/pd && pwd) OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -march=i686 -mtune=pentium4 CFLAGS += -mms-bitfields LDFLAGS += -s -shared -Wl,--enable-auto-import - LIBS += -L$(PD_PATH)/src -L$(PD_PATH)/bin -L$(PD_PATH)/obj -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 + LIBS += -L"$(PD_PATH)/src" -L"$(PD_PATH)/bin" -L"$(PD_PATH)/obj" -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 STRIP = strip --strip-unneeded -R .note -R .comment DISTBINDIR=$(DISTDIR)-$(OS) endif @@ -171,41 +176,41 @@ install: libdir_install # actually there. Those files are not optional, then need to be there. libdir_install: $(SOURCES:.c=.$(EXTENSION)) install-doc install-examples install-manual $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - $(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd \ + $(INSTALL_DATA) $(LIBRARY_NAME)-meta.pd \ $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) test -z "$(strip $(SOURCES))" || (\ - $(INSTALL_FILE) $(SOURCES:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) && \ + $(INSTALL_PROGRAM) $(SOURCES:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) && \ $(STRIP) $(addprefix $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/,$(SOURCES:.c=.$(EXTENSION)))) test -z "$(strip $(PDOBJECTS))" || \ - $(INSTALL_FILE) $(PDOBJECTS) \ + $(INSTALL_DATA) $(PDOBJECTS) \ $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) # install library linked as single binary single_install: $(LIBRARY_NAME) install-doc install-exec $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - $(INSTALL_FILE) $(LIBRARY_NAME).$(EXTENSION) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) + $(INSTALL_PROGRAM) $(LIBRARY_NAME).$(EXTENSION) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) $(STRIP) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/$(LIBRARY_NAME).$(EXTENSION) install-doc: $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) test -z "$(strip $(SOURCES) $(PDOBJECTS))" || \ - $(INSTALL_FILE) $(HELPPATCHES) \ + $(INSTALL_DATA) $(HELPPATCHES) \ $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME) - $(INSTALL_FILE) README.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/README.txt - $(INSTALL_FILE) LICENSE.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/LICENSE.txt + $(INSTALL_DATA) README.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/README.txt + $(INSTALL_DATA) LICENSE.txt $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/LICENSE.txt install-examples: test -z "$(strip $(EXAMPLES))" || \ $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/examples && \ for file in $(EXAMPLES); do \ - $(INSTALL_FILE) examples/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/examples; \ + $(INSTALL_DATA) examples/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/examples; \ done install-manual: test -z "$(strip $(MANUAL))" || \ $(INSTALL_DIR) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/manual && \ for file in $(MANUAL); do \ - $(INSTALL_FILE) manual/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/manual; \ + $(INSTALL_DATA) manual/$$file $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/manual; \ done @@ -228,11 +233,11 @@ $(DISTBINDIR): $(INSTALL_DIR) $(DISTBINDIR) libdir: all $(DISTBINDIR) - $(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd $(DISTBINDIR) - $(INSTALL_FILE) $(SOURCES) $(DISTBINDIR) - $(INSTALL_FILE) $(HELPPATCHES) $(DISTBINDIR) + $(INSTALL_DATA) $(LIBRARY_NAME)-meta.pd $(DISTBINDIR) + $(INSTALL_DATA) $(SOURCES) $(DISTBINDIR) + $(INSTALL_DATA) $(HELPPATCHES) $(DISTBINDIR) test -z "$(strip $(EXTRA_DIST))" || \ - $(INSTALL_FILE) $(EXTRA_DIST) $(DISTBINDIR) + $(INSTALL_DATA) $(EXTRA_DIST) $(DISTBINDIR) # tar --exclude-vcs -czpf $(DISTBINDIR).tar.gz $(DISTBINDIR) $(DISTDIR): @@ -242,27 +247,27 @@ $(ORIGDIR): $(INSTALL_DIR) $(ORIGDIR) dist: $(DISTDIR) - $(INSTALL_FILE) Makefile $(DISTDIR) - $(INSTALL_FILE) README.txt $(DISTDIR) - $(INSTALL_FILE) LICENSE.txt $(DISTDIR) - $(INSTALL_FILE) $(LIBRARY_NAME)-meta.pd $(DISTDIR) + $(INSTALL_DATA) Makefile $(DISTDIR) + $(INSTALL_DATA) README.txt $(DISTDIR) + $(INSTALL_DATA) LICENSE.txt $(DISTDIR) + $(INSTALL_DATA) $(LIBRARY_NAME)-meta.pd $(DISTDIR) test -z "$(strip $(ALLSOURCES))" || \ - $(INSTALL_FILE) $(ALLSOURCES) $(DISTDIR) + $(INSTALL_DATA) $(ALLSOURCES) $(DISTDIR) test -z "$(strip $(PDOBJECTS))" || \ - $(INSTALL_FILE) $(PDOBJECTS) $(DISTDIR) + $(INSTALL_DATA) $(PDOBJECTS) $(DISTDIR) test -z "$(strip $(HELPPATCHES))" || \ - $(INSTALL_FILE) $(HELPPATCHES) $(DISTDIR) + $(INSTALL_DATA) $(HELPPATCHES) $(DISTDIR) test -z "$(strip $(EXTRA_DIST))" || \ - $(INSTALL_FILE) $(EXTRA_DIST) $(DISTDIR) + $(INSTALL_DATA) $(EXTRA_DIST) $(DISTDIR) test -z "$(strip $(EXAMPLES))" || \ $(INSTALL_DIR) $(DISTDIR)/examples && \ for file in $(EXAMPLES); do \ - $(INSTALL_FILE) examples/$$file $(DISTDIR)/examples; \ + $(INSTALL_DATA) examples/$$file $(DISTDIR)/examples; \ done test -z "$(strip $(MANUAL))" || \ $(INSTALL_DIR) $(DISTDIR)/manual && \ for file in $(MANUAL); do \ - $(INSTALL_FILE) manual/$$file $(DISTDIR)/manual; \ + $(INSTALL_DATA) manual/$$file $(DISTDIR)/manual; \ done tar --exclude-vcs -czpf $(DISTDIR).tar.gz $(DISTDIR) @@ -280,6 +285,10 @@ etags: etags *.h $(SOURCES) ../../pd/src/*.[ch] /usr/include/*.h /usr/include/*/*.h showsetup: + @echo "CFLAGS: $(CFLAGS)" + @echo "LDFLAGS: $(LDFLAGS)" + @echo "LIBS: $(LIBS)" + @echo "PD_INCLUDE: $(PD_INCLUDE)" @echo "PD_PATH: $(PD_PATH)" @echo "objectsdir: $(objectsdir)" @echo "LIBRARY_NAME: $(LIBRARY_NAME)" -- cgit v1.2.1 From a5b617d8b4020e771b1882df494cb45ac1edb327 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sun, 12 Sep 2010 18:39:27 +0000 Subject: updated to use Alessio Treglia's dh_auto_install tricks, which strip too svn path=/trunk/abstractions/nusmuk/; revision=14078 --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 14714fa..bae22bd 100755 --- a/debian/rules +++ b/debian/rules @@ -5,10 +5,10 @@ PACKAGE = pd-$(LIBRARY_NAME) pkglibdir = /usr/lib/pd/extra %: - dh $@ + dh $@ --buildsystem=makefile override_dh_auto_install: - make DESTDIR=$(CURDIR)/debian/$(PACKAGE) pkglibdir=$(pkglibdir) install + dh_auto_install -- prefix=/usr pkglibdir=$(pkglibdir) # replace license file with link to the Debian license file rm -f -- $(CURDIR)/debian/$(PACKAGE)/$(pkglibdir)/$(LIBRARY_NAME)/LICENSE.txt -- cgit v1.2.1 From 20685bd7785d9cc423d34e5ebe98aea34f680d87 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sun, 12 Sep 2010 22:34:24 +0000 Subject: Recommends: pd-libdir since these are all libdirs svn path=/trunk/abstractions/nusmuk/; revision=14098 --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 3a2bb97..0e3e74b 100644 --- a/debian/control +++ b/debian/control @@ -10,4 +10,5 @@ Homepage: http://puredata.info Package: pd-nusmuk Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, pd +Recommends: pd-libdir Description: -- cgit v1.2.1 From b22ba11c4beb53cf9c99db6c3335db9088aa9f4a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 13 Sep 2010 13:14:15 +0000 Subject: added debian/watch file pointing at sourceforge svn path=/trunk/abstractions/nusmuk/; revision=14110 --- debian/watch | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 debian/watch diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..13deea9 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/pure-data/nusmuk-(.*)\.tar\.gz -- cgit v1.2.1 From a17daac4e365713d750f3b027166a05d77122f7b Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 13 Sep 2010 13:23:28 +0000 Subject: added sign-tags = True svn path=/trunk/abstractions/nusmuk/; revision=14111 --- debian/gbp.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index baae294..ae1dc36 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -4,4 +4,4 @@ debian-branch = master upstream-tag = upstream/%(version)s debian-tag = debian/%(version)s pristine-tar = True - +sign-tags = True -- cgit v1.2.1 From bcf82bb493705224e7c66b2194a4c0cba014f538 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 13 Sep 2010 15:47:46 +0000 Subject: converted to one-dep-per-line style svn path=/trunk/abstractions/nusmuk/; revision=14115 --- debian/control | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 0e3e74b..95e863c 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,15 @@ Section: sound Priority: optional Maintainer: Debian Multimedia Maintainers Uploaders: Hans-Christoph Steiner -Build-Depends: debhelper (>= 7.0.50~), puredata (>= 0.42.5-3.1~) +Build-Depends: debhelper (>= 7.0.50~), + puredata (>= 0.42.5-3.1~) Standards-Version: 3.9.1 Homepage: http://puredata.info Package: pd-nusmuk Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, pd +Depends: ${shlibs:Depends}, + pd, + ${misc:Depends} Recommends: pd-libdir Description: -- cgit v1.2.1 From 6121ad89d33e13a31bdb058df76fd4de18b7564d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 13 Sep 2010 16:23:39 +0000 Subject: updated debian/copyright to more closely conform to DEP-5 svn path=/trunk/abstractions/nusmuk/; revision=14116 --- debian/copyright | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/debian/copyright b/debian/copyright index 242ac0f..91c705f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,16 +1,23 @@ Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135 Name: nusmuk -Debianized-By: Hans-Christoph Steiner -Debianized-Date: Sat, 3 Apr 2010 17:14:25 -0400 -Files: * -Copyright: 2001-2003, Free Software Foundation +Maintainer: Cyrille Henry +Source: +Copyright: Cyrille Henry License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . - On Debian systems, the complete text of the GNU General Public License - version 2 can be found in file "/usr/share/common-licenses/GPL-2". + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +X-Comment: On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. -- cgit v1.2.1 From 861bab1ac2ac8b57515fce2988bc49853dc7886a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 22 Sep 2010 05:34:52 +0000 Subject: fixed bug introduced by IOhannes' addition of unused HELPPATCHES variable that stopped the help patches for abstractions from being installed svn path=/trunk/abstractions/nusmuk/; revision=14178 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 68c6d23..864e5ee 100644 --- a/Makefile +++ b/Makefile @@ -149,7 +149,7 @@ ifeq (MINGW,$(findstring MINGW,$(UNAME))) endif # in case somebody manually set the HELPPATCHES above -HELPPATCHES ?= $(SOURCES:.c=-help.pd) $(PDOBJECTS:.c=-help.pd) +HELPPATCHES ?= $(SOURCES:.c=-help.pd) $(PDOBJECTS:.pd=-help.pd) CFLAGS += $(OPT_CFLAGS) -- cgit v1.2.1 From c7b2d3a5275e9125d2ab53e4aeb9e40dd040372f Mon Sep 17 00:00:00 2001 From: Cyrille Henry Date: Sat, 25 Sep 2010 16:13:45 +0000 Subject: add a speedlim clone svn path=/trunk/abstractions/nusmuk/; revision=14181 --- puremapping/speedlimit-help.pd | 15 +++++++++++++++ puremapping/speedlimit.pd | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 puremapping/speedlimit-help.pd create mode 100644 puremapping/speedlimit.pd diff --git a/puremapping/speedlimit-help.pd b/puremapping/speedlimit-help.pd new file mode 100644 index 0000000..49020db --- /dev/null +++ b/puremapping/speedlimit-help.pd @@ -0,0 +1,15 @@ +#N canvas 630 215 450 300 10; +#X floatatom 96 112 5 0 0 0 - - -; +#X floatatom 96 153 5 0 0 0 - - -; +#X text 55 31 limit data flow to the specific time; +#X obj 139 179 t b b; +#X obj 139 202 timer; +#X floatatom 139 226 5 0 0 0 - - -; +#X obj 96 131 speedlimit 500; +#X text 54 47 (same than speedlim \, but as an abstraction); +#X connect 0 0 6 0; +#X connect 3 0 4 0; +#X connect 3 1 4 1; +#X connect 4 0 5 0; +#X connect 6 0 1 0; +#X connect 6 0 3 0; diff --git a/puremapping/speedlimit.pd b/puremapping/speedlimit.pd new file mode 100644 index 0000000..8b732f3 --- /dev/null +++ b/puremapping/speedlimit.pd @@ -0,0 +1,40 @@ +#N canvas 0 0 440 550 10; +#X obj 45 33 inlet; +#X obj 44 448 outlet; +#X obj 68 124 list; +#X msg 122 272 1; +#X msg 111 102 1; +#X msg 70 273 0; +#X obj 44 214 t a b b; +#X obj 90 350 sel 1; +#X obj 89 378 f; +#X obj 59 402 sel 1; +#X obj 45 68 t a a b; +#X obj 44 162 spigot 1; +#X obj 177 339 f; +#X obj 121 297 t f f; +#X obj 71 298 t f f; +#X obj 265 24 inlet; +#X obj 121 248 delay \$1; +#X connect 0 0 10 0; +#X connect 2 0 11 0; +#X connect 3 0 13 0; +#X connect 4 0 8 1; +#X connect 5 0 14 0; +#X connect 6 0 1 0; +#X connect 6 1 5 0; +#X connect 6 2 16 0; +#X connect 7 0 8 0; +#X connect 8 0 9 0; +#X connect 9 0 2 0; +#X connect 10 0 11 0; +#X connect 10 1 2 1; +#X connect 10 2 4 0; +#X connect 11 0 6 0; +#X connect 12 0 11 1; +#X connect 13 0 7 0; +#X connect 13 1 12 0; +#X connect 14 0 8 1; +#X connect 14 1 12 0; +#X connect 15 0 16 1; +#X connect 16 0 3 0; -- cgit v1.2.1