[PD-cvs] externals/pidip CHANGES.LOG,1.14,1.15 INSTALL,1.5,1.6 Makefile,1.6,1.7 Makefile.in,1.5,1.6 acinclude.m4,1.7,1.8 aclocal.m4,1.7,1.8 configure,1.7,1.8 configure.ac,1.9,1.10 configure.in,1.4,1.5

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

Modified Files: CHANGES.LOG INSTALL Makefile Makefile.in acinclude.m4 aclocal.m4 configure configure.ac configure.in Log Message: PiDiP v 0.12.17

Index: configure =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** configure 18 May 2004 00:59:44 -0000 1.7 --- configure 14 Nov 2004 22:52:19 -0000 1.8 *************** *** 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 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 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=''

*************** *** 803,808 **** --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-ffmpeg enable ffmpeg streaming support (no) - --enable-mpeg4ip enable mpeg4ip streaming support (no) --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer --- 803,806 ---- *************** *** 811,814 **** --- 809,816 ---- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-pd=PATH pd source tree + --with-pdp=PATH pdp source tree + --with-ffmpeg=PATH ffmpeg source tree + --with-mpeg4ip=PATH mpeg4ip source tree --with-dmalloc use dmalloc, as in ftp://ftp.letters.com/src/dmalloc/dmalloc.tar.gz *************** *** 1265,1284 **** ac_config_headers="$ac_config_headers include/pidip_config.h"

- # Check whether --enable-ffmpeg or --disable-ffmpeg was given. - if test "${enable_ffmpeg+set}" = set; then - enableval="$enable_ffmpeg" - - else - enable_ffmpeg=no - fi; - # Check whether --enable-mpeg4ip or --disable-mpeg4ip was given. - if test "${enable_mpeg4ip+set}" = set; then - enableval="$enable_mpeg4ip" - - else - enable_mpeg4ip=no - fi;

! PDP_PIDIP_VERSION="0.12.14" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp --- 1267,1272 ---- ac_config_headers="$ac_config_headers include/pidip_config.h"

! PDP_PIDIP_VERSION="0.12.17" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp *************** *** 1286,1289 **** --- 1274,1360 ---- MPEG4IP_SOURCE_DIR=/SOURCES/mpeg4ip PDP_STREAMING_OBJECTS= + enable_ffmpeg=no + enable_mpeg4ip=no + + + # Check whether --with-pdsources or --without-pdsources was given. + if test "${with_pdsources+set}" = set; then + withval="$with_pdsources" + + fi; + if ! test -z "${with_pd}" + then + pd_tree="`cd ${with_pd} 2>/dev/null && pwd`" + if test -z "${pd_tree}" + then + { { echo "$as_me:$LINENO: error: pd sources not found in ${with_pd}" >&5 + echo "$as_me: error: pd sources not found in ${with_pd}" >&2;} + { (exit 1); exit 1; }; } + else + PD_DIR=${pd_tree} + fi + fi + + + # Check whether --with-pdpsources or --without-pdpsources was given. + if test "${with_pdpsources+set}" = set; then + withval="$with_pdpsources" + + fi; + if ! test -z "${with_pdp}" + then + pdp_tree="`cd ${with_pdp} 2>/dev/null && pwd`" + if test -z "${pdp_tree}" + then + { { echo "$as_me:$LINENO: error: pdp sources not found in ${with_pdp}" >&5 + echo "$as_me: error: pdp sources not found in ${with_pdp}" >&2;} + { (exit 1); exit 1; }; } + else + PDP_DIR=${pdp_tree} + fi + fi + + + # Check whether --with-ffmpeg or --without-ffmpeg was given. + if test "${with_ffmpeg+set}" = set; then + withval="$with_ffmpeg" + + fi; + if ! test -z "${with_ffmpeg}" + then + ffmpeg_tree="`cd ${with_ffmpeg} 2>/dev/null && pwd`" + if test -z "${ffmpeg_tree}" + then + { { echo "$as_me:$LINENO: error: ffmpeg sources not found in ${with_ffmpeg}" >&5 + echo "$as_me: error: ffmpeg sources not found in ${with_ffmpeg}" >&2;} + { (exit 1); exit 1; }; } + else + FFMPEG_SOURCE_DIR=${ffmpeg_tree} + enable_ffmpeg=yes + fi + fi + + + # Check whether --with-mpeg4ip or --without-mpeg4ip was given. + if test "${with_mpeg4ip+set}" = set; then + withval="$with_mpeg4ip" + + fi; + if ! test -z "${with_mpeg4ip}" + then + mpeg4ip_tree="`cd ${with_mpeg4ip} 2>/dev/null && pwd`" + if test -z "${mpeg4ip_tree}" + then + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: mpeg4ip sources not found in ${with_mpeg4ip}" >&5 + echo "$as_me: error: mpeg4ip sources not found in ${with_mpeg4ip}" >&2;} + { (exit 1); exit 1; }; } + else + MPEG4IP_SOURCE_DIR=${mpeg4ip_tree} + enable_mpeg4ip=yes + fi + fi + 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" *************** *** 4562,4565 **** --- 4633,4714 ----

+ echo "$as_me:$LINENO: checking for theora_encode_init in -ltheora" >&5 + echo $ECHO_N "checking for theora_encode_init in -ltheora... $ECHO_C" >&6 + if test "${ac_cv_lib_theora_theora_encode_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltheora -lm $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + /* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus + extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char theora_encode_init (); + int + main () + { + theora_encode_init (); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (eval echo "$as_me:$LINENO: "$ac_link"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: $? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: "$ac_try"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: $? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: "$ac_try"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: $? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_theora_theora_encode_init=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_theora_theora_encode_init=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $ac_cv_lib_theora_theora_encode_init" >&5 + echo "${ECHO_T}$ac_cv_lib_theora_theora_encode_init" >&6 + if test $ac_cv_lib_theora_theora_encode_init = yes; then + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBTHEORA 1 + _ACEOF + + LIBS="-ltheora $LIBS" + + else + { { echo "$as_me:$LINENO: error: theora library needed! sorry..." >&5 + echo "$as_me: error: theora library needed! sorry..." >&2;} + { (exit 1); exit 1; }; } + fi + +

*************** *** 4569,4572 **** --- 4718,4757 ----

