Update of /cvsroot/pure-data/externals/pidip In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32601

Modified Files: Tag: branch-v0-39-2-extended Makefile.in acinclude.m4 aclocal.m4 configure.ac Log Message: imported recent changes from HEAD; quick kludge for absolute path to pdp_colorgrid background image; fixed object name in pdp_colorgrid help

Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure.ac,v retrieving revision 1.13.2.3 retrieving revision 1.13.2.4 diff -C2 -d -r1.13.2.3 -r1.13.2.4 *** configure.ac 8 May 2007 03:52:31 -0000 1.13.2.3 --- configure.ac 10 May 2007 05:03:57 -0000 1.13.2.4 *************** *** 2,7 ****

AC_INIT - AC_CONFIG_HEADER(include/pidip_config.h) AC_CANONICAL_HOST

PDP_PIDIP_VERSION="0.12.20" --- 2,7 ----

AC_INIT AC_CANONICAL_HOST + AC_CONFIG_HEADER(include/pidip_config.h)

PDP_PIDIP_VERSION="0.12.20" *************** *** 11,17 **** --- 11,43 ---- MPEG4IP_SOURCE_DIR=/SOURCES/mpeg4ip PDP_STREAMING_OBJECTS= + PDP_CAPTURE_OBJECT= + IMLIB_LIBS= + IMLIB_CFLAGS= + MAGIC_LIBS= + MAGIC_CFLAGS= + THEORA_LIBS= enable_ffmpeg=no enable_mpeg4ip=no

+ # Check for DarwinPorts and/or Fink on Mac OS X/Darwin + case "$host" in + *-darwin* | *-macos10*) + PDP_CAPTURE_OBJECT="$PDP_CAPTURE_OBJECT pdp_ieee1394.o" + if test -d /sw ; then + # Fink + PATH="/sw/bin:/sw/sbin:$PATH" + CFLAGS="$CFLAGS -I/sw/include" + CPPFLAGS="$CPPFLAGS -I/sw/include" + LDFLAGS="$LDFLAGS -L/sw/lib" + elif test -d /opt/local ; then + # DarwinPorts + PATH="/opt/local/bin:/opt/local/sbin:$PATH" + CFLAGS="$CFLAGS -I/opt/local/include" + CPPFLAGS="$CPPFLAGS -I/opt/local/include" + LDFLAGS="$LDFLAGS -L/opt/local/lib" + fi + ;; + esac + AC_ARG_WITH(pdsources, [ --with-pd=PATH pd source tree]) if ! test -z "${with_pd}" *************** *** 70,74 ****

PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc" ! PDP_PIDIP_INCLUDES="-I$PD_DIR/src -I. -I$PDP_DIR/include -I../include -I../charmaps -I/sw/include/libquicktime"

make clean --- 96,100 ----

PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc" ! PDP_PIDIP_INCLUDES="-I$PD_DIR/src -I. -I$PDP_DIR/include -I../include -I../charmaps"

make clean *************** *** 85,146 **** AM_WITH_DMALLOC

! # Check for DarwinPorts and/or Fink on Mac OS X/Darwin ! echo "host $host" ! case "$host" in ! *-darwin* | *-macos10*) ! if test -d /sw ; then ! # Fink ! PATH="/sw/bin:/sw/sbin:$PATH" ! CFLAGS="$CFLAGS -I/sw/include" ! CPPFLAGS="$CPPFLAGS -I/sw/include" ! LDFLAGS="$LDFLAGS -L/sw/lib" ! elif test -d /opt/local ; then ! # DarwinPorts ! PATH="/opt/local/bin:/opt/local/sbin:$PATH" ! CFLAGS="$CFLAGS -I/opt/local/include" ! CPPFLAGS="$CPPFLAGS -I/opt/local/include" ! LDFLAGS="$LDFLAGS -L/opt/local/lib" ! fi ! ;; ! esac ! ! AC_PATH_GENERIC(imlib2, 1.0.0, [ ! AC_SUBST(IMLIB_LIBS) ! AC_SUBST(IMLIB_CFLAGS) ], AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) )

