contribs: reflect an API change in 10.4, which leads to compilation errors within...

additionally, fixed the libmodplug patch

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index eab3661c525219e42a7210d37b249c7e136ecdbd..683b31631ba22c8a9d8150ea72a68fa18dee8e60 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1501,6 +1501,9 @@ libcdio-$(CDIO_VERSION).tar.gz:
 libcdio: libcdio-$(CDIO_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p0 < Patches/libcdio-install-cdparanoia-pc.patch
+ifdef HAVE_DARWIN_OS
+       patch -p0 < Patches/libcdio-modernOSX.patch
+endif
 
 .cdio: libcdio
        (cd $<; sed -e 's%@ENABLE_CPP_TRUE@SUBDIRS = C++%@ENABLE_CPP_TRUE@SUBDIRS = %' -i.orig example/Makefile.in && autoreconf -fisv && ./configure --prefix=$(PREFIX) --without-vcdinfo --disable-shared && make && make install)

diff --git a/extras/contrib/src/Patches/libcdio-modernOSX.patch b/extras/contrib/src/Patches/libcdio-modernOSX.patch
new file mode 100644 (file)
index 0000000..7dce6bd
--- /dev/null
+++ b/extras/contrib/src/Patches/libcdio-modernOSX.patch
@@ -0,0 +1,20 @@
+--- libcdio-orig/lib/driver/osx.c      2007-08-12 14:38:25.000000000 +0200
++++ libcdio/lib/driver/osx.c   2008-12-27 00:38:21.000000000 +0100
+@@ -58,7 +58,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>
+ 
+@@ -77,7 +77,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>

diff --git a/extras/contrib/src/Patches/libmodplug-gccllvm42.patch b/extras/contrib/src/Patches/libmodplug-gccllvm42.patch
index 8a686be08a3994d6e6f103944e3a040a7029993b..e3f352236749b3f68d1dd03f3672a6e46b849c23 100644 (file)
--- a/extras/contrib/src/Patches/libmodplug-gccllvm42.patch
+++ b/extras/contrib/src/Patches/libmodplug-gccllvm42.patch
@@ -6,7 +6,7 @@ diff -ru libmodplug-orig/src/load_abc.cpp libmodplug/src/load_abc.cpp
  #include "load_pat.h"
  
 +#ifndef uint
-+#typedef uint unsigned int
++#define uint unsigned int
 +#endif
 +
  #define MAXABCINCLUDES        8
@@ -20,7 +20,7 @@ diff -ru libmodplug-orig/src/load_mid.cpp libmodplug/src/load_mid.cpp
  #include "load_pat.h"
  
 +#ifndef uint
-+#typedef uint unsigned int
++#define uint unsigned int
 +#endif
 +
  #define ROWSPERNOTE 16
@@ -34,7 +34,7 @@ diff -ru libmodplug-orig/src/load_pat.cpp libmodplug/src/load_pat.cpp
  #include "load_pat.h"
  
 +#ifndef uint
-+#typedef uint unsigned int
++#define uint unsigned int
 +#endif
 +
  #ifdef MSC_VER