Update of /cvsroot/pure-data/packages/patches
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1714/patches
Added Files:
disable-fat_option-0.40-1.patch
expose_sys_register_loader-0.41.0-test03.patch
macosx_deployment_target-0.40-1.patch mingw_fixes-0.40-1.patch
remove_x11_fontspecs_0.40-1.patch
Removed Files:
alsa_adddev_proto_with_alsa_only-0.40-pre.patch
array_overflow_fix-0.39.2.patch
bang_method_for_clip-0.40.pre.patch
build_vars_4_makefile.in.patch
complete_version_defines-0.39.2.patch
help_browser-0.39.2.patch libdir-0.38-4.patch
loaderHEX-0.39-1.patch macintel-0.39.2.patch
mingw_fixes-0.39-2.patch number_bug_list_bug-0.39.2.patch
pd_window_close_save_prompt-0.39.2.diff
put_version_into_aboutpd_page-0.40-pre.patch
remove_doubleclick_as_rightclick-0.39.2.patch
remove_x11_fontspecs_0.39.2.patch
Log Message:
updated patch collection to apply and build against stable_0_40, which is currently at 0.40.1
--- build_vars_4_makefile.in.patch DELETED ---
--- mingw_fixes-0.39-2.patch DELETED ---
--- loaderHEX-0.39-1.patch DELETED ---
--- NEW FILE: expose_sys_register_loader-0.41.0-test03.patch ---
Index: s_loader.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v
retrieving revision 1.13
diff -u -w -r1.13 s_loader.c
--- s_loader.c 9 Oct 2006 04:36:12 -0000 1.13
+++ s_loader.c 26 Nov 2006 04:46:57 -0000
@@ -198,9 +198,6 @@
return (1);
}
-/* callback type definition */
-typedef int (*loader_t)(t_canvas *canvas, char *classname);
-
/* linked list of loaders */
typedef struct loader_queue {
loader_t loader;
Index: s_stuff.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v
retrieving revision 1.10
diff -u -w -r1.10 s_stuff.h
--- s_stuff.h 15 Aug 2006 04:54:15 -0000 1.10
+++ s_stuff.h 26 Nov 2006 04:46:57 -0000
@@ -52,6 +52,8 @@
/* s_loader.c */
int sys_load_lib(t_canvas *canvas, char *filename);
+typedef int (*loader_t)(t_canvas *canvas, char *classname);
+EXTERN void sys_register_loader(loader_t loader);
/* s_audio.c */
--- remove_x11_fontspecs_0.39.2.patch DELETED ---
--- pd_window_close_save_prompt-0.39.2.diff DELETED ---
--- complete_version_defines-0.39.2.patch DELETED ---
--- macintel-0.39.2.patch DELETED ---
--- alsa_adddev_proto_with_alsa_only-0.40-pre.patch DELETED ---
--- put_version_into_aboutpd_page-0.40-pre.patch DELETED ---
--- NEW FILE: macosx_deployment_target-0.40-1.patch ---
Index: makefile.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
retrieving revision 1.8
diff -u -w -r1.8 makefile.in
--- makefile.in 24 Jul 2005 19:41:14 -0000 1.8
+++ makefile.in 22 Feb 2006 05:19:42 -0000
@@ -1,3 +1,8 @@
+# On Mac OS X, this needs to be defined to enable dlopen and weak linking
+# support. Its safe on other platforms since gcc only checks this env var on
+# Apple's gcc. <hans(a)at.or.at>
+export MACOSX_DEPLOYMENT_TARGET = 10.3
+
VPATH = ../obj:./
OBJ_DIR = ../obj
BIN_DIR = ../bin
--- remove_doubleclick_as_rightclick-0.39.2.patch DELETED ---
--- number_bug_list_bug-0.39.2.patch DELETED ---
--- help_browser-0.39.2.patch DELETED ---
--- NEW FILE: mingw_fixes-0.40-1.patch ---
Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.15
diff -u -w -r1.15 configure.in
--- configure.in 16 Aug 2005 04:06:28 -0000 1.15
+++ configure.in 22 Feb 2006 05:41:08 -0000
@@ -19,6 +19,7 @@
AC_SUBST(GUIFLAGS)
AC_SUBST(OSNUMBER)
AC_SUBST(EXTERNTARGET)
+AC_SUBST(ASIOSRC)
dnl other defaults
@@ -77,7 +78,10 @@
dnl Checking for `pthread_create' function in -pthread
AC_CHECK_LIB(pthread, pthread_create,PDLIB="$PDLIB -lpthread",
- echo "pthreads required" || exit 1)
+ AC_CHECK_LIB(pthreadGC2, pthread_create, PDLIB="$PDLIB -lpthreadGC2",
+ AC_CHECK_LIB(pthreadGC1, pthread_create, PDLIB="$PDLIB -lpthreadGC1",
+ AC_CHECK_LIB(pthreadGC, pthread_create, PDLIB="$PDLIB -lpthreadGC",
+ echo "pthreads required"; exit 1))))
dnl look for tcl 8.x... do I really have to go through all this!?
@@ -108,6 +112,11 @@
fi
if test $foundit == "no";
then
+ AC_CHECK_HEADER(tcl8.4/tcl.h,
+ GUIFLAGS="$GUIFLAGS -I/usr/local/include/tcl8.4";foundit=yes,)
+fi
+if test $foundit == "no";
+then
AC_CHECK_HEADER(tcl8.3/tcl.h,
GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.3";foundit=yes,)
fi
@@ -119,27 +128,30 @@
if test $foundit == "no";
then
echo no tcl header found
- exit -1
+ echo bolding trying without...
+# exit -1
fi
-AC_CHECK_LIB(tcl8.7, main,,
- AC_CHECK_LIB(tcl8.6, main,,
+AC_CHECK_LIB(tcl85, main,,
AC_CHECK_LIB(tcl8.5, main,,
+ AC_CHECK_LIB(tcl84, main,,
AC_CHECK_LIB(tcl8.4, main,,
AC_CHECK_LIB(tcl8.3, main,,
AC_CHECK_LIB(tcl8.2, main,,
- AC_CHECK_LIB(tcl8.0, main,,echo no tcl library found || exit 1)))))))
+ AC_CHECK_LIB(tcl8.0, main,,
+ echo no tcl library found; exit 1)))))))
-AC_CHECK_LIB(tk8.7, main,,
- AC_CHECK_LIB(tk8.6, main,,
+AC_CHECK_LIB(tk85, main,,
AC_CHECK_LIB(tk8.5, main,,
+ AC_CHECK_LIB(tk84, main,,
AC_CHECK_LIB(tk8.4, main,,
AC_CHECK_LIB(tk8.3, main,,
AC_CHECK_LIB(tk8.2, main,,
- AC_CHECK_LIB(tk8.0, main,,echo no tk library found || exit 1)))))))
+ AC_CHECK_LIB(tk8.0, main,,
+ echo no tk library found; exit 1)))))))
-if test `uname -s` = Linux;
+if test `uname -s` == Linux;
then
dnl Ckecking for ALSA
echo .................... alsa= $alsa
@@ -254,7 +266,7 @@
LDFLAGS=$LDFLAGS" -lrt -ljack"
fi
-if test `uname -s` = Darwin;
+if test `uname -s` == Darwin;
then
LDFLAGS="-Wl -framework CoreAudio \
-framework AudioUnit -framework AudioToolbox \
@@ -324,6 +336,39 @@
fi
fi
+# only Windows uses ASIO, for the rest, set to blank
+ASIOSRC=
+
+if test `uname -s` == MINGW32_NT-5.0;
+then
+ EXT=dll
+ MORECFLAGS="-DUSEAPI_PORTAUDIO -DPA19 -DMSW -DPA_NO_DS -DPD_INTERNAL \
+ -I../portaudio/pa_common -I../portaudio/pablio \
+ -mwindows -mms-bitfields "$MORECFLAGS
+ PDLIB=$PDLIB" -lwsock32 -lwinmm -lole32 -lstdc++"
+
+ SYSSRC="s_audio_pa.c s_audio_pablio.c s_audio_paring.c \
+ s_audio_mmio.c s_midi_mmio.c \
+ ../portaudio/pa_common/pa_allocation.c \
+ ../portaudio/pa_common/pa_converters.c \
+ ../portaudio/pa_common/pa_cpuload.c \
+ ../portaudio/pa_common/pa_dither.c \
+ ../portaudio/pa_common/pa_front.c \
+ ../portaudio/pa_common/pa_process.c \
+ ../portaudio/pa_common/pa_skeleton.c \
+ ../portaudio/pa_common/pa_stream.c \
+ ../portaudio/pa_common/pa_trace.c \
+ ../portaudio/pa_win/pa_win_util.c \
+ ../portaudio/pa_win/pa_win_hostapis.c \
+ ../portaudio/pa_win_wmme/pa_win_wmme.c"
+ ASIOSRC="../portaudio/pa_asio/iasiothiscallresolver.cpp \
+ ../portaudio/pa_asio/pa_asio.cpp ../asio/asio.cpp \
+ ../asio/asiodrivers.cpp ../asio/asiolist.cpp"
+ STRIPFLAG="--strip-unneeded"
+ GUINAME="pdtcl.dll"
+ GUIFLAGS=
+fi
+
# support for jack, on either linux or darwin:
if test x$jack == "xyes";
Index: makefile.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
retrieving revision 1.8
diff -u -w -r1.8 makefile.in
--- makefile.in 24 Jul 2005 19:41:14 -0000 1.8
+++ makefile.in 22 Feb 2006 05:41:08 -0000
@@ -30,6 +30,10 @@
SYSSRC += @SYSSRC@
+ASIOSRC = @ASIOSRC@
+
+ASIOOBJ = $(ASIOSRC:.cpp=.o)
+
SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \
g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \
g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \
@@ -70,6 +74,9 @@
$(GOBJ) : %.o : %.c
$(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c
+$(ASIOOBJ): %.o : %.cpp
+ $(CXX) $(CFLAGS) $(INCLUDE) -c -o $(OBJ_DIR)/$*.o $*.cpp
+
pd: $(PDEXEC)
gui: $(BIN_DIR)/$(GUINAME)
@@ -109,6 +116,12 @@
@executable_path/../Frameworks/Tk.framework/Versions/8.4/Tk \
../bin/libPdTcl.dylib
+# this is for Windows/MinGW (only?)
+$(BIN_DIR)/pdtcl.dll: $(GOBJ)
+ cd $(BIN_DIR); dllwrap --export-all-symbols --output-def pdtcl.def \
+ --output-lib=pdtcl.a --dllname=$(GUINAME) $(OBJ_DIR)/t_tkcmd.o $(LIB) $(GLIB)
+ strip --strip-unneeded $(BIN_DIR)/pdtcl.dll
+
externs:
cd ../extra/bonk~;make @EXTERNTARGET@
cd ../extra/choice;make @EXTERNTARGET@
Index: s_inter.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v
retrieving revision 1.14
diff -u -w -r1.14 s_inter.c
--- s_inter.c 15 Oct 2005 23:14:28 -0000 1.14
+++ s_inter.c 22 Feb 2006 05:41:08 -0000
@@ -23,16 +23,19 @@
#ifdef HAVE_BSTRING_H
#include <bstring.h>
#endif
-#ifdef MSW
+#ifdef _WIN32
#include <io.h>
#include <fcntl.h>
#include <process.h>
#include <winsock.h>
#include <windows.h>
+# ifdef _MSC_VER
typedef int pid_t;
+# endif
typedef int socklen_t;
#define EADDRINUSE WSAEADDRINUSE
#endif
+
#include <stdarg.h>
#include <signal.h>
#include <fcntl.h>
--- NEW FILE: disable-fat_option-0.40-1.patch ---
Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.21.2.1
diff -u -w -r1.21.2.1 configure.in
--- configure.in 28 Oct 2006 19:16:41 -0000 1.21.2.1
+++ configure.in 23 Dec 2006 07:44:30 -0000
@@ -41,6 +42,8 @@
setuid=$enableval)
AC_ARG_ENABLE(fftw, [ --enable-fftw use FFTW package],
fftw=$enableval)
+AC_ARG_ENABLE(fat, [ --disable-fat build fat binary on Mac OS X],
+ fat=$enableval, fat="yes")
dnl Checks for programs.
AC_PROG_CC
@@ -249,15 +263,20 @@
-I../portmidi/pm_common -I../portmidi/pm_mac \
-I../portmidi/porttime \
-DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO"
+dnl for Mac OS X 10.3 (i.e. < 10.4)
if test `uname -r` = 7.9.0;
then
- MORECFLAGS="-DMACOSX3 -DPA_BIG_ENDIAN -Wno-error"
- EXTERNTARGET=d_ppc
- else
+ fat="no"
+ fi
+ if test "x$fat" == "xyes";
+ then
MORECFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-arch i386 -arch ppc -Wno-error"
EXTERNTARGET=d_fat
LDFLAGS=$LDFLAGS" -arch i386 -arch ppc"
+ else
+ MORECFLAGS="-DMACOSX3 -Wno-error"
+ EXTERNTARGET=d_ppc
fi
SYSSRC="s_midi_pm.c s_audio_pa.c \
s_audio_pablio.c \
--- array_overflow_fix-0.39.2.patch DELETED ---
--- bang_method_for_clip-0.40.pre.patch DELETED ---
--- libdir-0.38-4.patch DELETED ---
--- NEW FILE: remove_x11_fontspecs_0.40-1.patch ---
? configure
? makefile
Index: g_graph.c
===================================================================
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 23 Dec 2006 07:27:29 -0000
@@ -741,7 +741,7 @@
{
i -= sys_fontheight(glist_getfont(x));
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor nw\
- -font -*-courier-bold--normal--%d-* -tags %s\n",
+ -font {courier %d bold} -tags %s\n",
(long)glist_getcanvas(x), x1, i, arrayname->s_name,
sys_hostfontsize(glist_getfont(x)), tag);
}
@@ -823,7 +823,7 @@
/* draw x labels */
for (i = 0; i < x->gl_nxlabels; i++)
sys_vgui(".x%lx.c create text\
- %d %d -text {%s} -font -*-courier-bold--normal--%d-* -tags %s\n",
+ %d %d -text {%s} -font {courier %d bold} -tags %s\n",
glist_getcanvas(x),
(int)glist_xtopixels(x, atof(x->gl_xlabel[i]->s_name)),
(int)glist_ytopixels(x, x->gl_xlabely), x->gl_xlabel[i]->s_name,
@@ -832,7 +832,7 @@
/* draw y labels */
for (i = 0; i < x->gl_nylabels; i++)
sys_vgui(".x%lx.c create text\
- %d %d -text {%s} -font -*-courier-bold--normal--%d-* -tags %s\n",
+ %d %d -text {%s} -font {courier %d bold} -tags %s\n",
glist_getcanvas(x),
(int)glist_xtopixels(x, x->gl_ylabelx),
(int)glist_ytopixels(x, atof(x->gl_ylabel[i]->s_name)),
Index: g_template.c
===================================================================
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 23 Dec 2006 07:27:30 -0000
@@ -2126,7 +2126,7 @@
drawnumber_sprintf(x, buf, &at);
sys_vgui(".x%lx.c create text %d %d -anchor nw -fill %s -text {%s}",
glist_getcanvas(glist), xloc, yloc, colorstring, buf);
- sys_vgui(" -font -*-courier-bold--normal--%d-*",
+ sys_vgui(" -font {courier %d bold}",
sys_hostfontsize(glist_getfont(glist)));
sys_vgui(" -tags drawnumber%lx\n", data);
}
Index: s_main.c
===================================================================
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 23 Dec 2006 07:27:31 -0000
@@ -158,11 +158,7 @@
}
int sys_defaultfont;
-#ifdef MSW
-#define DEFAULTFONT 12
-#else
#define DEFAULTFONT 10
-#endif
static void openit(const char *dirname, const char *filename)
{
Index: u_main.tk
===================================================================
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 23 Dec 2006 07:27:33 -0000
@@ -175,7 +175,7 @@
frame .printout
-text .printout.text -relief raised -bd 2 -font -*-courier-bold--normal--12-* \
+text .printout.text -relief raised -bd 2 -font {courier 12 normal} \
-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 +364,7 @@
global pd_myversion
set name [format ".help%d" $doc_number]
toplevel $name
- text $name.text -relief raised -bd 2 -font -*-times-regular--normal--14-* \
+ text $name.text -relief raised -bd 2 -font {times 14 normal} \
-yscrollcommand "$name.scroll set" -background white
scrollbar $name.scroll -command "$name.text yview"
pack $name.scroll -side right -fill y
@@ -1279,7 +1279,7 @@
set $windowName.lb [listbox $windowName.lb -height 20 -width 25\
-selectmode extended \
-relief solid -background white -borderwidth 1 \
- -font [format -*-courier-bold--normal--%d-* \
+ -font [format {courier %d bold} \
$font] \
-yscrollcommand "$windowName.lb.sb set"]
set $windowName.lb.sb [scrollbar $windowName.lb.sb \
@@ -1398,7 +1398,7 @@
set bbox [$lbName bbox $itemNum]
set y [expr [lindex $bbox 1] - 4]
set $lbName.entry [entry $lbName.entry \
- -font [format -*-courier-bold--normal--%d-* $font]]
+ -font [format {courier %d bold} $font]]
$lbName.entry insert 0 []
place configure $lbName.entry -relx 0 -y $y -relwidth 1
lower $lbName.entry
@@ -3214,8 +3214,8 @@
############ pdtk_text_new -- create a new text object #2###########
proc pdtk_text_new {canvasname myname x y text font color} {
-# if {$font < 13} {set fontname [format -*-courier-bold----%d-* $font]}
-# if {$font >= 13} {set fontname [format -*-courier-----%d-* $font]}
+# if {$font < 13} {set fontname [format {courier %d bold} $font]}
+# if {$font >= 13} {set fontname [format {courier %d normal} $font]}
global pd_fontlist
switch -- $font {