From 080130283bca29af04b5e353e3256a17a4321a1a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 3 Aug 2007 06:37:46 +0000 Subject: removed misplaced libquicktime chunk from u_main.tk since it is in its own patch svn path=/trunk/; revision=8375 --- ...s_pixel_accurate_on_every_platform-0.40.3.patch | 90 ++++++++++------------ 1 file changed, 41 insertions(+), 49 deletions(-) diff --git a/packages/patches/make_sizes_pixel_accurate_on_every_platform-0.40.3.patch b/packages/patches/make_sizes_pixel_accurate_on_every_platform-0.40.3.patch index 5aadf5ce..ec2315df 100644 --- a/packages/patches/make_sizes_pixel_accurate_on_every_platform-0.40.3.patch +++ b/packages/patches/make_sizes_pixel_accurate_on_every_platform-0.40.3.patch @@ -1,12 +1,10 @@ -? configure -? makefile Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.9 diff -u -w -r1.9 g_all_guis.c --- g_all_guis.c 11 Aug 2006 20:09:07 -0000 1.9 -+++ g_all_guis.c 25 Jul 2007 20:26:19 -0000 ++++ g_all_guis.c 3 Aug 2007 06:36:34 -0000 @@ -438,7 +438,7 @@ else { @@ -43,7 +41,7 @@ RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v retrieving revision 1.5 diff -u -w -r1.5 g_all_guis.h --- g_all_guis.h 16 Aug 2005 04:06:28 -0000 1.5 -+++ g_all_guis.h 25 Jul 2007 20:26:19 -0000 ++++ g_all_guis.h 3 Aug 2007 06:36:34 -0000 @@ -144,7 +144,7 @@ int x_w; int x_ldx; @@ -59,7 +57,7 @@ RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.5 diff -u -w -r1.5 g_bang.c --- g_bang.c 8 Sep 2006 23:45:30 -0000 1.5 -+++ g_bang.c 25 Jul 2007 20:26:19 -0000 ++++ g_bang.c 3 Aug 2007 06:36:34 -0000 @@ -55,11 +55,12 @@ xpos + x->x_gui.x_w-1, ypos + x->x_gui.x_h-1, x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol, x); @@ -110,7 +108,7 @@ RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v retrieving revision 1.10 diff -u -w -r1.10 g_graph.c --- g_graph.c 3 Jun 2006 19:13:07 -0000 1.10 -+++ g_graph.c 25 Jul 2007 20:26:19 -0000 ++++ g_graph.c 3 Aug 2007 06:36:35 -0000 @@ -741,9 +741,9 @@ { i -= sys_fontheight(glist_getfont(x)); @@ -159,7 +157,7 @@ RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v retrieving revision 1.7 diff -u -w -r1.7 g_hdial.c --- g_hdial.c 8 Sep 2006 23:45:30 -0000 1.7 -+++ g_hdial.c 25 Jul 2007 20:26:19 -0000 ++++ g_hdial.c 3 Aug 2007 06:36:35 -0000 @@ -73,10 +73,10 @@ x->x_drawn = x->x_on; } @@ -208,7 +206,7 @@ RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.6 diff -u -w -r1.6 g_hslider.c --- g_hslider.c 8 Sep 2006 23:45:30 -0000 1.6 -+++ g_hslider.c 25 Jul 2007 20:26:19 -0000 ++++ g_hslider.c 3 Aug 2007 06:36:35 -0000 @@ -76,11 +76,12 @@ canvas, r, ypos+1, r, ypos + x->x_gui.x_h, x->x_gui.x_fcol, x); @@ -259,7 +257,7 @@ RCS file: /cvsroot/pure-data/pd/src/g_mycanvas.c,v retrieving revision 1.5 diff -u -w -r1.5 g_mycanvas.c --- g_mycanvas.c 6 Sep 2004 20:20:34 -0000 1.5 -+++ g_mycanvas.c 25 Jul 2007 20:26:19 -0000 ++++ g_mycanvas.c 3 Aug 2007 06:36:35 -0000 @@ -44,10 +44,11 @@ xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, x->x_gui.x_bcol, x); @@ -310,7 +308,7 @@ RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.8 diff -u -w -r1.8 g_numbox.c --- g_numbox.c 8 Sep 2006 23:45:30 -0000 1.8 -+++ g_numbox.c 25 Jul 2007 20:26:19 -0000 ++++ g_numbox.c 3 Aug 2007 06:36:35 -0000 @@ -195,15 +195,17 @@ xpos, ypos + x->x_gui.x_h, x->x_gui.x_fcol, x); @@ -374,7 +372,7 @@ RCS file: /cvsroot/pure-data/pd/src/g_rtext.c,v retrieving revision 1.6 diff -u -w -r1.6 g_rtext.c --- g_rtext.c 11 Aug 2006 20:09:07 -0000 1.6 -+++ g_rtext.c 25 Jul 2007 20:26:19 -0000 ++++ g_rtext.c 3 Aug 2007 06:36:35 -0000 @@ -15,10 +15,16 @@ #include "g_canvas.h" #include "t_tk.h" @@ -402,7 +400,7 @@ RCS file: /cvsroot/pure-data/pd/src/g_template.c,v retrieving revision 1.18 diff -u -w -r1.18 g_template.c --- g_template.c 9 Oct 2006 04:36:12 -0000 1.18 -+++ g_template.c 25 Jul 2007 20:26:19 -0000 ++++ g_template.c 3 Aug 2007 06:36:36 -0000 @@ -2126,8 +2126,8 @@ drawnumber_sprintf(x, buf, &at); sys_vgui(".x%lx.c create text %d %d -anchor nw -fill %s -text {%s}", @@ -420,7 +418,7 @@ RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v retrieving revision 1.5 diff -u -w -r1.5 g_toggle.c --- g_toggle.c 8 Sep 2006 23:45:30 -0000 1.5 -+++ g_toggle.c 25 Jul 2007 20:26:19 -0000 ++++ g_toggle.c 3 Aug 2007 06:36:36 -0000 @@ -61,11 +61,12 @@ canvas, xx+w+1, yy + x->x_gui.x_h-w-1, xx + x->x_gui.x_w-w, yy+w, w, (x->x_on!=0.0)?x->x_gui.x_fcol:x->x_gui.x_bcol, x); @@ -471,7 +469,7 @@ RCS file: /cvsroot/pure-data/pd/src/g_vdial.c,v retrieving revision 1.6 diff -u -w -r1.6 g_vdial.c --- g_vdial.c 8 Sep 2006 23:45:30 -0000 1.6 -+++ g_vdial.c 25 Jul 2007 20:26:19 -0000 ++++ g_vdial.c 3 Aug 2007 06:36:36 -0000 @@ -75,10 +75,10 @@ x->x_drawn = x->x_on; } @@ -520,7 +518,7 @@ RCS file: /cvsroot/pure-data/pd/src/g_vslider.c,v retrieving revision 1.6 diff -u -w -r1.6 g_vslider.c --- g_vslider.c 8 Sep 2006 23:45:30 -0000 1.6 -+++ g_vslider.c 25 Jul 2007 20:26:19 -0000 ++++ g_vslider.c 3 Aug 2007 06:36:36 -0000 @@ -59,10 +59,11 @@ canvas, xpos+1, r, xpos + x->x_gui.x_w, r, x->x_gui.x_fcol, x); @@ -570,7 +568,7 @@ RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v retrieving revision 1.5 diff -u -w -r1.5 g_vumeter.c --- g_vumeter.c 16 Aug 2005 04:06:28 -0000 1.5 -+++ g_vumeter.c 25 Jul 2007 20:26:19 -0000 ++++ g_vumeter.c 3 Aug 2007 06:36:36 -0000 @@ -116,17 +116,19 @@ canvas, quad1, yyy, quad3, yyy, x->x_led_size, iemgui_color_hex[led_col], x, i); if(((i+2)&3) && (x->x_scale)) @@ -696,7 +694,7 @@ RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.16.2.2 diff -u -w -r1.16.2.2 m_pd.h --- m_pd.h 18 Jul 2007 00:20:12 -0000 1.16.2.2 -+++ m_pd.h 25 Jul 2007 20:26:19 -0000 ++++ m_pd.h 3 Aug 2007 06:36:36 -0000 @@ -368,6 +368,8 @@ EXTERN void canvas_makefilename(t_glist *c, char *file, char *result,int resultsize); @@ -712,7 +710,7 @@ RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.18.2.1 diff -u -w -r1.18.2.1 s_inter.c --- s_inter.c 18 Jul 2007 00:20:12 -0000 1.18.2.1 -+++ s_inter.c 25 Jul 2007 20:26:19 -0000 ++++ s_inter.c 3 Aug 2007 06:36:36 -0000 @@ -87,7 +87,6 @@ extern char *pd_version; @@ -748,7 +746,7 @@ RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.28 diff -u -w -r1.28 s_main.c --- s_main.c 4 Oct 2006 19:35:06 -0000 1.28 -+++ s_main.c 25 Jul 2007 20:26:19 -0000 ++++ s_main.c 3 Aug 2007 06:36:37 -0000 @@ -58,7 +58,12 @@ int sys_midiindevlist[MAXMIDIINDEV] = {1}; int sys_midioutdevlist[MAXMIDIOUTDEV] = {1}; @@ -846,7 +844,7 @@ RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.25 diff -u -w -r1.25 u_main.tk --- u_main.tk 9 Oct 2006 04:36:12 -0000 1.25 -+++ u_main.tk 25 Jul 2007 20:26:19 -0000 ++++ u_main.tk 3 Aug 2007 06:36:37 -0000 @@ -1,14 +1,4 @@ #!/usr/bin/wish - @@ -898,7 +896,7 @@ diff -u -w -r1.25 u_main.tk # Tearoff is set to true by default: set pd_tearoff 1 -@@ -44,15 +63,14 @@ +@@ -44,12 +63,8 @@ if {$pd_nt == 2} { # turn on James Tittle II's fast drawing set tk::mac::useCGDrawing 1 @@ -913,13 +911,7 @@ diff -u -w -r1.25 u_main.tk global pd_guidir global pd_tearoff set pd_gui2 [string range $argv0 0 [expr [string last / $argv0 ] - 1]] -+# this is the embedded libquicktime can find its embedded plugins -+ puts stderr "Setting LIBQUICKTIME_PLUGIN_DIR: $pd_gui2/../../lib/libquicktime" -+ set env(LIBQUICKTIME_PLUGIN_DIR) $pd_gui2/../../lib/libquicktime - set pd_guidir $pd_gui2/.. - load $pd_guidir/bin/libPdTcl.dylib - set pd_tearoff 0 -@@ -132,6 +150,15 @@ +@@ -132,6 +147,15 @@ .mbar add cascade -label "Help" -menu .mbar.help } @@ -935,7 +927,7 @@ diff -u -w -r1.25 u_main.tk set ctrls_audio_on 0 set ctrls_meter_on 0 set ctrls_inlevel 0 -@@ -175,7 +201,7 @@ +@@ -175,7 +199,7 @@ frame .printout @@ -944,7 +936,7 @@ diff -u -w -r1.25 u_main.tk -yscrollcommand ".printout.scroll set" -width 80 # .printout.text insert end "\n\n\n\n\n\n\n\n\n\n" scrollbar .printout.scroll -command ".printout.text yview" -@@ -364,7 +390,7 @@ +@@ -364,7 +388,7 @@ global pd_myversion set name [format ".help%d" $doc_number] toplevel $name @@ -953,7 +945,7 @@ diff -u -w -r1.25 u_main.tk -yscrollcommand "$name.scroll set" -background white scrollbar $name.scroll -command "$name.text yview" pack $name.scroll -side right -fill y -@@ -1142,6 +1168,18 @@ +@@ -1142,6 +1166,18 @@ $name.popup add command -label {Help} \ -command [concat popup_action $name 2] @@ -972,7 +964,7 @@ diff -u -w -r1.25 u_main.tk # WM protocol wm protocol $name WM_DELETE_WINDOW [concat menu_close $name] -@@ -1266,6 +1304,7 @@ +@@ -1266,6 +1302,7 @@ global pd_nt global pd_array_listview_page global pd_array_listview_id @@ -980,7 +972,7 @@ diff -u -w -r1.25 u_main.tk set pd_array_listview_page($arrayName) $page set pd_array_listview_id($arrayName) $id set windowName [format ".%sArrayWindow" $arrayName] -@@ -1279,8 +1318,7 @@ +@@ -1279,8 +1316,7 @@ set $windowName.lb [listbox $windowName.lb -height 20 -width 25\ -selectmode extended \ -relief solid -background white -borderwidth 1 \ @@ -990,7 +982,7 @@ diff -u -w -r1.25 u_main.tk -yscrollcommand "$windowName.lb.sb set"] set $windowName.lb.sb [scrollbar $windowName.lb.sb \ -command "$windowName.lb yview" -orient vertical] -@@ -1384,9 +1422,7 @@ +@@ -1384,9 +1420,7 @@ proc pdtk_array_listview_edit {arrayName page font} { global pd_array_listview_entry global pd_nt @@ -1001,7 +993,7 @@ diff -u -w -r1.25 u_main.tk set lbName [format ".%sArrayWindow.lb" $arrayName] if {[winfo exists $lbName.entry]} { pdtk_array_listview_update_entry \ -@@ -1398,7 +1434,7 @@ +@@ -1398,7 +1432,7 @@ set bbox [$lbName bbox $itemNum] set y [expr [lindex $bbox 1] - 4] set $lbName.entry [entry $lbName.entry \ @@ -1010,7 +1002,7 @@ diff -u -w -r1.25 u_main.tk $lbName.entry insert 0 [] place configure $lbName.entry -relx 0 -y $y -relwidth 1 lower $lbName.entry -@@ -1874,6 +1910,8 @@ +@@ -1874,6 +1908,8 @@ set vid [string trimleft $id .] @@ -1019,7 +1011,7 @@ diff -u -w -r1.25 u_main.tk set var_gatomwidth [concat gatomwidth_$vid] global $var_gatomwidth set var_gatomlo [concat gatomlo_$vid] -@@ -1898,87 +1936,96 @@ +@@ -1898,87 +1934,96 @@ set $var_gatomsymto [gatom_unescape $symto] toplevel $id @@ -1186,7 +1178,7 @@ diff -u -w -r1.25 u_main.tk pdtk_standardkeybindings $id.params.entry $id.params.entry select from 0 $id.params.entry select adjust end -@@ -2131,7 +2178,7 @@ +@@ -2131,7 +2176,7 @@ if {[eval concat $$var_iemgui_gn_fs] < $iemgui_define_min_fontsize} { set $var_iemgui_gn_fs $iemgui_define_min_fontsize @@ -1195,7 +1187,7 @@ diff -u -w -r1.25 u_main.tk } } -@@ -2145,20 +2192,20 @@ +@@ -2145,20 +2190,20 @@ set var_iemgui_lcol [concat iemgui_lcol_$vid] global $var_iemgui_lcol @@ -1219,7 +1211,7 @@ diff -u -w -r1.25 u_main.tk -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ -@@ -2242,17 +2289,27 @@ +@@ -2242,17 +2287,27 @@ } } @@ -1253,7 +1245,7 @@ diff -u -w -r1.25 u_main.tk } proc iemgui_lb {id} { -@@ -2398,6 +2455,9 @@ +@@ -2398,6 +2453,9 @@ set vid [string trimleft $id .] @@ -1263,7 +1255,7 @@ diff -u -w -r1.25 u_main.tk set var_iemgui_wdt [concat iemgui_wdt_$vid] global $var_iemgui_wdt set var_iemgui_min_wdt [concat iemgui_min_wdt_$vid] -@@ -2485,7 +2545,8 @@ +@@ -2485,7 +2543,8 @@ set $var_iemgui_l2_f1_b0 0 toplevel $id @@ -1273,7 +1265,7 @@ diff -u -w -r1.25 u_main.tk wm protocol $id WM_DELETE_WINDOW [concat iemgui_cancel $id] frame $id.dim -@@ -2518,7 +2579,7 @@ +@@ -2518,7 +2577,7 @@ $id.rng.max_lab $id.rng.max_ent -side left} } if { [eval concat $$var_iemgui_lin0_log1] >= 0 || [eval concat $$var_iemgui_loadbang] >= 0 || [eval concat $$var_iemgui_num] > 0 || [eval concat $$var_iemgui_steady] >= 0 } { @@ -1282,7 +1274,7 @@ diff -u -w -r1.25 u_main.tk pack $id.space1 -side top } frame $id.para -@@ -2547,157 +2608,189 @@ +@@ -2547,157 +2606,189 @@ pack $id.para.dummy3 $id.para.num_lab $id.para.num_ent -side left -expand 1} if {[eval concat $$var_iemgui_steady] >= 0} { pack $id.para.dummy3 $id.para.stdy_jmp -side left -expand 1} @@ -1596,7 +1588,7 @@ diff -u -w -r1.25 u_main.tk if {[info tclversion] < 8.4} { bind $id {tkTabToWindow [tk_focusNext %W]} -@@ -2712,24 +2805,24 @@ +@@ -2712,24 +2803,24 @@ bind $id.rng.min_ent [concat iemgui_ok $id] bind $id.rng.max_ent [concat iemgui_ok $id] bind $id.para.num_ent [concat iemgui_ok $id] @@ -1633,7 +1625,7 @@ diff -u -w -r1.25 u_main.tk pdtk_standardkeybindings $id.cao.ok $id.dim.w_ent select from 0 -@@ -2807,6 +2900,7 @@ +@@ -2807,6 +2898,7 @@ toplevel $id wm title $id {array} @@ -1641,7 +1633,7 @@ diff -u -w -r1.25 u_main.tk wm protocol $id WM_DELETE_WINDOW [concat array_cancel $id] frame $id.name -@@ -3264,18 +3358,21 @@ +@@ -3264,18 +3356,21 @@ # seven "useful" font sizes. # tb: user defined typefaces @@ -1666,7 +1658,7 @@ diff -u -w -r1.25 u_main.tk set pd_fontlist [linsert $pd_fontlist 100000 $font] set width0 [font measure $font x] set height0 [lindex [font metrics $font] 5] -@@ -3522,8 +3619,12 @@ +@@ -3522,8 +3617,12 @@ # create a popup menu proc audio_popup {name buttonname varname devlist} { @@ -1679,7 +1671,7 @@ diff -u -w -r1.25 u_main.tk # puts stderr [concat $devlist ] for {set x 0} {$x<[llength $devlist]} {incr x} { $name.popup add command -label [lindex $devlist $x] \ -@@ -3798,8 +3899,12 @@ +@@ -3798,8 +3897,12 @@ # create a popup menu proc midi_popup {name buttonname varname devlist} { -- cgit v1.2.1