Hi,
I'm currently the maintainer of the FreeBSD port of cdrdao (see
http://www.freebsd.org/cgi/cvsweb.cgi/ports/sysutils/cdrdao) and it
would be great if its non-port-specific local patches (i.e. patches
dealing with the install location, etc.) could be incorporated into
the cdrdao repository. Attached is a diff against the current HEAD of
the CVS repository. Most changes are FreeBSD- and LP64-related and I
already sent them to Andreas Mueller once, others fix issues
introduced with the gnome2 changes in cdrdao 1.1.8. Detailed list
of changed files:
configure.in:
- Add an option --without-xdao which completely disables the
compilation of gcdmaster (even the tests for the required libs).
- When using an existing pccts (i.e. one specified via --with-pcctsbin
and --with-pcctsinc) it's not necessary to compile the one shipping
with cdrdao. This was broken when switching to automake/the gnome2
changes.
- Improve the checks for --with-pcctsbin and --with-pcctsinc, if
something is wrong just use the pccts shipping with cdrdao instead
of bailing out.
- Some FreeBSD-related improvements, e.g. add support for current and
soon to be upcoming versions, use the Linux sound interface also on
FreeBSD.
README.FreeBSD:
- Remove it as the infomation given here is outdated. The required
kernel options are enabled in the GENERIC kernel since FreeBSD 4.0
(released March 2000) and their names have changed more than once
over time. Therefore instead of writing a version that tries to list
the correct options for the different kernel versions that would
probably confuse people more than help them I decided to no longer
let the port install this file. I never received a complaint
regarding this in the time of being the maintainer, which is over
a year.
Makefile.am:
- Second part of making pccts an optional target.
- Remove README.FreeBSD.
utils/Makefile.am:
- Compile and install toc2cddb. Seems to have been broken by the
switch to automake.
specs/cdrdao.fedora1.spec.in
and
specs/cdrdao.rh9.spec.in:
- Remove README.FreeBSD and add toc2cddb. I hope this is done right
as I didn't test it.
dao/cdrdao.drivers:
- Add a few burners.
dao/ScsiIf-lib.cc
and
trackdb/lec.cc:
- LP64 fixes, tested on FreeBSD/alpha and FreeBSD/sparc64. These changes
don't have an impact on the binaries generated on i386, i.e. they are
identical to the ones without these changes.
paranoia/isort.c:
- Fix for !i386 platforms, taken from the cdparanoia repository:
<snip>
fixed up two allocations of the wrong type (sort_link * instead of
sort_link and ** instead of *). All are 4 bytes on Intel/GCC so no
damage done to released binaries, but this obviously had to be fixed.
<snip>
trackdb/Track.cc:
- Cdrdao here uses a GCC extensions (IIRC, it's not defined in the
C++ standard or at least it's unclear on it) without a need as the
standard constructor of class Msf also sets lba etc. to 0. This
fixes compilation with the Intel C++ Compiler.
xdao/CdDevice.cc
- Replace deprecated malloc.h header with stdlib.h.
xdao/SoundIF-linux.cc
- Add support for FreeBSD.
|
