rev 5914 - in trunk/packages/kdemultimedia/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2007-04-14 11:55:08 +0000 (Sat, 14 Apr 2007)
New Revision: 5914

Added:
   trunk/packages/kdemultimedia/debian/patches/11_audiocd_no_-x_in_lame.diff
Modified:
   trunk/packages/kdemultimedia/debian/changelog
Log:
fix lame encoding options


Modified: trunk/packages/kdemultimedia/debian/changelog
===================================================================
--- trunk/packages/kdemultimedia/debian/changelog	2007-04-14 11:52:59 UTC (rev 5913)
+++ trunk/packages/kdemultimedia/debian/changelog	2007-04-14 11:55:08 UTC (rev 5914)
@@ -1,10 +1,13 @@
 kdemultimedia (4:3.5.6-2) unstable; urgency=low
 
   * UNRELEASED
-  * 
+  +++ Changes by Sune Vuorela:
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Apr 2007 13:52:16 +0200
+  * Don't lame encode with -x. It seems to have no effect on x86 arch - and it
+    breaks on PPC. (Closes: #388382)
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Apr 2007 13:53:20 +0200
+
 kdemultimedia (4:3.5.6-1) experimental; urgency=low
 
   * New upstream release.

Added: trunk/packages/kdemultimedia/debian/patches/11_audiocd_no_-x_in_lame.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/11_audiocd_no_-x_in_lame.diff	2007-04-14 11:52:59 UTC (rev 5913)
+++ trunk/packages/kdemultimedia/debian/patches/11_audiocd_no_-x_in_lame.diff	2007-04-14 11:55:08 UTC (rev 5914)
@@ -0,0 +1,16 @@
+Index: kdemultimedia/kioslave/audiocd/plugins/lame/encoderlame.cpp
+===================================================================
+--- kdemultimedia/kioslave/audiocd/plugins/lame/encoderlame.cpp	(revision 653121)
++++ kdemultimedia/kioslave/audiocd/plugins/lame/encoderlame.cpp	(working copy)
+@@ -217,10 +217,9 @@
+ 	d->lastErrorMessage = QString::null;
+ 	d->processHasExited = false;
+ 
+-	// -x bitswap
+ 	// -r raw/pcm
+ 	// -s 44.1 (because it is raw you have to specify this)
+-	*(d->currentEncodeProcess)	<< "lame" << "--verbose" << "-x" << "-r" << "-s" << "44.1";
++	*(d->currentEncodeProcess)	<< "lame" << "--verbose" << "-r" << "-s" << "44.1";
+ 
+ 	*(d->currentEncodeProcess) << args;
+ 	if(Settings::self()->id3_tag())