libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapted to libcdio-0.83 and its runtime version telling

Browse Source
This commit is contained in:
Thomas Schmitt 2009-12-25 20:55:37 +00:00
parent d0d6e49727
commit 060df845ba
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libburn/trunk/cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2009.12.25.144122" #define Cdrskin_timestamP "2009.12.25.205704"

3
libburn/trunk/configure.ac
View File

@ -231,8 +231,7 @@ else
echo "enabled EXPERIMENTAL use of libcdio as system adapter" echo "enabled EXPERIMENTAL use of libcdio as system adapter"
CFLAGS="$CFLAGS $LIBCDIO_DEF" CFLAGS="$CFLAGS $LIBCDIO_DEF"
dnl Bump to 0.83 when released LIBCDIO_REQUIRED=0.83
LIBCDIO_REQUIRED=0.82
PKG_CHECK_MODULES(LIBCDIO, libcdio >= $LIBCDIO_REQUIRED) PKG_CHECK_MODULES(LIBCDIO, libcdio >= $LIBCDIO_REQUIRED)
fi fi

16
libburn/trunk/libburn/sg-libcdio.c
View File

@ -330,14 +330,18 @@ int sg_grab(struct burn_drive *d)
sprintf(msg, "Using sg-libcdio-%d with libcdio version ", sprintf(msg, "Using sg-libcdio-%d with libcdio version ",
LIBCDIO_VERSION_NUM ); LIBCDIO_VERSION_NUM );
/* >>> change this to #if LIBCDIO_VERSION_NUM < 83 */ #if LIBCDIO_VERSION_NUM < 83
#ifdef LIBCDIO_HAS_VERSION_CALL
cdio_ver = cdio_version(&version_text);
#else
LIBBURN_MISCONFIGURATION = 0; 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; 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); strncat(msg, version_text, 80);
libdax_msgs_submit(libdax_messenger, -1, 0x00000002, libdax_msgs_submit(libdax_messenger, -1, 0x00000002,