Skip to content
This repository
Browse code

Revert "[depends/libcdio] - bump to 0.90 again (was lost during unifi…

…ed deps)"

This reverts commit 64109e8.

- was already taken care of in the libcdio-gplv3 subdir
  • Loading branch information...
commit 98e2ce491c61b6bda1fe5422365a0a916fe2dea1 1 parent 34ff4c8
Memphiz authored
4  tools/depends/target/libcdio/Makefile
@@ -3,7 +3,7 @@ DEPS= ../../Makefile.include configure.patch Makefile
3 3
 
4 4
 # lib name, version
5 5
 LIBNAME=libcdio
6  
-VERSION=0.90
  6
+VERSION=0.80
7 7
 SOURCE=$(LIBNAME)-$(VERSION)
8 8
 ARCHIVE=$(SOURCE).tar.gz
9 9
 # configuration settings
@@ -25,7 +25,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
25 25
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
26 26
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
27 27
 	cd $(PLATFORM); patch -p0 < ../configure.patch
28  
-	cd $(PLATFORM); patch -p0 < ../osx.patch
  28
+	cd $(PLATFORM); patch -p0 < ../cross.patch
29 29
 	cd $(PLATFORM); $(AUTORECONF) -vif
30 30
 	cd $(PLATFORM); $(CONFIGURE)
31 31
 
8  tools/depends/target/libcdio/configure.patch
... ...
@@ -1,11 +1,11 @@
1  
---- configure.ac.orig	2012-10-27 17:07:45.000000000 +0200
2  
-+++ configure.ac	2013-10-07 22:20:02.000000000 +0200
3  
-@@ -387,7 +387,7 @@
  1
+--- configure.ac	2012-05-27 15:06:13.044747493 -0400
  2
++++ configure.ac	2012-05-27 15:05:52.364747505 -0400
  3
+@@ -378,7 +378,7 @@
4 4
       ;;
5 5
       linux*|uclinux)
6 6
          AC_CHECK_HEADERS(linux/version.h linux/major.h)
7 7
 -        AC_CHECK_HEADERS(linux/cdrom.h, [have_linux_cdrom_h="yes"])
8 8
 +        AC_CHECK_HEADERS(linux/cdrom.h, [have_linux_cdrom_h="no"])
9  
- 	if test "x$have_linux_cdrom_h" = "xyes"; then
  9
