aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorN.N. <sevyves@users.sourceforge.net>2003-10-29 02:29:45 +0000
committerN.N. <sevyves@users.sourceforge.net>2003-10-29 02:29:45 +0000
commitb04c38b5353d7340d500a7152cf21a28ea5098c8 (patch)
tree0675e2c10e8623a85364e9b5066250c9b31fb406
parentb24c8007a5228960b6bd407737064981446ec677 (diff)
The Real PiDiP 0.12.10
svn path=/trunk/externals/pidip/; revision=1149
-rw-r--r--CHANGES.LOG1
-rw-r--r--acinclude.m42
-rw-r--r--aclocal.m42
-rw-r--r--config.log387
-rwxr-xr-xconfig.status718
-rw-r--r--doc/help-pdp_juxta.pd4
-rw-r--r--modules/Makefile3
-rw-r--r--modules/Makefile.in3
-rw-r--r--modules/pdp_fcqt.c6
-rw-r--r--modules/pdp_fqt.c42
-rw-r--r--system/pidip.c2
11 files changed, 159 insertions, 1011 deletions
diff --git a/CHANGES.LOG b/CHANGES.LOG
index 89630c0..22285e3 100644
--- a/CHANGES.LOG
+++ b/CHANGES.LOG
@@ -1,4 +1,5 @@
0.12.10
+ added pdp_xcanvas : pdp_canvas + pdp_xv in one ( for performances reasons )
optimized pdp_canvas ( but overlapping has disappeared )
added pdp_fqt : fast quicktime reader ( frames are cached in memory and no audio decoding )
added pdp_fcqt : fast quicktime reader ( same as pdp_fqt but frames are compressed )
diff --git a/acinclude.m4 b/acinclude.m4
index 990ddaf..7a71c45 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -24,7 +24,7 @@ dnl At present there is no support for additional "MODULES" (see AM_PATH_GTK)
dnl (shamelessly stolen from gtk.m4 and then hacked around a fair amount)
dnl
dnl @author Angus Lees <gusl@cse.unsw.edu.au>
-dnl @version $Id: acinclude.m4,v 1.3 2003-10-23 17:21:31 sevyves Exp $
+dnl @version $Id: acinclude.m4,v 1.4 2003-10-29 02:29:45 sevyves Exp $
AC_DEFUN(AC_PATH_GENERIC,
[dnl
diff --git a/aclocal.m4 b/aclocal.m4
index 9542042..a2ff4fe 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -36,7 +36,7 @@ dnl At present there is no support for additional "MODULES" (see AM_PATH_GTK)
dnl (shamelessly stolen from gtk.m4 and then hacked around a fair amount)
dnl
dnl @author Angus Lees <gusl@cse.unsw.edu.au>
-dnl @version $Id: aclocal.m4,v 1.3 2003-10-23 17:22:20 sevyves Exp $
+dnl @version $Id: aclocal.m4,v 1.4 2003-10-29 02:29:45 sevyves Exp $
AC_DEFUN(AC_PATH_GENERIC,
[dnl
diff --git a/config.log b/config.log
index 11db3da..9506f42 100644
--- a/config.log
+++ b/config.log
@@ -1,363 +1,30 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by configure, which was
-generated by GNU Autoconf 2.53. Invocation command line was
-
- $ ./configure
-
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = dhcp-93-1541
-uname -m = i686
-uname -r = 2.5.7
-uname -s = Linux
-uname -v = #152 SMP Sat Oct 4 21:01:57 EDT 2003
-
-/usr/bin/uname -p = unknown
-/bin/uname -X = unknown
-
-/bin/arch = i686
-/usr/bin/arch -k = unknown
-/usr/convex/getsysinfo = unknown
-hostinfo = unknown
-/bin/machine = unknown
-/usr/bin/oslevel = unknown
-/bin/universe = unknown
-
-PATH: /usr/local/sbin
-PATH: /usr/sbin
-PATH: /sbin
-PATH: /usr/local/sbin
-PATH: /usr/local/bin
-PATH: /sbin
-PATH: /bin
-PATH: /usr/sbin
-PATH: /usr/bin
-PATH: /usr/X11R6/bin
-PATH: /usr/local/java/bin
-PATH: /usr/local/bea/recyclers
-PATH: /usr/local/kde/bin
-PATH: /usr/lib/qt3/bin
-PATH: /usr/local/ant/bin
-PATH: /root/bin
-PATH: /usr/local/java/bin
-PATH: /usr/local/bea/recyclers
-PATH: /usr/local/kde/bin
-PATH: /usr/lib/qt3/bin
-PATH: /usr/local/ant/bin
-PATH: /usr/local/java/bin
-PATH: /usr/local/bea/recyclers
-PATH: /usr/local/kde/bin
-PATH: /usr/lib/qt3/bin
-PATH: /usr/local/ant/bin
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-configure:1208: checking for gcc
-configure:1224: found /usr/bin/gcc
-configure:1234: result: gcc
-configure:1478: checking for C compiler version
-configure:1481: gcc --version </dev/null >&5
-gcc (GCC) 3.2.2 (Mandrake Linux 9.1 3.2.2-3mdk)
-Copyright (C) 2002 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:1484: $? = 0
-configure:1486: gcc -v </dev/null >&5
-Reading specs from /usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2.2/specs
-Configured with: ../configure --prefix=/usr --libdir=/usr/lib --with-slibdir=/lib --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --enable-long-long --enable-__cxa_atexit --enable-languages=c,c++,ada,f77,objc,java --host=i586-mandrake-linux-gnu --with-system-zlib
-Thread model: posix
-gcc version 3.2.2 (Mandrake Linux 9.1 3.2.2-3mdk)
-configure:1489: $? = 0
-configure:1491: gcc -V </dev/null >&5
-gcc: argument to `-V' is missing
-configure:1494: $? = 1
-configure:1520: checking for C compiler default output
-configure:1523: gcc conftest.c >&5
-configure:1526: $? = 0
-configure:1559: result: a.out
-configure:1564: checking whether the C compiler works
-configure:1570: ./a.out
-configure:1573: $? = 0
-configure:1588: result: yes
-configure:1595: checking whether we are cross compiling
-configure:1597: result: no
-configure:1600: checking for suffix of executables
-configure:1602: gcc -o conftest conftest.c >&5
-configure:1605: $? = 0
-configure:1627: result:
-configure:1633: checking for suffix of object files
-configure:1657: gcc -c conftest.c >&5
-configure:1660: $? = 0
-configure:1679: result: o
-configure:1683: checking whether we are using the GNU C compiler
-configure:1710: gcc -c conftest.c >&5
-configure:1713: $? = 0
-configure:1716: test -s conftest.o
-configure:1719: $? = 0
-configure:1731: result: yes
-configure:1737: checking whether gcc accepts -g
-configure:1761: gcc -c -g conftest.c >&5
-configure:1764: $? = 0
-configure:1767: test -s conftest.o
-configure:1770: $? = 0
-configure:1780: result: yes
-configure:1807: gcc -c -g -O2 conftest.c >&5
-conftest.c:2: parse error before "me"
-configure:1810: $? = 1
-configure: failed program was:
-#ifndef __cplusplus
- choke me
-#endif
-configure:1922: checking for strerror in -lcposix
-configure:1955: gcc -o conftest -g -O2 conftest.c -lcposix >&5
-/usr/bin/ld: cannot find -lcposix
-collect2: ld returned 1 exit status
-configure:1958: $? = 1
-configure: failed program was:
-#line 1929 "configure"
-#include "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 strerror ();
-#ifdef F77_DUMMY_MAIN
-# ifdef __cplusplus
- extern "C"
-# endif
- int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-strerror ();
- ;
- return 0;
-}
-configure:1975: result: no
-configure:2029: checking for gcc
-configure:2055: result: gcc
-configure:2299: checking for C compiler version
-configure:2302: gcc --version </dev/null >&5
-gcc (GCC) 3.2.2 (Mandrake Linux 9.1 3.2.2-3mdk)
-Copyright (C) 2002 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:2305: $? = 0
-configure:2307: gcc -v </dev/null >&5
-Reading specs from /usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2.2/specs
-Configured with: ../configure --prefix=/usr --libdir=/usr/lib --with-slibdir=/lib --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --enable-long-long --enable-__cxa_atexit --enable-languages=c,c++,ada,f77,objc,java --host=i586-mandrake-linux-gnu --with-system-zlib
-Thread model: posix
-gcc version 3.2.2 (Mandrake Linux 9.1 3.2.2-3mdk)
-configure:2310: $? = 0
-configure:2312: gcc -V </dev/null >&5
-gcc: argument to `-V' is missing
-configure:2315: $? = 1
-configure:2318: checking whether we are using the GNU C compiler
-configure:2366: result: yes
-configure:2372: checking whether gcc accepts -g
-configure:2415: result: yes
-configure:2442: gcc -c -g -O2 conftest.c >&5
-conftest.c:2: parse error before "me"
-configure:2445: $? = 1
-configure: failed program was:
-#ifndef __cplusplus
- choke me
-#endif
-configure:2558: checking for gcc option to accept ANSI C
-configure:2623: gcc -c -g -O2 conftest.c >&5
-configure:2626: $? = 0
-configure:2629: test -s conftest.o
-configure:2632: $? = 0
-configure:2646: result: none needed
-configure:2662: checking how to run the C preprocessor
-configure:2688: gcc -E conftest.c
-configure:2694: $? = 0
-configure:2721: gcc -E conftest.c
-configure:2717:28: ac_nonexistent.h: No such file or directory
-configure:2727: $? = 1
-configure: failed program was:
-#line 2716 "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-configure:2764: result: gcc -E
-configure:2779: gcc -E conftest.c
-configure:2785: $? = 0
-configure:2812: gcc -E conftest.c
-configure:2808:28: ac_nonexistent.h: No such file or directory
-configure:2818: $? = 1
-configure: failed program was:
-#line 2807 "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-configure:2858: checking for ANSI C header files
-configure:2872: gcc -E conftest.c
-configure:2878: $? = 0
-configure:2963: gcc -o conftest -g -O2 conftest.c >&5
-configure:2966: $? = 0
-configure:2968: ./conftest
-configure:2971: $? = 0
-configure:2985: result: yes
-configure:3032: checking for a BSD-compatible install
-configure:3086: result: /usr/bin/install -c
-configure:3097: checking whether make sets ${MAKE}
-configure:3117: result: yes
-configure:3126: checking whether build environment is sane
-configure:3169: result: yes
-configure:3172: checking whether to enable maintainer-specific portions of Makefiles
-configure:3181: result: no
-configure:3195: checking if malloc debugging is wanted
-configure:3216: result: no
-configure:3254: checking for imlib2-config
-configure:3272: found /usr/local/bin/imlib2-config
-configure:3285: result: /usr/local/bin/imlib2-config
-configure:3292: checking for imlib2 - version >= 1.0.0
-configure:3350: result: yes
-configure:3415: checking for aalib-config
-configure:3433: found /usr/local/bin/aalib-config
-configure:3446: result: /usr/local/bin/aalib-config
-configure:3453: checking for aalib - version >= 1.0.0
-configure:3511: result: yes
-configure:3544: checking for XWindowByProperty in -lMagick
-configure:3577: gcc -o conftest -g -O2 conftest.c -lMagick -I/usr/X11R6/include -L/usr/X11R6/lib >&5
-configure:3580: $? = 0
-configure:3583: test -s conftest
-configure:3586: $? = 0
-configure:3597: result: yes
-configure:3613: checking for BZ2_bzBuffToBuffCompress in -lbz2
-configure:3646: gcc -o conftest -g -O2 conftest.c -lbz2 -lMagick >&5
-configure:3649: $? = 0
-configure:3652: test -s conftest
-configure:3655: $? = 0
-configure:3666: result: yes
-configure:3682: checking for deflate in -lz
-configure:3715: gcc -o conftest -g -O2 conftest.c -lz -lbz2 -lMagick >&5
-configure:3718: $? = 0
-configure:3721: test -s conftest
-configure:3724: $? = 0
-configure:3735: result: yes
-configure:3751: checking for dlopen in -ldl
-configure:3784: gcc -o conftest -g -O2 conftest.c -ldl -lz -lbz2 -lMagick >&5
-configure:3787: $? = 0
-configure:3790: test -s conftest
-configure:3793: $? = 0
-configure:3804: result: yes
-configure:3820: checking for InitMP3 in -lmp3lame
-configure:3853: gcc -o conftest -g -O2 conftest.c -lmp3lame -lm -ldl -lz -lbz2 -lMagick >&5
-configure:3856: $? = 0
-configure:3859: test -s conftest
-configure:3862: $? = 0
-configure:3873: result: yes
-configure:3889: checking for ogg_stream_init in -logg
-configure:3922: gcc -o conftest -g -O2 conftest.c -logg -lm -lmp3lame -ldl -lz -lbz2 -lMagick >&5
-configure:3925: $? = 0
-configure:3928: test -s conftest
-configure:3931: $? = 0
-configure:3942: result: yes
-configure:3958: checking for vorbis_analysis_init in -lvorbis
-configure:3991: gcc -o conftest -g -O2 conftest.c -lvorbis -lm -logg -lmp3lame -ldl -lz -lbz2 -lMagick >&5
-configure:3994: $? = 0
-configure:3997: test -s conftest
-configure:4000: $? = 0
-configure:4011: result: yes
-configure:4027: checking for vorbis_encode_setup_init in -lvorbisenc
-configure:4060: gcc -o conftest -g -O2 conftest.c -lvorbisenc -lm -lvorbis -logg -lmp3lame -ldl -lz -lbz2 -lMagick >&5
-configure:4063: $? = 0
-configure:4066: test -s conftest
-configure:4069: $? = 0
-configure:4080: result: yes
-configure:4249: creating ./config.status
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by config.status, which was
-generated by GNU Autoconf 2.53. Invocation command line was
-
- CONFIG_FILES =
- CONFIG_HEADERS =
- CONFIG_LINKS =
- CONFIG_COMMANDS =
- $ ./config.status
-
-on dhcp-93-1541
-
-config.status:578: creating Makefile
-config.status:578: creating system/Makefile
-config.status:578: creating modules/Makefile
-
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-
-ac_cv_c_compiler_gnu=yes
-ac_cv_env_CC_set=
-ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=
-ac_cv_env_CFLAGS_value=
-ac_cv_env_CPPFLAGS_set=
-ac_cv_env_CPPFLAGS_value=
-ac_cv_env_CPP_set=
-ac_cv_env_CPP_value=
-ac_cv_env_LDFLAGS_set=
-ac_cv_env_LDFLAGS_value=
-ac_cv_env_build_alias_set=
-ac_cv_env_build_alias_value=
-ac_cv_env_host_alias_set=
-ac_cv_env_host_alias_value=
-ac_cv_env_target_alias_set=
-ac_cv_env_target_alias_value=
-ac_cv_exeext=
-ac_cv_header_stdc=yes
-ac_cv_lib_Magick_XWindowByProperty=yes
-ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=yes
-ac_cv_lib_cposix_strerror=no
-ac_cv_lib_dl_dlopen=yes
-ac_cv_lib_mp3lame_InitMP3=yes
-ac_cv_lib_ogg_ogg_stream_init=yes
-ac_cv_lib_vorbis_vorbis_analysis_init=yes
-ac_cv_lib_vorbisenc_vorbis_encode_setup_init=yes
-ac_cv_lib_z_deflate=yes
-ac_cv_objext=o
-ac_cv_path_AALIB_CONFIG=/usr/local/bin/aalib-config
-ac_cv_path_IMLIB2_CONFIG=/usr/local/bin/imlib2-config
-ac_cv_path_install='/usr/bin/install -c'
-ac_cv_prog_CPP='gcc -E'
-ac_cv_prog_ac_ct_CC=gcc
-ac_cv_prog_cc_g=yes
-ac_cv_prog_make_make_set=yes
-am_cv_prog_cc_stdc=
-
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-
-#define PACKAGE_NAME ""
-#define PACKAGE_TARNAME ""
-#define PACKAGE_VERSION ""
-#define PACKAGE_STRING ""
-#define PACKAGE_BUGREPORT ""
-#define STDC_HEADERS 1
-#define HAVE_LIBMAGICK 1
-#define HAVE_LIBBZ2 1
-#define HAVE_LIBZ 1
-#define HAVE_LIBDL 1
-#define HAVE_LIBMP3LAME 1
-#define HAVE_LIBOGG 1
-#define HAVE_LIBVORBIS 1
-#define HAVE_LIBVORBISENC 1
-
-configure: exit 0
+configure:546: checking for strerror in -lcposix
+configure:590: checking for gcc
+configure:703: checking whether the C compiler (gcc ) works
+configure:719: gcc -o conftest conftest.c 1>&5
+configure:745: checking whether the C compiler (gcc ) is a cross-compiler
+configure:750: checking whether we are using GNU C
+configure:778: checking whether gcc accepts -g
+configure:813: checking for gcc option to accept ANSI C
+configure:890: checking how to run the C preprocessor
+configure:970: checking for ANSI C header files
+configure:1104: checking for a BSD compatible install
+configure:1157: checking whether make sets ${MAKE}
+configure:1184: checking whether build environment is sane
+configure:1223: checking whether to enable maintainer-specific portions of Makefiles
+configure:1246: checking if malloc debugging is wanted
+configure:1301: checking for imlib2-config
+configure:1335: checking for imlib2 - version >= 1.0.0
+configure:1454: checking for aalib-config
+configure:1488: checking for aalib - version >= 1.0.0
+configure:1574: checking for XWindowByProperty in -lMagick
+configure:1622: checking for BZ2_bzBuffToBuffCompress in -lbz2
+configure:1670: checking for deflate in -lz
+configure:1718: checking for dlopen in -ldl
+configure:1766: checking for InitMP3 in -lmp3lame
+configure:1814: checking for ogg_stream_init in -logg
+configure:1862: checking for vorbis_analysis_init in -lvorbis
+configure:1910: checking for vorbis_encode_setup_init in -lvorbisenc
diff --git a/config.status b/config.status
index 3f71b5c..1eacec5 100755
--- a/config.status
+++ b/config.status
@@ -1,652 +1,132 @@
#! /bin/sh
-# Generated by configure.
+# Generated automatically by configure.
# Run this file to recreate the current configuration.
+# This directory was configured as follows,
+# on host dhcp-94-145:
+#
+# ./configure
+#
# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
-fi
-
-# NLS nuisances.
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
- { $as_unset LANG || test "${LANG+set}" != set; } ||
- { LANG=C; export LANG; }
-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
- { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
- { LC_ALL=C; export LC_ALL; }
-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
- { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
- { LC_TIME=C; export LC_TIME; }
-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
- { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
- { LC_CTYPE=C; export LC_CTYPE; }
-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
- { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
- { LANGUAGE=C; export LANGUAGE; }
-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
- { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
- { LC_COLLATE=C; export LC_COLLATE; }
-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
- { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
- { LC_NUMERIC=C; export LC_NUMERIC; }
-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
- { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
- { LC_MESSAGES=C; export LC_MESSAGES; }
-
-
-# Name of the executable.
-as_me=`(basename "$0") 2>/dev/null ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)$' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conftest.sh
- echo "exit 0" >>conftest.sh
- chmod +x conftest.sh
- if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conftest.sh
-fi
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" || {
- # Find who we are. Look in the path if we contain no path at all
- # relative or not.
- case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
- ;;
- esac
- # We did not find ourselves, most probably we were run as `sh COMMAND'
- # in which case we are not to be found in the path.
- if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
- { (exit 1); exit 1; }; }
- fi
- case $CONFIG_SHELL in
- '')
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
- case $as_dir in
- /*)
- if ("$as_dir/$as_base" -c '
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
- CONFIG_SHELL=$as_dir/$as_base
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
- done
-done
-;;
- esac
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line before each line; the second 'sed' does the real
- # work. The second script uses 'N' to pair each line-number line
- # with the numbered line, and appends trailing '-' during
- # substitution so that $LINENO is not a special case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
- sed '=' <$as_myself |
- sed '
- N
- s,$,-,
- : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
- t loop
- s,-$,,
- s,^['$as_cr_digits']*\n,,
- ' >$as_me.lineno &&
- chmod +x $as_me.lineno ||
- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensible to this).
- . ./$as_me.lineno
- # Exit status is that of the last command.
- exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
- as_ln_s='cp -p'
- else
- as_ln_s='ln -s'
- fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
-
-exec 6>&1
+# configure, is in ./config.log if it exists.
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling. Logging --version etc. is OK.
-exec 5>>config.log
-{
- echo
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.53. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
- CONFIG_LINKS = $CONFIG_LINKS
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-config_files=" Makefile system/Makefile modules/Makefile"
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
- -h, --help print this help, then exit
- -V, --version print version number, then exit
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-ac_cs_version="\
-config.status
-configured by ./configure, generated by GNU Autoconf 2.53,
- with options \"\"
-
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=.
-INSTALL="/usr/bin/install -c"
-# If no file are specified by the user, then we need to provide default
-# value. By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
+ac_cs_usage="Usage: ./config.status [--recheck] [--version] [--help]"
+for ac_option
do
- case $1 in
- --*=*)
- ac_option=`expr "x$1" : 'x\([^=]*\)='`
- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
- shift
- set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
- shift
- ;;
- -*);;
- *) # This is not an option, so the user has probably given explicit
- # arguments.
- ac_need_defaults=false;;
- esac
-
- case $1 in
- # Handling of the options.
+ case "$ac_option" in
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- echo "running /bin/sh ./configure " " --no-create --no-recursion"
- exec /bin/sh ./configure --no-create --no-recursion ;;
- --version | --vers* | -V )
- echo "$ac_cs_version"; exit 0 ;;
- --he | --h)
- # Conflict between --help and --header
- { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
- { (exit 1); exit 1; }; };;
- --help | --hel | -h )
+ echo "running ${CONFIG_SHELL-/bin/sh} ./configure --no-create --no-recursion"
+ exec ${CONFIG_SHELL-/bin/sh} ./configure --no-create --no-recursion ;;
+ -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+ echo "./config.status generated by autoconf version 2.13"
+ exit 0 ;;
+ -help | --help | --hel | --he | --h)
echo "$ac_cs_usage"; exit 0 ;;
- --debug | --d* | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- shift
- CONFIG_FILES="$CONFIG_FILES $1"
- ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- shift
- CONFIG_HEADERS="$CONFIG_HEADERS $1"
- ac_need_defaults=false;;
-
- # This is an error.
- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
- { (exit 1); exit 1; }; } ;;
-
- *) ac_config_targets="$ac_config_targets $1" ;;
-
+ *) echo "$ac_cs_usage"; exit 1 ;;
esac
- shift
done
-for ac_config_target in $ac_config_targets
-do
- case "$ac_config_target" in
- # Handling of arguments.
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "system/Makefile" ) CONFIG_FILES="$CONFIG_FILES system/Makefile" ;;
- "modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
- esac
-done
+ac_given_srcdir=.
+ac_given_INSTALL="/usr/bin/install -c"
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used. Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-: ${TMPDIR=/tmp}
-{
- tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
-} ||
-{
- tmp=$TMPDIR/cs$$-$RANDOM
- (umask 077 && mkdir $tmp)
-} ||
-{
- echo "$me: cannot create a temporary directory in $TMPDIR" >&2
- { (exit 1); exit 1; }
-}
+trap 'rm -fr conftest*; exit 1' 1 2 15
+# Protect against being on the right side of a sed subst in config.status.
+sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\&%]/\\&/g;
+ s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF
+/^[ ]*VPATH[ ]*=[^:]*$/d
-#
-# CONFIG_FILES section.
-#
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
- # Protect against being on the right side of a sed subst in config.status.
- sed 's/,@/@@/; s/@,/@@/; s/,;t t$/@;t t/; /@;t t$/s/[\\&,]/\\&/g;
- s/@@/,@/; s/@@/@,/; s/@;t t$/,;t t/' >$tmp/subs.sed <<\CEOF
-s,@SHELL@,/bin/sh,;t t
-s,@PATH_SEPARATOR@,:,;t t
-s,@PACKAGE_NAME@,,;t t
-s,@PACKAGE_TARNAME@,,;t t
-s,@PACKAGE_VERSION@,,;t t
-s,@PACKAGE_STRING@,,;t t
-s,@PACKAGE_BUGREPORT@,,;t t
-s,@exec_prefix@,${prefix},;t t
-s,@prefix@,/usr/local,;t t
-s,@program_transform_name@,s,x,x,,;t t
-s,@bindir@,${exec_prefix}/bin,;t t
-s,@sbindir@,${exec_prefix}/sbin,;t t
-s,@libexecdir@,${exec_prefix}/libexec,;t t
-s,@datadir@,${prefix}/share,;t t
-s,@sysconfdir@,${prefix}/etc,;t t
-s,@sharedstatedir@,${prefix}/com,;t t
-s,@localstatedir@,${prefix}/var,;t t
-s,@libdir@,${exec_prefix}/lib,;t t
-s,@includedir@,${prefix}/include,;t t
-s,@oldincludedir@,/usr/include,;t t
-s,@infodir@,${prefix}/info,;t t
-s,@mandir@,${prefix}/man,;t t
-s,@build_alias@,,;t t
-s,@host_alias@,,;t t
-s,@target_alias@,,;t t
-s,@DEFS@,-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_LIBMAGICK=1 -DHAVE_LIBBZ2=1 -DHAVE_LIBZ=1 -DHAVE_LIBDL=1 -DHAVE_LIBMP3LAME=1 -DHAVE_LIBOGG=1 -DHAVE_LIBVORBIS=1 -DHAVE_LIBVORBISENC=1 ,;t t
-s,@ECHO_C@,,;t t
-s,@ECHO_N@,-n,;t t
-s,@ECHO_T@,,;t t
-s,@LIBS@,-lvorbisenc -lvorbis -logg -lmp3lame -ldl -lz -lbz2 -lMagick -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc,;t t
-s,@CC@,gcc,;t t
-s,@CFLAGS@,-g -O2 -Wall,;t t
-s,@LDFLAGS@,,;t t
-s,@CPPFLAGS@,,;t t
-s,@ac_ct_CC@,gcc,;t t
-s,@EXEEXT@,,;t t
-s,@OBJEXT@,o,;t t
-s,@CPP@,gcc -E,;t t
-s,@INSTALL_PROGRAM@,${INSTALL},;t t
-s,@INSTALL_SCRIPT@,${INSTALL},;t t
-s,@INSTALL_DATA@,${INSTALL} -m 644,;t t
-s,@SET_MAKE@,,;t t
-s,@MAINTAINER_MODE_TRUE@,#,;t t
-s,@MAINTAINER_MODE_FALSE@,,;t t
-s,@MAINT@,#,;t t
-s,@IMLIB2_CONFIG@,/usr/local/bin/imlib2-config,;t t
-s,@IMLIB_LIBS@,-L/usr/local/lib -lImlib2 -lttf -lm -ldl -lXext -lXext -lX11 -L/usr/X11R6/lib,;t t
-s,@IMLIB_CFLAGS@,-I/usr/local/include -I/usr/X11R6/include,;t t
-s,@IMLIB2_CFLAGS@,-I/usr/local/include -I/usr/X11R6/include,;t t
-s,@IMLIB2_LIBS@,-L/usr/local/lib -lImlib2 -lttf -lm -ldl -lXext -lXext -lX11 -L/usr/X11R6/lib,;t t
-s,@AALIB_CONFIG@,/usr/local/bin/aalib-config,;t t
-s,@AALIB_LIBS@,-L/usr/local/lib -Wl,-rpath,/usr/local/lib -laa -lm -L/usr/X11R6/lib -lX11 -lgpm -lslang,;t t
-s,@AALIB_CFLAGS@,-I/usr/local/include,;t t
-s,@PDP_PIDIP_VERSION@,0.12.9,;t t
-s,@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,;t t
-s,@MAGICK_CFLAGS@,-I/usr/X11R6/include -g -O2 -Wall ,;t t
-s,@PD_DIR@,/usr/local/pd,;t t
-s,@PDP_DIR@,/usr/local/pd/pdp,;t t
-s,@FFMPEG_SOURCE_DIR@,/SOURCES/ffmpeg,;t t
CEOF
- # Split the substitutions into bite-sized pieces for seds with
- # small command number limits, like on Digital OSF/1 and HP-UX.
- ac_max_sed_lines=48
- ac_sed_frag=1 # Number of current file.
- ac_beg=1 # First line for current file.
- ac_end=$ac_max_sed_lines # Line after last line for current file.
- ac_more_lines=:
- ac_sed_cmds=
- while $ac_more_lines; do
- if test $ac_beg -gt 1; then
- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- else
- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- fi
- if test ! -s $tmp/subs.frag; then
- ac_more_lines=false
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+ if test $ac_beg -gt 1; then
+ sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+ else
+ sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+ fi
+ if test ! -s conftest.s$ac_file; then
+ ac_more_lines=false
+ rm -f conftest.s$ac_file
+ else
+ if test -z "$ac_sed_cmds"; then
+ ac_sed_cmds="sed -f conftest.s$ac_file"
else
- # The purpose of the label and of the branching condition is to
- # speed up the sed processing (if there are no `@' at all, there
- # is no need to browse any of the substitutions).
- # These are the two extra sed commands mentioned above.
- (echo ':t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
- else
- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
- fi
- ac_sed_frag=`expr $ac_sed_frag + 1`
- ac_beg=$ac_end
- ac_end=`expr $ac_end + $ac_max_sed_lines`
+ ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
fi
- done
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds=cat
+ ac_file=`expr $ac_file + 1`
+ ac_beg=$ac_end
+ ac_end=`expr $ac_end + $ac_max_sed_cmds`
fi
-fi # test -n "$CONFIG_FILES"
+done
+if test -z "$ac_sed_cmds"; then
+ ac_sed_cmds=cat
+fi
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+CONFIG_FILES=${CONFIG_FILES-""}
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case $ac_file in
- - | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
- esac
-
- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { case "$ac_dir" in
- [\\/]* | ?:[\\/]* ) as_incr_dir=;;
- *) as_incr_dir=.;;
-esac
-as_dummy="$ac_dir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
- case $as_mkdir_dir in
- # Skip DOS drivespec
- ?:) as_incr_dir=$as_mkdir_dir ;;
- *)
- as_incr_dir=$as_incr_dir/$as_mkdir_dir
- test -d "$as_incr_dir" ||
- mkdir "$as_incr_dir" ||
- { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }
- ;;
+ case "$ac_file" in
+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+ ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+ *) ac_file_in="${ac_file}.in" ;;
esac
-done; }
- ac_builddir=.
+ # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-if test "$ac_dir" != .; then
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
+ # Remove last slash and all that follows it. Not all systems have dirname.
+ ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+ # The file is in a subdirectory.
+ test ! -d "$ac_dir" && mkdir "$ac_dir"
+ ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+ # A "../" for each directory in $ac_dir_suffix.
+ ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+ else
+ ac_dir_suffix= ac_dots=
+ fi
-case $srcdir in
- .) # No --srcdir option. We are building in place.
- ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
+ case "$ac_given_srcdir" in
+ .) srcdir=.
+ if test -z "$ac_dots"; then top_srcdir=.
+ else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+ /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
*) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-
+ srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+ top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
- case $INSTALL in
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+ case "$ac_given_INSTALL" in
+ [/$]*) INSTALL="$ac_given_INSTALL" ;;
+ *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
esac
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
- if test x"$ac_file" = x-; then
- configure_input=
- else
- configure_input="$ac_file. "
- fi
- configure_input=$configure_input"Generated from `echo $ac_file_in |
- sed 's,.*/,,'` by configure."
+ echo creating "$ac_file"
+ rm -f "$ac_file"
+ configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+ case "$ac_file" in
+ *Makefile*) ac_comsub="1i\\
+# $configure_input" ;;
+ *) ac_comsub= ;;
+ esac
- # First look for the input files in the build tree, otherwise in the
- # src tree.
- ac_file_inputs=`IFS=:
- for f in $ac_file_in; do
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- echo $f;;
- *) # Relative
- if test -f "$f"; then
- # Build tree
- echo $f
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo $srcdir/$f
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- fi;;
- esac
- done` || { (exit 1); exit 1; }
- sed "/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[ ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[ ]*$//;
-}
+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+ sed -e "$ac_comsub
+s%@configure_input@%$configure_input%g
+s%@srcdir@%$srcdir%g
+s%@top_srcdir@%$top_srcdir%g
+s%@INSTALL@%$INSTALL%g
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+fi; done
+rm -f conftest.s*
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
- rm -f $tmp/stdin
- if test x"$ac_file" != x-; then
- mv $tmp/out $ac_file
- else
- cat $tmp/out
- rm -f $tmp/out
- fi
-done
-{ (exit 0); exit 0; }
+exit 0
diff --git a/doc/help-pdp_juxta.pd b/doc/help-pdp_juxta.pd
index 9d12e5a..7b9c68c 100644
--- a/doc/help-pdp_juxta.pd
+++ b/doc/help-pdp_juxta.pd
@@ -3,7 +3,7 @@
#X obj 227 97 bng 15 250 50 0 empty empty empty 20 8 0 8 -262144 -1
-1;
#X msg 123 136 loop \$1;
-#X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 1
+#X obj 124 114 tgl 15 0 empty empty empty 20 8 0 8 -262144 -1 -1 0
1;
#X msg 46 138 open \$1;
#X obj 45 114 openpanel;
@@ -71,6 +71,7 @@
#X obj 671 98 makefilename file://%s;
#X floatatom 273 62 5 0 0 0 - - -;
#X floatatom 189 166 5 0 0 0 - - -;
+#X floatatom 163 206 5 0 0 0 - - -;
#X connect 1 0 8 0;
#X connect 2 0 9 0;
#X connect 3 0 2 0;
@@ -80,6 +81,7 @@
#X connect 7 0 8 0;
#X connect 8 0 9 0;
#X connect 9 0 19 0;
+#X connect 9 3 58 0;
#X connect 10 0 19 0;
#X connect 11 0 10 0;
#X connect 12 0 11 0;
diff --git a/modules/Makefile b/modules/Makefile
index 8d6c12f..d7d0926 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -15,6 +15,7 @@ OBJECTS = pdp_intrusion.o pdp_yqt.o pdp_simura.o pdp_underwatch.o \
pdp_ffmpeg~.o pdp_live~.o pdp_segsnd~.o pdp_noquark.o \
pdp_juxta.o pdp_capture.o pdp_smuck.o pdp_lumafilt.o \
pdp_transition.o pdp_imgloader.o pdp_imgsaver.o pdp_cache.o \
- pdp_canvas.o pdp_pen.o pdp_shape.o pdp_fqt.o pdp_fcqt.o
+ pdp_canvas.o pdp_pen.o pdp_shape.o pdp_fqt.o pdp_fcqt.o \
+ pdp_xcanvas.o
all_modules: $(OBJECTS)
diff --git a/modules/Makefile.in b/modules/Makefile.in
index e7f9de0..1d490a1 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -14,6 +14,7 @@ OBJECTS = pdp_intrusion.o pdp_yqt.o pdp_simura.o pdp_underwatch.o \
pdp_ffmpeg~.o pdp_live~.o pdp_segsnd~.o pdp_noquark.o \
pdp_juxta.o pdp_capture.o pdp_smuck.o pdp_lumafilt.o \
pdp_transition.o pdp_imgloader.o pdp_imgsaver.o pdp_cache.o \
- pdp_canvas.o pdp_pen.o pdp_shape.o pdp_fqt.o pdp_fcqt.o
+ pdp_canvas.o pdp_pen.o pdp_shape.o pdp_fqt.o pdp_fcqt.o \
+ pdp_xcanvas.o
all_modules: $(OBJECTS)
diff --git a/modules/pdp_fcqt.c b/modules/pdp_fcqt.c
index e7be248..e3659e3 100644
--- a/modules/pdp_fcqt.c
+++ b/modules/pdp_fcqt.c
@@ -273,13 +273,11 @@ static void pdp_fcqt_frame_cold(t_pdp_fcqt *x, t_floatarg frameindex)
if (!(x->initialized)) return;
- length = quicktime_video_length(x->qt,0);
-
- frame = (frame >= length) ? length-1 : frame;
+ frame = (frame >= x->x_length) ? x->x_length-1 : frame;
frame = (frame < 0) ? 0 : frame;
// post("pdp_fcqt : frame cold : setting video position to : %d", frame );
- quicktime_set_video_position(x->qt, frame, 0);
+ x->x_current_frame = frame;
}
static void pdp_fcqt_frame(t_pdp_fcqt *x, t_floatarg frameindex)
diff --git a/modules/pdp_fqt.c b/modules/pdp_fqt.c
index ccbaf57..1747c6f 100644
--- a/modules/pdp_fqt.c
+++ b/modules/pdp_fqt.c
@@ -49,13 +49,13 @@ typedef struct pdp_fqt_struct
t_int x_cursec;
t_int x_framescount;
- unsigned char * qt_rows[3];
+ unsigned char *qt_rows[3];
- unsigned char * qt_frame;
+ unsigned char *qt_frame;
quicktime_t *qt;
int qt_cmodel;
- unsigned int** x_frames;
+ unsigned char **x_frames;
t_int* x_fsizes;
} t_pdp_fqt;
@@ -73,7 +73,7 @@ static void pdp_fqt_close(t_pdp_fqt *x)
{
if ( x->x_frames[fi] ) freebytes( x->x_frames[fi], x->x_fsizes[fi] );
}
- if ( x->x_frames ) freebytes( x->x_frames, x->x_length*sizeof(unsigned int*) );
+ if ( x->x_frames ) freebytes( x->x_frames, x->x_length*sizeof(unsigned char*) );
x->initialized = false;
}
@@ -128,7 +128,7 @@ static void pdp_fqt_open(t_pdp_fqt *x, t_symbol *name)
// read all frames
x->x_current_frame = 0;
- x->x_frames = (unsigned int**) getbytes( x->x_length*sizeof(unsigned int*) );
+ x->x_frames = (unsigned char**) getbytes( x->x_length*sizeof(unsigned char*) );
x->x_fsizes = (t_int*) getbytes( x->x_length*sizeof(t_int) );
x->x_fsize = 0;
if ( !x->x_frames )
@@ -141,9 +141,9 @@ static void pdp_fqt_open(t_pdp_fqt *x, t_symbol *name)
for ( fi=0; fi<x->x_length; fi++ )
{
- x->x_fsizes[fi] = ((x->x_size)+(x->x_size>>1))<<1;
+ x->x_fsizes[fi] = (x->x_size)+((x->x_vwidth>>1)*(x->x_vheight>>1)<<1);
x->x_fsize += x->x_fsizes[fi];
- x->x_frames[fi] = (unsigned int*) getbytes( x->x_fsizes[fi] );
+ x->x_frames[fi] = (unsigned char*) getbytes( x->x_fsizes[fi] );
if ( !x->x_frames[fi] )
{
post("pdp_fqt: couldn't allocate memory for frames" );
@@ -156,8 +156,7 @@ static void pdp_fqt_open(t_pdp_fqt *x, t_symbol *name)
switch(x->qt_cmodel){
case BC_YUV420P:
- pdp_llconv(x->qt_frame, RIF_YVU__P411_U8, x->x_frames[fi], RIF_YVU__P411_S16,
- x->x_vwidth, x->x_vheight);
+ memcpy(x->x_frames[fi], x->qt_frame, x->x_fsizes[fi] );
break;
default:
@@ -180,26 +179,25 @@ static void pdp_fqt_bang(t_pdp_fqt *x)
struct timeval etime;
if (!(x->initialized)){
- //post("pdp_fqt: no qt file opened");
+ post("pdp_fqt: no qt file opened");
return;
}
- object = pdp_packet_new_image_YCrCb( x->x_vwidth, x->x_vheight );
+ object = pdp_packet_new_bitmap_yv12( x->x_vwidth, x->x_vheight );
header = pdp_packet_header(object);
data = (short int *) pdp_packet_data(object);
- header->info.image.encoding = PDP_IMAGE_YV12;
+ header->info.image.encoding = PDP_BITMAP_YV12;
header->info.image.width = x->x_vwidth;
header->info.image.height = x->x_vheight;
- x->x_current_frame = ( x->x_current_frame + 1 ) % x->x_length;
- // post( "pdp_fqt : current frame : %d", x->x_current_frame );
-
+ // post( "pdp_fqt : current frame : %d size : %d",
+ // x->x_current_frame, x->x_fsizes[x->x_current_frame] );
memcpy( data, x->x_frames[x->x_current_frame], x->x_fsizes[x->x_current_frame] );
if ( gettimeofday(&etime, NULL) == -1)
{
- post("pdp_fcqt : could not get time" );
+ post("pdp_fqt : could not get time" );
}
if ( etime.tv_sec != x->x_cursec )
{
@@ -209,6 +207,7 @@ static void pdp_fqt_bang(t_pdp_fqt *x)
}
x->x_framescount++;
+ x->x_current_frame = ( x->x_current_frame + 1 ) % x->x_length;
outlet_float(x->x_curframe, (float)x->x_current_frame);
pdp_packet_pass_if_valid(x->x_outlet0, &object);
@@ -216,19 +215,16 @@ static void pdp_fqt_bang(t_pdp_fqt *x)
static void pdp_fqt_frame_cold(t_pdp_fqt *x, t_floatarg frameindex)
{
- int frame = (int)frameindex;
- int length;
-
+ int frame = (int)frameindex;
if (!(x->initialized)) return;
- length = quicktime_video_length(x->qt,0);
-
- frame = (frame >= length) ? length-1 : frame;
+ frame = (frame >= x->x_length) ? x->x_length-1 : frame;
frame = (frame < 0) ? 0 : frame;
// post("pdp_fqt : frame cold : setting video position to : %d", frame );
- quicktime_set_video_position(x->qt, frame, 0);
+ x->x_current_frame = frame;
+
}
static void pdp_fqt_frame(t_pdp_fqt *x, t_floatarg frameindex)
diff --git a/system/pidip.c b/system/pidip.c
index fb2ba55..29dea9e 100644
--- a/system/pidip.c
+++ b/system/pidip.c
@@ -59,6 +59,7 @@ extern "C"
void pdp_imgsaver_setup(void);
void pdp_cache_setup(void);
void pdp_canvas_setup(void);
+ void pdp_xcanvas_setup(void);
void pdp_pen_setup(void);
void pdp_shape_setup(void);
@@ -119,6 +120,7 @@ void pidip_setup(void){
pdp_imgsaver_setup();
pdp_cache_setup();
pdp_canvas_setup();
+ pdp_xcanvas_setup();
pdp_pen_setup();
pdp_shape_setup();