From ff9c8878c5b4abf79df3316bcd1e73530f4d0c45 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Wed, 10 Oct 2001 14:25:15 +0000 Subject: [PATCH] * 0.2.90 release. * Updated ChangeLog files. * XVideo module now compiled as built-in for Debian packages, to avoid PIC and non-PIC code collision (Closes Debian bug #111790). --- ChangeLog | 149 +++++++++++++--- ChangeLog.libdvdcss | 1 + Makefile | 6 +- configure | 383 ++++++++++++++++++++--------------------- configure.in | 2 +- debian/changelog | 6 +- debian/rules | 7 +- plugins/gtk/gtk_open.c | 10 +- src/input/input.c | 10 +- src/misc/netutils.c | 11 +- vlc.spec | 7 +- 11 files changed, 355 insertions(+), 237 deletions(-) diff --git a/ChangeLog b/ChangeLog index efea567a39..06632e407a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,113 @@ HEAD + * Nothing yet. + +0.2.90 +Wed, 10 Oct 2001 15:00:29 +0200 + + * XVideo module now compiled as built-in for Debian packages, to avoid + PIC and non-PIC code collision (Closes Debian bug #111790). + * MacOS X port : replaced -traditional-cpp (deprecated) with -no-cpp-precomp. + * MacOS X port : native QuickTime video output, courtesy of Florian G. + Pflug . Use it with -I macosx_qt. + * Fixed bugs in the altivec detection, courtesy of Michel Lanners + . + * Added HTTP url drop (from a WWW browser) to the gtk/gnome interface. + * Added User-Agent header in the HTTP input. + * Fixed an input segfault which occured using ES input. + * Enhanced --with-tuning. + * Added an endianness check for cross-compilations. + * We now check for sys/times.h. + * Repaired dummy input broken yesterday. + * Minor ShowBits() optimization. + * Fixed a bug in vlc.spec. + * New --disable-plugins option ; make all plug-ins built-in. + * Changes to ensure the BeOS compile still works. + * Added HTTP virtualhost support in the HTTP input. + * Enabled mouse clicks in the GGI plugin. + * Fixed a warning in input_es.c. + * Don't connect on INADDR_ANY, patch courtesy of Mathias Kretschmer + . + * Cleaned up sam's mess with input's pf_open and pf_close (not completely). + * With -vvv modules now show up their scores. + * HTTP input support. + * Borrowed Mandrakesoft's vlc.spec and libdvdcss.spec. + * New configure option --with-tuning=[arch], extending --enable-pentiumpro ; + for Pentium, use --with-tuning=pentium, for PowerPC 604 use --with-tuning=604, + and so on. + * Dramatically improve compilation time, with a negligible performance + tradeoff. + * Removed -march=pentiumpro ; should now work on pentium-class machines. + * Removed --enable-stats configuration directive. Stats are now activated + at runtime with --stats. + * New intf_StatMsg() call. + * Vout picture heap is now 8 pictures instead of 5 (better synchro). + * Tremendous enhancements in statistics display. + * Better capabilities handling. + * Error checks in debug mode : pthread ERRORCHECK_MUTEX and MALLOC_CHECK_=2. + * "added support for an unusual construct at the start of some + slices", says walken :-). + * In spdif ac3 is selected by default + * Video output grows to respect acpect ratio instead of shrinking (not + in x11 because it takes cpu to resize a picture). + * Disable dpms in xvideo. + * Better handling of the buffer of the sound driver to try to remove + sratches in spdif. + * Fix bad dates in ac3 spdif "decoder" (playing with the bit stream is very + funny). + * Thanks to Stef for his ideas, Meuuh for his bit stream, and Sam for his + trolls :) + * Fixed bugs in the MacOS X port. + * Faster configure script and as-yet untested Darwin patches. + * Test for Altivec C extensions. + * If memalign isn't available, fall back on valloc. + * Fixed a stupid mistake in NormScan(). + * By default, use the real size of the stream for the video output size. + * Altivec IDCT and motion compensation, courtesy of Michel Lespinasse for + mpeg2dec (untested). + * Fixed many alignment issues. + * Miscellaneous updates to configure, especially for cross-compilation. + * Fixed the BeOS slider overflow problem. + * Corrected BeOS Slider and button status behaviour. + * Simplified Code in the vout_beos ready for another developer to implement + more advanced video output. + * Fixed typos, courtesy of Michel Lanners . + * Fixed a netlist packet leak in demuxPSI (Mark Gritter + ). + * Removed the nuts message "unable to allocate memory" when the netlist got + empty. + * Various fixes for GCC 3.0. + * Reworked jlj's patch for field pictures. + * Fixed numerous bugs with the Altivec IDCT (still not compiling). + * MPEG audio emphasis fix, courtesy of Matthieu Lochegnies + . + * ac3dec uninitialized data structure fix, courtesy of Damian Ivereigh + . + * Altivec IDCT and motion compensation, based on Paul Mackerras's mpeg2dec. + * Local minor optimizations in IDCT. + * Removed a hopeless kludge in input_clock.c. + * Fixed a problem with field streams not working with new video decoder. + * IP Multicast support, courtesy of Mathias Kretschmer + . + * Removed O_NONBLCK in aout_Play because we don't use it and some drivers + (e.g. esssolo1 have problems with this) ; + * Added warning messages. + * Fixed build dependencies for architectures not supporting libasound2 + (Closes Debian bug #109722). + * Install doesn't explode if libdvdcss hasn't been compiled. + * Attempt to fix the SDL detection under *BSD. + * Removed /usr/local/include, because it is unsafe in a cross-compilation + environment. + * The win32 port is once again using msvcrt.dll instead of msvcrt40.dll. + * Fixed a synchro bug (typo) in video_output.c. + * Added documentation to use VLC as a netscape plug-in and do some + (buggy) web streaming. + * Totally rewrote the video decoder (inspired by walken's mpeg2dec), + implying - performance boost ; - fixed the "Dual Prime Arithmetic" bug ; + - 3DNow! motion compensation module. + * AC3dec statistics do not show up with --enable-stats, because I doubt + they're understandable by a normal human being, and they pollute the output. * Minor changes to the (non-working) ncurses interface. * Fixed a packet leak in DemuxPSI. * Added gnome.h check and cleaned the error messages in the configure script. @@ -50,7 +157,7 @@ Tue, 7 Aug 2001 12:39:16 +0200 and will use the dummy functions only if it couldn't find a valid libdvdcss. This is probably only useful to package maintainers. * Made the remote command plugin usable even with no stream. - * Fixed a deadlock in the remote command plugin. + * Fixed a deadlock in the remote command plugin. * Fixed a deadlock in the SPU decoder. * Minor bug fix to aout_directx.c. * Big rewrite of the DirectX audio plugin. The audio output is now (almost) @@ -68,7 +175,7 @@ Tue, 7 Aug 2001 12:39:16 +0200 * Modified input_dvd so you can now go directly to the selected chapter when you change the title. * Implemented the Probe function in the Xvideo plugin. Xvideo is now the - default video output plugin when it is supported. + default video output plugin when it is supported. * Now use SDL_CFLAGS for searching SDL/SDL.h. * Don't miserably die in `make` when ./configure hasn't be run. * Fixed a bug when compiling KDE plug-in without Qt plug-in. @@ -204,7 +311,7 @@ Sat, 28 Jul 2001 04:13:57 +0200 * In DVD mode, we reinit the synchro only if the SCR are not continuous (instead of each cell). * Tried to improve AC3 spdif to prevent desynchronization. - * Lots of DirectX plugin fixes by Gildas Bazin. + * Lots of DirectX plugin fixes by Gildas Bazin. * Compilation fix in message queue mode. * Another FreeBSD compilation fix. * SDL compilation fix for FreeBSD. @@ -477,7 +584,7 @@ Sat, 7 Apr 2001 05:52:00 +0200 * Header cleaning: filled all empty authors fields, added CVS $Id stuff. * Fixes to aout_darwin.c by Colin Delacroix . * Fixes to configure.in, Makefile.in and main.c (Altivec detection) - by Eugenio Jarosiewicz . + by Eugenio Jarosiewicz . * Added a SYNCHRO_START in DVDRead for each cell change to fix multi-angle streams * Changed seek function to prevent jump-at-will and to remove two bugs in @@ -570,7 +677,7 @@ Mon, 5 Mar 2001 00:41:16 +0100 * Completely changed title and chapter initialization. Now we have real title units. * Fixed size for a majority of DVD. - * More consistency in the p_input->stream management. + * More consistency in the p_input->stream management. * Made input_SelectES() and input_UnselectES() not block the input thread for a long time. * Changed debian/control to fix Debian bug #83707 @@ -585,7 +692,7 @@ Mon, 5 Mar 2001 00:41:16 +0100 nobody noticed it. * New function for DVD reading, that is able to read multiple blocks (I've chosen 32 now), that doesn't use any memcpy anymore and is also much - faster. It is ready now for cell positioning in multi-angle DVD (to come + faster. It is ready now for cell positioning in multi-angle DVD (to come soon). * DVD specific netlist adapted to 2048 bytes long blocks that contain several data_packets. @@ -656,7 +763,7 @@ Fri, 2 Mar 2001 17:32:24 +0100 * Started thinking about built-in modules, and added some code to make it easier eventually. * Added Oct in the AUTHORS file. - * Fixed a mistake in configure.in. + * Fixed a mistake in configure.in. * All your base are belong to us. * Fixed a bug in src/misc/modules which prevented loading modules when launched from the Tracker. @@ -712,7 +819,7 @@ Fri, 16 Feb 2001 08:09:59 +0100 * Fixed package building (both RPMs and .debs). * Fixed `make snapshot' rule. - * Added some magic to filename detection. To read a DVD you now just + * Added some magic to filename detection. To read a DVD you now just need to run 'vlc dvd:/dev/hdc' for instance. Same for file:// URIs. * Fixed a segfault in the slider when no stream was playing. * Made the slider go from 0 to 100 (instead of 99 :) @@ -733,7 +840,7 @@ Fri, 16 Feb 2001 08:09:59 +0100 * New more recent css authentication code. * Beginning of udf support (not in Makefile) * Removed useless includes in intf_gnome.c - * Made the vout_sdl.c functions static + * Made the vout_sdl.c functions static * Ported vout_x11.c to the modules API; code isn't very nice yet though * X11 output works again. It's just the output, but it works; I now need to clean the code and add event handling. @@ -783,7 +890,7 @@ Wed, 14 Feb 2001 08:33:46 +0100 a playlist window (still empty). * Added `Slow' and `Fast' buttons to the interface and popup menu. * Removed tests against i_rate and i_new_rate calculation from the - plugins and hid this complexity into input_ext-intf.c + plugins and hid this complexity into input_ext-intf.c * The pure Gnome part of the Gnome interface has been rewritten from scratch, and the .glade file included as well. You can edit it by installing glade-gnome and doing `glade plugins/gnome/intf_gnome.glade', @@ -828,7 +935,7 @@ Wed, 14 Feb 2001 08:33:46 +0100 * Added a missing pf_close() because it's always cool to close files after we read them. * Solved bug with cssdescrambling. The vlc might segfault with dvd - plugins. I will fix that soon. + plugins. I will fix that soon. * Minor modification in pluginification. * Playlist works again (still the old wrong way like Meuuh doesn't like, but this is going to change within a few hours) @@ -928,7 +1035,7 @@ Wed, 31 Jan 2001 04:30:37 +0100 available information * Fixed a bug in parsing of VTS attributes * Fixed a bug in input.c that made input plugin initialize even though - no stream is reachable (thanks Sam) + no stream is reachable (thanks Sam) * Merged the YUV plugins in the same directory to avoid too much code duplication * YUV transformations now use the new module API ; now only the vout @@ -956,7 +1063,7 @@ Wed, 31 Jan 2001 04:30:37 +0100 you think ? * Fixed the Makefile to spare a few variables here and there. * Reduced module hide delay, removed loading of the audio output - plugins since they are now modules. + plugins since they are now modules. * Changed a few intf_Msg to intf_DbgMsg, and added "vout:", "intf:", and so on in a few other messages. * Removed unused includes in the idct modules. @@ -969,7 +1076,7 @@ Wed, 31 Jan 2001 04:30:37 +0100 * The IDCT functions are now located in modules : the classic IDCT, our optimized IDCT, and MMX IDCT. * Cosmetic changes for modules (pf_* instead of p_*) - * Fixes to the BeOS and dummy modules + * Fixes to the BeOS and dummy modules * Changed default values : INPUT_PTS_DELAY down to 200 ms ; video heap down from 10 to 5 pictures ; @@ -1029,15 +1136,15 @@ Wed, 31 Jan 2001 04:30:37 +0100 cases (some ES were not deleted because their index was skipped when the former one was deleted, well Meuuh should know what I mean) * Cleaning of SDL Lock/Unlock Surface. - * All plugins now compile with -fPIC. + * All plugins now compile with -fPIC. * Made the audio_output API a bit simpler. * Got rid of modules_config.h. - * Fixed `make install' rule. + * Fixed `make install' rule. * Fixed warnings in the MMX YUV compilation. * Probably fixed a bug in the input : pp_foo structures were free()d at the end, but this was useless since the last call to realloc() is equivalent to free(), and two consecutive calls to free() aren't a - goo idea. + goo idea. * We check that the version number match and that we don't already have a module by that name when loading a new module. * All public module_* functions now properly lock the module bank. @@ -1110,7 +1217,7 @@ Wed, 31 Jan 2001 04:30:37 +0100 * Fixed memory leaks. * Moved video_decoder's headers from include/ to src/video_decoder. * Temporarily removed b&w kludge. - * Splitted up p_method_data/p_plugin_data ; + * Splitted up p_method_data/p_plugin_data ; * Cleaned up input_ts.c, added it into the Makefile. * Fixed various memory leaks. * Removed all arbitrary limits on the number of elementary streams. @@ -1153,7 +1260,7 @@ Wed, 31 Jan 2001 04:30:37 +0100 * Fixed a var name typo in input_programs.c which prevents vlc from compiling with --enable-debug option. (i_es_pid -> i_es_id :) * Autodetection of Overlay support - * Fixed support for broken MPEG-1 files. + * Fixed support for broken MPEG-1 files. * Cleaned up program and ES management by using input_programs.c whenever necessary. * Cleaned up decoder spawning. @@ -1217,7 +1324,7 @@ Wed, 31 Jan 2001 04:30:37 +0100 advantage of the SMP machines. * Added --enable-debug, --enable-stats, and --disable-optims in the GNU configure stuff. - * Added alsa audio support (plugin) + * Added alsa audio support (plugin) * vlc is now compiled without the STATS mode by default. * Fixed a bug which made frames go backwards with some displays (the video_decoder thread is now niced). @@ -1248,7 +1355,7 @@ Tue, 22 Aug 2000 01:31:58 +0200 * fixed a bug that was making the crash randomly under beos. * fixed a bug that was exhausting system ressources under beos. * improved the cond_var for beos. - * added support for the SDL vout : the --display fullscreen allows + * added support for the SDL vout : the --display fullscreen allows fullscreen when possible. Disabled by default. * added sdlvlc (which probably should start in fullscreen, no ?) * removed sdlvlc :) diff --git a/ChangeLog.libdvdcss b/ChangeLog.libdvdcss index cba1151bbe..a7578a0c5c 100644 --- a/ChangeLog.libdvdcss +++ b/ChangeLog.libdvdcss @@ -4,6 +4,7 @@ HEAD + * Darwin ioctl, courtesy of ej0. * If we see 3000 unencrypted blocks assume that the title is unencrypted. * If we have not seen any encrypted block and then discover that the block just read is not a valid block of an MPEG2 Program stream, assume that the diff --git a/Makefile b/Makefile index d5f5aa4483..65efd44caf 100644 --- a/Makefile +++ b/Makefile @@ -66,6 +66,8 @@ ifneq (,$(findstring mingw32,$(SYS))) RESOURCE_OBJ := share/vlc_win32_rc.o endif +VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) + # # Generated header # @@ -379,8 +381,8 @@ endif # # Main application target # -vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) plugins - $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) $(LCFLAGS) +vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(VLC_OBJ) $(BUILTIN_OBJ) plugins + $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LCFLAGS) ifeq ($(SYS),beos) xres -o $@ ./share/vlc_beos.rsrc mimeset -f $@ diff --git a/configure b/configure index 7ed641a18f..aac876dcc1 100755 --- a/configure +++ b/configure @@ -708,7 +708,7 @@ test "$host_alias" != "$target_alias" && HAVE_VLC=0 if test -r src/interface/main.c; then HAVE_VLC=1 - VLC_VERSION=0.2.83 + VLC_VERSION=0.2.90 VLC_CODENAME=Ourumov @@ -2317,15 +2317,12 @@ else #include #include #include -#include -#include - -#ifdef HAVE_UNISTD_H -# include -#endif /* This mess was copied from the GNU getpagesize.h. */ #ifndef HAVE_GETPAGESIZE +# ifdef HAVE_UNISTD_H +# include +# endif /* Assume that all systems that can run configure have sys/param.h. */ # ifndef HAVE_SYS_PARAM_H @@ -2380,7 +2377,7 @@ main() /* * First, make a file with some known garbage in it. */ - data = (char*)malloc(pagesize); + data = malloc(pagesize); if (!data) exit(1); for (i = 0; i < pagesize; ++i) @@ -2401,7 +2398,7 @@ main() fd = open("conftestmmap", O_RDWR); if (fd < 0) exit(1); - data2 = (char*)malloc(2 * pagesize); + data2 = malloc(2 * pagesize); if (!data2) exit(1); data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); @@ -2419,7 +2416,7 @@ main() */ for (i = 0; i < pagesize; ++i) *(data2 + i) = *(data2 + i) + 1; - data3 = (char*)malloc(pagesize); + data3 = malloc(pagesize); if (!data3) exit(1); if (read(fd, data3, pagesize) != pagesize) @@ -2433,7 +2430,7 @@ main() } EOF -if { (eval echo configure:2437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2456,12 +2453,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2460: checking return type of signal handlers" >&5 +echo "configure:2457: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2478,7 +2475,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2497,7 +2494,7 @@ EOF echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2501: checking for dlopen in -ldl" >&5 +echo "configure:2498: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2505,7 +2502,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2537,7 +2534,7 @@ else fi echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6 -echo "configure:2541: checking for pow in -lm" >&5 +echo "configure:2538: checking for pow in -lm" >&5 ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2545,7 +2542,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2580,7 +2577,7 @@ fi THREAD_LIB=error if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 -echo "configure:2584: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:2581: checking for pthread_attr_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2588,7 +2585,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2622,7 +2619,7 @@ fi fi if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init in -lpthreads""... $ac_c" 1>&6 -echo "configure:2626: checking for pthread_attr_init in -lpthreads" >&5 +echo "configure:2623: checking for pthread_attr_init in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2630,7 +2627,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2664,7 +2661,7 @@ fi fi if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6 -echo "configure:2668: checking for pthread_attr_init in -lc_r" >&5 +echo "configure:2665: checking for pthread_attr_init in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2672,7 +2669,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2706,12 +2703,12 @@ fi fi if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6 -echo "configure:2710: checking for pthread_attr_init" >&5 +echo "configure:2707: checking for pthread_attr_init" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_attr_init=yes" else @@ -2757,7 +2754,7 @@ fi fi echo $ac_n "checking for cthread_fork in -lthreads""... $ac_c" 1>&6 -echo "configure:2761: checking for cthread_fork in -lthreads" >&5 +echo "configure:2758: checking for cthread_fork in -lthreads" >&5 ac_lib_var=`echo threads'_'cthread_fork | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2765,7 +2762,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2798,7 +2795,7 @@ fi cat > conftest.$ac_ext < EOF @@ -2814,7 +2811,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -2834,17 +2831,17 @@ for ac_hdr in stddef.h getopt.h strings.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2838: checking for $ac_hdr" >&5 +echo "configure:2835: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2845: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2874,17 +2871,17 @@ for ac_hdr in sys/sockio.h fcntl.h sys/time.h sys/times.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2878: checking for $ac_hdr" >&5 +echo "configure:2875: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2914,17 +2911,17 @@ for ac_hdr in sys/soundcard.h machine/soundcard.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2918: checking for $ac_hdr" >&5 +echo "configure:2915: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2954,17 +2951,17 @@ for ac_hdr in dlfcn.h image.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2958: checking for $ac_hdr" >&5 +echo "configure:2955: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2994,17 +2991,17 @@ for ac_hdr in arpa/inet.h net/if.h netinet/in.h sys/socket.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2998: checking for $ac_hdr" >&5 +echo "configure:2995: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3034,17 +3031,17 @@ for ac_hdr in machine/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3038: checking for $ac_hdr" >&5 +echo "configure:3035: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3075,17 +3072,17 @@ for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3079: checking for $ac_hdr" >&5 +echo "configure:3076: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3113,20 +3110,20 @@ done echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6 -echo "configure:3117: checking for ntohl in sys/param.h" >&5 +echo "configure:3114: checking for ntohl in sys/param.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_ntohl_sys_param_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -Wall -Werror" cat > conftest.$ac_ext < int main() { void foo() { int meuh; ntohl(meuh); } ; return 0; } EOF -if { (eval echo configure:3130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_ntohl_sys_param_h=yes else @@ -3147,20 +3144,20 @@ EOF fi echo $ac_n "checking if \$CC accepts -finline-limit""... $ac_c" 1>&6 -echo "configure:3151: checking if \$CC accepts -finline-limit" >&5 +echo "configure:3148: checking if \$CC accepts -finline-limit" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline_limit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -finline-limit-30000" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline_limit=yes else @@ -3178,20 +3175,20 @@ if test x"$ac_cv_c_inline_limit" != x"no"; then fi echo $ac_n "checking if \$CC accepts -bundle -undefined error""... $ac_c" 1>&6 -echo "configure:3182: checking if \$CC accepts -bundle -undefined error" >&5 +echo "configure:3179: checking if \$CC accepts -bundle -undefined error" >&5 if eval "test \"`echo '$''{'ac_cv_ld_darwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -bundle -undefined error" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ld_darwin=yes else @@ -3209,20 +3206,20 @@ if test x"$ac_cv_ld_darwin" != x"no"; then fi echo $ac_n "checking if \$CC accepts -shared""... $ac_c" 1>&6 -echo "configure:3213: checking if \$CC accepts -shared" >&5 +echo "configure:3210: checking if \$CC accepts -shared" >&5 if eval "test \"`echo '$''{'ac_cv_ld_plugins'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -shared" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ld_plugins=yes else @@ -3241,7 +3238,7 @@ fi if test x"${SOFLAGS}" = x; then echo $ac_n "checking for soname setting""... $ac_c" 1>&6 -echo "configure:3245: checking for soname setting" >&5 +echo "configure:3242: checking for soname setting" >&5 if eval "test \"`echo '$''{'ac_cv_ld_soname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3250,14 +3247,14 @@ else try_SOFLAGS="-Wl,-soname -Wl," LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ld_soname="${try_SOFLAGS}" else @@ -3269,14 +3266,14 @@ else try_SOFLAGS="-Wl,-h -Wl," LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ld_soname="${try_SOFLAGS}" else @@ -3308,19 +3305,19 @@ CFLAGS="${save_CFLAGS}" LDFLAGS="${save_LDFLAGS}" echo $ac_n "checking for boolean_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3312: checking for boolean_t in sys/types.h" >&5 +echo "configure:3309: checking for boolean_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_sys_types_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { void quux() { boolean_t foo; } ; return 0; } EOF -if { (eval echo configure:3324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_sys_types_h=yes else @@ -3341,19 +3338,19 @@ EOF fi echo $ac_n "checking for boolean_t in pthread.h""... $ac_c" 1>&6 -echo "configure:3345: checking for boolean_t in pthread.h" >&5 +echo "configure:3342: checking for boolean_t in pthread.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_pthread_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { void quux() { boolean_t foo; } ; return 0; } EOF -if { (eval echo configure:3357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_pthread_h=yes else @@ -3374,19 +3371,19 @@ EOF fi echo $ac_n "checking for boolean_t in cthreads.h""... $ac_c" 1>&6 -echo "configure:3378: checking for boolean_t in cthreads.h" >&5 +echo "configure:3375: checking for boolean_t in cthreads.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_cthreads_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { void quux() { boolean_t foo; } ; return 0; } EOF -if { (eval echo configure:3390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_cthreads_h=yes else @@ -3407,18 +3404,18 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3411: checking for working const" >&5 +echo "configure:3408: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3482,12 +3479,12 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3486: checking for ANSI C header files" >&5 +echo "configure:3483: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3495,7 +3492,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3512,7 +3509,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3530,7 +3527,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3551,7 +3548,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3562,7 +3559,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3586,12 +3583,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3590: checking for size_t" >&5 +echo "configure:3587: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3619,12 +3616,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3623: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3620: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3633,7 +3630,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3655,21 +3652,21 @@ fi echo $ac_n "checking __attribute__ ((aligned ())) support""... $ac_c" 1>&6 -echo "configure:3659: checking __attribute__ ((aligned ())) support" >&5 +echo "configure:3656: checking __attribute__ ((aligned ())) support" >&5 if eval "test \"`echo '$''{'ac_cv_c_attribute_aligned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_attribute_aligned=0 for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try else @@ -3702,19 +3699,19 @@ SSE_MODULES="imdctsse downmixsse" ALTIVEC_MODULES="idctaltivec motionaltivec" echo $ac_n "checking if \$CC groks MMX inline assembly""... $ac_c" 1>&6 -echo "configure:3706: checking if \$CC groks MMX inline assembly" >&5 +echo "configure:3703: checking if \$CC groks MMX inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_mmx_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mmx_inline=yes else @@ -3732,19 +3729,19 @@ if test x"$ac_cv_mmx_inline" != x"no"; then fi echo $ac_n "checking if \$CC groks MMX EXT inline assembly""... $ac_c" 1>&6 -echo "configure:3736: checking if \$CC groks MMX EXT inline assembly" >&5 +echo "configure:3733: checking if \$CC groks MMX EXT inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_mmxext_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mmxext_inline=yes else @@ -3762,19 +3759,19 @@ if test x"$ac_cv_mmxext_inline" != x"no"; then fi echo $ac_n "checking if \$CC groks 3D Now! inline assembly""... $ac_c" 1>&6 -echo "configure:3766: checking if \$CC groks 3D Now! inline assembly" >&5 +echo "configure:3763: checking if \$CC groks 3D Now! inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_3dnow_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_3dnow_inline=yes else @@ -3792,19 +3789,19 @@ if test x"$ac_cv_3dnow_inline" != x"no"; then fi echo $ac_n "checking if \$CC groks SSE inline assembly""... $ac_c" 1>&6 -echo "configure:3796: checking if \$CC groks SSE inline assembly" >&5 +echo "configure:3793: checking if \$CC groks SSE inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_sse_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sse_inline=yes else @@ -3822,19 +3819,19 @@ if test x"$ac_cv_sse_inline" != x"no"; then fi echo $ac_n "checking if \$CC groks Altivec inline assembly""... $ac_c" 1>&6 -echo "configure:3826: checking if \$CC groks Altivec inline assembly" >&5 +echo "configure:3823: checking if \$CC groks Altivec inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_altivec_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_altivec_inline=yes else @@ -3844,14 +3841,14 @@ else save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Wa,-m7400" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3852: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_altivec_inline=yes; CFLAGS_ALTIVEC="-Wa,-m7400" else @@ -3873,7 +3870,7 @@ if test x"$ac_cv_altivec_inline" != x"no"; then fi echo $ac_n "checking if \$CC groks Altivec C extensions""... $ac_c" 1>&6 -echo "configure:3877: checking if \$CC groks Altivec C extensions" >&5 +echo "configure:3874: checking if \$CC groks Altivec C extensions" >&5 if eval "test \"`echo '$''{'ac_cv_c_altivec'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3881,14 +3878,14 @@ else CFLAGS="$CFLAGS -faltivec" # Darwin test cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_altivec=-faltivec else @@ -3899,14 +3896,14 @@ else # Linux/PPC test CFLAGS="$save_CFLAGS $CFLAGS_ALTIVEC -fvec" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_altivec="-fvec" else @@ -3933,21 +3930,21 @@ EOF fi echo $ac_n "checking if linker needs -framework vecLib""... $ac_c" 1>&6 -echo "configure:3937: checking if linker needs -framework vecLib" >&5 +echo "configure:3934: checking if linker needs -framework vecLib" >&5 if eval "test \"`echo '$''{'ac_cv_ld_altivec'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -framework vecLib" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ld_altivec=yes else @@ -3973,17 +3970,17 @@ for ac_hdr in winioctl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3977: checking for $ac_hdr" >&5 +echo "configure:3974: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4016,17 +4013,17 @@ for ac_hdr in sys/ioctl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4020: checking for $ac_hdr" >&5 +echo "configure:4017: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4052,17 +4049,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4056: checking for $ac_hdr" >&5 +echo "configure:4053: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4091,7 +4088,7 @@ done BSD_DVD_STRUCT=0 LINUX_DVD_STRUCT=0 cat > conftest.$ac_ext < EOF @@ -4109,7 +4106,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -4127,7 +4124,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -4146,7 +4143,7 @@ rm -f conftest* NEED_BSDI_LIBDVD=0 cat > conftest.$ac_ext < EOF @@ -4168,17 +4165,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4172: checking for $ac_hdr" >&5 +echo "configure:4169: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4218,17 +4215,17 @@ rm -f conftest* ac_safe=`echo "sys/scsi/scsi_types.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/scsi/scsi_types.h""... $ac_c" 1>&6 -echo "configure:4222: checking for sys/scsi/scsi_types.h" >&5 +echo "configure:4219: checking for sys/scsi/scsi_types.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4247,17 +4244,17 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ac_safe=`echo "sys/scsi/impl/uscsi.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/scsi/impl/uscsi.h""... $ac_c" 1>&6 -echo "configure:4251: checking for sys/scsi/impl/uscsi.h" >&5 +echo "configure:4248: checking for sys/scsi/impl/uscsi.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4409,7 +4406,7 @@ if test "${enable_pth+set}" = set; then enableval="$enable_pth" if test x$enableval = xyes; then echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6 -echo "configure:4413: checking for pth_init in -lpth" >&5 +echo "configure:4410: checking for pth_init in -lpth" >&5 ac_lib_var=`echo pth'_'pth_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4417,7 +4414,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpth $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4456,7 +4453,7 @@ else fi cat > conftest.$ac_ext < EOF @@ -4620,7 +4617,7 @@ if test "${enable_esd+set}" = set; then # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4624: checking for $ac_word" >&5 +echo "configure:4621: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4687,17 +4684,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4691: checking for $ac_hdr" >&5 +echo "configure:4688: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4701: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4742,17 +4739,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4746: checking for $ac_hdr" >&5 +echo "configure:4743: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4830,7 +4827,7 @@ fi # Extract the first word of "sdl12-config", so it can be a program name with args. set dummy sdl12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4834: checking for $ac_word" >&5 +echo "configure:4831: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4870,7 +4867,7 @@ fi # Extract the first word of "sdl11-config", so it can be a program name with args. set dummy sdl11-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4874: checking for $ac_word" >&5 +echo "configure:4871: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4911,7 +4908,7 @@ fi # Extract the first word of "sdl-config", so it can be a program name with args. set dummy sdl-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4915: checking for $ac_word" >&5 +echo "configure:4912: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4957,17 +4954,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4961: checking for $ac_hdr" >&5 +echo "configure:4958: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5030,17 +5027,17 @@ if test "${with_directx+set}" = set; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5034: checking for $ac_hdr" >&5 +echo "configure:5031: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5079,17 +5076,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5083: checking for $ac_hdr" >&5 +echo "configure:5080: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5186,7 +5183,7 @@ if test "${enable_gnome+set}" = set; then # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5190: checking for $ac_word" >&5 +echo "configure:5187: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5231,17 +5228,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5235: checking for $ac_hdr" >&5 +echo "configure:5232: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5291,7 +5288,7 @@ then # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5295: checking for $ac_word" >&5 +echo "configure:5292: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5336,17 +5333,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5340: checking for $ac_hdr" >&5 +echo "configure:5337: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5397,17 +5394,17 @@ if test x$enable_x11 != xno; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5401: checking for $ac_hdr" >&5 +echo "configure:5398: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5459,17 +5456,17 @@ if test x$enable_xvideo != xno; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5463: checking for $ac_hdr" >&5 +echo "configure:5460: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5509,17 +5506,17 @@ if test "${enable_alsa+set}" = set; then then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6 -echo "configure:5513: checking for sys/asoundlib.h" >&5 +echo "configure:5510: checking for sys/asoundlib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5536,7 +5533,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6 -echo "configure:5540: checking for main in -lasound" >&5 +echo "configure:5537: checking for main in -lasound" >&5 ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5544,14 +5541,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff --git a/configure.in b/configure.in index 8556cdcb82..7e03a24066 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_CANONICAL_SYSTEM HAVE_VLC=0 if test -r src/interface/main.c; then HAVE_VLC=1 - VLC_VERSION=0.2.83 + VLC_VERSION=0.2.90 AC_SUBST(VLC_VERSION) VLC_CODENAME=Ourumov AC_SUBST(VLC_CODENAME) diff --git a/debian/changelog b/debian/changelog index 8391ecc374..1a501c8e84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -vlc (0.2.83-3) unstable; urgency=low +vlc (0.2.90-1) unstable; urgency=low * Fixed syntax error in build dependencies (Closes: #109722). + * XVideo module now compiled as built-in, to avoid PIC and non-PIC + code collision (Closes: #111790). - -- Samuel Hocevar Sun, 9 Sep 2001 09:28:06 +0200 + -- Samuel Hocevar Wed, 10 Oct 2001 15:00:29 +0200 vlc (0.2.83-2) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 2fc89565d6..0365319e4b 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ build-stamp: case $(DEB_BUILD_ARCH) in \ i386) \ - ARCH_FLAGS="--enable-alsa --with-glide --disable-ppro" ;; \ + ARCH_FLAGS="--enable-alsa --with-glide" ;; \ alpha|ia64|m68k|powerpc) \ ARCH_FLAGS="--enable-alsa" ;; \ *) \ @@ -35,6 +35,11 @@ build-stamp: --infodir=$${prefix}/share/info \ $(shell echo $(CONFIG_FLAGS)) $(shell echo $(LIBDVDCSS_FLAGS)) + # Fix Makefile + sed -e 's/^\(PLUGINS.*\)xvideo/\1/' -e 's/^BUILTINS.*/& xvideo/' \ + < Makefile.opts > Makefile.opts.tmp + mv -f Makefile.opts.tmp Makefile.opts + $(MAKE) touch build-stamp diff --git a/plugins/gtk/gtk_open.c b/plugins/gtk/gtk_open.c index c5313adf02..9169f32a6f 100644 --- a/plugins/gtk/gtk_open.c +++ b/plugins/gtk/gtk_open.c @@ -2,7 +2,7 @@ * gtk_open.c : functions to handle file/disc/network open widgets. ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: gtk_open.c,v 1.6 2001/07/25 03:12:33 sam Exp $ + * $Id: gtk_open.c,v 1.7 2001/10/10 14:25:15 sam Exp $ * * Authors: Samuel Hocevar * Stéphane Borel @@ -336,10 +336,10 @@ void GtkNetworkOpenOk( GtkButton *button, gpointer user_data ) } /* Build source name and add it to playlist */ - sprintf( psz_source, "%s://%s:%i::%s", psz_protocol, - psz_server, - i_port, - psz_broadcast ); + sprintf( psz_source, "%s://%s:%i/%s", psz_protocol, + psz_server, + i_port, + psz_broadcast ); } else { diff --git a/src/input/input.c b/src/input/input.c index 30c914397b..1ae59cb1a7 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -4,7 +4,7 @@ * decoders. ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: input.c,v 1.141 2001/10/03 15:10:55 sam Exp $ + * $Id: input.c,v 1.142 2001/10/10 14:25:15 sam Exp $ * * Authors: Christophe Massiot * @@ -729,7 +729,7 @@ static void NetworkOpen( input_thread_t * p_input ) psz_port++; psz_broadcast = psz_port; - while( *psz_broadcast && *psz_broadcast != ':' ) + while( *psz_broadcast && *psz_broadcast != '/' ) { psz_broadcast++; } @@ -738,7 +738,7 @@ static void NetworkOpen( input_thread_t * p_input ) { *psz_broadcast = '\0'; psz_broadcast++; - while( *psz_broadcast && *psz_broadcast == ':' ) + while( *psz_broadcast && *psz_broadcast == '/' ) { psz_broadcast++; } @@ -844,8 +844,8 @@ static void NetworkOpen( input_thread_t * p_input ) if( i_opt < 0x80000 ) { - intf_WarnMsg( 1, "input warning: socket receive buffer size just %d instead of %d bytes.", - i_opt, 0x80000 ); + intf_WarnMsg( 1, "input warning: socket receive buffer size just 0x%x" + " instead of 0x%x bytes.", i_opt, 0x80000 ); } /* Build the local socket */ diff --git a/src/misc/netutils.c b/src/misc/netutils.c index 6398dfcf05..0e8d34441a 100644 --- a/src/misc/netutils.c +++ b/src/misc/netutils.c @@ -2,7 +2,7 @@ * netutils.c: various network functions ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: netutils.c,v 1.38 2001/10/03 02:20:39 tcastley Exp $ + * $Id: netutils.c,v 1.39 2001/10/10 14:25:15 sam Exp $ * * Authors: Vincent Seguin * Benoit Steiner @@ -58,7 +58,7 @@ #endif #if defined( WIN32 ) /* tools to get the MAC adress from */ -#include /* the interface under Windows */ +#include /* the interface under Windows */ #include #endif @@ -219,8 +219,9 @@ int network_ChannelCreate( void ) intf_ErrMsg( "error: channel changing is not yet supported under BeOS" ); return( 1 ); +/* FIXME : channel handling only work for linux */ #elif defined( SYS_LINUX ) || defined( WIN32 ) -/* FIXME : channels handling only work for linux */ + /* Allocate structure */ p_main->p_channel = malloc( sizeof( input_channel_t ) ); if( p_main->p_channel == NULL ) @@ -485,7 +486,7 @@ static int GetMacAddress( int i_socket, char *psz_mac ) { if ( GetAdapterInfo ( AdapterList.lana[ i ], psz_mac ) == 0 ) { - i_ret = 0; + i_ret = 0; } } @@ -544,7 +545,7 @@ static int GetAdapterInfo( int i_adapter, char *psz_string ) (int) ( Adapter.adapt.adapter_address[4] ), (int) ( Adapter.adapt.adapter_address[5] ) ); - intf_WarnMsg( 2, "network: found MAC address %s", psz_string ); + intf_WarnMsg( 2, "network: found MAC address %s", psz_string ); return 0; } diff --git a/vlc.spec b/vlc.spec index a7a8894217..fe1638c0e8 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,6 +1,6 @@ # This is borrowed and adapted from Mandrake's Cooker %define name vlc -%define vlc_ver 0.2.83 +%define vlc_ver 0.2.90 %define version %vlc_ver # libdvdcss @@ -103,7 +103,7 @@ install vlc-ncurses %build %configure --with-dvdcss=local-shared \ - --enable-gnome --enable-gtk \ + --enable-gnome --enable-gtk \ --enable-x11 --enable-qt --enable-ncurses \ --enable-esd --disable-alsa \ --enable-fb \ @@ -156,6 +156,9 @@ rm -fr %buildroot %changelog +* Wed Oct 10 2001 Christophe Massiot 0.2.90-1 +- version 0.2.90 + * Tue Oct 02 2001 Christophe Massiot - Imported Mandrake's vlc.spec into the CVS