Ticket #34247: libcdio-0.83-osx.patch

File libcdio-0.83-osx.patch, 1.6 KB (added by claunia@…, 13 years ago)

  • configure 

    diff -rupN libcdio-0.83-orig/configure libcdio-0.83-new/configure
    old new case $host_os in 
    1667516675       ## AC_DEFINE([HAVE_AIX_CDROM], [1],
    1667616676       ##     [Define 1 if you have AIX CD-ROM support])
    1667716677       ;;
    16678      darwin6*|darwin7*|darwin8*|darwin9*)
     16678     darwin6*|darwin7*|darwin8*|darwin9*|darwin10*|darwin11*)
    1667916679       for ac_header in IOKit/IOKitLib.h CoreFoundation/CFBase.h
    1668016680do :
    1668116681  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

  • lib/driver/osx.c 

    diff -rupN libcdio-0.83-orig/lib/driver/osx.c libcdio-0.83-new/lib/driver/osx.c
    old new static const char _rcsid[] = "$Id: osx.c 
    5656
    5757#include <mach/mach.h>
    5858#include <Carbon/Carbon.h>
     59#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1040
     60#include <IOKit/scsi/SCSITaskLib.h>
     61#else
    5962#include <IOKit/scsi-commands/SCSITaskLib.h>
     63#endif
    6064#include <IOKit/IOCFPlugIn.h>
    6165#include <mach/mach_error.h>
    6266
    … … static const char _rcsid[] = "$Id: osx.c 
    7579#include <CoreFoundation/CoreFoundation.h>
    7680#include <IOKit/IOKitLib.h>
    7781#include <IOKit/IOBSD.h>
     82#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1040
     83#include <IOKit/scsi/IOSCSIMultimediaCommandsDevice.h>
     84#else
    7885#include <IOKit/scsi-commands/IOSCSIMultimediaCommandsDevice.h>
     86#endif
    7987#include <IOKit/storage/IOCDTypes.h>
    8088#include <IOKit/storage/IODVDTypes.h>
    8189#include <IOKit/storage/IOMedia.h>