* Synced dummy_dvdcss with Stef's changes to libdvdcss.
  * configure now compiles the VCD plugin if linux/cdrom.h is present.

configure.in

@@ -659,18 +659,18 @@ AC_ARG_WITH(dvdcss,
       LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl"
     fi ])
 
-
-
-
 dnl
-dnl  vcd module
+dnl  VCD module
 dnl
 AC_ARG_ENABLE(vcd,
-  [  --enable-vcd        VCDs support (default disabled)],
-      [if test x$enable_vcd = xyes; then
-               PLUGINS="${PLUGINS} vcd"
-       fi])
+  [  --enable-vcd            VCD support for Linux (default enabled)])
 
+if test x$enable_vcd != xno
+then
+  AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[
+    BUILTINS="${BUILTINS} vcd"
+  ])
+fi
 
 dnl
 dnl  dummy plugin

debian/changelog

+vlc (0.2.90-2) unstable; urgency=low
+
+  * Various upstream bugfixes.
+  * Compiled against libsdl1.2-debian (Closes: #116709).
+
+ -- Samuel Hocevar <sam@zoy.org>  Tue, 23 Oct 2001 02:09:39 +0200
+
 vlc (0.2.90-1) unstable; urgency=low
 
   * Fixed syntax error in build dependencies (Closes: #109722).

include/defs.h.in

@@ -190,6 +190,9 @@
 /* Define if <sys/param.h> defines ntohl. */
 #undef NTOHL_IN_SYS_PARAM_H
 
+/* Maximum supported data alignment */
+#undef ATTRIBUTE_ALIGNED_MAX
+
 /* Define if <sys/types.h> defines boolean_t. */
 #undef BOOLEAN_T_IN_SYS_TYPES_H
 
@@ -199,9 +202,6 @@
 /* Define if <cthreads.h> defines boolean_t. */
 #undef BOOLEAN_T_IN_CTHREADS_H
 
-/* Maximum supported data alignment */
-#undef ATTRIBUTE_ALIGNED_MAX
-
 /* Define if $CC groks 3D Now! inline assembly. */
 #undef HAVE_3DNOW
 

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.1 2001/08/06 13:28:00 sam Exp $
+ * $Id: dummy_dvdcss.c,v 1.2 2001/10/23 23:41:00 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -111,7 +111,8 @@ extern char * dummy_dvdcss_error ( dvdcss_handle dvdcss )
 /*****************************************************************************
  * dvdcss_seek: seek into the device
  *****************************************************************************/
-extern int dummy_dvdcss_seek ( dvdcss_handle dvdcss, int i_blocks )
+extern int dummy_dvdcss_seek ( dvdcss_handle dvdcss, int i_blocks,
+                                                     int i_flags )
 {
     off_t i_read;
 

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.1 2001/08/06 13:28:00 sam Exp $
+ * $Id: dummy_dvdcss.h,v 1.2 2001/10/23 23:41:00 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -36,15 +36,25 @@ typedef struct dvdcss_s* dvdcss_handle;
 
 #define DVDCSS_READ_DECRYPT    (1 << 0)
 
+#define DVDCSS_SEEK_INI        (1 << 0)
+#define DVDCSS_SEEK_MPEG       (2 << 0)
+
 #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
  *****************************************************************************/
 dvdcss_handle dummy_dvdcss_open  ( char *, int i_flags );
 int           dummy_dvdcss_close ( dvdcss_handle );
 int           dummy_dvdcss_title ( dvdcss_handle, int );
-int           dummy_dvdcss_seek  ( dvdcss_handle, int );
+int           dummy_dvdcss_seek  ( dvdcss_handle, int, int );
 int           dummy_dvdcss_read  ( dvdcss_handle, void *, int, int );
 int           dummy_dvdcss_readv ( dvdcss_handle, void *, int, int );
 char *        dummy_dvdcss_error ( dvdcss_handle );
@@ -56,7 +66,7 @@ char *        dummy_dvdcss_error ( dvdcss_handle );
 dvdcss_handle (* dvdcss_open )   ( char *, int i_flags );
 int           (* dvdcss_close )  ( dvdcss_handle );
 int           (* dvdcss_title )  ( dvdcss_handle, int );
-int           (* dvdcss_seek )   ( dvdcss_handle, int );
+int           (* dvdcss_seek )   ( dvdcss_handle, int, int );
 int           (* dvdcss_read )   ( dvdcss_handle, void *, int, int );
 int           (* dvdcss_readv )  ( dvdcss_handle, void *, int, int );
 char *        (* dvdcss_error )  ( dvdcss_handle );