Update of /cvsroot/pure-data/externals/pdp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628
Modified Files: CHANGES.LOG Makefile Makefile.config Makefile.config.in README TODO buildall configure.ac Log Message: pdp current darcs merge
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 21 Jul 2006 15:39:11 -0000 1.7 --- Makefile 1 Sep 2006 13:45:29 -0000 1.8 *************** *** 1,11 **** include Makefile.config
! # all: $(PDP_TARGET)
! ifeq ($(OS_NAME),darwin) ! all: darwin ! else ! all: linux ! endif
pdp_all: --- 1,17 ---- include Makefile.config
! # hc ? ! #ifeq ($(OS_NAME),darwin) ! #all: darwin ! #else ! #all: linux ! #endif
! ! all: $(PDP_TARGET) ! ! everything: all ! make -C opengl ! make -C scaf
pdp_all:
Index: Makefile.config =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/Makefile.config,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.config 16 Dec 2005 00:38:55 -0000 1.5 --- Makefile.config 1 Sep 2006 13:45:29 -0000 1.6 *************** *** 4,21 **** #PD_CPPFLAGS=-I/path_to_pd_dir/src #PD_EXECUTABLE=/path_to_pd_dir/bin/pd ! PD_CPPFLAGS= ! PD_EXECUTABLE=/usr/local/bin/pd ! PDP_CFLAGS=-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -O2 -funroll-loops -fomit-frame-pointer -ffast-math
prefix=/usr/local ! PDP_VERSION = 0.12.4 ! PDP_TARGET = darwin ! PDP_LIBRARY_NAME = pdp.pd_darwin ! PDP_EXTRA_CPPFLAGS = -I/sw/include PDP_EXTRA_CFLAGS = SDL_FLAGS = -D_REENTRANT
# optional objects ! PDP_OPTMOD = pdp_xv.o pdp_qt.o pdp_glx.o PDP_X11MOD = pdp_xwindow.o pdp_xvideo.o PDP_PDMOD = --- 4,23 ---- #PD_CPPFLAGS=-I/path_to_pd_dir/src #PD_EXECUTABLE=/path_to_pd_dir/bin/pd ! PD_CPPFLAGS=-I/home/tom/pdcvs/externals/pdp/../../pd/src ! PD_EXECUTABLE= ! PDP_CFLAGS=-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -I/../../pd/src -O2 -funroll-loops -fomit-frame-pointer -ffast-math
+ # these are reused in opengl module prefix=/usr/local ! PDP_VERSION=0.12.4 ! PDP_TARGET=linux_mmx ! ! PDP_LIBRARY_NAME = pdp.pd_linux ! PDP_EXTRA_CPPFLAGS = PDP_EXTRA_CFLAGS = SDL_FLAGS = -D_REENTRANT
# optional objects ! PDP_OPTMOD = pdp_v4l.o pdp_xv.o pdp_qt.o pdp_glx.o pdp_sdl.o PDP_X11MOD = pdp_xwindow.o pdp_xvideo.o PDP_PDMOD = *************** *** 29,33 ****
PDP_CPPFLAGS = -I. -I/usr/X11R6/include -I../include -I../../include $(PD_CPPFLAGS) $(PDP_EXTRA_CPPFLAGS) ! PDP_LIBS = -lgslcblas -lm -L/sw/lib -lgslcblas -lgsl -lz -lpng -L/usr/X11R6/lib -lX11 -lXv -lXext -lquicktime -lGL -lGLU PDP_AFLAGS = #--gstabs --- 31,35 ----
PDP_CPPFLAGS = -I. -I/usr/X11R6/include -I../include -I../../include $(PD_CPPFLAGS) $(PDP_EXTRA_CPPFLAGS) ! PDP_LIBS = -lgslcblas -lm -lgslcblas -lgsl -lz -lpng -L/usr/X11R6/lib -lX11 -lXv -lXext -lquicktime -lGL -lGLU -lSDL PDP_AFLAGS = #--gstabs *************** *** 46,50 **** #CC = gcc #AS = as ! CC = cc
# build rules --- 48,52 ---- #CC = gcc #AS = as ! CC = gcc
# build rules
Index: CHANGES.LOG =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/CHANGES.LOG,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CHANGES.LOG 16 Dec 2005 00:51:01 -0000 1.6 --- CHANGES.LOG 1 Sep 2006 13:45:29 -0000 1.7 *************** *** 158,161 **** --- 158,163 ---- build fixes + 0.12.5: + build fixes
Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/configure.ac,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure.ac 16 Dec 2005 02:55:14 -0000 1.5 --- configure.ac 1 Sep 2006 13:45:29 -0000 1.6 *************** *** 6,10 **** dnl TAG CVS WHEN RELEASE VERSION CHANGES !!!
! PDP_VERSION=0.12.4 AC_SUBST(PDP_VERSION)
--- 6,10 ---- dnl TAG CVS WHEN RELEASE VERSION CHANGES !!!
! PDP_VERSION=0.12.5-darcs AC_SUBST(PDP_VERSION)
*************** *** 43,50 ****
! PWD=`pwd` ! PDP_CFLAGS="-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -I$(PWD)/../../pd/src" dnl -Werror -Wshadow
--- 43,51 ----
! # long double? -Wno-long-double ! PDP_CFLAGS="-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -fPIC" dnl -Werror -Wshadow
+ dnl the -Wshadow option is way too strict.. gl headers won't compile
*************** *** 54,58 **** then AC_DEFINE(PDP_DEBUG, 1, "enable debugging support") ! PDP_CFLAGS="$PDP_CFLAGS -g -Werror -Wshadow" else AC_DEFINE(PDP_DEBUG, 0, "disable debugging support") --- 55,59 ---- then AC_DEFINE(PDP_DEBUG, 1, "enable debugging support") ! PDP_CFLAGS="$PDP_CFLAGS -g -Werror" else AC_DEFINE(PDP_DEBUG, 0, "disable debugging support") *************** *** 76,79 **** --- 77,81 ---- dnl check in $prefix/pd/src then ../pd/src dnl if this fails we trust it is in the standard include path + PWD=`pwd` if test -f $prefix/pd/src/m_pd.h; then *************** *** 83,89 **** then PD_CPPFLAGS="-I$prefix/src/pd/src" - elif test -f $PWD/../../pd/src/m_pd.h; - then - PD_CPPFLAGS="-I$PWD/../../pd/src" elif test -f $PWD/../pd/src/m_pd.h; then --- 85,88 ---- *************** *** 128,132 **** if test $ARCH == Darwin then ! PD_EXECUTABLE=$PWD/../../pd/bin/pd LIBS="$LIBS -L/sw/lib" CPPFLAGS="$CPPFLAGS -I/sw/include" --- 127,131 ---- if test $ARCH == Darwin then ! PD_EXECUTABLE=$prefix/bin/pd LIBS="$LIBS -L/sw/lib" CPPFLAGS="$CPPFLAGS -I/sw/include"
Index: Makefile.config.in =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/Makefile.config.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.config.in 16 Dec 2005 00:38:55 -0000 1.4 --- Makefile.config.in 1 Sep 2006 13:45:29 -0000 1.5 *************** *** 8,14 **** PDP_CFLAGS=@PDP_CFLAGS@
prefix=@prefix@ ! PDP_VERSION = @PDP_VERSION@ ! PDP_TARGET = @PDP_TARGET@ PDP_LIBRARY_NAME = @PDP_LIBRARY_NAME@ PDP_EXTRA_CPPFLAGS = @PDP_EXTRA_CPPFLAGS@ --- 8,16 ---- PDP_CFLAGS=@PDP_CFLAGS@
+ # these are reused in opengl module prefix=@prefix@ ! PDP_VERSION=@PDP_VERSION@ ! PDP_TARGET=@PDP_TARGET@ ! PDP_LIBRARY_NAME = @PDP_LIBRARY_NAME@ PDP_EXTRA_CPPFLAGS = @PDP_EXTRA_CPPFLAGS@
Index: README =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/README,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** README 16 Dec 2005 00:51:02 -0000 1.6 --- README 1 Sep 2006 13:45:29 -0000 1.7 *************** *** 2,6 **** a packet processing library for pure data
! Copyright (c) by Tom Schouten pdp@zzz.kotnet.org
This program is free software; you can redistribute it and/or modify --- 2,6 ---- a packet processing library for pure data
! Copyright (c) by Tom Schouten pdp@goto10.org
This program is free software; you can redistribute it and/or modify *************** *** 30,34 **** * pdp_scaf (in directory scaf/) * pdp_opengl (in directory opengl/) - * pdp_guile (in directory guile)
Features: --- 30,33 ---- *************** *** 52,58 **** built in forth extension language (only for mmx) * opengl 3d processing (gem like, but built around packets) - * embedded guile interpreter
! See the README files in the scaf/ opengl/ and guile/ dirs for more info on the extension libraries.
--- 51,57 ---- built in forth extension language (only for mmx) * opengl 3d processing (gem like, but built around packets)
! ! See the README files in the scaf/ and opengl/ dirs for more info on the extension libraries.
*************** *** 154,158 ****
* New versions of this package can be found at ! http://zwizwa.fartit.com/pd/pdp Experimental relases are in the subdirectory test/
--- 153,157 ----
* New versions of this package can be found at ! http://zwizwa.goto10.org/pd/pdp Experimental relases are in the subdirectory test/
*************** *** 250,254 **** opengl/ opengl extension lib (experimental) scaf/ CA extension lib - guile/ scheme extension lib system/ core pdp system
--- 249,252 ----
Index: buildall =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/buildall,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** buildall 16 Dec 2005 00:51:02 -0000 1.3 --- buildall 1 Sep 2006 13:45:29 -0000 1.4 *************** *** 4,18 **** # might need some editing to work for you
# build the stable stuff ! autoconf && ./configure --enable-mmx --prefix=/home/tom/pd && make install
cd scaf ! autoconf && ./configure && make install cd ..
# build the experimental stuff - make -C opengl
--- 4,19 ---- # might need some editing to work for you
+ # PREFIX=--prefix=/home/tom/pd +
# build the stable stuff ! ./configure --enable-mmx && make install
cd scaf ! ./configure && make install cd ..
# build the experimental stuff make -C opengl
Index: TODO =================================================================== RCS file: /cvsroot/pure-data/externals/pdp/TODO,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TODO 16 Dec 2005 00:51:02 -0000 1.6 --- TODO 1 Sep 2006 13:45:29 -0000 1.7 *************** *** 1,40 **** - - todo 0.12.x: - best to do an intermediate release for documentation. 0.13 is not - there yet. - - * check reference.txt - - - known bugs:
* running out of memory (using delay lines or loops) will likely crash pd. short story: don't, use pdp_control's memlimit for limiting pdp's memory usage. - * no known other fatal (crashing) bugs. please let me know if you find one.
! pdp/libpdp remark: ! i'm working on a version 2 of pdp. until that is finished, pdp proper will ! probably be frozen, except for bug fixes.
- todo 0.13:
- * yves shm code - * make fobs (all c object code usable in packet forth should be wrapped (automaticly??)) - * pdp_xwindow event handling is not thread safe (fixed ?) - * fine tune udp protocol - * solve scheduling probs: pd+3dp = ok, pd+pdp+(3dp) = not - (lots of frags -> video slow, few frags -> audio drops. - pdp threading is not implemented everywhere and is a problem for feedback stuff. think about - a synchronous dropping scheme (central point of failure), like for 3dp. most of the threading - problems could be solved with the new threadsafe pd 0.37 -> check this out)
! * add source type to source objects (noise,plasma,constant,...) (solve with forth) * pdp_crop/pad - * seed plasma - * reorganize headers to cut down compile time (done for core stuff, move pd objects to forth) - * fullscreen x command -> add window manager suppression * where to solve autoconvert? per type, or central in pdp_base? 2 cases: - template based autoconvert: in pdp_base --- 1,21 ---- known bugs:
* running out of memory (using delay lines or loops) will likely crash pd. short story: don't, use pdp_control's memlimit for limiting pdp's memory usage.
! todo 0.12.5:
+ * find nasty 3dp bug + * fix pdp_glx BadMatch bug (crashes on OSX) + * platform independent [pdp_vdac] [pdp_vadc]
! todo later: ! ! * include guenter's / carmen's windows changes ! * field based bttv capture (might be possible without driver hacks using v4l2) * pdp_crop/pad * where to solve autoconvert? per type, or central in pdp_base? 2 cases: - template based autoconvert: in pdp_base *************** *** 42,55 **** * finish high level packet conversion: - move 8bit images to packet level (iow: cleanup pdp_qt, pdp_v4l, pdp_xv) (solve with forth) - - add bitmap packet support to source modules (optim for pdp_opengl usage) - (solve with sliceforth: pdp image processing should become independent of image encoding: at least - packed 8/16 rgb(a), and all planar rgb/yuv formats should be well supported: sliceforth feeders) - get rid of pdp_type* methods * fix mac/linux name differences (use pdp_video, pdp_movie, pdp_window) * pdp_xv framerate doc + pwc addons - - todo 0.14: - - * stress test the memory manager. it looks like there's a bug that pops up after running for a while * enable audio output on bttv cards in pdp_v4l * fix cache slicer objects + thread problems (fixed in sliceforth) --- 23,29 ---- *************** *** 77,83 **** * type multiplexing: find a way to use the same name for packet processors. (solved in forth: polymorhpy) i.e. pdp_add should add images, but also vectors, ascii packets, textures,... - - experimental stuff - * modify 2D rotation to be used as arbitrary rotation (givens) * add 3D rotation --- 51,54 ---- *************** *** 85,93 **** * optimize resampling code (mipmapped packed 16bit format?)
- * better type handling - - core is in place. todo: - - better (tree) search algorithm (breadth first + cost) - - add more converters -
--- 56,58 ----