From d3988dd74b0d1f1ed03f86d7f18e1c0009b3c8d2 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 25 Dec 2009 20:55:37 +0000 Subject: [PATCH] Adapted to libcdio-0.83 and its runtime version telling --- cdrskin/cdrskin_timestamp.h | 2 +- configure.ac | 3 +-- libburn/sg-libcdio.c | 16 ++++++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index 91e1490..e6cf1ef 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2009.12.25.144122" +#define Cdrskin_timestamP "2009.12.25.205704" diff --git a/configure.ac b/configure.ac index 670dd6a..b418d67 100644 --- a/configure.ac +++ b/configure.ac @@ -231,8 +231,7 @@ else echo "enabled EXPERIMENTAL use of libcdio as system adapter" CFLAGS="$CFLAGS $LIBCDIO_DEF" - dnl Bump to 0.83 when released - LIBCDIO_REQUIRED=0.82 + LIBCDIO_REQUIRED=0.83 PKG_CHECK_MODULES(LIBCDIO, libcdio >= $LIBCDIO_REQUIRED) fi diff --git a/libburn/sg-libcdio.c b/libburn/sg-libcdio.c index 293cc6e..5c8db6a 100644 --- a/libburn/sg-libcdio.c +++ b/libburn/sg-libcdio.c @@ -330,14 +330,18 @@ int sg_grab(struct burn_drive *d) sprintf(msg, "Using sg-libcdio-%d with libcdio version ", LIBCDIO_VERSION_NUM ); -/* >>> change this to #if LIBCDIO_VERSION_NUM < 83 */ -#ifdef LIBCDIO_HAS_VERSION_CALL - cdio_ver = cdio_version(&version_text); -#else + #if LIBCDIO_VERSION_NUM < 83 + LIBBURN_MISCONFIGURATION = 0; -INTENTIONAL_ABORT_OF_COMPILATION__HEADERFILE_cdio_version_dot_h_TOO_OLD__NEED_LIBCDIO_HAS_VERSION_CALL = 0; +INTENTIONAL_ABORT_OF_COMPILATION__HEADERFILE_cdio_version_dot_h_TOO_OLD__NEED_LIBCDIO_VERSION_NUM_83 = 0; LIBBURN_MISCONFIGURATION_ = 0; -#endif /* ! LIBCDIO_HAS_VERSION_CALL */ + + #else + + cdio_ver = libcdio_version_num; + version_text = (char *) cdio_version_string; + + #endif /* ! LIBCDIO_VERSION_NUM < 83 */ strncat(msg, version_text, 80); libdax_msgs_submit(libdax_messenger, -1, 0x00000002,