SVN commit 498711 by adridg:
Take all the weird hacks that were done specifically for FreeBSD
and get rid of them. The upstream cdparanoia has been fixed now,
which gives us a more straightforward interface.
CCMAIL: [EMAIL PROTECTED]
M +22 -0 configure.in.in
M +1 -2 kioslave/audiocd/audiocd.cpp
--- branches/KDE/3.5/kdemultimedia/configure.in.in #498710:498711
@@ -251,6 +251,28 @@
KDE_CHECK_HEADER(cdda_interface.h,
[:], [have_cdparanoia=no])
+ # Older versions of FreeBSD's cdparanoia lack cdrom_drive.cdda_device_name
+ AC_MSG_CHECKING([for cdrom_drive.cdda_device_name in cdda_interface.h])
+ kde_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $all_includes"
+ AC_LANG_SAVE
+ AC_LANG_C
+ AC_TRY_COMPILE([
+ #include <cdda_interface.h>
+ ],
+ [
+ struct cdrom_drive device;
+ device.cdda_device_name = 0;
+ ],
+ [
+ AC_MSG_RESULT([yes])
+ ], [
+ AC_MSG_RESULT([no])
+ have_cdparanoia=no
+ ])
+ AC_LANG_RESTORE
+ CPPFLAGS=$kde_save_CPPFLAGS
+
KDE_CHECK_LIB(cdda_paranoia, paranoia_init,
[:], [have_cdparanoia=no], [-lcdda_interface -lm])
--- branches/KDE/3.5/kdemultimedia/kioslave/audiocd/audiocd.cpp #498710:498711
@@ -215,9 +215,8 @@
// Update our knowledge of the disc
// TODO which one is right?
// qDebug("\"%s\" \"%s\"", drive->cdda_device_name,
drive->ioctl_device_name);
-#if defined(Q_OS_LINUX)
d->cd.setDevice(drive->cdda_device_name, 50, false);
-#elif defined(Q_OS_FREEBSD)
+#if 0
// FreeBSD's cdparanoia as of january 5th 2006 has rather broken
// support for non-SCSI devices. Although it finds ATA cdroms just
// fine, there is no straightforward way to discover the device
_______________________________________________
kde-freebsd mailing list
[email protected]
http://freebsd.kde.org/mailman/listinfo/kde-freebsd
