plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 38 31 + 7 - 0 !
1 file changed, 31 insertions(+), 7 deletions(-)

---

libk3b/core/k3bdefaultexternalprograms.cpp | 8 7 + 1 - 0 !
libk3b/core/k3bdefaultexternalprograms.h | 3 3 + 0 - 0 !
libk3b/projects/audiocd/k3baudiodoc.cpp | 4 2 + 2 - 0 !
libk3b/projects/audiocd/k3baudionormalizejob.cpp | 12 6 + 6 - 0 !
src/k3bprojectmanager.cpp | 4 2 + 2 - 0 !
src/projects/k3baudioburndialog.cpp | 12 6 + 6 - 0 !
src/projects/k3bmixedburndialog.cpp | 12 6 + 6 - 0 !
7 files changed, 32 insertions(+), 23 deletions(-)

 normalize is named "normalize-audio" in debian.
 Change that everywhere.... for real this time

src/k3bsystemproblemdialog.cpp | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

---

src/k3bsystemproblemdialog.cpp | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

src/k3bsystemproblemdialog.cpp | 3 1 + 2 - 0 !
1 file changed, 1 insertion(+), 2 deletions(-)

---

src/k3bsystemproblemdialog.cpp | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

---

src/k3b.desktop | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 set k3b as the default handler for iso files rather than ark

libk3bdevice/k3bdevice_mmc.cpp | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 report proper bd-r capacity (for lg bh10 and maybe others)

libk3bdevice/k3bscsicommand_bsd.cpp | 48 24 + 24 - 0 !
1 file changed, 24 insertions(+), 24 deletions(-)

 [patch] k3bscsicommand_bsd: do not access the scsi_sense_data fields
 manually.

cam users are expected to retrieve those values with scsi_extract_sense
(or, since FreeBSD 9, scsi_extract_sense_len).

FreeBSD 9 has changed the scsi_sense_data struct, but everything works
fine in all supported releases if we just use scsi_extract_sense.

CCMAIL: michalm@jabster.pl
(cherry picked from commit d8f73a5f66c6bbebac52a8b784affb106b188279)

k3bsetup/k3bsetup | 4 1 + 3 - 0 !
1 file changed, 1 insertion(+), 3 deletions(-)

 [patch] k3bsetup: fix the shebang line to be just /bin/sh

plugins/encoder/sox/k3bsoxencoder.cpp | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 [patch] fix sox detection with sox >= 14.4.0

sox 1.14.0 changed the string that is printed out on --version, breaking the simply string matching done;
add a new case to cover also this new version

BUG: 301544

(cherry picked from commit 79cd49cac3a6b7031556aae53ce3ecff8c360cb9)

plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 8 8 + 0 - 0 !
1 file changed, 8 insertions(+)

 [patch] fix k3b to build with recent ffmpeg versions

FFMPEG 0.11 (shipped on ArchLinux, for example) has renamed some
functions.

The exact versions in the #ifdefs are taken from the Mobile Robot
Programming Toolkit.

BUG: 300731

(backport of 6f34e14b28d2f9103151c6ba08b3bb40448ffe46)

plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 11 10 + 1 - 0 !
1 file changed, 10 insertions(+), 1 deletion(-)

---

libk3b/jobs/k3bdvdcopyjob.cpp | 17 12 + 5 - 0 !
libk3b/jobs/k3bmetawriter.cpp | 12 10 + 2 - 0 !
libk3b/projects/datacd/k3bdatajob.cpp | 13 10 + 3 - 0 !
3 files changed, 32 insertions(+), 10 deletions(-)

 [patch] prefer growisofs to wodim for dvd/bluray burning.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

K3b 2 defaults to cdrecord for all burning tasks, including DVDs and BluRay
discs. Unfortunately, it also does this when cdrecord is actually wodim. This
is a bad idea, because wodim's DVD burning code is not the "ProDVD" code in
Jrg Schilling's current cdrecord releases, but a much older, buggier and
basically unmaintained DVD patch. We cannot ship the ProDVD code in wodim
because of licensing conflicts: That code was never released under the GPL, it
was relicensed directly from its original proprietary license to the CDDL. But
wodim is GPLed, and cannot be relicensed to the CDDL, in fact this was the
whole reason for the fork: Jrg Schilling's cdrecord distributes mixed CDDL and
GPL code linked together. So the DVD code in wodim is based on an ancient
experimental community-contributed DVD support patch for cdrecord (from the
times where ProDVD was entirely proprietary). So it's a bad idea to use wodim
for DVDs. As for BluRay discs, those aren't currently supported by wodim at
all; K3b should detect this, but still, it's better to explicitly default to
growisofs there too, in case wodim grows some experimental BluRay support.

One concrete known issue with wodim's DVD burning code is that it fails to burn
dual-layer DVD+Rs: https://bugzilla.redhat.com/show_bug.cgi?id=610976 . But
chances are there are many more DVD burning bugs in wodim, which are unlikely
to get fixed promptly.

Growisofs, on the other hand, is designed specifically for DVDs and BluRay
disks, doesn't have licensing issues and has been used successfully for DVDs
for years (in fact, K3b 1 always used growisofs for DVDs).

This patch makes K3b default to growisofs for all DVD or BluRay burning tasks
if cdrecord is actually wodim.

REVIEW: 101208