+ THEORA_LIBS="" + 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) ... " if test -f $PD_DIR/src/m_pd.h *************** *** 4575,4579 **** echo "ok." else ! echo "pd source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 4760,4764 ---- echo "ok." else ! echo "pd source tree not found... install it and use the --with-pd=<path> configuration option." exit -1 fi *************** *** 4585,4589 **** echo "ok." else ! echo "pdp source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 4770,4774 ---- echo "ok." else ! echo "pdp source tree not found... install it and use the --with-pdp=<path> configuration option." exit -1 fi *************** *** 4595,4599 **** then

! PDP_STREAMING_OBJECTS="$PDP_STREAMING_OBJECTS pdp_live~.o pdp_ffmpeg~.o"

cat >>confdefs.h <<_ACEOF --- 4780,4784 ---- then

! PDP_STREAMING_OBJECTS="pdp_live~.o pdp_ffmpeg~.o"

cat >>confdefs.h <<_ACEOF *************** *** 4605,4609 **** echo "ok." else ! echo "ffmpeg source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 4790,4794 ---- echo "ok." else ! echo "ffmpeg source tree not found... install it and use the --with-ffmpeg=<path> configuration option." exit -1 fi *************** *** 4616,4620 **** then

! PDP_STREAMING_OBJECTS="$PDP_STREAMING_OBJECTS pdp_mp4config.o pdp_mp4videosource.o pdp_mp4audiosource.o pdp_mp4live~.o pdp_mp4player~.o pdp_mp4audiosync.o pdp_mp4videosync.o pdp_mp4playermedia.o pdp_mp4playersession.o"

cat >>confdefs.h <<_ACEOF --- 4801,4805 ---- then

! PDP_STREAMING_OBJECTS="pdp_mp4config.o pdp_mp4videosource.o pdp_mp4audiosource.o pdp_mp4live~.o pdp_mp4player~.o pdp_mp4audiosync.o pdp_mp4videosync.o pdp_mp4playermedia.o pdp_mp4playersession.o"

cat >>confdefs.h <<_ACEOF *************** *** 4628,4632 **** echo "ok." else ! echo "mpeg4ip source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 4813,4817 ---- echo "ok." else ! echo "mpeg4ip source tree not found... install it and use the --with-mpeg4ip=<path> configuration option." exit -1 fi *************** *** 5276,5279 **** --- 5461,5465 ---- s,@MAGICK_LIBS@,$MAGICK_LIBS,;t t s,@MAGICK_CFLAGS@,$MAGICK_CFLAGS,;t t + s,@THEORA_LIBS@,$THEORA_LIBS,;t t s,@PD_DIR@,$PD_DIR,;t t s,@PDP_DIR@,$PDP_DIR,;t t

Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure.in 18 May 2004 00:59:44 -0000 1.4 --- configure.in 14 Nov 2004 22:52:20 -0000 1.5 *************** *** 3,14 **** AC_INIT AC_CONFIG_HEADER(include/pidip_config.h) - AC_ARG_ENABLE(ffmpeg, - [ --enable-ffmpeg enable ffmpeg streaming support (no)], , - enable_ffmpeg=no) - AC_ARG_ENABLE(mpeg4ip, - [ --enable-mpeg4ip enable mpeg4ip streaming support (no)], , - enable_mpeg4ip=no)

! PDP_PIDIP_VERSION="0.12.14" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp --- 3,8 ---- AC_INIT AC_CONFIG_HEADER(include/pidip_config.h)

! PDP_PIDIP_VERSION="0.12.17" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp *************** *** 16,19 **** --- 10,71 ---- MPEG4IP_SOURCE_DIR=/SOURCES/mpeg4ip PDP_STREAMING_OBJECTS= + enable_ffmpeg=no + enable_mpeg4ip=no + + AC_ARG_WITH(pdsources, [ --with-pd=PATH pd source tree]) + if ! test -z "${with_pd}" + then + pd_tree="`cd ${with_pd} 2>/dev/null && pwd`" + if test -z "${pd_tree}" + then + dnl The given directory can't be found + AC_MSG_ERROR([pd sources not found in ${with_pd}]) + else + PD_DIR=${pd_tree} + fi + fi + + AC_ARG_WITH(pdpsources, [ --with-pdp=PATH pdp source tree]) + if ! test -z "${with_pdp}" + then + pdp_tree="`cd ${with_pdp} 2>/dev/null && pwd`" + if test -z "${pdp_tree}" + then + dnl The given directory can't be found + AC_MSG_ERROR([pdp sources not found in ${with_pdp}]) + else + PDP_DIR=${pdp_tree} + fi + fi + + AC_ARG_WITH(ffmpeg, [ --with-ffmpeg=PATH ffmpeg source tree]) + if ! test -z "${with_ffmpeg}" + then + ffmpeg_tree="`cd ${with_ffmpeg} 2>/dev/null && pwd`" + if test -z "${ffmpeg_tree}" + then + dnl The given directory can't be found + AC_MSG_ERROR([ffmpeg sources not found in ${with_ffmpeg}]) + else + FFMPEG_SOURCE_DIR=${ffmpeg_tree} + enable_ffmpeg=yes + fi + fi + + AC_ARG_WITH(mpeg4ip, [ --with-mpeg4ip=PATH mpeg4ip source tree]) + if ! test -z "${with_mpeg4ip}" + then + mpeg4ip_tree="`cd ${with_mpeg4ip} 2>/dev/null && pwd`" + if test -z "${mpeg4ip_tree}" + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([mpeg4ip sources not found in ${with_mpeg4ip}]) + else + MPEG4IP_SOURCE_DIR=${mpeg4ip_tree} + enable_mpeg4ip=yes + fi + fi + 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" *************** *** 51,54 **** --- 103,107 ---- 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_SUBST(PDP_PIDIP_VERSION) *************** *** 59,62 **** --- 112,151 ---- AC_SUBST(MAGICK_CFLAGS)

