[depends/libcdio] - bump to 0.90 again (was lost during unified deps)

4 files changed, 25 insertions, 115 deletions

diff --git a/tools/depends/target/libcdio/Makefile b/tools/depends/target/libcdio/Makefile
index c56e2c715a..3964558832 100644
--- a/tools/depends/target/libcdio/Makefile
+++ b/tools/depends/target/libcdio/Makefile
@@ -3,7 +3,7 @@ DEPS= ../../Makefile.include configure.patch Makefile
 
 # lib name, version
 LIBNAME=libcdio
-VERSION=0.80
+VERSION=0.90
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 # configuration settings
@@ -25,7 +25,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
 	cd $(PLATFORM); patch -p0 < ../configure.patch
-	cd $(PLATFORM); patch -p0 < ../cross.patch
+	cd $(PLATFORM); patch -p0 < ../osx.patch
 	cd $(PLATFORM); $(AUTORECONF) -vif
 	cd $(PLATFORM); $(CONFIGURE)
 
diff --git a/tools/depends/target/libcdio/configure.patch b/tools/depends/target/libcdio/configure.patch
index a4110ef9cb..96db61fc5a 100644
--- a/tools/depends/target/libcdio/configure.patch
+++ b/tools/depends/target/libcdio/configure.patch
@@ -1,11 +1,11 @@
---- configure.ac	2012-05-27 15:06:13.044747493 -0400
-+++ configure.ac	2012-05-27 15:05:52.364747505 -0400
-@@ -378,7 +378,7 @@
+--- configure.ac.orig	2012-10-27 17:07:45.000000000 +0200
++++ configure.ac	2013-10-07 22:20:02.000000000 +0200
+@@ -387,7 +387,7 @@
       ;;
       linux*|uclinux)
          AC_CHECK_HEADERS(linux/version.h linux/major.h)
 -        AC_CHECK_HEADERS(linux/cdrom.h, [have_linux_cdrom_h="yes"])
 +        AC_CHECK_HEADERS(linux/cdrom.h, [have_linux_cdrom_h="no"])
- 	if test "x$have_linux_cdrom_h" = "xyes" ; then
+ 	if test "x$have_linux_cdrom_h" = "xyes"; then
  	   AC_TRY_COMPILE(,[
  #include <linux/cdrom.h>
diff --git a/tools/depends/target/libcdio/cross.patch b/tools/depends/target/libcdio/cross.patch
deleted file mode 100644
index d5e17cecda..0000000000
--- a/tools/depends/target/libcdio/cross.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- configure.ac	2013-03-10 19:25:36.396466337 -0400
-+++ configure.ac	2013-03-10 19:24:34.906466376 -0400
-@@ -269,37 +269,6 @@
- fi
- dnl empty_array_size
- 
--dnl bitfield order
--AC_MSG_CHECKING(bitfield ordering in structs)
--AC_TRY_RUN([
--int
-- main() {
--  struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
--#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
--  __attribute__((packed))
--#endif
--  bf = { 1,1,1,1 };
--  if (sizeof (bf) != 1) return 1;
--  return *((unsigned char*) &bf) != 0x4b; }
--], bf_lsbf=1, AC_TRY_RUN([ 
--int
--main() {
--  struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
--#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
--  __attribute__((packed))
--#endif
--  bf = { 1,1,1,1 };
--  if (sizeof (bf) != 1) return 1;
--  return *((unsigned char*) &bf) != 0xa5; }
--], bf_lsbf=0, AC_MSG_ERROR([unsupported bitfield ordering])))
--if test "x$bf_lsbf" = "x1"; then
-- AC_MSG_RESULT(LSBF)
-- AC_DEFINE(BITFIELD_LSBF, [], [compiler does least-significant bit first in struct bitfields])
--else
-- AC_MSG_RESULT(MSBF)
--fi
--dnl
--
- dnl AM_PROG_LIBTOOL tests whether we have GNU ld
- dnl this must come before checking --with-versioned-libs
- dnl which requires GNU ld.
-@@ -466,24 +435,6 @@
- 	;;
- esac
- 
--AC_MSG_CHECKING(extern long timezone variable)
--AC_TRY_RUN([
--#ifdef NEED_TIMEZONEVAR
--#define timezonevar 1
--#endif
--
--#include <time.h>
--extern long timezone;
--int main(int argc, char **argv) {
--  long test_timezone = timezone;
--  return 0; 
--}
--], [AC_MSG_RESULT(yes); 
--   AC_DEFINE([HAVE_TIMEZONE_VAR], 1, 
--	[Define if you have an extern long timenzone variable.])],
--   [AC_MSG_RESULT(no)])
--dnl
--
- AC_SUBST(LINUX_CDROM_TIMEOUT)
- AC_SUBST(DARWIN_PKG_LIB_HACK)
- AC_SUBST(HAVE_BSDI_CDROM)
-@@ -508,43 +459,6 @@
-                  ,
-                  [#include <time.h>])
- 
--if test $ac_cv_member_struct_tm_tm_gmtoff = yes ; then
--  AC_MSG_CHECKING([whether time.h defines daylight and timezone variables])
--  AC_TRY_RUN([
--#include <time.h>
--
--
--       extern char *tzname[2];
--       extern long timezone;
--       extern int daylight;
--
--int
-- main() {
--  return (timezone != 0) + daylight;
--}
--  ],[AC_DEFINE(HAVE_DAYLIGHT, 1,
--   [Define if time.h defines extern long timezone and int daylight vars.])
--   has_daylight=yes
--   ],[has_daylight=no])
--  AC_MSG_RESULT($has_daylight)
--  AC_MSG_CHECKING([whether time.h defines tzname variable])
--  AC_TRY_RUN([
--#include <time.h>
--
--
--       extern char *tzname[2];
--
--int
-- main() {
--  return (tzname != NULL);
--}
--  ],[AC_DEFINE(HAVE_TZNAME, 1,
--   [Define if time.h defines extern extern char *tzname[2] variable])
--   has_tzname=yes
--   ],[has_tzname=no])
--   AC_MSG_RESULT($has_tzname)
--fi
--
- AC_ARG_ENABLE(joliet,
- 	AS_HELP_STRING([--disable-joliet], [don't include Joliet extension support (default enabled)]),
- 	[enable_joliet=$enableval],
diff --git a/tools/depends/target/libcdio/osx.patch b/tools/depends/target/libcdio/osx.patch
new file mode 100644
index 0000000000..7215c8603e
--- /dev/null
+++ b/tools/depends/target/libcdio/osx.patch
@@ -0,0 +1,19 @@
+--- configure.ac.orig	2013-10-07 22:22:20.000000000 +0200
++++ configure.ac	2013-10-07 22:22:37.000000000 +0200
+@@ -352,14 +352,14 @@
+ esac
+ AC_SUBST(native_abs_top_srcdir)
+ 
+-case $host_os in
++case $host in
+      aix*)
+        ## Don't use AIX driver until starts to really work
+        ## cd_drivers="${cd_drivers}, AIX"
+        ## AC_DEFINE([HAVE_AIX_CDROM], [1],
+        ##     [Define 1 if you have AIX CD-ROM support])
+        ;;
+-     darwin[[6-9]].*|darwin1[[0-2]].*)
++     *86*-apple-darwin*)
+        AC_CHECK_HEADERS(IOKit/IOKitLib.h CoreFoundation/CFBase.h, 
+                         [have_iokit_h="yes"])
+        if test "x$have_iokit_h" = "xyes" ; then