* Made everything ready for a vlc-0.2.91 / libdvdcss-1.0.0 release.

  * Updated ChangeLog and ChangeLog.libdvdcss.
  * Increased vlcs response message length.
  * Removed the i_flags argument to dvdcss_open. Everything is done through
    environment variables now.

diff --git a/ChangeLog b/ChangeLog
index 2aab79af0a3ca6fc1d55c3e1a3cbf1d3598a8425..f00f48547a43391e9a8141614789049424358443 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,93 @@ HEAD
 
   * Nothing yet.
 
+0.2.91
+Mon, 12 Nov 2001 17:14:29 +0100
+
+  * Added FAQ.
+  * New --channelserver switch.
+  * Documentation updates.
+  * ipkg script for Familiar Linux 0.5 & bug fix in debian/rules.
+  * Disabled DirectX audio output for the time being.
+  * Added Oct's NSIS installer script. It will probably not work for you,
+    but I need it to build the Win32 auto installer.
+  * Automatic handling of the Channel Server's response in network mode.
+  * GetMACAddress takes the interface defined in the environment variable
+    vlc_iface instead of eth0.
+  * Fixed bug with MPEG audio in TS streams.
+  * Fixed compilation (and quite probably runtime) issues under IA64
+    due to mixed int/void* casts.
+  * Merged DVD netlist with input netlist to remove duplicated code.
+  * BSD/OS VCD patch, courtesy of Steven M. Schultz <sms@TO.GD-ES.COM>.
+  * Win32 network fix.
+  * imdctsse should now compile and work in plugin and under BeOS.
+  * Kludge to have less discontinuity after a zero scr in DVD.
+  * Fixed some win32 64-bit issues.
+  * Fixed some win32 compile issues.
+  * Don't use long long, use u64/s64 (int_types.h).
+  * Move function that translates language codes into country name in src/misc
+    so that every plugin can use it.
+  * Changed the name of a function in dvd_udf.c to fit with the forthcoming
+    libdvdread plugin.
+  * Corrected à long time bug (around 0.2.81 I think), that created a
+    corruption in ifo data. This was the reason why some DVDs that worked with
+    0.2.80 no longer worked with newer version of vlc. They should work again
+    now.
+  * New --enable-release config option.
+  * Removed deprecated code and structures.
+  * Maybe corrected aspect ratio issue in fullscreen xvideo.
+  * Fixed support for SPU and LPCM streams over network.
+  * Added a new drawer to the control window to support Title / Chapter
+    selection, Subtitle selection, Audiochannel/Language selection,
+    Angle selection.
+  * New --volume option (untested, like usual :).
+  * Reimported Intf_Controller, connected "File/Open/File" to
+    Intf_Controller::file:Open (OS X).
+  * The intf is no longer accessed indirectly from vout_Destroy.
+  * Made it possible to open a File after vlc was started (you can use vlc now
+    without starting it from the command line) under OS X.
+  * Cleaned up playlist handling in Intf_Vlc_Wrapper.
+  * Modified the pf_close kludge in input.c so that we don't segfault when
+    pf_init fails.
+  * Changed chapter selection buttons aspect to try and differentiate them
+    from title selection ones.
+  * Changes to the BeOS interface to remove unwanted volumes from the Disk
+    Menu.  Readonly filesystems like NTFS were being incorrectly added.
+  * Do not resample audio output if delta is short enough.
+  * Fixed a segfault on exit under Windows 2000.
+  * Enabled http button in gtk/gnome interface.
+  * Use memalign for aligned data (instead of a greek malloc).
+  * Some optimizations in imdct (all data are now aligned).
+  * SSE downmix now works for windows.
+  * SSE imdct is desactivated for windows (MINGW32 doesn't know how to aligned
+    data).
+  * Fixed '-' input.
+  * New interface for MacOS X, courtesy of Florian G. Pflug.
+  * BeOS interface changes to include menu for Title and chapter navigation.
+  * Improved more "BeOS" CD detection.
+  * VLC FAQ TBU.
+  * Synced dummy_dvdcss with Stef's changes to libdvdcss.
+  * configure now compiles the VCD plugin if linux/cdrom.h is present.
+  * Added VCD input plugin for Linux.
+  * Fixed ATTR_ALIGN configure test.
+  * Fixed compilation problems with OpenBSD.
+  * xvideo.so is now built in by default. Mixing PIC and non-PIC code was not
+    very nice.
+  * Fixed compilation errors in src/interface/main.c when the compiler did
+    not support SSE or 3DNow! inline assembly.
+  * Qt fix in vlc.spec courtesy of Christopher Johnson <cjohnson@mint.net>.  
+  * Fixed error reporting on an unknown argument parsing.
+  * Fixed a deadlock in the TS input.
+  * Resizing the video out window in BeOS now retains the scaling.  
+  * Tidied up the BeOS code to remove interface messages not required.  
+  * Fixed an error in the ts://server[:port][/broadcast] input parsing.
+  * Minor video parser optimization.
+  * SDL now displays an error message on 422 streams.
+  * Chroma 4:2:2 and 4:4:4 support in the decoder.
+  * Fixed bugs in the C YUV transform with 4:2:2 format.
+  * Fixed bugs in RPM spec files.
+  * Fixed a bug in configure where ix86 machines were improperly detected.
+
 0.2.90
 Wed, 10 Oct 2001 15:00:29 +0200
 

diff --git a/ChangeLog.libdvdcss b/ChangeLog.libdvdcss
index a7578a0c5c616d8e44ee963d430b19b0cab77b2a..09e81867579c26d14fe19ad14704b8b2f44d9cb3 100644 (file)
--- a/ChangeLog.libdvdcss
+++ b/ChangeLog.libdvdcss
@@ -4,6 +4,33 @@
 
 HEAD
 
+  * Nothing yet.
+
+1.0.0
+Mon, 12 Nov 2001 17:14:29 +0100
+
+  * Removed the i_flags argument to dvdcss_open. Everything is done through
+    environment variables now.
+  * Fixed a buffer overflow in CSSAuth().
+  * libdvdcss port to OpenBSD.
+  * Fixed NetBSD (and probably OpenBSD) libdvdcss compilation.
+  * Fixed undefined KEY_SIZE compile bug mentioned by Dave Thorup.
+  * Fixed CSS ioctl for Darwin/OSX - still might need tweaking of 'dataLength'
+    fields.
+  * Added ReadTitleKey ioctl for Darwin/OSX.
+  * When using title cracking method in libdvdcss, the key is only checked at
+    title start, not before each chapter.
+  * Use of an environment variable to choose libdvdcss method.
+  * New features for libdvdcss: we have three ways now to decode a title key.
+  * 1) Crack the title key (the method that was here before). The only change
+    here is that we search the key for the exact chapter we are seeking with
+    DVDSetArea (in case the key has changed within a title). It is maybe not a
+    good idea.
+  * 2) Crack the disc key, which allows us to decode instantly all title keys.
+    I've used an algorithm from Frank Stevenson ; it eats much memory (64MB),
+    and takes about 15 s at launch time.
+  * 3) Decode the disc key with player keys (libcss method). However, you need
+    licensed player keys at build time for this to work.
   * 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

diff --git a/Makefile b/Makefile
index 78df89177649be8eb17130a5bee2f781f922841d..9f6d43550fbbdc47966e616ef8dbb5ad1ccc96b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -300,15 +300,19 @@ snapshot-common:
                -type d -name CVS -o -name '.*' -o -name '*.[o]' | \
                        while read i ; do rm -Rf $$i ; done
        # Copy misc files
-       cp vlc.spec AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \
+       cp FAQ AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \
                Makefile Makefile.opts.in Makefile.dep Makefile.modules \
-               configure configure.in install-sh config.sub config.guess \
+               configure configure.in install-sh install-win32 vlc.spec \
+               config.sub config.guess \
                        tmp/vlc/
        # Copy Debian control files
        for file in debian/*dirs debian/*docs debian/*menu debian/*desktop \
                debian/*copyright ; do cp $$file tmp/vlc/debian ; done
        for file in control changelog rules ; do \
                cp debian/$$file tmp/vlc/debian/ ; done
+       # Copy ipkg control files
+       for file in control rules ; do \
+               cp ipkg/$$file tmp/vlc/ipkg/ ; done
        # Copy fonts and icons
        for file in share/*png share/*xpm share/*psf ; do \
                cp $$file tmp/vlc/share ; done
@@ -365,7 +369,7 @@ package-win32:
                README README.libdvdcss FAQ TODO tmp/
        for file in gtk-1.3.dll gdk-1.3.dll glib-1.3.dll gmodule-1.3.dll \
                gnu-intl.dll SDL.dll README-SDL.txt ; \
-                       do cp ../vlc-win32/$$file tmp/ ; done
+                       do cp ../win32-libs/$$file tmp/ ; done
        mkdir tmp/share
        for file in default8x16.psf default8x9.psf ; \
                do cp share/$$file tmp/share/ ; done
@@ -381,6 +385,7 @@ libdvdcss-snapshot: snapshot-common
        rm -Rf tmp/vlc/src tmp/vlc/share tmp/vlc/plugins tmp/vlc/doc
        rm -Rf tmp/vlc/extras/GNUgetopt tmp/vlc/extras/MacOSX
        rm -Rf tmp/vlc/debian
+       rm -Rf tmp/vlc/ipkg
        # Remove useless headers
        rm -f tmp/vlc/include/*
        for file in defs.h.in config.h.in common.h int_types.h ; \

diff --git a/configure b/configure
index 76a89a936caca3948af97aacbfc32d012d2d0d20..403e7aa669c8ec78590b1ff5f55a8b3e6223bc6a 100755 (executable)
--- a/configure
+++ b/configure
@@ -712,7 +712,7 @@ test "$host_alias" != "$target_alias" &&
 HAVE_VLC=0
 if test -r src/interface/main.c; then
   HAVE_VLC=1
-  VLC_VERSION=0.2.90
+  VLC_VERSION=0.2.91
   
   VLC_CODENAME=Ourumov
   
@@ -721,7 +721,7 @@ fi
 HAVE_LIBDVDCSS=0
 if test -r extras/libdvdcss/libdvdcss.c; then
   HAVE_LIBDVDCSS=1
-  LIBDVDCSS_VERSION=0.0.3
+  LIBDVDCSS_VERSION=1.0.0
   
   if test -r extras/libdvdcss/csskeys.h; then
     cat >> confdefs.h <<\EOF
@@ -2327,15 +2327,12 @@ else
 #include <sys/types.h>
 #include <fcntl.h>
 #include <sys/mman.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 
 /* This mess was copied from the GNU getpagesize.h.  */
 #ifndef HAVE_GETPAGESIZE
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
 
 /* Assume that all systems that can run configure have sys/param.h.  */
 # ifndef HAVE_SYS_PARAM_H
