Slavek,
kaffeine is partially fixed to deal with the new paranoia/cdda.h and paranoia/paranoia.h header locations. The fix to kaffeine/configure.in.in seems OK. However, without a patch to 'kaffeine/kaffeine/configure.in.in' ./configure fails to find the new headers and fails with:
checking cdio/cdda.h usability... no checking cdio/cdda.h presence... no checking for cdio/cdda.h... no
----------------------------------------- ERROR: Could not find cdparanoia headers. -----------------------------------------
configure: error: could not find cdparanoia headers
This check in 'kaffeine/kaffeine/configure.in.in is causing the failure:
dnl -------------------- dnl check for cdparanoia dnl --------------------
KDE_CHECK_HEADER([cdio/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no])
if test "$with_cdparanoia" != "yes" ; then echo "" echo "-----------------------------------------" echo "ERROR: Could not find cdparanoia headers." echo "-----------------------------------------" echo ""
AC_MSG_ERROR([could not find cdparanoia headers]) fi
This must be consitnt with the new 'kaffeine/configure.in.in' check of:
KDE_CHECK_HEADER(cdio/paranoia/cdda.h, [have_libcdio_090="yes"], [have_libcdio_090="no"]) if test "x$have_libcdio_090" = "xyes"; then AC_DEFINE(HAVE_LIBCDIO_090, 1, [have libcdio >= 0.90]) fi
Since that check fails I have to patch configure.in.in. Next, you (or somebody) added preprocessor checks to kaffeine/kaffeine/src/input/disc/paranoia.h at line 35 - line 36 is MISSING a '/' after paranoia:
extern "C" { #ifdef HAVE_LIBCDIO_090 #include <cdio/paranoiacdda.h> #include <cdio/paranoia/paranoia.h> #else // HAVE_LIBCDIO_090 #include <cdio/cdda.h> #include <cdio/paranoia.h> #endif // HAVE_LIBCDIO_090 }
Should be:
extern "C" { #ifdef HAVE_LIBCDIO_090 #include <cdio/paranoia/cdda.h> ^^^^
Further, since configure.in.in is not fixed, the preprocessor checks do not work after I patch configure.in.in... I still get build failures:
In file included from disc.h:39:0, from disc.cpp:42, from libkaffeinedisc_la.all_cpp.cpp:2: paranoia.h:39:23: fatal error: cdio/cdda.h: No such file or directory #include <cdio/cdda.h>
I've tried fixing each of the autofoo checks and defines, but I still get:
l_cpp.Tpo -c libkaffeinedisc_la.all_cpp.cpp -fPIC -DPIC -o .libs/libkaffeinedisc_la.all_cpp.o In file included from disc.h:39:0, from disc.cpp:42, from libkaffeinedisc_la.all_cpp.cpp:2: paranoia.h:39:23: fatal error: cdio/cdda.h: No such file or directory #include <cdio/cdda.h> ^ compilation terminated.
I've attached the latest patch I tried. I need help fixing it :(