Update of /cvsroot/pure-data/externals/pidip In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4125
Modified Files: CHANGES.LOG Makefile Makefile.in acinclude.m4 aclocal.m4 configure configure.ac configure.in Log Message: PiDiP 0.12.20
Index: configure =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** configure 9 Jul 2005 19:35:39 -0000 1.10 --- configure 22 Nov 2005 06:18:01 -0000 1.11 *************** *** 272,276 **** PACKAGE_BUGREPORT=
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT IMLIB2_CONFIG IMLIB_LIBS IMLIB_CFLAGS IMLIB2_CFLAGS IMLIB2_LIBS PDP_PIDIP_VERSION MAGICK_LIBS MAGICK_CFLAGS THEORA_LIBS PD_DIR PDP_DIR FFMPEG_SOURCE_DIR MPEG4IP_SOURCE_DIR MPEG4IP_CFLAGS PDP_STREAMING_OBJECTS PDP_PIDIP_LIBS PDP_PIDIP_INCLUDES LIBOBJS LTLIBOBJS' ac_subst_files=''
--- 272,276 ---- PACKAGE_BUGREPORT=
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT IMLIB2_CONFIG IMLIB_LIBS IMLIB_CFLAGS IMLIB2_CFLAGS IMLIB2_LIBS CAIRO_CFLAGS PDP_PIDIP_VERSION MAGICK_LIBS MAGICK_CFLAGS THEORA_LIBS PD_DIR PDP_DIR FFMPEG_SOURCE_DIR MPEG4IP_SOURCE_DIR MPEG4IP_CFLAGS PDP_STREAMING_OBJECTS PDP_PIDIP_LIBS PDP_PIDIP_INCLUDES LIBOBJS LTLIBOBJS' ac_subst_files=''
*************** *** 1268,1272 ****
! PDP_PIDIP_VERSION="0.12.19" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp --- 1268,1272 ----
! PDP_PIDIP_VERSION="0.12.20" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp *************** *** 4008,4011 **** --- 4008,4014 ----
+ CAIRO_CFLAGS="-I/usr/include/cairo/ -I/usr/local/include/cairo/" + +
echo "$as_me:$LINENO: checking for XWindowByProperty in -lMagick" >&5 *************** *** 5458,5461 **** --- 5461,5465 ---- s,@IMLIB2_CFLAGS@,$IMLIB2_CFLAGS,;t t s,@IMLIB2_LIBS@,$IMLIB2_LIBS,;t t + s,@CAIRO_CFLAGS@,$CAIRO_CFLAGS,;t t s,@PDP_PIDIP_VERSION@,$PDP_PIDIP_VERSION,;t t s,@MAGICK_LIBS@,$MAGICK_LIBS,;t t
Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** configure.in 9 Jul 2005 19:35:39 -0000 1.7 --- configure.in 22 Nov 2005 06:18:01 -0000 1.8 *************** *** 4,8 **** AC_CONFIG_HEADER(include/pidip_config.h)
! PDP_PIDIP_VERSION="0.12.19" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp --- 4,8 ---- AC_CONFIG_HEADER(include/pidip_config.h)
! PDP_PIDIP_VERSION="0.12.20" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp *************** *** 95,98 **** --- 95,101 ---- AC_SUBST(IMLIB_CFLAGS)
+ CAIRO_CFLAGS="-I/usr/include/cairo/ -I/usr/local/include/cairo/" + AC_SUBST(CAIRO_CFLAGS) + AC_CHECK_LIB(Magick, XWindowByProperty, , AC_MSG_ERROR(screen captures requires ImageMagick library!!), -I/usr/X11R6/include -L/usr/X11R6/lib ) AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, , AC_MSG_ERROR(streaming requires bz2 library!!))
Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 14 Nov 2004 22:52:19 -0000 1.6 --- Makefile.in 22 Nov 2005 06:18:01 -0000 1.7 *************** *** 12,15 **** --- 12,16 ---- PDP_PIDIP_VERSION = @PDP_PIDIP_VERSION@ MPEG4IP_CFLAGS = @MPEG4IP_CFLAGS@ + CAIRO_CFLAGS = @CAIRO_CFLAGS@
PDP_PIDIP_DISTRO = /mnt/c/ydegoyon.free.fr/pidip-$(PDP_PIDIP_VERSION) *************** *** 17,21 ****
! PDP_PIDIP_CFLAGS = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \ -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wstrict-prototypes \ --- 18,22 ----
! PDP_PIDIP_CFLAGS = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) $(CAIRO_CFLAGS) \ -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wstrict-prototypes \ *************** *** 23,27 **** -DPDP_PIDIP_VERSION="$(PDP_PIDIP_VERSION)" -g
! PDP_PIDIP_CPPFLAGS = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \ -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wstrict-prototypes \ --- 24,28 ---- -DPDP_PIDIP_VERSION="$(PDP_PIDIP_VERSION)" -g
! PDP_PIDIP_CPPFLAGS = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) $(CAIRO_CFLAGS) \ -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wstrict-prototypes \
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile 9 Jul 2005 19:35:39 -0000 1.9 --- Makefile 22 Nov 2005 06:18:01 -0000 1.10 *************** *** 6,15 **** IMLIB_CFLAGS = -I/usr/local/include -I/usr/X11R6/include IMLIB_LIBS = -L/usr/local/lib -lImlib2 -lfreetype -lz -lm -ldl -lXext -lXext -lX11 -L/usr/X11R6/lib ! MAGICK_CFLAGS = -I/usr/X11R6/include -O2 -g -pipe -m32 -march=i386 -mtune=pentium4 -Wall -pthread ! MAGICK_LIBS = -L/usr/X11R6/lib -lMagick -lMagick -ltiff -lfreetype -ljpeg -lpng -ldpstk -ldps -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -lpthread -L/usr/lib -L/usr/X11R6/lib -lfreetype -lz -L/usr/lib ! THEORA_LIBS = /usr/lib/libtheora.a /usr/local/lib/libtheora.a /usr/lib/libogg.a /usr/local/lib/libvorbis.a /usr/local/lib/libvorbisenc.a PDP_PIDIP_INCLUDES = -I/usr/local/pd/src -I. -I/usr/local/pd/pdp/include -I../include -I../charmaps ! PDP_PIDIP_VERSION = 0.12.19 MPEG4IP_CFLAGS =
PDP_PIDIP_DISTRO = /mnt/c/ydegoyon.free.fr/pidip-$(PDP_PIDIP_VERSION) --- 6,16 ---- IMLIB_CFLAGS = -I/usr/local/include -I/usr/X11R6/include IMLIB_LIBS = -L/usr/local/lib -lImlib2 -lfreetype -lz -lm -ldl -lXext -lXext -lX11 -L/usr/X11R6/lib ! MAGICK_CFLAGS = -I/usr/X11R6/include -g -O2 -Wall -pthread ! MAGICK_LIBS = -L/usr/X11R6/lib -lMagick -lMagick -ltiff -lfreetype -ljpeg -lpng -ldpstk -ldps -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -lpthread -L/usr/local/lib -L/usr/X11R6/lib -lfreetype -lz -L/usr/lib ! THEORA_LIBS = /usr/lib/libtheora.a /usr/local/lib/libtheora.a /usr/lib/libogg.a /usr/lib/libvorbis.a /usr/local/lib/libvorbis.a /usr/lib/libvorbisenc.a /usr/local/lib/libvorbisenc.a PDP_PIDIP_INCLUDES = -I/usr/local/pd/src -I. -I/usr/local/pd/pdp/include -I../include -I../charmaps ! PDP_PIDIP_VERSION = 0.12.20 MPEG4IP_CFLAGS = + CAIRO_CFLAGS = -I/usr/include/cairo/ -I/usr/local/include/cairo/
PDP_PIDIP_DISTRO = /mnt/c/ydegoyon.free.fr/pidip-$(PDP_PIDIP_VERSION) *************** *** 17,21 ****
! PDP_PIDIP_CFLAGS = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \ -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wstrict-prototypes \ --- 18,22 ----
! PDP_PIDIP_CFLAGS = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) $(CAIRO_CFLAGS) \ -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wstrict-prototypes \ *************** *** 23,27 **** -DPDP_PIDIP_VERSION="$(PDP_PIDIP_VERSION)" -g
! PDP_PIDIP_CPPFLAGS = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \ -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wstrict-prototypes \ --- 24,28 ---- -DPDP_PIDIP_VERSION="$(PDP_PIDIP_VERSION)" -g
! PDP_PIDIP_CPPFLAGS = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) $(CAIRO_CFLAGS) \ -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wstrict-prototypes \
Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure.ac,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** configure.ac 9 Jul 2005 19:35:39 -0000 1.12 --- configure.ac 22 Nov 2005 06:18:01 -0000 1.13 *************** *** 4,8 **** AC_CONFIG_HEADER(include/pidip_config.h)
! PDP_PIDIP_VERSION="0.12.19" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp --- 4,8 ---- AC_CONFIG_HEADER(include/pidip_config.h)
! PDP_PIDIP_VERSION="0.12.20" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp *************** *** 95,98 **** --- 95,101 ---- AC_SUBST(IMLIB_CFLAGS)
+ CAIRO_CFLAGS="-I/usr/include/cairo/ -I/usr/local/include/cairo/" + AC_SUBST(CAIRO_CFLAGS) + AC_CHECK_LIB(Magick, XWindowByProperty, , AC_MSG_ERROR(screen captures requires ImageMagick library!!), -I/usr/X11R6/include -L/usr/X11R6/lib ) AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, , AC_MSG_ERROR(streaming requires bz2 library!!))
Index: CHANGES.LOG =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/CHANGES.LOG,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** CHANGES.LOG 9 Jul 2005 19:35:38 -0000 1.17 --- CHANGES.LOG 22 Nov 2005 06:18:01 -0000 1.18 *************** *** 1,2 **** --- 1,7 ---- + 0.12.20 ( codename Lavapies ) + added contributions from Pablo Martin Caedes ( caedes@sindominio.net ) : + pdp_qtext : a layered texts object, based on pdp_text and using imlib2 + pdp_imgloader : improved version from PMC, different ways of blending images ( in quality mode ) + 0.12.19 ( codename GISS action force ) addapted to newer Image Magick ( > 6.1.9 )