diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/Makefile | 28 | ||||
| -rw-r--r-- | packages/Makefile.buildlayout | 2 | ||||
| -rw-r--r-- | packages/TODO | 2 | ||||
| -rw-r--r-- | packages/darwin_app/Makefile | 7 | ||||
| -rw-r--r-- | packages/darwin_app/TODO | 8 | ||||
| -rw-r--r-- | packages/darwin_app/org.puredata.pd.plist | 48 | ||||
| -rw-r--r-- | packages/linux_make/TODO | 2 | ||||
| -rw-r--r-- | packages/patches/bang_method_for_clip-0.40.pre.patch | 47 | ||||
| -rw-r--r-- | packages/win32_inno/TODO | 16 | ||||
| -rwxr-xr-x | packages/win32_inno/pd-settings.reg | 196 |
10 files changed, 211 insertions, 145 deletions
diff --git a/packages/Makefile b/packages/Makefile index ddb3bf77..79db6132 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -136,10 +136,14 @@ flext: #------------------------------------------------------------------------------ # pd -ifeq ($(OS_NAME),windows) - PD_CONFIGURE_FLAGS = -else +ifeq ($(OS_NAME),darwin) PD_CONFIGURE_FLAGS = --enable-jack +else + ifeq ($(OS_NAME),linux) + PD_CONFIGURE_FLAGS = --enable-jack --enable-alsa + else + PD_CONFIGURE_FLAGS = + endif endif PD_BUILD_FLAGS = @@ -534,6 +538,16 @@ doc_format: +#---------------------------------------------------------------------------- +# STRIP_HACK +# not all of the build systems are stripping the externals, so strip them here. +# Gem, xsample, and some other things don't like to be stripped +strip_hack: + $(STRIP) $(objectsdir)/*/*.$(EXTENSION) + $(STRIP) $(objectsdir)/[A-FH-Za-wyz]*.$(EXTENSION) + + + #==============================================================================# # # DEVELOPER TARGETS @@ -641,19 +655,11 @@ patch_pd: cd $(pd_src)/src/ && \ sed 's/\(pd_version\[\] = "Pd version \)[0-9extndRC.-]*/\1$(PD_VERSION)-$(PACKAGE_VERSION)/' s_main.c > s_main.c.tmp && \ mv s_main.c.tmp s_main.c - for file in $(wildcard $(pd_src)/src/*.[ch]); do \ - sed 's/MACOSX/__APPLE__/g' $${file} > $${file}.tmp && \ - mv -f $${file}.tmp $$file;\ - done @echo " " @echo "patching succeeded!" unpatch_pd: - for file in $(wildcard $(pd_src)/src/*.[ch]); do \ - sed 's/__APPLE__/MACOSX/g' $${file} > $${file}.tmp && \ - mv -f $${file}.tmp $$file;\ - done # this sed pattern won't work with TEST versions cd $(pd_src)/src && \ sed 's/\(pd_version\[\] = "Pd version [0-9]\.[0-9]*[.-][0-9]*\)[0-9extndRC.-]*/\1/' \ diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout index 8f3f3b3a..9fef3fee 100644 --- a/packages/Makefile.buildlayout +++ b/packages/Makefile.buildlayout @@ -151,7 +151,7 @@ PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) # release version for this distro -PACKAGE_VERSION = extended-RC7 +PACKAGE_VERSION = extended-RC8 PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION) diff --git a/packages/TODO b/packages/TODO index 5cfc7ceb..004e5b23 100644 --- a/packages/TODO +++ b/packages/TODO @@ -1,4 +1,6 @@ +- revert to revision 1.1 of loaderHEX patch to maintain compatibilty with 0.40 + - fix patch failures in patch_pd - allow DESTDIR to be a relative path diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile index 71b08cb8..c06309c4 100644 --- a/packages/darwin_app/Makefile +++ b/packages/darwin_app/Makefile @@ -140,15 +140,16 @@ darwin_app_core: darwin_app_wrapper -darwin_app_doc_format: # set the font to 10pt on all help patches # the BSD/Darwin version of sed must create a backup file when doing # in-place replacement, so delete the unneeded backup files +darwin_app_doc_format: cd $(pddocdir) && \ sed -i.bak 's/^\(\#N canvas [0-9]* [0-9]* [0-9]* [0-9]*\) 12/\1 10/' \ */*.pd */*/*.pd */*/*/*.pd find $(DESTDIR) -name '*.pd.bak' -delete + #==============================================================================# # ## CVS SOURCES @@ -182,13 +183,13 @@ package: dmg DMG_NAME = $(PACKAGE_NAME) dmg: darwin_app_perms install -d "$(CWD)/$(DMG_NAME)" - install -p -m0444 $(manualsdir)/Pd/Pd-LICENSE.txt \ + install -p -m0644 $(manualsdir)/Pd/Pd-LICENSE.txt \ $(manualsdir)/Pd/License.html \ $(manualsdir)/Pd/Welcome.html \ $(manualsdir)/Pd/ReadMe.html \ "$(CWD)/$(DMG_NAME)" cd $(BUILD_BASE) && mv $(PD_APP_NAME).app "$(CWD)/$(DMG_NAME)/" - install -p -m0444 org.puredata.pd.plist "$(CWD)/$(DMG_NAME)" + install -p -m0644 org.puredata.pd.plist "$(CWD)/$(DMG_NAME)" cd $(CWD) && /bin/sh mkdmg "$(DMG_NAME)" diff --git a/packages/darwin_app/TODO b/packages/darwin_app/TODO index 3eb7a818..de1ff67a 100644 --- a/packages/darwin_app/TODO +++ b/packages/darwin_app/TODO @@ -1,9 +1,8 @@ -- OSC did not get included +- check code to make it all use single-precision/libmx functions on Mac OSX. -- check out embed-MacOSX-dependencies.sh script. There seems to be a bug - where the deps in lib/libogg.dylib don't get switched from /sw/lib to - @executable_path/blah/blah + +- make sure that org.puredata.pd.plist is rw in the .dmg (possible?) - check out using TclTkBI package for all of the tcl deps. It should have all @@ -33,6 +32,7 @@ http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/Articles - create Tcl script called from Prefs that creates links for the standard unix + (this probably makes more sense to have in "make devsymlinks") - redo menu system diff --git a/packages/darwin_app/org.puredata.pd.plist b/packages/darwin_app/org.puredata.pd.plist index 023ca976..6c11cf57 100644 --- a/packages/darwin_app/org.puredata.pd.plist +++ b/packages/darwin_app/org.puredata.pd.plist @@ -13,46 +13,54 @@ <key>loadlib5</key> <string>ext13</string> <key>loadlib6</key> - <string>iemabs</string> + <string>fftease</string> <key>loadlib7</key> - <string>iemmatrix</string> + <string>hid</string> <key>loadlib8</key> - <string>markex</string> + <string>iemabs</string> <key>loadlib9</key> - <string>maxlib</string> + <string>iemmatrix</string> <key>loadlib10</key> - <string>memento</string> + <string>liblist</string> <key>loadlib11</key> - <string>mjlib</string> + <string>markex</string> <key>loadlib12</key> - <string>motex</string> + <string>maxlib</string> <key>loadlib13</key> - <string>oscx</string> + <string>memento</string> <key>loadlib14</key> - <string>pddp</string> + <string>mjlib</string> <key>loadlib15</key> - <string>pdogg</string> + <string>motex</string> <key>loadlib16</key> - <string>pdp</string> + <string>oscx</string> <key>loadlib17</key> - <string>pidip</string> + <string>pddp</string> <key>loadlib18</key> - <string>pixeltango</string> + <string>pdogg</string> <key>loadlib19</key> - <string>pmpd</string> + <string>pdp</string> <key>loadlib20</key> - <string>rradical</string> + <string>pidip</string> <key>loadlib21</key> - <string>sigpack</string> + <string>pixeltango</string> <key>loadlib22</key> - <string>smlib</string> + <string>pmpd</string> <key>loadlib23</key> - <string>toxy</string> + <string>rradical</string> <key>loadlib24</key> - <string>unauthorized</string> + <string>sigpack</string> <key>loadlib25</key> - <string>vbap</string> + <string>smlib</string> <key>loadlib26</key> + <string>toxy</string> + <key>loadlib27</key> + <string>unauthorized</string> + <key>loadlib28</key> + <string>vasp</string> + <key>loadlib29</key> + <string>vbap</string> + <key>loadlib30</key> <string>xsample</string> </dict> </plist> diff --git a/packages/linux_make/TODO b/packages/linux_make/TODO index 7994c0e4..3f3b6fde 100644 --- a/packages/linux_make/TODO +++ b/packages/linux_make/TODO @@ -1,3 +1,5 @@ +- compile Pd with Jack and ALSA + - fix $ escaping in the generated install Makefile diff --git a/packages/patches/bang_method_for_clip-0.40.pre.patch b/packages/patches/bang_method_for_clip-0.40.pre.patch new file mode 100644 index 00000000..d97b2e11 --- /dev/null +++ b/packages/patches/bang_method_for_clip-0.40.pre.patch @@ -0,0 +1,47 @@ +--- x_arithmetic.c Sat Jan 28 10:06:59 2006 ++++ x_arithmetic.c Tue Feb 7 17:04:27 2006 +@@ -672,23 +677,31 @@ + t_object x_ob; + float x_f1; + float x_f2; ++ float x_f3; + } t_clip; + + static void *clip_new(t_floatarg f1, t_floatarg f2) + { + t_clip *x = (t_clip *)pd_new(clip_class); +- floatinlet_new(&x->x_ob, &x->x_f1); + floatinlet_new(&x->x_ob, &x->x_f2); ++ floatinlet_new(&x->x_ob, &x->x_f3); + outlet_new(&x->x_ob, &s_float); +- x->x_f1 = f1; +- x->x_f2 = f2; ++ x->x_f2 = f1; ++ x->x_f3 = f2; + return (x); + } + ++static void clip_bang(t_clip *x) ++{ ++ outlet_float(x->x_ob.ob_outlet, (x->x_f1 < x->x_f2 ? x->x_f2 : ( ++ x->x_f1 > x->x_f3 ? x->x_f3 : x->x_f1))); ++} ++ + static void clip_float(t_clip *x, t_float f) + { +- outlet_float(x->x_ob.ob_outlet, (f < x->x_f1 ? x->x_f1 : ( +- f > x->x_f2 ? x->x_f2 : f))); ++ x->x_f1 = f; ++ outlet_float(x->x_ob.ob_outlet, (x->x_f1 < x->x_f2 ? x->x_f2 : ( ++ x->x_f1 > x->x_f3 ? x->x_f3 : x->x_f1))); + } + + static void clip_setup(void) +@@ -696,6 +709,7 @@ + clip_class = class_new(gensym("clip"), (t_newmethod)clip_new, 0, + sizeof(t_clip), 0, A_DEFFLOAT, A_DEFFLOAT, 0); + class_addfloat(clip_class, clip_float); ++ class_addbang(clip_class, clip_bang); + } + + void x_arithmetic_setup(void) diff --git a/packages/win32_inno/TODO b/packages/win32_inno/TODO index 1093eca8..3cfd860e 100644 --- a/packages/win32_inno/TODO +++ b/packages/win32_inno/TODO @@ -1,12 +1,18 @@ +- make things compile in Cygwin's MinGW environment (then things can be + compiled from an ssh session) + + +- switch to Martin Peach's menu_openhtml patch, it handles names with spaces + better (i.e. replace openhtml_win32_fix-0.39-2.patch) + + +- make DLLs install into %SystemRoot%\system32 instead of %ProgramFiles%\pd\bin + + - check out using env vars in Path settings in registry, or make relative paths (I checked, you can't use env vars in the path or loadlib settings... arg, this should be implemented) -- Another detail is that help browser can't open files if there is a space in - the path or filename. I think its a problem of Tcl escaping. The problem - is in u_main.tk in menu_openhtml on Win32 with rundll32 dll.url.FileHandler - - - get Windows Makefiles for Gem diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg index dab1afd4..c8b14dda 100755 --- a/packages/win32_inno/pd-settings.reg +++ b/packages/win32_inno/pd-settings.reg @@ -1,109 +1,103 @@ Windows Registry Editor Version 5.00 [HKEY_LOCAL_MACHINE\SOFTWARE\Pd] -;; -;; load libs included with Pd-extended "loadlib1"="Gem" "loadlib2"="cyclone" "loadlib3"="zexy" "loadlib4"="cxc" "loadlib5"="ext13" -"loadlib6"="iemabs" -"loadlib7"="iemmatrix" -"loadlib8"="markex" -"loadlib9"="maxlib" -"loadlib10"="memento" -"loadlib11"="mjlib" -"loadlib12"="motex" -"loadlib13"="oscx" -"loadlib14"="pddp" -"loadlib15"="pdogg" -"loadlib16"="pdp" -"loadlib17"="pidip" -"loadlib18"="pixeltango" -"loadlib19"="pmpd" -"loadlib20"="rradical" -"loadlib21"="sigpack" -"loadlib22"="smlib" -"loadlib23"="toxy" -"loadlib24"="unauthorized" -"loadlib25"="vbap" -"loadlib26"="xsample" - -;; -;; blow away other lib settings to prevent conflicts, wrong order, etc. -"loadlib27"=- -"loadlib28"=- -"loadlib29"=- -"loadlib30"=- -"loadlib31"=- -"loadlib32"=- -"loadlib33"=- -"loadlib34"=- -"loadlib35"=- -"loadlib36"=- -"loadlib37"=- -"loadlib38"=- -"loadlib39"=- -"loadlib40"=- -"loadlib41"=- -"loadlib42"=- -"loadlib43"=- -"loadlib44"=- -"loadlib45"=- -"loadlib46"=- -"loadlib47"=- -"loadlib48"=- -"loadlib49"=- - -;; -;; blow away all path settings to prevent conflicts, wrong order, etc. -"path1"=- -"path2"=- -"path3"=- -"path4"=- -"path5"=- -"path6"=- -"path7"=- -"path8"=- -"path9"=- -"path10"=- -"path11"=- -"path12"=- -"path13"=- -"path14"=- -"path15"=- -"path16"=- -"path17"=- -"path18"=- -"path19"=- -"path20"=- -"path21"=- -"path22"=- -"path23"=- -"path24"=- -"path25"=- -"path26"=- -"path27"=- -"path28"=- -"path29"=- -"path30"=- -"path31"=- -"path32"=- -"path33"=- -"path34"=- -"path35"=- -"path36"=- -"path37"=- -"path38"=- -"path39"=- -"path40"=- -"path41"=- -"path42"=- -"path43"=- -"path44"=- -"path45"=- -"path46"=- -"path47"=- -"path48"=- -"path49"=- +"loadlib6"="fftease" +"loadlib7"="hid" +"loadlib8"="iemabs" +"loadlib9"="iemmatrix" +"loadlib10"="liblist" +"loadlib11"="markex" +"loadlib12"="maxlib" +"loadlib13"="memento" +"loadlib14"="mjlib" +"loadlib15"="motex" +"loadlib16"="oscx" +"loadlib17"="pddp" +"loadlib18"="pdogg" +"loadlib19"="pdp" +"loadlib20"="pidip" +"loadlib21"="pixeltango" +"loadlib22"="pmpd" +"loadlib23"="rradical" +"loadlib24"="sigpack" +"loadlib25"="smlib" +"loadlib26"="toxy" +"loadlib27"="unauthorized" +"loadlib28"="vasp" +"loadlib29"="vbap" +"loadlib30"="xsample" +; delete any previous loadlib flags +"loadlib31"="-" +"loadlib32"="-" +"loadlib33"="-" +"loadlib34"="-" +"loadlib35"="-" +"loadlib36"="-" +"loadlib37"="-" +"loadlib38"="-" +"loadlib39"="-" +"loadlib40"="-" +"loadlib41"="-" +"loadlib42"="-" +"loadlib43"="-" +"loadlib44"="-" +"loadlib45"="-" +"loadlib46"="-" +"loadlib47"="-" +"loadlib48"="-" +"loadlib49"="-" +; delete all existing path flags +"path1"="-" +"path2"="-" +"path3"="-" +"path4"="-" +"path5"="-" +"path6"="-" +"path7"="-" +"path8"="-" +"path9"="-" +"path10"="-" +"path11"="-" +"path12"="-" +"path13"="-" +"path14"="-" +"path15"="-" +"path16"="-" +"path17"="-" +"path18"="-" +"path19"="-" +"path20"="-" +"path21"="-" +"path22"="-" +"path23"="-" +"path24"="-" +"path25"="-" +"path26"="-" +"path27"="-" +"path28"="-" +"path29"="-" +"path30"="-" +"path31"="-" +"path32"="-" +"path33"="-" +"path34"="-" +"path35"="-" +"path36"="-" +"path37"="-" +"path38"="-" +"path39"="-" +"path40"="-" +"path41"="-" +"path42"="-" +"path43"="-" +"path44"="-" +"path45"="-" +"path46"="-" +"path47"="-" +"path48"="-" +"path49"="-" |