[mythtv-commits] Ticket #10569: libcdio broken on OS X?

[MythTV]

#10569: libcdio broken on OS X?
----------------------------------+-----------------------------
 Reporter:  nigel                 |          Owner:  jyavenard
     Type:  Bug Report - General  |         Status:  new
 Priority:  minor                 |      Milestone:  unknown
Component:  Ports - OSX           |        Version:  Master Head
 Severity:  low                   |     Resolution:
 Keywords:                        |  Ticket locked:  0
----------------------------------+-----------------------------

Comment (by nigel):

 libcdio-git is patched upstream, but a new release may be a while, so...
 {{{

 MacBook% diff -rwu libcdio-0.83.orig libcdio-0.83
 diff -rwu libcdio-0.83.orig/configure libcdio-0.83/configure
 --- libcdio-0.83.orig/configure 2011-10-27 13:23:40.000000000 +1100
 +++ libcdio-0.83/configure      2012-04-09 19:11:50.000000000 +1000
 @@ -16675,7 +16675,7 @@
         ## AC_DEFINE([HAVE_AIX_CDROM], [1],
         ##     [Define 1 if you have AIX CD-ROM support])
         ;;
 -     darwin6*|darwin7*|darwin8*|darwin9*)
 +     darwin6*|darwin7*|darwin8*|darwin9*|darwin10*)
         for ac_header in IOKit/IOKitLib.h CoreFoundation/CFBase.h
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

 diff -rwu libcdio-0.83.orig/lib/driver/osx.c libcdio-0.83/lib/driver/osx.c
 --- libcdio-0.83.orig/lib/driver/osx.c  2011-10-21 10:16:20.000000000
 +1100
 +++ libcdio-0.83/lib/driver/osx.c       2012-04-26 14:23:02.000000000
 +1000
 @@ -56,7 +56,7 @@

  #include <mach/mach.h>
  #include <Carbon/Carbon.h>
 -#include <IOKit/scsi-commands/SCSITaskLib.h>
 +#include <IOKit/scsi/SCSITaskLib.h>
  #include <IOKit/IOCFPlugIn.h>
  #include <mach/mach_error.h>

 @@ -75,7 +75,7 @@
  #include <CoreFoundation/CoreFoundation.h>
  #include <IOKit/IOKitLib.h>
  #include <IOKit/IOBSD.h>
 -#include <IOKit/scsi-commands/IOSCSIMultimediaCommandsDevice.h>
 +#include <IOKit/scsi/IOSCSIMultimediaCommandsDevice.h>
  #include <IOKit/storage/IOCDTypes.h>
  #include <IOKit/storage/IODVDTypes.h>
  #include <IOKit/storage/IOMedia.h>
 @@ -1826,6 +1827,11 @@

        do
          {
 +          /* Skip other removable media, like USB flash memory keys:  */
 +          if (!IOObjectConformsTo(next_media, kIODVDMediaClass) &&
 +              !IOObjectConformsTo(next_media, kIOCDMediaClass))
 +            continue;
 +
            str_bsd_path = IORegistryEntryCreateCFProperty( next_media,
                                                            CFSTR(
 kIOBSDNameKey ),
 kCFAllocatorDefault,
 @@ -1856,6 +1862,7 @@
          } while( ( next_media = IOIteratorNext( media_iterator ) ) != 0
 );
      }
    IOObjectRelease( media_iterator );
 +  cdio_warn ("cdio_get_default_device() - No mounted CDs or DVDs -
 returning NULL");
    return NULL;
  #endif /* HAVE_DARWIN_CDROM */
  }
 MacBook%
 }}}
 I still think some small MythMusic mods are required on OS X, though.

-- 
Ticket URL: <http://code.mythtv.org/trac/ticket/10569#comment:3>
MythTV <http://code.mythtv.org/trac>
MythTV Media Center