+ 	if test "x$have_linux_cdrom_h" = "xyes" ; then
10 10
  	   AC_TRY_COMPILE(,[
11 11
  #include <linux/cdrom.h>
109  tools/depends/target/libcdio/cross.patch
... ...
@@ -0,0 +1,109 @@
  1
+--- configure.ac	2013-03-10 19:25:36.396466337 -0400
  2
++++ configure.ac	2013-03-10 19:24:34.906466376 -0400
  3
+@@ -269,37 +269,6 @@
  4
+ fi
  5
+ dnl empty_array_size
  6
+ 
  7
+-dnl bitfield order
  8
+-AC_MSG_CHECKING(bitfield ordering in structs)
  9
+-AC_TRY_RUN([
  10
+-int
  11
+- main() {
  12
+-  struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
  13
+-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
  14
+-  __attribute__((packed))
  15
+-#endif
  16
+-  bf = { 1,1,1,1 };
  17
+-  if (sizeof (bf) != 1) return 1;
  18
+-  return *((unsigned char*) &bf) != 0x4b; }
  19
+-], bf_lsbf=1, AC_TRY_RUN([ 
  20
+-int
  21
+-main() {
  22
+-  struct { char bit_0:1, bit_12:2, bit_345:3, bit_67:2; }
  23
+-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
  24
+-  __attribute__((packed))
  25
+-#endif
  26
+-  bf = { 1,1,1,1 };
  27
+-  if (sizeof (bf) != 1) return 1;
  28
+-  return *((unsigned char*) &bf) != 0xa5; }
  29
+-], bf_lsbf=0, AC_MSG_ERROR([unsupported bitfield ordering])))
  30
+-if test "x$bf_lsbf" = "x1"; then
  31
+- AC_MSG_RESULT(LSBF)
  32
+- AC_DEFINE(BITFIELD_LSBF, [], [compiler does least-significant bit first in struct bitfields])
  33
+-else
  34
+- AC_MSG_RESULT(MSBF)
  35
+-fi
  36
+-dnl
  37
+-
  38
+ dnl AM_PROG_LIBTOOL tests whether we have GNU ld
  39
+ dnl this must come before checking --with-versioned-libs
  40
+ dnl which requires GNU ld.
  41
+@@ -466,24 +435,6 @@
  42
+ 	;;
  43
+ esac
  44
+ 
  45
+-AC_MSG_CHECKING(extern long timezone variable)
  46
+-AC_TRY_RUN([
  47
+-#ifdef NEED_TIMEZONEVAR
  48
+-#define timezonevar 1
  49
+-#endif
  50
+-
  51
+-#include <time.h>
  52
+-extern long timezone;
  53
+-int main(int argc, char **argv) {
  54
+-  long test_timezone = timezone;
  55
+-  return 0; 
  56
+-}
  57
+-], [AC_MSG_RESULT(yes); 
  58
+-   AC_DEFINE([HAVE_TIMEZONE_VAR], 1, 
  59
+-	[Define if you have an extern long timenzone variable.])],
  60
+-   [AC_MSG_RESULT(no)])
  61
+-dnl
  62
+-
  63
+ AC_SUBST(LINUX_CDROM_TIMEOUT)
  64
+ AC_SUBST(DARWIN_PKG_LIB_HACK)
  65
+ AC_SUBST(HAVE_BSDI_CDROM)
  66
+@@ -508,43 +459,6 @@
  67
+                  ,
  68
+                  [#include <time.h>])
  69
+ 
  70
+-if test $ac_cv_member_struct_tm_tm_gmtoff = yes ; then
  71
+-  AC_MSG_CHECKING([whether time.h defines daylight and timezone variables])
  72
+-  AC_TRY_RUN([
  73
+-#include <time.h>
  74
+-
  75
+-
  76
+-       extern char *tzname[2];
  77
+-       extern long timezone;
  78
+-       extern int daylight;
  79
+-
  80
+-int
  81
+- main() {
  82
+-  return (timezone != 0) + daylight;
  83
+-}
  84
+-  ],[AC_DEFINE(HAVE_DAYLIGHT, 1,
  85
+-   [Define if time.h defines extern long timezone and int daylight vars.])
  86
+-   has_daylight=yes
  87
+-   ],[has_daylight=no])
  88
+-  AC_MSG_RESULT($has_daylight)
  89
+-  AC_MSG_CHECKING([whether time.h defines tzname variable])
  90
+-  AC_TRY_RUN([
  91
+-#include <time.h>
  92
+-
  93
+-
  94
+-       extern char *tzname[2];
  95
+-
  96
+-int
  97
+- main() {
  98
+-  return (tzname != NULL);
  99
+-}
  100
+-  ],[AC_DEFINE(HAVE_TZNAME, 1,
  101
+-   [Define if time.h defines extern extern char *tzname[2] variable])
  102
+-   has_tzname=yes
  103
+-   ],[has_tzname=no])
  104
+-   AC_MSG_RESULT($has_tzname)
  105
+-fi
  106
+-
  107
+ AC_ARG_ENABLE(joliet,
  108
+ 	AS_HELP_STRING([--disable-joliet], [don't include Joliet extension support (default enabled)]),
  109
+ 	[enable_joliet=$enableval],
19  tools/depends/target/libcdio/osx.patch
... ...
@@ -1,19 +0,0 @@
1  
---- configure.ac.orig	2013-10-07 22:22:20.000000000 +0200
2  
-+++ configure.ac	2013-10-07 22:22:37.000000000 +0200
3  
-@@ -352,14 +352,14 @@
4  
- esac
5  
- AC_SUBST(native_abs_top_srcdir)
6  
- 
7  
--case $host_os in
8  
-+case $host in
9  
-      aix*)
10  
-        ## Don't use AIX driver until starts to really work
11  
-        ## cd_drivers="${cd_drivers}, AIX"
12  
-        ## AC_DEFINE([HAVE_AIX_CDROM], [1],
13  
-        ##     [Define 1 if you have AIX CD-ROM support])
14  
-        ;;
15  
--     darwin[[6-9]].*|darwin1[[0-2]].*)
16  
-+     *86*-apple-darwin*)
17  
-        AC_CHECK_HEADERS(IOKit/IOKitLib.h CoreFoundation/CFBase.h, 
18  
-                         [have_iokit_h="yes"])
19  
-        if test "x$have_iokit_h" = "xyes" ; then 

0 notes on commit 98e2ce4

Please sign in to comment.
Something went wrong with that request. Please try again.