+ THEORA_LIBS="" + 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 + + AC_SUBST(THEORA_LIBS) + echo -n "looking for pd sources (required) ... " if test -f $PD_DIR/src/m_pd.h *************** *** 65,69 **** echo "ok." else ! echo "pd source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 154,158 ---- echo "ok." else ! echo "pd source tree not found... install it and use the --with-pd=<path> configuration option." exit -1 fi *************** *** 75,79 **** echo "ok." else ! echo "pdp source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 164,168 ---- echo "ok." else ! echo "pdp source tree not found... install it and use the --with-pdp=<path> configuration option." exit -1 fi *************** *** 85,89 **** then AC_SUBST(FFMPEG_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="$PDP_STREAMING_OBJECTS pdp_live~.o pdp_ffmpeg~.o" AC_DEFINE(HAVE_PIDIP_FFMPEG, 1, build pdp_live~/pdp_ffmpeg~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $FFMPEG_SOURCE_DIR/libavformat/libavformat.a $FFMPEG_SOURCE_DIR/libavcodec/libavcodec.a" --- 174,178 ---- then AC_SUBST(FFMPEG_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="pdp_live~.o pdp_ffmpeg~.o" AC_DEFINE(HAVE_PIDIP_FFMPEG, 1, build pdp_live~/pdp_ffmpeg~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $FFMPEG_SOURCE_DIR/libavformat/libavformat.a $FFMPEG_SOURCE_DIR/libavcodec/libavcodec.a" *************** *** 91,95 **** echo "ok." else ! echo "ffmpeg source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 180,184 ---- echo "ok." else ! echo "ffmpeg source tree not found... install it and use the --with-ffmpeg=<path> configuration option." exit -1 fi *************** *** 102,106 **** then AC_SUBST(MPEG4IP_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="$PDP_STREAMING_OBJECTS pdp_mp4config.o pdp_mp4videosource.o pdp_mp4audiosource.o pdp_mp4live~.o pdp_mp4player~.o pdp_mp4audiosync.o pdp_mp4videosync.o pdp_mp4playermedia.o pdp_mp4playersession.o" AC_DEFINE(HAVE_PIDIP_MPEG4IP, 1, build pdp_mp4live~/pdp_mp4player~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $MPEG4IP_SOURCE_DIR/player/src/our_bytestream_file.o $MPEG4IP_SOURCE_DIR/player/src/our_config_file.o $MPEG4IP_SOURCE_DIR/player/src/qtime_file.o $MPEG4IP_SOURCE_DIR/player/src/mp4_file.o $MPEG4IP_SOURCE_DIR/player/src/mpeg3_file.o $MPEG4IP_SOURCE_DIR/player/src/avi_file.o $MPEG4IP_SOURCE_DIR/player/src/ip_port.o $MPEG4IP_SOURCE_DIR/player/src/media_utils.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread_nx.o $MPEG4IP_SOURCE_DIR/player/src/*bytestream.o $MPEG4IP_SOURCE_DIR/player/src/*plugin.o $MPEG4IP_SOURCE_DIR/player/src/player_sdp.o $MPEG4IP_SOURCE_DIR/player/src/player_util.o $MPEG4IP_SOURCE_DIR/player/src/audio.o $MPEG4IP_SOURCE_DIR/player/src/video.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_mpeg4.o $MPEG4IP_SOURCE_DIR/server/mp4live/sdp_file.o $MPEG4IP_SOURCE_DIR/server/mp4live/util.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_xvid.o $MPEG4IP_SOURCE_DIR/server/mp4live/media_source.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_rgb.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_resize.o $MPEG4IP_SOURCE_DIR/server/mp4live/resample.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_tables.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_lame.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_faac.o $MPEG4IP_SOURCE_DIR/server/mp4live/rtp_transmitter.o $MPEG4IP_SOURCE_DIR/server/mp4live/h261/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/sdp/.libs/libsdp.so $MPEG4IP_SOURCE_DIR/player/lib/mp4util/.libs/libmp4util.so $MPEG4IP_SOURCE_DIR/player/lib/libhttp/.libs/libhttp.a $MPEG4IP_SOURCE_DIR/lib/config_file/.libs/libconfig_file.so $MPEG4IP_SOURCE_DIR/lib/msg_queue/.libs/libmsg_queue.so $MPEG4IP_SOURCE_DIR/lib/mp4av/.libs/libmp4av.so $MPEG4IP_SOURCE_DIR/lib/mp4/.libs/libmp4.so $MPEG4IP_SOURCE_DIR/lib/mp4v2/.libs/libmp4v2.so $MPEG4IP_SOURCE_DIR/lib/SDL/src/.libs/libSDL.so $MPEG4IP_SOURCE_DIR/lib/rtp/*.o $MPEG4IP_SOURCE_DIR/player/lib/rtsp/.libs/librtsp.a $MPEG4IP_SOURCE_DIR/common/video/libmpeg32/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/avi/.libs/libavi.al $MPEG4IP_SOURCE_DIR/lib/mpeg2t/.libs/libmpeg2_transport.al $MPEG4IP_SOURCE_DIR/player/lib/audio/mp3util/.libs/libmp3utils.al -lm -L/usr/X11R6/lib -lX11 -lXext -lpthread $MPEG4IP_SOURCE_DIR/lib/SDL/src/main/libSDLmain.a -ldl -Wl,--rpath -Wl,/usr/local/lib -lfaac -lmpeg4ip_xvid" --- 191,195 ---- then AC_SUBST(MPEG4IP_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="pdp_mp4config.o pdp_mp4videosource.o pdp_mp4audiosource.o pdp_mp4live~.o pdp_mp4player~.o pdp_mp4audiosync.o pdp_mp4videosync.o pdp_mp4playermedia.o pdp_mp4playersession.o" AC_DEFINE(HAVE_PIDIP_MPEG4IP, 1, build pdp_mp4live~/pdp_mp4player~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $MPEG4IP_SOURCE_DIR/player/src/our_bytestream_file.o $MPEG4IP_SOURCE_DIR/player/src/our_config_file.o $MPEG4IP_SOURCE_DIR/player/src/qtime_file.o $MPEG4IP_SOURCE_DIR/player/src/mp4_file.o $MPEG4IP_SOURCE_DIR/player/src/mpeg3_file.o $MPEG4IP_SOURCE_DIR/player/src/avi_file.o $MPEG4IP_SOURCE_DIR/player/src/ip_port.o $MPEG4IP_SOURCE_DIR/player/src/media_utils.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread_nx.o $MPEG4IP_SOURCE_DIR/player/src/*bytestream.o $MPEG4IP_SOURCE_DIR/player/src/*plugin.o $MPEG4IP_SOURCE_DIR/player/src/player_sdp.o $MPEG4IP_SOURCE_DIR/player/src/player_util.o $MPEG4IP_SOURCE_DIR/player/src/audio.o $MPEG4IP_SOURCE_DIR/player/src/video.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_mpeg4.o $MPEG4IP_SOURCE_DIR/server/mp4live/sdp_file.o $MPEG4IP_SOURCE_DIR/server/mp4live/util.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_xvid.o $MPEG4IP_SOURCE_DIR/server/mp4live/media_source.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_rgb.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_resize.o $MPEG4IP_SOURCE_DIR/server/mp4live/resample.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_tables.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_lame.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_faac.o $MPEG4IP_SOURCE_DIR/server/mp4live/rtp_transmitter.o $MPEG4IP_SOURCE_DIR/server/mp4live/h261/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/sdp/.libs/libsdp.so $MPEG4IP_SOURCE_DIR/player/lib/mp4util/.libs/libmp4util.so $MPEG4IP_SOURCE_DIR/player/lib/libhttp/.libs/libhttp.a $MPEG4IP_SOURCE_DIR/lib/config_file/.libs/libconfig_file.so $MPEG4IP_SOURCE_DIR/lib/msg_queue/.libs/libmsg_queue.so $MPEG4IP_SOURCE_DIR/lib/mp4av/.libs/libmp4av.so $MPEG4IP_SOURCE_DIR/lib/mp4/.libs/libmp4.so $MPEG4IP_SOURCE_DIR/lib/mp4v2/.libs/libmp4v2.so $MPEG4IP_SOURCE_DIR/lib/SDL/src/.libs/libSDL.so $MPEG4IP_SOURCE_DIR/lib/rtp/*.o $MPEG4IP_SOURCE_DIR/player/lib/rtsp/.libs/librtsp.a $MPEG4IP_SOURCE_DIR/common/video/libmpeg32/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/avi/.libs/libavi.al $MPEG4IP_SOURCE_DIR/lib/mpeg2t/.libs/libmpeg2_transport.al $MPEG4IP_SOURCE_DIR/player/lib/audio/mp3util/.libs/libmp3utils.al -lm -L/usr/X11R6/lib -lX11 -lXext -lpthread $MPEG4IP_SOURCE_DIR/lib/SDL/src/main/libSDLmain.a -ldl -Wl,--rpath -Wl,/usr/local/lib -lfaac -lmpeg4ip_xvid" *************** *** 110,114 **** echo "ok." else ! echo "mpeg4ip source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 199,203 ---- echo "ok." else ! echo "mpeg4ip source tree not found... install it and use the --with-mpeg4ip=<path> configuration option." exit -1 fi

Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 18 May 2004 00:59:44 -0000 1.5 --- Makefile.in 14 Nov 2004 22:52:19 -0000 1.6 *************** *** 8,11 **** --- 8,12 ---- MAGICK_CFLAGS = @MAGICK_CFLAGS@ MAGICK_LIBS = @MAGICK_LIBS@ + THEORA_LIBS = @THEORA_LIBS@ PDP_PIDIP_INCLUDES = @PDP_PIDIP_INCLUDES@ PDP_PIDIP_VERSION = @PDP_PIDIP_VERSION@ *************** *** 36,40 **** pidip.pd_linux: pdp_pidip_all rm -f pidip.pd_linux ! g++ -export_dynamic -shared -o pidip.pd_linux modules/*.o system/*.o $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) $(MAGICK_LIBS) strip --strip-unneeded pidip.pd_linux

--- 37,41 ---- pidip.pd_linux: pdp_pidip_all rm -f pidip.pd_linux ! g++ -export_dynamic -shared -o pidip.pd_linux modules/*.o system/*.o $(THEORA_LIBS) $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) $(MAGICK_LIBS) strip --strip-unneeded pidip.pd_linux

*************** *** 44,47 **** --- 45,49 ----

install: + if test ! -d /usr/X11R6/lib/X11/fonts/TTF; then mkdir /usr/X11R6/lib/X11/fonts/TTF; fi cp fonts/* /usr/X11R6/lib/X11/fonts/TTF cp -f --remove-destination doc/* $(PD_DIR)/doc/5.reference

Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 18 May 2004 00:59:44 -0000 1.6 --- Makefile 14 Nov 2004 22:52:19 -0000 1.7 *************** *** 1,13 **** PD_DIR = /usr/local/pd PDP_DIR = /usr/local/pd/pdp ! FFMPEG_SOURCE_DIR = /SOURCES/ffmpeg

! PDP_PIDIP_LIBS = -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc /SOURCES/ffmpeg/libavformat/libavformat.a /SOURCES/ffmpeg/libavcodec/libavcodec.a IMLIB_CFLAGS = -I/usr/local/include -I/usr/X11R6/include ! IMLIB_LIBS = -L/usr/local/lib -lImlib2 -lttf -lm -ldl -lXext -lXext -lX11 -L/usr/X11R6/lib ! MAGICK_CFLAGS = -I/usr/X11R6/include -g -O2 -Wall ! MAGICK_LIBS = -L/usr/X11R6/lib -lMagick -lMagick -ltiff -lfreetype -ljasper -ljpeg -lpng -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib ! PDP_PIDIP_INCLUDES = -I/usr/local/pd/src -I. -I/usr/local/pd/pdp/include -I../include -I../charmaps -I/SOURCES/ffmpeg/libavcodec -I/SOURCES/ffmpeg/libavformat ! PDP_PIDIP_VERSION = 0.12.14 MPEG4IP_CFLAGS =

--- 1,14 ---- PD_DIR = /usr/local/pd PDP_DIR = /usr/local/pd/pdp ! FFMPEG_SOURCE_DIR = /SOURCES/ffmpeg-cvs-2003-03-04

! PDP_PIDIP_LIBS = -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc /SOURCES/ffmpeg-cvs-2003-03-04/libavformat/libavformat.a /SOURCES/ffmpeg-cvs-2003-03-04/libavcodec/libavcodec.a 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/lib/libogg.a /usr/lib/libvorbis.a /usr/lib/libvorbisenc.a ! PDP_PIDIP_INCLUDES = -I/usr/local/pd/src -I. -I/usr/local/pd/pdp/include -I../include -I../charmaps -I/SOURCES/ffmpeg-cvs-2003-03-04/libavcodec -I/SOURCES/ffmpeg-cvs-2003-03-04/libavformat ! PDP_PIDIP_VERSION = 0.12.17 MPEG4IP_CFLAGS =

*************** *** 36,40 **** pidip.pd_linux: pdp_pidip_all rm -f pidip.pd_linux ! g++ -export_dynamic -shared -o pidip.pd_linux modules/*.o system/*.o $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) $(MAGICK_LIBS) strip --strip-unneeded pidip.pd_linux

--- 37,41 ---- pidip.pd_linux: pdp_pidip_all rm -f pidip.pd_linux ! g++ -export_dynamic -shared -o pidip.pd_linux modules/*.o system/*.o $(THEORA_LIBS) $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) $(MAGICK_LIBS) strip --strip-unneeded pidip.pd_linux

*************** *** 44,47 **** --- 45,49 ----

install: + if test ! -d /usr/X11R6/lib/X11/fonts/TTF; then mkdir /usr/X11R6/lib/X11/fonts/TTF; fi cp fonts/* /usr/X11R6/lib/X11/fonts/TTF cp -f --remove-destination doc/* $(PD_DIR)/doc/5.reference

Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure.ac,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** configure.ac 18 May 2004 00:59:44 -0000 1.9 --- configure.ac 14 Nov 2004 22:52:20 -0000 1.10 *************** *** 3,14 **** AC_INIT AC_CONFIG_HEADER(include/pidip_config.h) - AC_ARG_ENABLE(ffmpeg, - [ --enable-ffmpeg enable ffmpeg streaming support (no)], , - enable_ffmpeg=no) - AC_ARG_ENABLE(mpeg4ip, - [ --enable-mpeg4ip enable mpeg4ip streaming support (no)], , - enable_mpeg4ip=no)

! PDP_PIDIP_VERSION="0.12.14" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp --- 3,8 ---- AC_INIT AC_CONFIG_HEADER(include/pidip_config.h)

! PDP_PIDIP_VERSION="0.12.17" PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp *************** *** 16,19 **** --- 10,71 ---- MPEG4IP_SOURCE_DIR=/SOURCES/mpeg4ip PDP_STREAMING_OBJECTS= + enable_ffmpeg=no + enable_mpeg4ip=no + + AC_ARG_WITH(pdsources, [ --with-pd=PATH pd source tree]) + if ! test -z "${with_pd}" + then + pd_tree="`cd ${with_pd} 2>/dev/null && pwd`" + if test -z "${pd_tree}" + then + dnl The given directory can't be found + AC_MSG_ERROR([pd sources not found in ${with_pd}]) + else + PD_DIR=${pd_tree} + fi + fi + + AC_ARG_WITH(pdpsources, [ --with-pdp=PATH pdp source tree]) + if ! test -z "${with_pdp}" + then + pdp_tree="`cd ${with_pdp} 2>/dev/null && pwd`" + if test -z "${pdp_tree}" + then + dnl The given directory can't be found + AC_MSG_ERROR([pdp sources not found in ${with_pdp}]) + else + PDP_DIR=${pdp_tree} + fi + fi + + AC_ARG_WITH(ffmpeg, [ --with-ffmpeg=PATH ffmpeg source tree]) + if ! test -z "${with_ffmpeg}" + then + ffmpeg_tree="`cd ${with_ffmpeg} 2>/dev/null && pwd`" + if test -z "${ffmpeg_tree}" + then + dnl The given directory can't be found + AC_MSG_ERROR([ffmpeg sources not found in ${with_ffmpeg}]) + else + FFMPEG_SOURCE_DIR=${ffmpeg_tree} + enable_ffmpeg=yes + fi + fi + + AC_ARG_WITH(mpeg4ip, [ --with-mpeg4ip=PATH mpeg4ip source tree]) + if ! test -z "${with_mpeg4ip}" + then + mpeg4ip_tree="`cd ${with_mpeg4ip} 2>/dev/null && pwd`" + if test -z "${mpeg4ip_tree}" + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([mpeg4ip sources not found in ${with_mpeg4ip}]) + else + MPEG4IP_SOURCE_DIR=${mpeg4ip_tree} + enable_mpeg4ip=yes + fi + fi + 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" *************** *** 51,54 **** --- 103,107 ---- 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_SUBST(PDP_PIDIP_VERSION) *************** *** 59,62 **** --- 112,151 ---- AC_SUBST(MAGICK_CFLAGS)

+ THEORA_LIBS="" + 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 + + AC_SUBST(THEORA_LIBS) + echo -n "looking for pd sources (required) ... " if test -f $PD_DIR/src/m_pd.h *************** *** 65,69 **** echo "ok." else ! echo "pd source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 154,158 ---- echo "ok." else ! echo "pd source tree not found... install it and use the --with-pd=<path> configuration option." exit -1 fi *************** *** 75,79 **** echo "ok." else ! echo "pdp source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 164,168 ---- echo "ok." else ! echo "pdp source tree not found... install it and use the --with-pdp=<path> configuration option." exit -1 fi *************** *** 85,89 **** then AC_SUBST(FFMPEG_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="$PDP_STREAMING_OBJECTS pdp_live~.o pdp_ffmpeg~.o" AC_DEFINE(HAVE_PIDIP_FFMPEG, 1, build pdp_live~/pdp_ffmpeg~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $FFMPEG_SOURCE_DIR/libavformat/libavformat.a $FFMPEG_SOURCE_DIR/libavcodec/libavcodec.a" --- 174,178 ---- then AC_SUBST(FFMPEG_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="pdp_live~.o pdp_ffmpeg~.o" AC_DEFINE(HAVE_PIDIP_FFMPEG, 1, build pdp_live~/pdp_ffmpeg~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $FFMPEG_SOURCE_DIR/libavformat/libavformat.a $FFMPEG_SOURCE_DIR/libavcodec/libavcodec.a" *************** *** 91,95 **** echo "ok." else ! echo "ffmpeg source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 180,184 ---- echo "ok." else ! echo "ffmpeg source tree not found... install it and use the --with-ffmpeg=<path> configuration option." exit -1 fi *************** *** 102,106 **** then AC_SUBST(MPEG4IP_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="$PDP_STREAMING_OBJECTS pdp_mp4config.o pdp_mp4videosource.o pdp_mp4audiosource.o pdp_mp4live~.o pdp_mp4player~.o pdp_mp4audiosync.o pdp_mp4videosync.o pdp_mp4playermedia.o pdp_mp4playersession.o" AC_DEFINE(HAVE_PIDIP_MPEG4IP, 1, build pdp_mp4live~/pdp_mp4player~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $MPEG4IP_SOURCE_DIR/player/src/our_bytestream_file.o $MPEG4IP_SOURCE_DIR/player/src/our_config_file.o $MPEG4IP_SOURCE_DIR/player/src/qtime_file.o $MPEG4IP_SOURCE_DIR/player/src/mp4_file.o $MPEG4IP_SOURCE_DIR/player/src/mpeg3_file.o $MPEG4IP_SOURCE_DIR/player/src/avi_file.o $MPEG4IP_SOURCE_DIR/player/src/ip_port.o $MPEG4IP_SOURCE_DIR/player/src/media_utils.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread_nx.o $MPEG4IP_SOURCE_DIR/player/src/*bytestream.o $MPEG4IP_SOURCE_DIR/player/src/*plugin.o $MPEG4IP_SOURCE_DIR/player/src/player_sdp.o $MPEG4IP_SOURCE_DIR/player/src/player_util.o $MPEG4IP_SOURCE_DIR/player/src/audio.o $MPEG4IP_SOURCE_DIR/player/src/video.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_mpeg4.o $MPEG4IP_SOURCE_DIR/server/mp4live/sdp_file.o $MPEG4IP_SOURCE_DIR/server/mp4live/util.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_xvid.o $MPEG4IP_SOURCE_DIR/server/mp4live/media_source.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_rgb.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_resize.o $MPEG4IP_SOURCE_DIR/server/mp4live/resample.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_tables.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_lame.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_faac.o $MPEG4IP_SOURCE_DIR/server/mp4live/rtp_transmitter.o $MPEG4IP_SOURCE_DIR/server/mp4live/h261/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/sdp/.libs/libsdp.so $MPEG4IP_SOURCE_DIR/player/lib/mp4util/.libs/libmp4util.so $MPEG4IP_SOURCE_DIR/player/lib/libhttp/.libs/libhttp.a $MPEG4IP_SOURCE_DIR/lib/config_file/.libs/libconfig_file.so $MPEG4IP_SOURCE_DIR/lib/msg_queue/.libs/libmsg_queue.so $MPEG4IP_SOURCE_DIR/lib/mp4av/.libs/libmp4av.so $MPEG4IP_SOURCE_DIR/lib/mp4/.libs/libmp4.so $MPEG4IP_SOURCE_DIR/lib/mp4v2/.libs/libmp4v2.so $MPEG4IP_SOURCE_DIR/lib/SDL/src/.libs/libSDL.so $MPEG4IP_SOURCE_DIR/lib/rtp/*.o $MPEG4IP_SOURCE_DIR/player/lib/rtsp/.libs/librtsp.a $MPEG4IP_SOURCE_DIR/common/video/libmpeg32/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/avi/.libs/libavi.al $MPEG4IP_SOURCE_DIR/lib/mpeg2t/.libs/libmpeg2_transport.al $MPEG4IP_SOURCE_DIR/player/lib/audio/mp3util/.libs/libmp3utils.al -lm -L/usr/X11R6/lib -lX11 -lXext -lpthread $MPEG4IP_SOURCE_DIR/lib/SDL/src/main/libSDLmain.a -ldl -Wl,--rpath -Wl,/usr/local/lib -lfaac -lmpeg4ip_xvid" --- 191,195 ---- then AC_SUBST(MPEG4IP_SOURCE_DIR) ! PDP_STREAMING_OBJECTS="pdp_mp4config.o pdp_mp4videosource.o pdp_mp4audiosource.o pdp_mp4live~.o pdp_mp4player~.o pdp_mp4audiosync.o pdp_mp4videosync.o pdp_mp4playermedia.o pdp_mp4playersession.o" AC_DEFINE(HAVE_PIDIP_MPEG4IP, 1, build pdp_mp4live~/pdp_mp4player~) PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $MPEG4IP_SOURCE_DIR/player/src/our_bytestream_file.o $MPEG4IP_SOURCE_DIR/player/src/our_config_file.o $MPEG4IP_SOURCE_DIR/player/src/qtime_file.o $MPEG4IP_SOURCE_DIR/player/src/mp4_file.o $MPEG4IP_SOURCE_DIR/player/src/mpeg3_file.o $MPEG4IP_SOURCE_DIR/player/src/avi_file.o $MPEG4IP_SOURCE_DIR/player/src/ip_port.o $MPEG4IP_SOURCE_DIR/player/src/media_utils.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread_nx.o $MPEG4IP_SOURCE_DIR/player/src/*bytestream.o $MPEG4IP_SOURCE_DIR/player/src/*plugin.o $MPEG4IP_SOURCE_DIR/player/src/player_sdp.o $MPEG4IP_SOURCE_DIR/player/src/player_util.o $MPEG4IP_SOURCE_DIR/player/src/audio.o $MPEG4IP_SOURCE_DIR/player/src/video.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_mpeg4.o $MPEG4IP_SOURCE_DIR/server/mp4live/sdp_file.o $MPEG4IP_SOURCE_DIR/server/mp4live/util.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_xvid.o $MPEG4IP_SOURCE_DIR/server/mp4live/media_source.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_rgb.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_resize.o $MPEG4IP_SOURCE_DIR/server/mp4live/resample.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_tables.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_lame.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_faac.o $MPEG4IP_SOURCE_DIR/server/mp4live/rtp_transmitter.o $MPEG4IP_SOURCE_DIR/server/mp4live/h261/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/sdp/.libs/libsdp.so $MPEG4IP_SOURCE_DIR/player/lib/mp4util/.libs/libmp4util.so $MPEG4IP_SOURCE_DIR/player/lib/libhttp/.libs/libhttp.a $MPEG4IP_SOURCE_DIR/lib/config_file/.libs/libconfig_file.so $MPEG4IP_SOURCE_DIR/lib/msg_queue/.libs/libmsg_queue.so $MPEG4IP_SOURCE_DIR/lib/mp4av/.libs/libmp4av.so $MPEG4IP_SOURCE_DIR/lib/mp4/.libs/libmp4.so $MPEG4IP_SOURCE_DIR/lib/mp4v2/.libs/libmp4v2.so $MPEG4IP_SOURCE_DIR/lib/SDL/src/.libs/libSDL.so $MPEG4IP_SOURCE_DIR/lib/rtp/*.o $MPEG4IP_SOURCE_DIR/player/lib/rtsp/.libs/librtsp.a $MPEG4IP_SOURCE_DIR/common/video/libmpeg32/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/avi/.libs/libavi.al $MPEG4IP_SOURCE_DIR/lib/mpeg2t/.libs/libmpeg2_transport.al $MPEG4IP_SOURCE_DIR/player/lib/audio/mp3util/.libs/libmp3utils.al -lm -L/usr/X11R6/lib -lX11 -lXext -lpthread $MPEG4IP_SOURCE_DIR/lib/SDL/src/main/libSDLmain.a -ldl -Wl,--rpath -Wl,/usr/local/lib -lfaac -lmpeg4ip_xvid" *************** *** 110,114 **** echo "ok." else ! echo "mpeg4ip source tree not found... install it, fix the path in configure.ac and run autoconf" exit -1 fi --- 199,203 ---- echo "ok." else ! echo "mpeg4ip source tree not found... install it and use the --with-mpeg4ip=<path> configuration option." exit -1 fi

Index: CHANGES.LOG =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/CHANGES.LOG,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** CHANGES.LOG 18 May 2004 00:59:44 -0000 1.14 --- CHANGES.LOG 14 Nov 2004 22:52:19 -0000 1.15 *************** *** 1,2 **** --- 1,37 ---- + 0.12.17 ( codename No pasa nada ) + added pdp_theorout~ : theora file recorder + fixed pdp_theorin~ : fixed buggy end of file detection + fixed pdp_theorin~ : now, it's able to read files without sound + added pdp_cropper : a video cropper for image compositing + ( see patch cutandpaste.pd ) + added pdp_background : a simple background generator + modified pdp_ocanvas : added an alpha channel for each source + modified pdp_text, pdp_form, pdp_pen : added an alpha channel ( global ) + + 0.12.16 ( codename Fadaiat ) + added pdp_theorin~ : threaded theora file reader + ( warning : requires theora, ogg & vorbis static libs ) + + modified pdp_live~ : added an autoplay option ( default = true ) + modified pdp_live~ : made the files seekable + ( added an input for the frame number, works with ffmpeg >= 0.4.9 ) + modified pdp_live~ : better disconnection mechanism + modified pdp_live~ : reworked on a/v synchronisation + + fixed pdp_i/pdp_o : fixed huffman encoding and freezings + fixed pdp_i/pdp_o : fix communication between macs and pcs ( endianness problem ) + + added --with-ffmpeg=PATH and --with-mpeg4ip=PATH configure options + ( --enable-ffmpeg and --enable-mpeg4ip are dead ) + + 0.12.15 ( codename Technologia Del Sur ) + added morphology patches : patches/morphology : opening, closing, thinning, thickening, skeletization + added morphology operator : distance transform + ( inspired by Paul Rosin, 91, http://www.cs.cf.ac.uk/User/Paul.Rosin/resources/sdt/ ) + added morphology operators : erosion ( pdp_erode ), dilation ( pdp_dilate ), hit and miss ( pdp_hitandmiss ) + added pdp_binary : transform an image to a binary image ( using yuv settings, a filter for morphology ) + ( for all the theory on morphology, thanx to the excellent site : http://homepages.inf.ed.ac.uk/rbf/HIPR2 ) + added pdp_disintegration : a new effect based on piksels summing and averaging + 0.12.14 ( codename Naveen's Ethiopian Cafe ) added pdp_mp4player~ : a quicktime stream reader ( compiled against meg4ip v1.0, needs some testing ) *************** *** 6,9 **** --- 41,45 ---- added colorgrid : a color picker written by Lluis Gomez i Bigorda ( http://www.artefacte.org/pd ) added help_pdp-tatiana.pd : a more simple to use help patch for effects, contribution from Tatiana de la O. + 0.12.13 ( codename Gollum Club Riereta ) improved decoding in pdp_live~, in particular for audio/video synchronization *************** *** 13,16 **** --- 49,53 ---- added pdp_cabaret patch : a patch to track someone with a spotlight ( poursuite ) added pdp_ieee1394 : firewire capture object for OSX based on pix_video ( OSX only ) + 0.12.12 added pdp_mp4live~ : mpeg4ip streaming object to stream to a darwin server *************** *** 20,23 **** --- 57,61 ---- ( problem reported by Mark Widmer ) added offsets messages in pdp_pen + 0.12.11 added pdp_charcoal to the effect rack : charcoal effect using edge detection, blur, normalization and negate *************** *** 26,29 **** --- 64,68 ---- commented pdp_aa : it introduces useless dependencies ( aalib ) and is not very good added pdp_ocanvas : canvas with some overlay + 0.12.10 fixed crashes and 'resize' bug in pdp_text *************** *** 34,37 **** --- 73,77 ---- added help patches for pdp_yqt, pdp_fqt and pdp_fcqt adaptations for newer autoconfs + 0.12.9 fixed pdp_ripple *************** *** 39,51 **** --- 79,95 ---- added "fill" in pdp_pen ( on request from ben ) + 0.12.8 added pdp_pen : a free hand drawing object ( on request from patrick/11h11.com ) + 0.12.7 added pdp_canvas : a canvas to display several video sources + 0.12.6 fix conflict between pdp_text and pdp_imgloader ( and the likes using Imlib2 ) fix successive loading of images in pdp_imgloader set help patches for all objects and install them in PD's doc folder ( compliant with 0.37 ) + 0.12.5 pdp_cache : hiding triangular zones from a video stream to let you do some collage *************** *** 54,60 **** --- 98,106 ---- ( see collage.pd patch ) pdp_transition : added "page" transitions + 0.12.4 added pdp_imgsaver : save an image from the current video stream pdp_transition : added "melt" and "blend" transitions + 0.12.3 added pdp_imgloader : load an image and blend it with a video *************** *** 62,92 **** --- 108,150 ---- added pdp_lumafilt : lumosity filter, useful to isolate some objects added pdp_smuck : same as pdp_transform ( mode 5 ) but setable, ported from veejay + 0.12.2 Fixed problems with Image Magick includes + 0.12.1 Added color components output in pdp_ctrack + 0.12.0 Compatibility with PDP 0.12 + 0.11.3 Nicolas Lhommet added scroll parameter in pdp_text + 0.11.2 added pdp_capture : capture a portion of screen : lets you import browser data, etc .... fixed pdp_compose + 0.11.1 added pdp_juxta : allow juxtaposition of frames + 0.11.0 change some packet allocation policies to comply with PDP 0.11 no new object + 0.10.1 added pdp_noquark object : moving object are clear, the background is noisy added tolerance input in pdp_quark + 0.10.0 added pdp_segsnd~ : produces sound from a segment of the video ( similar to pdp_scanxy~ ) binary compatible with pdp v.0.10 improved installation instructions + 0.9.2 fixed disconnection phase in pdp_live~ + 0.9.1 remove synchronization proposed by martin pi : it lead to some deadlocks sometimes + 0.9.0 fixed audio encoding/decoding in pdp_ffmpeg~/pdp_live~ ( which caused a lot of crashes ) *************** *** 95,105 **** --- 153,166 ---- add "set cursor" message in pdp_cmap, pdp_ctrack, pdp_compose ( used in conjonction with coordinates output of pdp_xv v0.9 ) + 0.8.4 added pdp_live~ : receive a video feed, at least from a ffmpeg server ( ffserver ) fixed resampling in pdp_ffmpeg~ : resizing to a bigger image used to crash PD ( now, you can't resize to a bigger scale, blame it on libavcodec ) + 0.8.3 pdp_rec became pdp_rec~ : it can record audio now fix crash in pdp_ascii, pdp_nervous, pdp_quark + 0.8.2 added pdp_ffmpeg : stream to a ffmpeg server with possibly several formats ( mpeg, asf, ... ) *************** *** 109,122 **** --- 170,188 ---- added a planes number action in pdp_quark and pdp_nervous ( plays on speed of switching ) fixed index bug in pdp_ctrack, pdp_cmap + 0.8.1 fixed colors in pdp_warhol + 0.8.0 added pdp_ascii : rendering of videos in ASCII art using character maps + 0.7.7 added pdp_aa : rendering of videos in ASCII art using aalib + 0.7.6 added pdp_cmap : color mapper ( thanx to liz for the suggestion ) added actions in color tracker ( steady mode, cursor on/off, frame on/off ), generally improved fixed colors in pdp_spiral, pdp_dice + 0.7.5 added pdp_form : addition of geometric forms *************** *** 125,128 **** --- 191,195 ---- fixed colors in pdp_transform, pdp_warp fix install stage + 0.7.4 added pdp_text : text addition on videos ( requires imlib2 ) *************** *** 130,150 **** --- 197,224 ---- optimized streaming again (pdp_i/pdp_o) fixed colors in pdp_puzzle + 0.7.3 fixed streaming objects pdp_i/pdp_o added "smoothing" and "framerate" controls to act on the bandwidth + 0.7.2 added shagadelic, dice and puzzle from effecTV modified objects to use PDP queue + 0.7.1 added cycle and transform : first effetTV objects using PDP queue ( i know i changed my mind ) all other objects must be modified to use PDP queue + 0.7.0 compatibility with PDP 0.7 + 0.6.2 added pdp_ctrack : color tracker : lets you follow an object + 0.6.1 added pdp_i/pdp_o : PDP packets streaming objects using bz2 added pdp_mgrid : motion grid detects movement within a grid + 0.6.0 added pdp_rec : a video recording object *************** *** 152,157 **** --- 226,233 ---- incremented PDP release number : it's now 0.6 set proper credits for each effecTV plugin + 0.5.8 added pdp_spigot : a video signal routing utility + 0.5.7 added nervous and quark objects *************** *** 160,179 **** --- 236,262 ---- because they are just clones of some other effects or because i simply wasn't interested in porting them + 0.5.6 added radioactiv and warhol objects + 0.5.5 added edge and spiral objects happy new year 2003 + 0.5.4 renamed to PiDiP added rev and mosaic objects + 0.5.3 added parameter "increment" to ripple fix "threshold" in ripple added warp and mosaic object + 0.5.2 remove buggy support of GREY packets + 0.5.1 added aging and ripple effects + 0.5 initial release

Index: INSTALL =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/INSTALL,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** INSTALL 30 Mar 2004 01:56:15 -0000 1.5 --- INSTALL 14 Nov 2004 22:52:19 -0000 1.6 *************** *** 6,9 **** --- 6,11 ---- ***** PDP and its deps : http://zwizwa.fartit.com/pd/pdp/ ***** imlib2 : http://sourceforge.net/project/showfiles.php?group_id=2 + ***** theora : http://www.theora.org/files/ + ----> watchout !! you will need the static libs ( theora.a, ogg.a, vorbis.a ) ***** Image Magick : http://www.imagemagick.org ----> watchout !! configure with --enable-shared *************** *** 12,16 **** ============= ***** ffmpeg : http://ffmpeg.sourceforge.net/cvs ! ( --enable-ffmpeg ) ----> watchout, it requires the cvs snapshot ! + don't forget to activate mp3 and vorbis support in ffmpeg : ./configure --enable-mp3lame --enable-vorbis --- 14,18 ---- ============= ***** ffmpeg : http://ffmpeg.sourceforge.net/cvs ! ( --with-ffmpeg=PATH ) ----> watchout, it requires the cvs snapshot ! + don't forget to activate mp3 and vorbis support in ffmpeg : ./configure --enable-mp3lame --enable-vorbis *************** *** 18,36 ****

***** mpeg4ip : http://mpeg4ip.sourceforge.net/ ( download mpeg4ip v1.0 ) ! ( --enable-mpeg4ip ) ! ! b/ fix PD, PDP and FFMPEG/MPEG4IP paths in configure.ac ! ! c/ autoconf

! d/ ./configure [--enable-ffmpeg] OR [--enable-mpeg4ip] ( not both )

! e/ make clean

! f/ make

! g/ as root, make install

! h/ modify your pd start-up script :

pidip is a library, it should be loaded --- 20,34 ----

***** mpeg4ip : http://mpeg4ip.sourceforge.net/ ( download mpeg4ip v1.0 ) ! ( --with-mpeg4ip=PATH )

! b/ ./configure --with-pd=PATH --with-pdp=PATH [--with-ffmpeg=PATH] OR [--with-mpeg4ip=PATH] ( not both )

! c/ make clean

! d/ make

! e/ as root, make install

! f/ modify your pd start-up script :

pidip is a library, it should be loaded