c++ gurus, I need help,
The problem:
cdio-paranoia is removed from libcdio > 0.83. A new package 'libcdio-paranoia' provides all old cdio-paranoia headers, BUT the header file location has moved from:
../cdio
to
../cdio/paranoia
I successfully built kaffeine on Arch with libcdio & libcdio-paranoia by softlinking the needed paranoia headers to ../cdio:
cdda.h -> paranoia/cdda.h paranoia.h -> paranoia/paranoia.h
How do we patch kaffeine to properly handle this change? kaffeine/src/input/disc/paranoia.h already includes:
#include <cdio/cdda.h> #include <cdio/paranoia.h>
The only other files that need fixing are:
configure.in:303:KDE_CHECK_HEADER([cdio/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no]) kaffeine/configure.in.in:223:KDE_CHECK_HEADER([cdio/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no])
But how to do this with preprocessor checks so that it will work with both libcdio <= 0.83 and those systems with libcdio > 0.83 that will also need libcdio-paranoia?
On 01/23/2014 01:30 AM, David C. Rankin wrote:
c++ gurus, I need help,
The problem:
cdio-paranoia is removed from libcdio > 0.83. A new package 'libcdio-paranoia' provides all old cdio-paranoia headers, BUT the header file location has moved from:
../cdio
to
../cdio/paranoia
I successfully built kaffeine on Arch with libcdio & libcdio-paranoia by softlinking the needed paranoia headers to ../cdio:
cdda.h -> paranoia/cdda.h paranoia.h -> paranoia/paranoia.h
How do we patch kaffeine to properly handle this change? kaffeine/src/input/disc/paranoia.h already includes:
#include <cdio/cdda.h> #include <cdio/paranoia.h>
The only other files that need fixing are:
configure.in:303:KDE_CHECK_HEADER([cdio/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no]) kaffeine/configure.in.in:223:KDE_CHECK_HEADER([cdio/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no])
But how to do this with preprocessor checks so that it will work with both libcdio <= 0.83 and those systems with libcdio > 0.83 that will also need libcdio-paranoia?
Ok,
I have to find a way to fix this. Linking is not a real solution.. I've opened http://bugs.pearsoncomputing.net/show_bug.cgi?id=1885 to facilitate this.
Slavek, do you know a automagic fix that will work?
On 01/28/2014 11:19 PM, David C. Rankin wrote:
Ok,
I have to find a way to fix this. Linking is not a real solution.. I've opened http://bugs.pearsoncomputing.net/show_bug.cgi?id=1885 to facilitate this.
Slavek, do you know a automagic fix that will work?
I'm an idiot... It was already filed as 1853.. I provided a patch to 1853 and closed 1885. Will need someone to figure out preprocessor or automate checks to allow the build to work with libcdio <= 0.83 and >= 0.9...
-
David C. Rankin