@@ -2390,7 +2387,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)
@@ -2411,7 +2408,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);
@@ -2429,7 +2426,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)
@@ -2443,7 +2440,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:2447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2444: \"$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
@@ -2466,12 +2463,12 @@ EOF
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2470: checking return type of signal handlers" >&5
+echo "configure:2467: 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 <<EOF
-#line 2475 "configure"
+#line 2472 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2488,7 +2485,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -2507,7 +2504,7 @@ EOF
 
 
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:2511: checking for dlopen in -ldl" >&5
+echo "configure:2508: 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
@@ -2515,7 +2512,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2519 "configure"
+#line 2516 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2526,7 +2523,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:2530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2527: \"$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
@@ -2547,7 +2544,7 @@ else
 fi
 
 echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6
-echo "configure:2551: checking for pow in -lm" >&5
+echo "configure:2548: 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
@@ -2555,7 +2552,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2559 "configure"
+#line 2556 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2566,7 +2563,7 @@ int main() {
 pow()
 ; return 0; }
 EOF
-if { (eval echo configure:2570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2567: \"$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
@@ -2590,7 +2587,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:2594: checking for pthread_attr_init in -lpthread" >&5
+echo "configure:2591: 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
@@ -2598,7 +2595,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2602 "configure"
+#line 2599 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2609,7 +2606,7 @@ int main() {
 pthread_attr_init()
 ; return 0; }
 EOF
-if { (eval echo configure:2613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2610: \"$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
@@ -2632,7 +2629,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:2636: checking for pthread_attr_init in -lpthreads" >&5
+echo "configure:2633: 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
@@ -2640,7 +2637,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthreads  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2644 "configure"
+#line 2641 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2651,7 +2648,7 @@ int main() {
 pthread_attr_init()
 ; return 0; }
 EOF
-if { (eval echo configure:2655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2652: \"$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
@@ -2674,7 +2671,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:2678: checking for pthread_attr_init in -lc_r" >&5
+echo "configure:2675: 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
@@ -2682,7 +2679,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2686 "configure"
+#line 2683 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2693,7 +2690,7 @@ int main() {
 pthread_attr_init()
 ; return 0; }
 EOF
-if { (eval echo configure:2697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2694: \"$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
@@ -2716,12 +2713,12 @@ fi
 fi
 if test "x${THREAD_LIB}" = xerror; then
   echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6
-echo "configure:2720: checking for pthread_attr_init" >&5
+echo "configure:2717: 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 <<EOF
-#line 2725 "configure"
+#line 2722 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pthread_attr_init(); below.  */
@@ -2744,7 +2741,7 @@ pthread_attr_init();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2745: \"$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
@@ -2767,7 +2764,7 @@ fi
 fi
 
 echo $ac_n "checking for cthread_fork in -lthreads""... $ac_c" 1>&6
-echo "configure:2771: checking for cthread_fork in -lthreads" >&5
+echo "configure:2768: 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
@@ -2775,7 +2772,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lthreads  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2779 "configure"
+#line 2776 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2786,7 +2783,7 @@ int main() {
 cthread_fork()
 ; return 0; }
 EOF
-if { (eval echo configure:2790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2787: \"$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
@@ -2808,7 +2805,7 @@ fi
 
 
 cat > conftest.$ac_ext <<EOF
-#line 2812 "configure"
+#line 2809 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 EOF
@@ -2824,7 +2821,7 @@ fi
 rm -f conftest*
 
 cat > conftest.$ac_ext <<EOF
-#line 2828 "configure"
+#line 2825 "configure"
 #include "confdefs.h"
 #include <strings.h>
 EOF
@@ -2844,17 +2841,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:2848: checking for $ac_hdr" >&5
+echo "configure:2845: 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
-#line 2853 "configure"
+#line 2850 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2855: \"$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*
@@ -2884,17 +2881,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:2888: checking for $ac_hdr" >&5
+echo "configure:2885: 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
-#line 2893 "configure"
+#line 2890 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2895: \"$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*
@@ -2924,17 +2921,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:2928: checking for $ac_hdr" >&5
+echo "configure:2925: 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
-#line 2933 "configure"
+#line 2930 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2935: \"$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*
@@ -2964,17 +2961,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:2968: checking for $ac_hdr" >&5
+echo "configure:2965: 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
-#line 2973 "configure"
+#line 2970 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2975: \"$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*
@@ -3004,17 +3001,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:3008: checking for $ac_hdr" >&5
+echo "configure:3005: 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
-#line 3013 "configure"
+#line 3010 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3015: \"$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*
@@ -3044,17 +3041,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:3048: checking for $ac_hdr" >&5
+echo "configure:3045: 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
-#line 3053 "configure"
+#line 3050 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3055: \"$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*
@@ -3085,17 +3082,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:3089: checking for $ac_hdr" >&5
+echo "configure:3086: 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
-#line 3094 "configure"
+#line 3091 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3096: \"$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*
@@ -3123,20 +3120,20 @@ done
 
 
 echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6
-echo "configure:3127: checking for ntohl in sys/param.h" >&5
+echo "configure:3124: 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 <<EOF
-#line 3133 "configure"
+#line 3130 "configure"
 #include "confdefs.h"
 #include <sys/param.h>
 int main() {
 void foo() { int meuh; ntohl(meuh); }
 ; return 0; }
 EOF
-if { (eval echo configure:3140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_ntohl_sys_param_h=yes
 else
@@ -3157,20 +3154,20 @@ EOF
 fi
 
 echo $ac_n "checking if \$CC accepts -finline-limit""... $ac_c" 1>&6
-echo "configure:3161: checking if \$CC accepts -finline-limit" >&5
+echo "configure:3158: 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 <<EOF
-#line 3167 "configure"
+#line 3164 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline_limit=yes
 else
@@ -3188,20 +3185,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:3192: checking if \$CC accepts -bundle -undefined error" >&5
+echo "configure:3189: 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 <<EOF
-#line 3198 "configure"
+#line 3195 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_ld_darwin=yes
 else
@@ -3219,20 +3216,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:3223: checking if \$CC accepts -shared" >&5
+echo "configure:3220: 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 <<EOF
-#line 3229 "configure"
+#line 3226 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_ld_plugins=yes
 else
@@ -3251,7 +3248,7 @@ fi
         
 if test x"${SOFLAGS}" = x; then
     echo $ac_n "checking for soname setting""... $ac_c" 1>&6
-echo "configure:3255: checking for soname setting" >&5
+echo "configure:3252: 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
@@ -3260,14 +3257,14 @@ else
         try_SOFLAGS="-Wl,-soname -Wl,"
         LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
         cat > conftest.$ac_ext <<EOF
-#line 3264 "configure"
+#line 3261 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3268: \"$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
@@ -3279,14 +3276,14 @@ else
             try_SOFLAGS="-Wl,-h -Wl,"
             LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
             cat > conftest.$ac_ext <<EOF
-#line 3283 "configure"
+#line 3280 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3287: \"$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
@@ -3315,7 +3312,7 @@ have problems using libdvdcss.
 fi
 
 echo $ac_n "checking __attribute__ ((aligned ())) support""... $ac_c" 1>&6
-echo "configure:3319: checking __attribute__ ((aligned ())) support" >&5
+echo "configure:3316: 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
@@ -3323,14 +3320,14 @@ else
        CFLAGS="${save_CFLAGS} -Werror"
     for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do
         cat > conftest.$ac_ext <<EOF
-#line 3327 "configure"
+#line 3324 "configure"
 #include "confdefs.h"
 
 int main() {
 static char c __attribute__ ((aligned($ac_cv_c_attr_align_try))) = 0; return c;
 ; return 0; }
 EOF
-if { (eval echo configure:3334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3331: \"$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
@@ -3353,19 +3350,19 @@ CFLAGS="${save_CFLAGS}"
 LDFLAGS="${save_LDFLAGS}"
 
 echo $ac_n "checking for boolean_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3357: checking for boolean_t in sys/types.h" >&5
+echo "configure:3354: 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 <<EOF
-#line 3362 "configure"
+#line 3359 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 void quux() { boolean_t foo; }
 ; return 0; }
 EOF
-if { (eval echo configure:3369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_boolean_t_sys_types_h=yes
 else
@@ -3386,19 +3383,19 @@ EOF
 fi
 
 echo $ac_n "checking for boolean_t in pthread.h""... $ac_c" 1>&6
-echo "configure:3390: checking for boolean_t in pthread.h" >&5
+echo "configure:3387: 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 <<EOF
-#line 3395 "configure"
+#line 3392 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 void quux() { boolean_t foo; }
 ; return 0; }
 EOF
-if { (eval echo configure:3402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_boolean_t_pthread_h=yes
 else
@@ -3419,19 +3416,19 @@ EOF
 fi
 
 echo $ac_n "checking for boolean_t in cthreads.h""... $ac_c" 1>&6
-echo "configure:3423: checking for boolean_t in cthreads.h" >&5
+echo "configure:3420: 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 <<EOF
-#line 3428 "configure"
+#line 3425 "configure"
 #include "confdefs.h"
 #include <cthreads.h>
 int main() {
 void quux() { boolean_t foo; }
 ; return 0; }
 EOF
-if { (eval echo configure:3435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_boolean_t_cthreads_h=yes
 else
@@ -3452,18 +3449,18 @@ EOF
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3456: checking for working const" >&5
+echo "configure:3453: 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 <<EOF
-#line 3461 "configure"
+#line 3458 "configure"
 #include "confdefs.h"
 
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x = {0,0};
+typedef int charset[2]; const charset x;
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
@@ -3506,7 +3503,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:3510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3527,12 +3524,12 @@ EOF
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3531: checking for ANSI C header files" >&5
+echo "configure:3528: 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 <<EOF
-#line 3536 "configure"
+#line 3533 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3540,7 +3537,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3541: \"$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*
@@ -3557,7 +3554,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
-#line 3561 "configure"
+#line 3558 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3575,7 +3572,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
-#line 3579 "configure"
+#line 3576 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3596,7 +3593,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3600 "configure"
+#line 3597 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3607,7 +3604,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:3611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3631,12 +3628,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3635: checking for size_t" >&5
+echo "configure:3632: 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 <<EOF
-#line 3640 "configure"
+#line 3637 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3664,12 +3661,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3668: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3665: 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 <<EOF
-#line 3673 "configure"
+#line 3670 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3678,7 +3675,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3712,19 +3709,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:3716: checking if \$CC groks MMX inline assembly" >&5
+echo "configure:3713: 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 <<EOF
-#line 3721 "configure"
+#line 3718 "configure"
 #include "confdefs.h"
 
 int main() {
 void quux(){void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));}
 ; return 0; }
 EOF
-if { (eval echo configure:3728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mmx_inline=yes
 else
@@ -3742,19 +3739,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:3746: checking if \$CC groks MMX EXT inline assembly" >&5
+echo "configure:3743: 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 <<EOF
-#line 3751 "configure"
+#line 3748 "configure"
 #include "confdefs.h"
 
 int main() {
 void quux(){void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));}
 ; return 0; }
 EOF
-if { (eval echo configure:3758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mmxext_inline=yes
 else
@@ -3772,19 +3769,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:3776: checking if \$CC groks 3D Now! inline assembly" >&5
+echo "configure:3773: 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 <<EOF
-#line 3781 "configure"
+#line 3778 "configure"
 #include "confdefs.h"
 
 int main() {
 void quux(){void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));}
 ; return 0; }
 EOF
-if { (eval echo configure:3788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_3dnow_inline=yes
 else
@@ -3806,19 +3803,19 @@ EOF
 fi
 
 echo $ac_n "checking if \$CC groks SSE inline assembly""... $ac_c" 1>&6
-echo "configure:3810: checking if \$CC groks SSE inline assembly" >&5
+echo "configure:3807: 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 <<EOF
-#line 3815 "configure"
+#line 3812 "configure"
 #include "confdefs.h"
 
 int main() {
 void quux(){void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));}
 ; return 0; }
 EOF
-if { (eval echo configure:3822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sse_inline=yes
 else
@@ -3840,19 +3837,19 @@ EOF
 fi
 
 echo $ac_n "checking if \$CC groks Altivec inline assembly""... $ac_c" 1>&6
-echo "configure:3844: checking if \$CC groks Altivec inline assembly" >&5
+echo "configure:3841: 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 <<EOF
-#line 3849 "configure"
+#line 3846 "configure"
 #include "confdefs.h"
 
 int main() {
 void quux(){asm volatile("vperm 0,1,2,3");}
 ; return 0; }
 EOF
-if { (eval echo configure:3856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_altivec_inline=yes
 else
@@ -3862,14 +3859,14 @@ else
   save_CFLAGS=$CFLAGS
           CFLAGS="$CFLAGS -Wa,-m7400"
           cat > conftest.$ac_ext <<EOF
-#line 3866 "configure"
+#line 3863 "configure"
 #include "confdefs.h"
 
 int main() {
 void quux(){asm volatile("vperm 0,1,2,3");}
 ; return 0; }
 EOF
-if { (eval echo configure:3873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_altivec_inline=yes; CFLAGS_ALTIVEC="-Wa,-m7400"
 else
@@ -3895,7 +3892,7 @@ EOF
 fi
 
 echo $ac_n "checking if \$CC groks Altivec C extensions""... $ac_c" 1>&6
-echo "configure:3899: checking if \$CC groks Altivec C extensions" >&5
+echo "configure:3896: 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
@@ -3903,14 +3900,14 @@ else
      CFLAGS="$CFLAGS -faltivec"
      # Darwin test
      cat > conftest.$ac_ext <<EOF
-#line 3907 "configure"
+#line 3904 "configure"
 #include "confdefs.h"
 
 int main() {
 void quux(){vec_mtvscr((vector unsigned int)(0));}
 ; return 0; }
 EOF
-if { (eval echo configure:3914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_altivec=-faltivec
 else
@@ -3921,14 +3918,14 @@ else
         # Linux/PPC test
         CFLAGS="$save_CFLAGS $CFLAGS_ALTIVEC -fvec"
         cat > conftest.$ac_ext <<EOF
-#line 3925 "configure"
+#line 3922 "configure"
 #include "confdefs.h"
 
 int main() {
 void quux(){vec_mtvscr((vector unsigned int)(0));}
 ; return 0; }
 EOF
-if { (eval echo configure:3932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_altivec="-fvec"
 else
@@ -3955,21 +3952,21 @@ EOF
 fi
 
 echo $ac_n "checking if linker needs -framework vecLib""... $ac_c" 1>&6
-echo "configure:3959: checking if linker needs -framework vecLib" >&5
+echo "configure:3956: 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 <<EOF
-#line 3966 "configure"
+#line 3963 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_ld_altivec=yes
 else
@@ -3995,17 +3992,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:3999: checking for $ac_hdr" >&5
+echo "configure:3996: 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
-#line 4004 "configure"
+#line 4001 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4006: \"$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*
@@ -4038,17 +4035,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:4042: checking for $ac_hdr" >&5
+echo "configure:4039: 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
-#line 4047 "configure"
+#line 4044 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4049: \"$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*
@@ -4074,17 +4071,17 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4078: checking for $ac_hdr" >&5
+echo "configure:4075: 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
-#line 4083 "configure"
+#line 4080 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4085: \"$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*
@@ -4114,7 +4111,7 @@ done
   LINUX_DVD_STRUCT=0
   OPENBSD_DVD_STRUCT=0
         cat > conftest.$ac_ext <<EOF
-#line 4118 "configure"
+#line 4115 "configure"
 #include "confdefs.h"
 #include <sys/cdio.h>
 EOF
@@ -4127,7 +4124,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 EOF
 
     cat > conftest.$ac_ext <<EOF
-#line 4131 "configure"
+#line 4128 "configure"
 #include "confdefs.h"
 #include <sys/cdio.h>
 EOF
@@ -4147,7 +4144,7 @@ fi
 rm -f conftest*
 
         cat > conftest.$ac_ext <<EOF
-#line 4151 "configure"
+#line 4148 "configure"
 #include "confdefs.h"
 #include <sys/dvdio.h>
 EOF
@@ -4160,7 +4157,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 EOF
 
     cat > conftest.$ac_ext <<EOF
-#line 4164 "configure"
+#line 4161 "configure"
 #include "confdefs.h"
 #include <sys/dvdio.h>
 EOF
@@ -4180,7 +4177,7 @@ fi
 rm -f conftest*
 
         cat > conftest.$ac_ext <<EOF
-#line 4184 "configure"
+#line 4181 "configure"
 #include "confdefs.h"
 #include <linux/cdrom.h>
 EOF
@@ -4199,7 +4196,7 @@ rm -f conftest*
 
         NEED_BSDI_LIBDVD=0
   cat > conftest.$ac_ext <<EOF
-#line 4203 "configure"
+#line 4200 "configure"
 #include "confdefs.h"
 #include <dvd.h>
 EOF
@@ -4221,17 +4218,17 @@ else
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4225: checking for $ac_hdr" >&5
+echo "configure:4222: 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
-#line 4230 "configure"
+#line 4227 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4232: \"$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*
@@ -4271,17 +4268,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:4275: checking for sys/scsi/scsi_types.h" >&5
+echo "configure:4272: 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
-#line 4280 "configure"
+#line 4277 "configure"
 #include "confdefs.h"
 #include <sys/scsi/scsi_types.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4282: \"$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*
@@ -4300,17 +4297,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:4304: checking for sys/scsi/impl/uscsi.h" >&5
+echo "configure:4301: 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
-#line 4309 "configure"
+#line 4306 "configure"
 #include "confdefs.h"
 #include <sys/scsi/impl/uscsi.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4311: \"$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*
@@ -4367,7 +4364,6 @@ fi
 done
 
 
-
 case ${target_os} in
   bsdi*)
     SYS=bsdi
@@ -4478,7 +4474,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:4482: checking for pth_init in -lpth" >&5
+echo "configure:4478: 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
@@ -4486,7 +4482,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpth  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4490 "configure"
+#line 4486 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4497,7 +4493,7 @@ int main() {
 pth_init()
 ; return 0; }
 EOF
-if { (eval echo configure:4501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4497: \"$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
@@ -4525,7 +4521,7 @@ else
 fi
 
     cat > conftest.$ac_ext <<EOF
-#line 4529 "configure"
+#line 4525 "configure"
 #include "confdefs.h"
 #include <pth.h>
 EOF
@@ -4632,7 +4628,7 @@ fi
 if test x$enable_vcd != xno
 then
   cat > conftest.$ac_ext <<EOF
-#line 4636 "configure"
+#line 4632 "configure"
 #include "confdefs.h"
 #include <linux/cdrom.h>
 EOF
@@ -4719,7 +4715,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:4723: checking for $ac_word" >&5
+echo "configure:4719: 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
@@ -4785,17 +4781,17 @@ else
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4789: checking for $ac_hdr" >&5
+echo "configure:4785: 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
-#line 4794 "configure"
+#line 4790 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4795: \"$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*
@@ -4839,17 +4835,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4843: checking for $ac_hdr" >&5
+echo "configure:4839: 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
-#line 4848 "configure"
+#line 4844 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4849: \"$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*
@@ -4927,7 +4923,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:4931: checking for $ac_word" >&5
+echo "configure:4927: 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
@@ -4967,7 +4963,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:4971: checking for $ac_word" >&5
+echo "configure:4967: 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
@@ -5008,7 +5004,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:5012: checking for $ac_word" >&5
+echo "configure:5008: 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
@@ -5054,17 +5050,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5058: checking for $ac_hdr" >&5
+echo "configure:5054: 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
-#line 5063 "configure"
+#line 5059 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5064: \"$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*
@@ -5127,17 +5123,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:5131: checking for $ac_hdr" >&5
+echo "configure:5127: 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
-#line 5136 "configure"
+#line 5132 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5137: \"$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*
@@ -5176,17 +5172,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5180: checking for $ac_hdr" >&5
+echo "configure:5176: 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
-#line 5185 "configure"
+#line 5181 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5186: \"$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*
@@ -5283,7 +5279,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:5287: checking for $ac_word" >&5
+echo "configure:5283: 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
@@ -5328,17 +5324,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5332: checking for $ac_hdr" >&5
+echo "configure:5328: 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
-#line 5337 "configure"
+#line 5333 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5338: \"$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*
@@ -5388,7 +5384,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:5392: checking for $ac_word" >&5
+echo "configure:5388: 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
@@ -5433,17 +5429,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5437: checking for $ac_hdr" >&5
+echo "configure:5433: 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
-#line 5442 "configure"
+#line 5438 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5443: \"$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*
@@ -5494,17 +5490,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:5498: checking for $ac_hdr" >&5
+echo "configure:5494: 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
-#line 5503 "configure"
+#line 5499 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5504: \"$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*
@@ -5556,17 +5552,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:5560: checking for $ac_hdr" >&5
+echo "configure:5556: 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
-#line 5565 "configure"
+#line 5561 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5570: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5566: \"$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*
@@ -5606,17 +5602,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:5610: checking for sys/asoundlib.h" >&5
+echo "configure:5606: 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
-#line 5615 "configure"
+#line 5611 "configure"
 #include "confdefs.h"
 #include <sys/asoundlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5616: \"$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*
@@ -5633,7 +5629,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:5637: checking for main in -lasound" >&5
+echo "configure:5633: 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
@@ -5641,14 +5637,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lasound  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5645 "configure"
+#line 5641 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5648: \"$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 6de9f328c8d7eb471a2e1af61da1ac9f6c9ca432..172b75bd6ec925c69f8cb30274fe9ce5d74f790c 100644 (file)
--- 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.90
+  VLC_VERSION=0.2.91
   AC_SUBST(VLC_VERSION)
   VLC_CODENAME=Ourumov
   AC_SUBST(VLC_CODENAME)
@@ -16,7 +16,7 @@ fi
 HAVE_LIBDVDCSS=0
 if test -r extras/libdvdcss/libdvdcss.c; then
   HAVE_LIBDVDCSS=1
-  LIBDVDCSS_VERSION=0.0.3
+  LIBDVDCSS_VERSION=1.0.0
   AC_SUBST(LIBDVDCSS_VERSION)
   if test -r extras/libdvdcss/csskeys.h; then
     AC_DEFINE(HAVE_CSSKEYS,1,css decryption with player keys)
@@ -479,7 +479,6 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
   fi
 ])
 
-
 dnl
 dnl  Check the operating system
 dnl

diff --git a/debian/changelog b/debian/changelog
index b03d667ac3c059813dce982f27941a9482eaeda0..72d70e873a2b3ffec54504861a28e9f8cc0a85c0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+vlc (0.2.91-1) unstable; urgency=low
+
+  * New upstream release.
+  * vlc will dlopen() an installed libdvdcss if available, to play
+    encrypted DVDs (Closes: #89856).
+  * vlc is now in sync with the official libdvdcss (Closes: #118194).
+
+ -- Samuel Hocevar <sam@zoy.org>  Mon, 12 Nov 2001 17:14:29 +0100
+
 vlc (0.2.90-2) unstable; urgency=low
 
   * Various upstream bugfixes.

diff --git a/debian/control b/debian/control
index 2af7e944c3e6c751816ed61005997afa4c28277c..1372f8009a303365141ba4ae28bb08ef1657cd58 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -15,21 +15,21 @@ Description: a free MPEG and DVD player
  This is vlc, the VideoLAN Client. It plays MPEG and MPEG2 files,
  DVDs, or MPEG streams from a network source.
 
-Package: libdvdcss0.0.3
+Package: libdvdcss1
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libdvdcss0.0.2
+Conflicts: libdvdcss0.0.1, libdvdcss0.0.2, libdvdcss0.0.3
 Description: a portable abstraction library for DVD decryption
  libdvdcss is a portable abstraction library for DVD decryption, it
  provides a simple API to access a DVD device as a block device.
  .
  This package contains the libdvdcss0 runtime library.
 
-Package: libdvdcss0.0.3-dev
+Package: libdvdcss1-dev
 Architecture: any
-Depends: libdvdcss0.0.3 (= ${Source-Version}), libc6-dev
-Conflicts: libdvdcss0.0.2-dev
-Description: development files for libdvdcss0
+Depends: libdvdcss1 (= ${Source-Version}), libc6-dev
+Conflicts: libdvdcss0.0.1-dev, libdvdcss0.0.2-dev, libdvdcss0.0.3-dev
+Description: development files for libdvdcss1
  libdvdcss is a portable abstraction library for DVD decryption, it
  provides a simple API to access a DVD device as a block device.
  .

diff --git a/debian/libdvdcss0.0.3-dev.dirs b/debian/libdvdcss1-dev.dirs
similarity index 100%
rename from debian/libdvdcss0.0.3-dev.dirs
rename to debian/libdvdcss1-dev.dirs

diff --git a/debian/libdvdcss0.0.3.copyright b/debian/libdvdcss1.copyright
similarity index 100%
rename from debian/libdvdcss0.0.3.copyright
rename to debian/libdvdcss1.copyright

diff --git a/debian/libdvdcss0.0.3.dirs b/debian/libdvdcss1.dirs
similarity index 100%
rename from debian/libdvdcss0.0.3.dirs
rename to debian/libdvdcss1.dirs

diff --git a/debian/libdvdcss0.0.3.docs b/debian/libdvdcss1.docs
similarity index 100%
rename from debian/libdvdcss0.0.3.docs
rename to debian/libdvdcss1.docs

diff --git a/debian/rules b/debian/rules
index cb28c4fbaf37b4445ccb63db645ea78b172604b7..da9721c3b2825902e3d014eead2e08fdd8c4b9c8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,8 @@ export PIXDIR="usr/share/pixmaps"
 export GNOMEDIR="usr/share/gnome/apps/Multimedia"
 
 # Library options
-version=$(shell grep '^ *LIBDVDCSS_VERSION=' configure.in | cut -f2 -d=)
-major=$(shell echo $(version) | cut -f1 -d.)
+version=$(shell grep '^ *LIBDVDCSS_VERSION=[0-9]' configure.in | head -1 | cut -f2 -d=)
+major=$(shell echo "$(version)" | cut -f1 -d.)
 
 build: build-stamp
 build-stamp:
@@ -93,13 +93,13 @@ install: build
 
 # libdvdcss start
        mv debian/vlc/usr/include/videolan/dvdcss.h \
-                               debian/libdvdcss$(version)-dev/usr/include/videolan
+                               debian/libdvdcss$(major)-dev/usr/include/videolan
        rmdir debian/vlc/usr/include/videolan
        rmdir debian/vlc/usr/include
-       mv debian/vlc/usr/lib/*.a debian/libdvdcss$(version)-dev/usr/lib
-       mv debian/vlc/usr/lib/*.so debian/libdvdcss$(version)-dev/usr/lib
-       mv debian/vlc/usr/lib/*.so.* debian/libdvdcss$(version)/usr/lib
-       ln -s libdvdcss$(version) debian/libdvdcss$(version)-dev/usr/share/doc/libdvdcss$(version)-dev
+       mv debian/vlc/usr/lib/*.a debian/libdvdcss$(major)-dev/usr/lib
+       mv debian/vlc/usr/lib/*.so debian/libdvdcss$(major)-dev/usr/lib
+       mv debian/vlc/usr/lib/*.so.* debian/libdvdcss$(major)/usr/lib
+       ln -s libdvdcss$(major) debian/libdvdcss$(major)-dev/usr/share/doc/libdvdcss$(major)-dev
 # libdvdcss stop
 
 # Build architecture-independent files here.

diff --git a/doc/vlc.1 b/doc/vlc.1
index 5864d94b50633a2d2db0b478274bff228a50dd78..90c5b9ea0ae473c084665e7da267768799e1316f 100644 (file)
--- a/doc/vlc.1
+++ b/doc/vlc.1
@@ -124,6 +124,13 @@ audio channel will also depend on the channel type.
 .B \-s, \-\-dvdsubtitle [ 0\-31 ]
 Select the subtitle channel, if there is one in the stream.
 .TP
+.B \-\-dvdcss-method <method>
+Select the CSS decryption scheme when using libdvdcss. Usually to choose
+from "disc", "title" or "key", but depends on your libdvdcss version.
+.TP
+.B \-\-dvdcss-verbose <level>
+Select the CSS decryption verbosity level, 0, 1 or 2.
+.TP
 .B \-\-input <method>
 Choose the input method, "dvd", "ps", "ts" for instance.
 .TP

diff --git a/extras/libdvdcss/css.c b/extras/libdvdcss/css.c
index 998242a0987a737345e5b77dd6ea5167ad8acc9f..e5d48b7b72b8fd1170502aa889f2c4e36fa134ff 100644 (file)
--- a/extras/libdvdcss/css.c
+++ b/extras/libdvdcss/css.c
@@ -2,7 +2,7 @@
  * css.c: Functions for DVD authentification and unscrambling
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: css.c,v 1.14 2001/11/11 04:51:10 jlj Exp $
+ * $Id: css.c,v 1.15 2001/11/12 20:16:32 sam Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *         Håkan Hjort <d95hjort@dtek.chalmers.se>
@@ -61,7 +61,7 @@ static int  CSSGetASF    ( dvdcss_handle dvdcss );
 static void CSSCryptKey  ( int i_key_type, int i_varient,
                            u8 const * p_challenge, u8* p_key );
 static void CSSDecryptKey( u8* p_crypted, u8* p_key, u8 );
-static int  CSSDiscCrack ( u8 * p_disc_key );
+static int  CSSDiscCrack ( dvdcss_handle dvdcss, u8 * p_disc_key );
 static int  CSSTitleCrack( int i_start, unsigned char * p_crypted,
                            unsigned char * p_decrypted,
                            dvd_key_t * p_sector_key, dvd_key_t * p_key );
@@ -79,7 +79,8 @@ int CSSTest( dvdcss_handle dvdcss )
     {
         /* Since it's the first ioctl we try to issue, we add a notice */
         _dvdcss_error( dvdcss, "css error: ioctl_ReadCopyright failed, "
-                       "make sure DVD ioctls were compiled in" );
+                       "make sure there is a DVD in the drive, and that "
+                       "DVD ioctls were compiled in this libdvdcss version" );
 
         return i_ret;
     }
@@ -303,7 +304,7 @@ int CSSGetDiscKey( dvdcss_handle dvdcss )
 
     switch( dvdcss->i_method )
     {
-        case DVDCSS_KEY:
+        case DVDCSS_METHOD_KEY:
 #ifdef HAVE_CSSKEYS
             /* Decrypt disc key with player keys from csskeys.h */
             _dvdcss_debug( dvdcss, "decrypting disc key with player keys" );
@@ -331,13 +332,13 @@ int CSSGetDiscKey( dvdcss_handle dvdcss )
             memcpy( dvdcss->css.disc.p_disc_key, disc_key, KEY_SIZE );
             break;
 #else
-            dvdcss->i_method = DVDCSS_DISC;            
+            dvdcss->i_method = DVDCSS_METHOD_DISC;            
 #endif
-        case DVDCSS_DISC:
+        case DVDCSS_METHOD_DISC:
             /* Crack Disc key to be able to use it */
             _dvdcss_debug( dvdcss, "cracking disc key with key hash" );
             _dvdcss_debug( dvdcss, "building 64MB table ... this will take some time" );
-            CSSDiscCrack( dvdcss->css.disc.p_disc_key );
+            CSSDiscCrack( dvdcss, dvdcss->css.disc.p_disc_key );
             break;
 
         default:
@@ -356,7 +357,8 @@ int CSSGetTitleKey( dvdcss_handle dvdcss, int i_pos )
     dvd_key_t   p_key;
     int         i,j;
 
-    if( ( dvdcss->i_method == DVDCSS_TITLE ) || ( dvdcss->b_ioctls == 0 ) )
+    if( ( dvdcss->i_method == DVDCSS_METHOD_TITLE )
+        || ( dvdcss->b_ioctls == 0 ) )
     {
         /*
          * Title key cracking method from Ethan Hawke,
@@ -488,7 +490,7 @@ int CSSGetTitleKey( dvdcss_handle dvdcss, int i_pos )
         memcpy( dvdcss->css.p_title_key, p_key, sizeof(dvd_key_t) );
 
         return 0;
-    } // ( dvdcss->i_method == DVDCSS_TITLE ) || ( dvdcss->b_ioctls == 0 )
+    } // (dvdcss->i_method == DVDCSS_METHOD_TITLE) || (dvdcss->b_ioctls == 0)
 }
 
 /*****************************************************************************
@@ -866,7 +868,7 @@ static int investigate( unsigned char* hash, unsigned char *ckey )
     return memcmp( key, pkey, 5 );
 }
 
-static int CSSDiscCrack( u8 * p_disc_key )
+static int CSSDiscCrack( dvdcss_handle dvdcss, u8 * p_disc_key )
 {
     unsigned char B[5] = { 0,0,0,0,0 }; /* Second Stage of mangle cipher */
     unsigned char C[5] = { 0,0,0,0,0 }; /* Output Stage of mangle cipher
@@ -913,7 +915,7 @@ static int CSSDiscCrack( u8 * p_disc_key )
 /*
             if( tmp4 == K1TABLEWIDTH )
             {
-                fprintf( stderr, "Table disaster %d", tmp4 );
+                _dvdcss_debug( dvdcss, "Table disaster %d", tmp4 );
             }
 */
             if( tmp4 < K1TABLEWIDTH )
@@ -934,7 +936,7 @@ static int CSSDiscCrack( u8 * p_disc_key )
 
     tmp3 = 0;
 
-    fprintf( stderr, "initializing the big table" );
+    _dvdcss_debug( dvdcss, "initializing the big table" );
 
     for( i = 0 ; i < 16777216 ; i++ )
     {
@@ -958,7 +960,7 @@ static int CSSDiscCrack( u8 * p_disc_key )
         BigTable[j] = i;
     }
 
-//    printf( "\n" );
+/*    fprintf( stderr, "\n" ); */
 
     /*
      * We are done initing, now reverse hash

diff --git a/extras/libdvdcss/libdvdcss.c b/extras/libdvdcss/libdvdcss.c
index 845d34b4bf11cfc6008998dc34a8f9c79e46bf60..fffb07ddf815f496c21a6c538482f8eefaf0ef8f 100644 (file)
--- a/extras/libdvdcss/libdvdcss.c
+++ b/extras/libdvdcss/libdvdcss.c
@@ -2,7 +2,7 @@
  * libdvdcss.c: DVD reading library.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: libdvdcss.c,v 1.18 2001/10/16 16:51:28 stef Exp $
+ * $Id: libdvdcss.c,v 1.19 2001/11/12 20:16:33 sam Exp $
  *
  * Authors: Stéphane Borel <stef@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -80,11 +80,12 @@ static int _win32_dvdcss_aread  ( int i_fd, void *p_data, int i_blocks );
 /*****************************************************************************
  * dvdcss_open: initialize library, open a DVD device, crack CSS key
  *****************************************************************************/
-extern dvdcss_handle dvdcss_open ( char *psz_target, int i_flags )
+extern dvdcss_handle dvdcss_open ( char *psz_target )
 {
     int i_ret;
 
-    char    psz_method[16] = "dvdcss_method";
+    char *psz_method = getenv( "DVDCSS_METHOD" );
+    char *psz_verbose = getenv( "DVDCSS_VERBOSE" );
 
     dvdcss_handle dvdcss;
 
@@ -92,37 +93,63 @@ extern dvdcss_handle dvdcss_open ( char *psz_target, int i_flags )
     dvdcss = malloc( sizeof( struct dvdcss_s ) );
     if( dvdcss == NULL )
     {
-        if( ! (i_flags & DVDCSS_INIT_QUIET) )
-        {
-            DVDCSS_ERROR( "could not initialize library" );
-        }
-
         return NULL;
     }
 
-    /* Initialize structure */
+    /* Initialize structure with default values */
     dvdcss->p_titles = NULL;
-    dvdcss->b_debug = i_flags & DVDCSS_INIT_DEBUG;
-    dvdcss->b_errors = !(i_flags & DVDCSS_INIT_QUIET);
     dvdcss->psz_error = "no error";
+    dvdcss->i_method = DVDCSS_METHOD_TITLE;
+    dvdcss->b_debug = 0;
+    dvdcss->b_errors = 1;
 
-
-
-    /* find method from DVDCSS_METHOD environment variable */
-    dvdcss->i_method = DVDCSS_TITLE;
-
-    if( getenv( psz_method ) )
+    /* Find method from DVDCSS_METHOD environment variable */
+    if( psz_method != NULL )
     {
-        if( !strncmp( getenv( psz_method ), "key", 3 ) )
+        if( !strncmp( psz_method, "key", 4 ) )
+        {
+            dvdcss->i_method = DVDCSS_METHOD_KEY;
+        }
+        else if( !strncmp( psz_method, "disc", 5 ) )
+        {
+            dvdcss->i_method = DVDCSS_METHOD_DISC;
+        }
+        else if( !strncmp( psz_method, "title", 5 ) )
         {
-            dvdcss->i_method = DVDCSS_KEY;
+            dvdcss->i_method = DVDCSS_METHOD_TITLE;
         }
-        else if( !strncmp( getenv( psz_method ), "disc", 4 ) )
+        else
         {
-            dvdcss->i_method = DVDCSS_DISC;
+            _dvdcss_error( dvdcss, "unknown decrypt method, please choose "
+                                   "from 'title', 'key' or 'disc'" );
+            free( dvdcss );
+            return NULL;
+        }
+    }
+
+    /* Find verbosity from DVDCSS_VERBOSE environment variable */
+    if( psz_verbose != NULL )
+    {
+        switch( atoi( psz_verbose ) )
+        {
+        case 0:
+            dvdcss->b_errors = 0;
+            break;
+        case 1:
+            break;
+        case 2:
+            dvdcss->b_debug = 1;
+            break;
+        default:
+            _dvdcss_error( dvdcss, "unknown verbose level, please choose "
+                                   "from '0', '1' or '2'" );
+            free( dvdcss );
+            return NULL;
+            break;
         }
     }
 
+    /* Open device */
     i_ret = _dvdcss_open( dvdcss, psz_target );
     if( i_ret < 0 )
     {
@@ -174,7 +201,8 @@ extern char * dvdcss_error ( dvdcss_handle dvdcss )
 extern int dvdcss_seek ( dvdcss_handle dvdcss, int i_blocks, int i_flags )
 {
     /* title cracking method is too slow to be used at each seek */
-    if( ( ( i_flags & DVDCSS_SEEK_MPEG ) && ( dvdcss->i_method != DVDCSS_TITLE ) )
+    if( ( ( i_flags & DVDCSS_SEEK_MPEG )
+             && ( dvdcss->i_method != DVDCSS_METHOD_TITLE ) )
        || ( i_flags & DVDCSS_SEEK_INI ) )
     {
         /* check the title key */

diff --git a/extras/libdvdcss/libdvdcss.h b/extras/libdvdcss/libdvdcss.h
index f66915794c766291ca70fbb4c844da19004ea1eb..fc464571d6f5d6d86b282d6e680f5fa30341cb25 100644 (file)
--- a/extras/libdvdcss/libdvdcss.h
+++ b/extras/libdvdcss/libdvdcss.h
@@ -2,7 +2,7 @@
  * private.h: private DVD reading library data
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: libdvdcss.h,v 1.8 2001/10/13 15:34:21 stef Exp $
+ * $Id: libdvdcss.h,v 1.9 2001/11/12 20:16:33 sam Exp $
  *
  * Authors: Stéphane Borel <stef@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -54,6 +54,13 @@ struct dvdcss_s
 #endif
 };
 
+/*****************************************************************************
+ * libdvdcss method: used like init flags
+ *****************************************************************************/
+#define DVDCSS_METHOD_KEY        0
+#define DVDCSS_METHOD_DISC       1
+#define DVDCSS_METHOD_TITLE      2
+
 /*****************************************************************************
  * Error management
  *****************************************************************************/

diff --git a/extras/libdvdcss/videolan/dvdcss.h b/extras/libdvdcss/videolan/dvdcss.h
index 2b596579ac8f563f667356d6634dc9d2525d66eb..886c0e6698692d4b58b8746170bf1ff487083aa2 100644 (file)
--- a/extras/libdvdcss/videolan/dvdcss.h
+++ b/extras/libdvdcss/videolan/dvdcss.h
@@ -2,7 +2,7 @@
  * libdvdcss.h: DVD reading library, exported functions.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: dvdcss.h,v 1.7 2001/10/14 03:26:20 stef Exp $
+ * $Id: dvdcss.h,v 1.8 2001/11/12 20:16:33 sam Exp $
  *
  * Authors: Stéphane Borel <stef@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -32,9 +32,6 @@ typedef struct dvdcss_s* dvdcss_handle;
  *****************************************************************************/
 #define DVDCSS_NOFLAGS         0
 
-#define DVDCSS_INIT_QUIET      (1 << 0)
-#define DVDCSS_INIT_DEBUG      (1 << 1)
-
 #define DVDCSS_READ_DECRYPT    (1 << 0)
 
 #define DVDCSS_SEEK_INI        (1 << 0)
@@ -42,18 +39,10 @@ typedef struct dvdcss_s* dvdcss_handle;
 
 #define DVDCSS_BLOCK_SIZE      2048
 
-/*****************************************************************************
- * libdvdcss method: used like init flags
- *****************************************************************************/
-#define DVDCSS_KEY        0
-#define DVDCSS_DISC       1
-#define DVDCSS_TITLE      2
-
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
-extern dvdcss_handle dvdcss_open  ( char *psz_target,
-                                    int i_flags );
+extern dvdcss_handle dvdcss_open  ( char *psz_target );
 extern int           dvdcss_close ( dvdcss_handle );
 extern int           dvdcss_title ( dvdcss_handle,
                                     int i_block );

diff --git a/include/config.h.in b/include/config.h.in
index a25a2a89eaf6989e63178fb4eb9bb9b4c03eeeb1..3152b95bff569a38ebf5dfb90e2b6ae7ee8bbd92 100644 (file)
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -60,7 +60,6 @@
  * useful to track a bug */
 //#define TRACE_INTF
 //#define TRACE_INPUT
-//#define TRACE_DVDCSS
 //#define TRACE_AUDIO
 #define TRACE_VOUT
 #define TRACE_VPAR
@@ -221,8 +220,6 @@
 #define INPUT_AUDIO_VAR                 "vlc_input_audio"
 #define INPUT_CHANNEL_VAR               "vlc_input_channel"
 #define INPUT_SUBTITLE_VAR              "vlc_input_subtitle"
-#define INPUT_DVDCSS_VAR                "dvdcss_method"
-#define INPUT_DVDCSS_DEFAULT            "title"
 
 /* VCD defaults */
 #define INPUT_VCD_DEVICE_VAR            "vlc_vcd_device"

diff --git a/install-win32 b/install-win32
index 4a0a144ec6bbfe36f863c4f9fa65b0cadee7478d..eaefb9bd8cc132aaca7326944bcd274c4bcb22d7 100644 (file)
--- a/install-win32
+++ b/install-win32
@@ -13,6 +13,10 @@
 ; . really remove the shortcuts.\r
 ; . added an exec command to display the program file folder. (grOovy)\r
 \r
+;;;;;;;;;;;;;;;;;;;;;;;;;\r
+; General configuration ;\r
+;;;;;;;;;;;;;;;;;;;;;;;;;\r
+\r
 OutFile vlc-@VERSION@.exe\r
 Name "the VideoLAN Client"\r
 Caption "vlc @VERSION@ for Win32 Setup"\r
@@ -38,6 +42,10 @@ SetDatablockOptimize on
 SetDateSave off\r
 SetCompress auto\r
 \r
+;;;;;;;;;;;;;;;;;;;;\r
+; Install settings ;\r
+;;;;;;;;;;;;;;;;;;;;\r
+\r
 Section "Install"\r
        SetOutPath $INSTDIR\r
 \r
@@ -76,6 +84,10 @@ Section "Install"
        Exec "explorer $SMPROGRAMS\VideoLAN\"\r
 SectionEnd\r
 \r
+;;;;;;;;;;;;;;;;;;;;;;\r
+; Uninstall settings ;\r
+;;;;;;;;;;;;;;;;;;;;;;\r
+\r
 Section "Uninstall"\r
        Delete $SMPROGRAMS\VideoLAN\*\r
        RMDir $SMPROGRAMS\VideoLAN\r

diff --git a/plugins/alsa/Makefile b/plugins/alsa/Makefile
index b6370c369308e87149320e230fb47181eaf798f4..db93956f23f2e0096ca64c9a186c22a8accdfdb3 100644 (file)
--- a/plugins/alsa/Makefile
+++ b/plugins/alsa/Makefile
@@ -23,7 +23,7 @@ include ../../Makefile.modules
 #
 
 ../alsa.so: $(PLUGIN_C)
-       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ALSA)
+       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ALSA) -lasound -lm -ldl
 
 ../alsa.a: $(BUILTIN_C)
        ar r $@ $^

diff --git a/plugins/alsa/aout_alsa.c b/plugins/alsa/aout_alsa.c
index 59330f4bdc20aaf774a56ec640b2c33753ac5eb6..e1d4fcee7dcbe6f3e7f9dfc862590a3d724b8f6d 100644 (file)
--- a/plugins/alsa/aout_alsa.c
+++ b/plugins/alsa/aout_alsa.c
@@ -2,7 +2,7 @@
  * aout_alsa.c : Alsa functions library
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: aout_alsa.c,v 1.18 2001/07/12 20:44:52 reno Exp $
+ * $Id: aout_alsa.c,v 1.19 2001/11/12 20:16:33 sam Exp $
  *
  * Authors: Henri Fallon <henri@videolan.org> - Original Author
  *          Jeffrey Baker <jwbaker@acm.org> - Port to ALSA 1.0 API
@@ -89,9 +89,11 @@ static int aout_Probe( probedata_t *p_data )
     int i_open_return, i_close_return;
     aout_sys_t local_sys;
 
+    printf("aout_probe\n");
     /* Open device */
-    i_open_return = snd_pcm_open( &(local_sys.p_alsa_handle), "plug:0,0",
+    i_open_return = snd_pcm_open( &(local_sys.p_alsa_handle), "default",
                                   SND_PCM_STREAM_PLAYBACK, 0 );
+    printf("grmbl\n");
     if( i_open_return )
     {
         intf_WarnMsg( 2, "aout info: could not probe ALSA device (%s)",
@@ -145,7 +147,7 @@ static int aout_Open( aout_thread_t *p_aout )
 
     /* Open device */
     if( ( i_open_returns = snd_pcm_open(&(p_aout->p_sys->p_alsa_handle),
-                                        "plug:0,0",
+                                        "default",
                                         SND_PCM_STREAM_PLAYBACK, 0) ) )
     {
         intf_ErrMsg( "aout error: could not open ALSA device (%s)",

diff --git a/plugins/dvd/dummy_dvdcss.c b/plugins/dvd/dummy_dvdcss.c
index cf43d0b5925e71ad0e7a265543ebaf043f844de5..1cc92cb154874ae05c033ab6f99938d8508c0cdb 100644 (file)
--- a/plugins/dvd/dummy_dvdcss.c
+++ b/plugins/dvd/dummy_dvdcss.c
@@ -2,7 +2,7 @@
  * dummy_dvdcss.c: Dummy libdvdcss with minimal DVD access.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: dummy_dvdcss.c,v 1.2 2001/10/23 23:41:00 sam Exp $
+ * $Id: dummy_dvdcss.c,v 1.3 2001/11/12 20:16:33 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -60,7 +60,7 @@ struct dvdcss_s
 /*****************************************************************************
  * dvdcss_open: initialize library, open a DVD device, crack CSS key
  *****************************************************************************/
-extern dvdcss_handle dummy_dvdcss_open ( char *psz_target, int i_flags )
+extern dvdcss_handle dummy_dvdcss_open ( char *psz_target )
 {
     dvdcss_handle dvdcss;
     dvd_struct    dvd;

diff --git a/plugins/dvd/dummy_dvdcss.h b/plugins/dvd/dummy_dvdcss.h
index 7c190e11840c207b51a0f5aa2e358b79ae47c474..f1c80cc3a24980b21fd554112e45bde35f4ade8a 100644 (file)
--- a/plugins/dvd/dummy_dvdcss.h
+++ b/plugins/dvd/dummy_dvdcss.h
@@ -2,7 +2,7 @@
  * dummy_dvdcss.h: Dummy libdvdcss header.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: dummy_dvdcss.h,v 1.2 2001/10/23 23:41:00 sam Exp $
+ * $Id: dummy_dvdcss.h,v 1.3 2001/11/12 20:16:33 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -31,9 +31,6 @@ typedef struct dvdcss_s* dvdcss_handle;
  *****************************************************************************/
 #define DVDCSS_NOFLAGS         0
 
-#define DVDCSS_INIT_QUIET      (1 << 0)
-#define DVDCSS_INIT_DEBUG      (1 << 1)
-
 #define DVDCSS_READ_DECRYPT    (1 << 0)
 
 #define DVDCSS_SEEK_INI        (1 << 0)
@@ -51,7 +48,7 @@ typedef struct dvdcss_s* dvdcss_handle;
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
-dvdcss_handle dummy_dvdcss_open  ( char *, int i_flags );
+dvdcss_handle dummy_dvdcss_open  ( char * );
 int           dummy_dvdcss_close ( dvdcss_handle );
 int           dummy_dvdcss_title ( dvdcss_handle, int );
 int           dummy_dvdcss_seek  ( dvdcss_handle, int, int );
@@ -63,7 +60,7 @@ char *        dummy_dvdcss_error ( dvdcss_handle );
  * Pointers which will be filled either with dummy_dvdcss functions or
  * with the dlopen()ed ones.
  *****************************************************************************/
-dvdcss_handle (* dvdcss_open )   ( char *, int i_flags );
+dvdcss_handle (* dvdcss_open )   ( char * );
 int           (* dvdcss_close )  ( dvdcss_handle );
 int           (* dvdcss_title )  ( dvdcss_handle, int );
 int           (* dvdcss_seek )   ( dvdcss_handle, int, int );

diff --git a/plugins/dvd/dvd.c b/plugins/dvd/dvd.c
index 3f3da1dee91b3610cdbb53e5563eb5a880a69e08..0e6dc12d983ca3d078e6ea68963c0fb16ae6f96f 100644 (file)
--- a/plugins/dvd/dvd.c
+++ b/plugins/dvd/dvd.c
@@ -2,7 +2,7 @@
  * dvd.c : DVD input module for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: dvd.c,v 1.13 2001/08/07 02:48:25 sam Exp $
+ * $Id: dvd.c,v 1.14 2001/11/12 20:16:33 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -105,9 +105,9 @@ MODULE_DEACTIVATE_STOP
  *****************************************************************************/
 static void ProbeLibDVDCSS( void )
 {
-    char *pp_filelist[4] = { "libdvdcss.so.0",
-                             "./libdvdcss.so.0",
-                             "./lib/libdvdcss.so.0",
+    char *pp_filelist[4] = { "libdvdcss.so.1",
+                             "./libdvdcss.so.1",
+                             "./lib/libdvdcss.so.1",
                              NULL };
     char **pp_file = pp_filelist;
 
@@ -128,39 +128,28 @@ static void ProbeLibDVDCSS( void )
     /* If libdvdcss.so was found, check that it's valid */
     if( p_libdvdcss == NULL )
     {
-        intf_ErrMsg( "dvd warning: libdvdcss.so.0 not present" );
+        intf_ErrMsg( "dvd warning: libdvdcss.so.1 not present" );
     }
     else
     {
-        /* Check for libdvdcss 0.0.1 */
-        if( dlsym( p_libdvdcss, "dvdcss_crack" ) != NULL )
+        dvdcss_open = dlsym( p_libdvdcss, "dvdcss_open" );
+        dvdcss_close = dlsym( p_libdvdcss, "dvdcss_close" );
+        dvdcss_title = dlsym( p_libdvdcss, "dvdcss_title" );
+        dvdcss_seek = dlsym( p_libdvdcss, "dvdcss_seek" );
+        dvdcss_read = dlsym( p_libdvdcss, "dvdcss_read" );
+        dvdcss_readv = dlsym( p_libdvdcss, "dvdcss_readv" );
+        dvdcss_error = dlsym( p_libdvdcss, "dvdcss_error" );
+
+        if( dvdcss_open == NULL || dvdcss_close == NULL
+             || dvdcss_title == NULL || dvdcss_seek == NULL
+             || dvdcss_read == NULL || dvdcss_readv == NULL
+             || dvdcss_error == NULL )
         {
-            intf_ErrMsg( "dvd warning: libdvdcss.so.0 has deprecated symbol "
-                         "dvdcss_crack(), please upgrade" );
+            intf_ErrMsg( "dvd warning: missing symbols in libdvdcss.so.1, "
+                         "this shouldn't happen !" );
             dlclose( p_libdvdcss );
             p_libdvdcss = NULL;
         }
-        else
-        {
-            dvdcss_open = dlsym( p_libdvdcss, "dvdcss_open" );
-            dvdcss_close = dlsym( p_libdvdcss, "dvdcss_close" );
-            dvdcss_title = dlsym( p_libdvdcss, "dvdcss_title" );
-            dvdcss_seek = dlsym( p_libdvdcss, "dvdcss_seek" );
-            dvdcss_read = dlsym( p_libdvdcss, "dvdcss_read" );
-            dvdcss_readv = dlsym( p_libdvdcss, "dvdcss_readv" );
-            dvdcss_error = dlsym( p_libdvdcss, "dvdcss_error" );
-
-            if( dvdcss_open == NULL || dvdcss_close == NULL
-                 || dvdcss_title == NULL || dvdcss_seek == NULL
-                 || dvdcss_read == NULL || dvdcss_readv == NULL
-                 || dvdcss_error == NULL )
-            {
-                intf_ErrMsg( "dvd warning: missing symbols in libdvdcss.so.0, "
-                             "please upgrade libdvdcss or vlc" );
-                dlclose( p_libdvdcss );
-                p_libdvdcss = NULL;
-            }
-        }
     }
 
     /* If libdvdcss was not found or was not valid, use the dummy

diff --git a/plugins/dvd/input_dvd.c b/plugins/dvd/input_dvd.c
index 12767a3608f46c563f017af1031225fc973dd6aa..13eba44fc6404af42f76b4bdab9b6dd6e163aaa4 100644 (file)
--- a/plugins/dvd/input_dvd.c
+++ b/plugins/dvd/input_dvd.c
@@ -10,7 +10,7 @@
  *  -dvd_udf to find files
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.95 2001/11/12 03:07:13 stef Exp $
+ * $Id: input_dvd.c,v 1.96 2001/11/12 20:16:33 sam Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -310,7 +310,6 @@ static void DVDInit( input_thread_t * p_input )
 static void DVDOpen( struct input_thread_s *p_input )
 {
     dvdcss_handle dvdhandle;
-    int           i_flags;
 
     vlc_mutex_lock( &p_input->stream.stream_lock );
 
@@ -324,23 +323,15 @@ static void DVDOpen( struct input_thread_s *p_input )
 
     vlc_mutex_unlock( &p_input->stream.stream_lock );
 
-    /* Error messages from libdvdcss only in verbose mode */
-    i_flags = p_main->i_warning_level ? DVDCSS_NOFLAGS : DVDCSS_INIT_QUIET;
-    
-    /* Debug message from libdvdcss selected from config.h #define */
-#ifdef TRACE_DVDCSS
-    i_flags |= DVDCSS_INIT_DEBUG;
-#endif
-
     /* XXX: put this shit in an access plugin */
     if( strlen( p_input->p_source ) > 4
          && !strncasecmp( p_input->p_source, "dvd:", 4 ) )
     {
-        dvdhandle = dvdcss_open( p_input->p_source + 4, i_flags );
+        dvdhandle = dvdcss_open( p_input->p_source + 4 );
     }
     else
     {
-        dvdhandle = dvdcss_open( p_input->p_source, i_flags );
+        dvdhandle = dvdcss_open( p_input->p_source );
     }
 
     if( dvdhandle == NULL )
@@ -488,11 +479,9 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
             return -1;
         }
         
-        /*
-         * Force libdvdcss to check its title key.
-         * It is only useful for title cracking method. Methods using the decrypted
-         * disc key are fast enough to check the key at each seek
-         */
+        /* Force libdvdcss to check its title key.
+         * It is only useful for title cracking method. Methods using the
+         * decrypted disc key are fast enough to check the key at each seek */
         if( dvdcss_seek( p_dvd->dvdhandle, p_dvd->i_start, DVDCSS_SEEK_INI ) < 0 )
         {
             intf_ErrMsg( "dvd error: %s", dvdcss_error( p_dvd->dvdhandle ) );

diff --git a/src/interface/main.c b/src/interface/main.c
index 55c9e42a395b1198ed7d5c651a220ebc0783bc29..da8a13d11245821660b85cc91761247da9fbe437 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -4,7 +4,7 @@
  * and spawn threads.
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: main.c,v 1.122 2001/11/12 12:54:16 massiot Exp $
+ * $Id: main.c,v 1.123 2001/11/12 20:16:33 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -131,7 +131,8 @@
 #define OPT_YUV                 183
 #define OPT_DOWNMIX             184
 #define OPT_IMDCT               185
-#define OPT_DVDCSS              186
+#define OPT_DVDCSS_METHOD       186
+#define OPT_DVDCSS_VERBOSE      187
 
 #define OPT_SYNCHRO             190
 #define OPT_WARNING             191
@@ -203,7 +204,8 @@ static const struct option longopts[] =
     {   "dvdaudio",         1,          0,      'a' },
     {   "dvdchannel",       1,          0,      'c' },
     {   "dvdsubtitle",      1,          0,      's' },
-    {   "dvdcss_method",    1,          0,      OPT_DVDCSS },
+    {   "dvdcss-method",    1,          0,      OPT_DVDCSS_METHOD },
+    {   "dvdcss-verbose",   1,          0,      OPT_DVDCSS_VERBOSE },
     
     /* Input options */
     {   "input",            1,          0,      OPT_INPUT },
@@ -772,8 +774,11 @@ static int GetConfiguration( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
         case 's':                                           /* --dvdsubtitle */
             main_PutIntVariable( INPUT_SUBTITLE_VAR, atoi(optarg) );
             break;
-        case OPT_DVDCSS:                                         /* --dvdcss */
-                main_PutPszVariable( INPUT_DVDCSS_VAR, optarg );
+        case OPT_DVDCSS_METHOD:                           /* --dvdcss-method */
+            main_PutPszVariable( "DVDCSS_METHOD", optarg );
+            break;
+        case OPT_DVDCSS_VERBOSE:                         /* --dvdcss-verbose */
+            main_PutPszVariable( "DVDCSS_VERBOSE", optarg );
             break;
 
         /* Input options */
@@ -904,7 +909,8 @@ static void Usage( int i_fashion )
           "\n  -a, --dvdaudio <type>          \tchoose DVD audio type"
           "\n  -c, --dvdchannel <channel>     \tchoose DVD audio channel"
           "\n  -s, --dvdsubtitle <channel>    \tchoose DVD subtitle channel"
-          "\n    , --dvdcss <method>          \tselect DVDCSS decryption method"
+          "\n      --dvdcss-method <method>   \tselect dvdcss decryption method"
+          "\n      --dvdcss-verbose <level>   \tselect dvdcss verbose level"
           "\n"
           "\n      --input                    \tinput method"
           "\n      --channels                 \tenable channels"
@@ -936,7 +942,7 @@ static void Usage( int i_fashion )
         "\n  " DOWNMIX_METHOD_VAR "=<method name>     \tAC3 downmix method"
         "\n  " IMDCT_METHOD_VAR "=<method name>       \tAC3 IMDCT method"
         "\n  " AOUT_VOLUME_VAR "=[0..1024]            \tVLC output volume"
-        "\n  " AOUT_RATE_VAR "=<rate>                 \toutput rate" );
+        "\n  " AOUT_RATE_VAR "=<rate>             \toutput rate" );
 
     /* Video parameters */
     intf_MsgImm( "\nVideo parameters:"
@@ -963,13 +969,12 @@ static void Usage( int i_fashion )
         "\n  " INPUT_ANGLE_VAR "=<angle>              \tangle number"
         "\n  " INPUT_AUDIO_VAR "={ac3|lpcm|mpeg|off}  \taudio type"
         "\n  " INPUT_CHANNEL_VAR "=[0-15]             \taudio channel"
-        "\n  " INPUT_SUBTITLE_VAR "=[0-31]            \tsubtitle channel"
-        "\n  " INPUT_DVDCSS_VAR "={csskey|disc|title} \tdvdcss method" );
+        "\n  " INPUT_SUBTITLE_VAR "=[0-31]            \tsubtitle channel" );
 
     /* Input parameters */
     intf_MsgImm( "\nInput parameters:"
         "\n  " INPUT_SERVER_VAR "=<hostname>          \tvideo server"
-        "\n  " INPUT_PORT_VAR "=<port>                \tvideo server port"
+        "\n  " INPUT_PORT_VAR "=<port>            \tvideo server port"
         "\n  " INPUT_IFACE_VAR "=<interface>          \tnetwork interface"
         "\n  " INPUT_BCAST_ADDR_VAR "=<addr>          \tbroadcast mode"
         "\n  " INPUT_CHANNEL_SERVER_VAR "=<hostname>  \tchannel server"

diff --git a/src/misc/netutils.c b/src/misc/netutils.c
index ccd18dac54d361ebe8726cfbc8aa4982a3353819..2ccbff06213968e8e4c1dd6e1a10d141f212fd6f 100644 (file)
--- 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.41 2001/11/12 04:12:38 sam Exp $
+ * $Id: netutils.c,v 1.42 2001/11/12 20:16:33 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Benoit Steiner <benny@via.ecp.fr>
@@ -258,7 +258,7 @@ int network_ChannelJoin( int i_channel )
 #if defined( SYS_LINUX ) || defined( WIN32 )
 
 #define VLCS_VERSION 12
-#define MESSAGE_LENGTH 80
+#define MESSAGE_LENGTH 256
 
     char psz_mess[ MESSAGE_LENGTH ];
     char psz_mac[ 40 ];

diff --git a/vlc.spec b/vlc.spec
index 1661d6e386e9eef941552eed65c645237d62ef53..109060c39d80fc646f6c49eeba934019a055f721 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,11 +1,11 @@
 # This is borrowed and adapted from Mandrake's Cooker
 %define name   vlc
-%define vlc_ver 0.2.90
+%define vlc_ver 0.2.91
 %define version        %vlc_ver
 
 # libdvdcss
 %define major   0
-%define lib_ver 0.0.3
+%define lib_ver 1.0.0
 %define lib_name libdvdcss%{major}
 
 %define cvs     0
@@ -157,6 +157,9 @@ rm -fr %buildroot
 
 
 %changelog
+* Mon Nov 12 2001 Christophe Massiot <massiot@via.ecp.fr> 0.2.91-1
+- version 0.2.91
+
 * Wed Oct 10 2001 Christophe Massiot <massiot@via.ecp.fr> 0.2.90-1
 - version 0.2.90