Unbreak vlc after cdio upgrade

[Jan Henrik Sylvester]

The latest cdio upgrade breaks the vlc build.

These two patches converted over from Gentoo unbreak it.

Jan Henrik


----------------------------------------
/usr/ports/multimedia/vlc/files/patch-modules_access_cdda_access.c
----------------------------------------
--- modules/access/cdda/access.c.orig   2008-03-23 23:41:48.000000000 +0100
+++ modules/access/cdda/access.c        2008-04-08 20:11:15.000000000 +0200
@@ -737,14 +737,14 @@

        char *psz_paranoia = config_GetPsz( p_access,
                                           MODULE_STRING "-paranoia" );
-      p_cdda->e_paranoia = paranoia_none;
+      p_cdda->e_paranoia = PARANOIA_MODE_DISABLE;
        if( psz_paranoia && *psz_paranoia )
        {

         if( !strncmp( psz_paranoia, "full", strlen("full") )  )
-         p_cdda->e_paranoia = paranoia_full;
+         p_cdda->e_paranoia = PARANOIA_MODE_FULL;
         else if( !strncmp( psz_paranoia, "overlap", strlen("overlap") )  )
-         p_cdda->e_paranoia = paranoia_overlap;
+         p_cdda->e_paranoia = PARANOIA_MODE_OVERLAP;

         /* Use CD Paranoia? */
         if ( p_cdda->e_paranoia ) {
@@ -755,7 +755,7 @@
           if ( 0 != cdio_cddap_open(p_cdda->paranoia_cd) ) {
             msg_Warn( p_cdda_input, "unable to get paranoia support - "
                       "continuing without it." );
-           p_cdda->e_paranoia = paranoia_none;
+           p_cdda->e_paranoia = PARANOIA_MODE_DISABLE;
           } else {
             p_cdda->paranoia = cdio_paranoia_init(p_cdda->paranoia_cd);
             cdio_paranoia_seek(p_cdda->paranoia, p_cdda->i_lsn, SEEK_SET);
@@ -763,7 +763,7 @@
             /* Set reading mode for full or overlap paranoia,
                but allow skipping sectors. */
             cdio_paranoia_modeset(p_cdda->paranoia,
-                                 paranoia_full == p_cdda->e_paranoia ?
+                                 PARANOIA_MODE_FULL == p_cdda->e_paranoia ?
 
PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP :
 
PARANOIA_MODE_OVERLAP^PARANOIA_MODE_NEVERSKIP
                                   );
----------------------------------------
/usr/ports/multimedia/vlc/files/patch-modules_access_cdda_cdda.h
----------------------------------------
--- modules/access/cdda/cdda.h.orig     2008-03-23 23:41:48.000000000 +0100
+++ modules/access/cdda/cdda.h  2008-04-08 20:07:42.000000000 +0200
@@ -71,11 +71,13 @@
  #define CdIo_t CdIo
  #endif

+#if LIBCDIO_VERSION_NUM < 78
  typedef enum {
-  paranoia_none    = 0, /* Note: We make use of 0 as being the same as 
false */
-  paranoia_overlap = 1,
-  paranoia_full    = 2
+  PARANOIA_MODE_DISABLE = 0x00, /* Note: We make use of 0 as being the 
same as false */
+  PARANOIA_MODE_OVERLAP = 0x04,
+  PARANOIA_MODE_FULL    = 0xff
  } paranoia_mode_t;
+#endif


 
/*****************************************************************************

-------------- next part --------------
--- modules/access/cdda/access.c.orig	2008-03-23 23:41:48.000000000 +0100
+++ modules/access/cdda/access.c	2008-04-08 20:11:15.000000000 +0200
@@ -737,14 +737,14 @@
    
       char *psz_paranoia = config_GetPsz( p_access, 
 					  MODULE_STRING "-paranoia" );
-      p_cdda->e_paranoia = paranoia_none;
+      p_cdda->e_paranoia = PARANOIA_MODE_DISABLE;
       if( psz_paranoia && *psz_paranoia )
       {
 
 	if( !strncmp( psz_paranoia, "full", strlen("full") )  )
-	  p_cdda->e_paranoia = paranoia_full;
+	  p_cdda->e_paranoia = PARANOIA_MODE_FULL;
 	else if( !strncmp( psz_paranoia, "overlap", strlen("overlap") )  )
-	  p_cdda->e_paranoia = paranoia_overlap;
+	  p_cdda->e_paranoia = PARANOIA_MODE_OVERLAP;
 	
 	/* Use CD Paranoia? */
 	if ( p_cdda->e_paranoia ) {
@@ -755,7 +755,7 @@
 	  if ( 0 != cdio_cddap_open(p_cdda->paranoia_cd) ) {
 	    msg_Warn( p_cdda_input, "unable to get paranoia support - "
 		      "continuing without it." );
-	    p_cdda->e_paranoia = paranoia_none;
+	    p_cdda->e_paranoia = PARANOIA_MODE_DISABLE;
 	  } else {
 	    p_cdda->paranoia = cdio_paranoia_init(p_cdda->paranoia_cd);
 	    cdio_paranoia_seek(p_cdda->paranoia, p_cdda->i_lsn, SEEK_SET);
@@ -763,7 +763,7 @@
 	    /* Set reading mode for full or overlap paranoia, 
 	       but allow skipping sectors. */
 	    cdio_paranoia_modeset(p_cdda->paranoia,
-				  paranoia_full == p_cdda->e_paranoia ?
+				  PARANOIA_MODE_FULL == p_cdda->e_paranoia ?
 				  PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP :
 				  PARANOIA_MODE_OVERLAP^PARANOIA_MODE_NEVERSKIP
 				  );
-------------- next part --------------
--- modules/access/cdda/cdda.h.orig	2008-03-23 23:41:48.000000000 +0100
+++ modules/access/cdda/cdda.h	2008-04-08 20:07:42.000000000 +0200
@@ -71,11 +71,13 @@
 #define CdIo_t CdIo
 #endif    
 
+#if LIBCDIO_VERSION_NUM < 78
 typedef enum {
-  paranoia_none    = 0, /* Note: We make use of 0 as being the same as false */
-  paranoia_overlap = 1, 
-  paranoia_full    = 2
+  PARANOIA_MODE_DISABLE = 0x00, /* Note: We make use of 0 as being the same as false */
+  PARANOIA_MODE_OVERLAP = 0x04, 
+  PARANOIA_MODE_FULL    = 0xff
 } paranoia_mode_t;
+#endif
 
   
 /*****************************************************************************