! dnl the above doesn't work for some reason :/ ! IMLIB_LIBS=`imlib2-config --libs` ! IMLIB_CFLAGS=`imlib2-config --cflags` ! AC_SUBST(IMLIB_LIBS) ! 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 -I/sw/include -L/usr/X11R6/lib -L/sw/lib ) AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, , AC_MSG_ERROR(streaming requires bz2 library!!)) AC_CHECK_LIB(z, deflate, , AC_MSG_ERROR(streaming requires compress library!!)) AC_CHECK_LIB(dl, dlopen, , AC_MSG_ERROR(streaming requires dynamic loader library!!)) ! AC_CHECK_LIB(mp3lame, InitMP3, , AC_MSG_ERROR(streaming requires lame library!!)) ! AC_CHECK_LIB(ogg, ogg_stream_init, , AC_MSG_ERROR(streaming requires ogg library!!)) ! AC_CHECK_LIB(vorbis, vorbis_analysis_init, , AC_MSG_ERROR(streaming requires vorbis library!!)) ! AC_CHECK_LIB(vorbisenc, vorbis_encode_setup_init, , AC_MSG_ERROR(streaming requires vorbis encoder library!!)) ! AC_CHECK_LIB(theora, theora_encode_init, , AC_MSG_ERROR(theora library needed! sorry...)) ! ! AC_CHECK_LIB([m],[powf]) ! AC_CHECK_LIB(quicktime, quicktime_open, , ! [AC_WARN(libquicktime missing; disabling support for Quicktime files.)] ! ) ! ! AC_SUBST(PDP_PIDIP_VERSION)

! MAGICK_LIBS="-L/usr/X11R6/lib -lMagick `Magick-config --libs` `Magick-config --ldflags`" ! MAGICK_CFLAGS="-I/usr/X11R6/include `Magick-config --cflags` " ! AC_SUBST(MAGICK_LIBS) ! AC_SUBST(MAGICK_CFLAGS)

! THEORA_LIBS="$LIBS" ! AC_SUBST(THEORA_LIBS)

echo -n "looking for pd sources (required) ... " --- 111,193 ---- AM_WITH_DMALLOC

! AC_PATH_GENERIC(imlib2, 1.0.0, ! [ IMLIB_LIBS=`imlib2-config --libs` ! IMLIB_CFLAGS=`imlib2-config --cflags` ], AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) )

! AC_CHECK_LIB(Magick, XWindowByProperty, ! [ PDP_CAPTURE_OBJECT="$PDP_CAPTURE_OBJECT pdp_capture.o" ! AC_DEFINE(HAVE_IMAGE_MAGICK, 1, image magick capture capability) ! MAGICK_LIBS="-L/usr/X11R6/lib -lMagick `Magick-config --libs` `Magick-config --ldflags`" ! MAGICK_CFLAGS="-I/usr/X11R6/include `Magick-config --cflags` " ], ! echo "Image Magick not found : not building pdp_capture", ! -I/usr/X11R6/include -L/usr/X11R6/lib )

AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, , AC_MSG_ERROR(streaming requires bz2 library!!)) AC_CHECK_LIB(z, deflate, , AC_MSG_ERROR(streaming requires compress library!!)) AC_CHECK_LIB(dl, dlopen, , AC_MSG_ERROR(streaming requires dynamic loader library!!)) ! AC_CHECK_LIB(mp3lame, InitMP3, , AC_MSG_ERROR(streaming requires lame library!!), -lm) ! AC_CHECK_LIB(ogg, ogg_stream_init, , AC_MSG_ERROR(streaming requires ogg library!!), -lm) ! AC_CHECK_LIB(vorbis, vorbis_analysis_init, , AC_MSG_ERROR(streaming requires vorbis library!!), -lm) ! AC_CHECK_LIB(vorbisenc, vorbis_encode_setup_init, , AC_MSG_ERROR(streaming requires vorbis encoder library!!), -lm) ! AC_CHECK_LIB(theora, theora_encode_init, , AC_MSG_ERROR(theora library needed! sorry...), -lm) ! AC_CHECK_LIB(quicktime, lqt_decode_video, , AC_MSG_ERROR(libquicktime not found) )

! qt_minor_version="`lqt-config --version | cut -f3 -d'.'`" ! echo "qt version minor : ${qt_minor_version}" ! if test ${qt_minor_version} == "8"; ! then ! IMLIB_CFLAGS="$CFLAGS -DQUICKTIME_NEWER=1" ! fi ! if test ${qt_minor_version} == "9"; ! then ! IMLIB_CFLAGS="$CFLAGS -DQUICKTIME_NEWER=1" ! fi ! if test ${qt_minor_version} == "10"; ! then ! IMLIB_CFLAGS="$CFLAGS -DQUICKTIME_NEWER=1" ! fi ! if test ${qt_minor_version} == "11"; ! then ! IMLIB_CFLAGS="$CFLAGS -DQUICKTIME_NEWER=1" ! fi ! if test ${qt_minor_version} == "12"; ! then ! IMLIB_CFLAGS="$CFLAGS -DQUICKTIME_NEWER=1" ! fi

! THEORA_LIBS="-ltheora -logg -lvorbis -lvorbisenc" ! if test -f /usr/lib/libtheora.a ! then ! THEORA_LIBS="$THEORA_LIBS /usr/lib/libtheora.a" ! fi ! if test -f /usr/local/lib/libtheora.a ! then ! THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libtheora.a" ! fi ! if test -f /usr/lib/libogg.a ! then ! THEORA_LIBS="$THEORA_LIBS /usr/lib/libogg.a" ! fi ! if test -f /usr/local/lib/libogg.a ! then ! THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libogg.a" ! fi ! if test -f /usr/lib/libvorbis.a ! then ! THEORA_LIBS="$THEORA_LIBS /usr/lib/libvorbis.a" ! fi ! if test -f /usr/local/lib/libvorbis.a ! then ! THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libvorbis.a" ! fi ! if test -f /usr/lib/libvorbisenc.a ! then ! THEORA_LIBS="$THEORA_LIBS /usr/lib/libvorbisenc.a" ! fi ! if test -f /usr/local/lib/libvorbisenc.a ! then ! THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libvorbisenc.a" ! fi

echo -n "looking for pd sources (required) ... " *************** *** 200,204 **** --- 247,258 ---- fi

+ AC_SUBST(PDP_PIDIP_VERSION) + AC_SUBST(MAGICK_LIBS) + AC_SUBST(MAGICK_CFLAGS) + AC_SUBST(IMLIB_LIBS) + AC_SUBST(IMLIB_CFLAGS) + AC_SUBST(THEORA_LIBS) AC_SUBST(PDP_STREAMING_OBJECTS) + AC_SUBST(PDP_CAPTURE_OBJECT) AC_SUBST(PDP_PIDIP_LIBS) AC_SUBST(PDP_PIDIP_INCLUDES) *************** *** 212,215 ****

echo "used configure options:" ! echo " --enable-ffmpeg=$enable_ffmpeg" ! echo " --enable-mpeg4ip=$enable_mpeg4ip" --- 266,269 ----

echo "used configure options:" ! echo " --enable_ffmpeg=$enable_ffmpeg" ! echo " --enable_mpeg4ip=$enable_mpeg4ip"

Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/Makefile.in,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -C2 -d -r1.7.2.2 -r1.7.2.3 *** Makefile.in 19 Apr 2007 04:56:47 -0000 1.7.2.2 --- Makefile.in 10 May 2007 05:03:56 -0000 1.7.2.3 *************** *** 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) --- 12,15 ---- *************** *** 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 \ --- 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 \ *************** *** 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 \ --- 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 \