Accepting request 259700 from KDE:Extra
Update to 2.0.3 OBS-URL: https://build.opensuse.org/request/show/259700 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=55
This commit is contained in:
Stephan Kulow
Git OBS Bridge
parent
06d88b9075
commit
093a7651a3
@ -1,11 +0,0 @@
|
||||
--- src/k3b.desktop 2011-01-15 21:47:30.000000000 +0100
|
||||
+++ src/k3b.desktop 2011-01-16 12:08:05.698000050 +0100
|
||||
@@ -137,7 +137,7 @@
|
||||
Name[x-test]=xxK3bxx
|
||||
Name[zh_CN]=K3b
|
||||
Name[zh_TW]=K3b
|
||||
-MimeType=application/x-k3b;application/x-iso;application/x-cd-image;application/x-cue;
|
||||
+MimeType=application/x-k3b;application/x-iso;application/x-cd-image;application/x-cue;x-content/blank-cd;x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd;
|
||||
X-KDE-StartupNotify=true
|
||||
X-KDE-NativeMimeType=application/x-k3b;
|
||||
Categories=KDE;Qt;AudioVideo;DiscBurning;System;Filesystem;
|
||||
@ -1,105 +0,0 @@
|
||||
diff -ur k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
|
||||
--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2011-01-15 21:47:29.000000000 +0100
|
||||
+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2012-05-27 20:30:32.174569308 +0200
|
||||
@@ -88,7 +88,7 @@
|
||||
close();
|
||||
|
||||
// open the file
|
||||
- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
|
||||
+ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, 0 );
|
||||
if( err < 0 ) {
|
||||
kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
|
||||
return false;
|
||||
@@ -109,7 +109,13 @@
|
||||
#else
|
||||
::AVCodecContext* codecContext = d->formatContext->streams[0]->codec;
|
||||
#endif
|
||||
- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) {
|
||||
+ if( codecContext->codec_type !=
|
||||
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
|
||||
+ AVMEDIA_TYPE_AUDIO)
|
||||
+#else
|
||||
+ CODEC_TYPE_AUDIO)
|
||||
+#endif
|
||||
+ {
|
||||
kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
|
||||
return false;
|
||||
}
|
||||
@@ -137,7 +143,7 @@
|
||||
}
|
||||
|
||||
// dump some debugging info
|
||||
- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
|
||||
+ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -225,8 +231,11 @@
|
||||
QString K3bFFMpegFile::title() const
|
||||
{
|
||||
// FIXME: is this UTF8 or something??
|
||||
- if( d->formatContext->title[0] != '\0' )
|
||||
- return QString::fromLocal8Bit( d->formatContext->title );
|
||||
+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
|
||||
+ if( ade == NULL )
|
||||
+ return QString();
|
||||
+ if( ade->value != '\0' )
|
||||
+ return QString::fromLocal8Bit( ade->value );
|
||||
else
|
||||
return QString();
|
||||
}
|
||||
@@ -235,8 +244,11 @@
|
||||
QString K3bFFMpegFile::author() const
|
||||
{
|
||||
// FIXME: is this UTF8 or something??
|
||||
- if( d->formatContext->author[0] != '\0' )
|
||||
- return QString::fromLocal8Bit( d->formatContext->author );
|
||||
+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
|
||||
+ if( ade == NULL )
|
||||
+ return QString();
|
||||
+ if( ade->value != '\0' )
|
||||
+ return QString::fromLocal8Bit( ade->value );
|
||||
else
|
||||
return QString();
|
||||
}
|
||||
@@ -245,8 +257,11 @@
|
||||
QString K3bFFMpegFile::comment() const
|
||||
{
|
||||
// FIXME: is this UTF8 or something??
|
||||
- if( d->formatContext->comment[0] != '\0' )
|
||||
- return QString::fromLocal8Bit( d->formatContext->comment );
|
||||
+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
|
||||
+ if( ade == NULL )
|
||||
+ return QString();
|
||||
+ if( ade->value != '\0' )
|
||||
+ return QString::fromLocal8Bit( ade->value );
|
||||
else
|
||||
return QString();
|
||||
}
|
||||
@@ -309,8 +324,13 @@
|
||||
#if LIBAVCODEC_VERSION_MAJOR < 52
|
||||
int len = ::avcodec_decode_audio(
|
||||
#else
|
||||
- int len = ::avcodec_decode_audio2(
|
||||
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
|
||||
+ int len = ::avcodec_decode_audio3(
|
||||
+ #else
|
||||
+ int len = ::avcodec_decode_audio2(
|
||||
+ #endif
|
||||
#endif
|
||||
+
|
||||
#ifdef FFMPEG_BUILD_PRE_4629
|
||||
&d->formatContext->streams[0]->codec,
|
||||
#else
|
||||
@@ -318,7 +338,11 @@
|
||||
#endif
|
||||
(short*)d->alignedOutputBuffer,
|
||||
&d->outputBufferSize,
|
||||
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
|
||||
+ &d->packet );
|
||||
+#else
|
||||
d->packetData, d->packetSize );
|
||||
+#endif
|
||||
|
||||
if( d->packetSize <= 0 || len < 0 )
|
||||
::av_free_packet( &d->packet );
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:af176f29c1d2339c4648d461476227cb07bcd0c75056f2a4006f253e3ef5b7cd
|
||||
size 12833321
|
||||
3
k3b-2.0.3a.tar.xz
Normal file
3
k3b-2.0.3a.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2d0bb2746802c1d3ad7ddd10e29234cf2053074f376feb200306a5570c39c081
|
||||
size 9864468
|
||||
@ -1,23 +0,0 @@
|
||||
From: Kevin Kofler <kevin.kofler@chello.at>
|
||||
Date: Sat, 17 Sep 2011 21:34:23 +0000
|
||||
Subject: K3b::IsOverburnAllowed: Don't count used capacity twice.
|
||||
X-Git-Url: http://quickgit.kde.org/?p=k3b.git&a=commitdiff&h=8270d2853f2962facdf6f9ea6d669922d6c78aba
|
||||
---
|
||||
K3b::IsOverburnAllowed: Don't count used capacity twice.
|
||||
|
||||
CCBUG: 276002
|
||||
---
|
||||
|
||||
|
||||
--- a/libk3b/core/k3bglobals.cpp
|
||||
+++ b/libk3b/core/k3bglobals.cpp
|
||||
@@ -595,7 +595,7 @@
|
||||
bool K3b::IsOverburnAllowed( const Msf& projectSize, const Msf& capacity, const Msf& usedCapacity )
|
||||
{
|
||||
return( k3bcore->globalSettings()->overburn() &&
|
||||
- (projectSize + usedCapacity) <= ( capacity.lba() - usedCapacity.lba() + capacity.lba() / 4 ) ); // 25% tolerance in overburn mode
|
||||
+ (projectSize + usedCapacity) <= ( capacity.lba() + capacity.lba() / 4 ) ); // 25% tolerance in overburn mode
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From: Michal Malek <michalm@jabster.pl>
|
||||
Date: Sat, 09 Jul 2011 22:03:55 +0000
|
||||
Subject: Fixed crash on detecting writing speeds
|
||||
X-Git-Url: http://quickgit.kde.org/?p=k3b.git&a=commitdiff&h=61ee818030f29e57556248adf1398b6c9e5ee7de
|
||||
---
|
||||
Fixed crash on detecting writing speeds
|
||||
|
||||
Device::Device::determineSupportedWriteSpeeds() method
|
||||
lacked checking if data array is of enough size before accessing
|
||||
it.
|
||||
|
||||
BUG: 272427
|
||||
FIXED-IN: 2.0.3
|
||||
|
||||
Conflicts:
|
||||
|
||||
libk3bdevice/k3bdevice.cpp
|
||||
libk3bdevice/k3bdevice_mmc.cpp
|
||||
---
|
||||
|
||||
|
||||
--- a/libk3bdevice/k3bdevice.cpp
|
||||
+++ b/libk3bdevice/k3bdevice.cpp
|
||||
@@ -3253,7 +3253,7 @@
|
||||
int max = 0;
|
||||
unsigned char* data = 0;
|
||||
unsigned int dataLen = 0;
|
||||
- if( modeSense( &data, dataLen, 0x2A ) ) {
|
||||
+ if( modeSense( &data, dataLen, 0x2A ) && dataLen >= 8 ) {
|
||||
mm_cap_page_2A* mm = (mm_cap_page_2A*)&data[8];
|
||||
|
||||
// MMC1 used byte 18 and 19 for the max write speed
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From: Michal Malek <michalm@jabster.pl>
|
||||
Date: Sun, 03 Jul 2011 21:55:16 +0000
|
||||
Subject: Fixed improper track number in CDDB track edit window title
|
||||
X-Git-Url: http://quickgit.kde.org/?p=k3b.git&a=commitdiff&h=6110dc547b118a6aecc64f15bbcef04636854958
|
||||
---
|
||||
Fixed improper track number in CDDB track edit window title
|
||||
|
||||
The title showed track index instead of a track number (which equals to
|
||||
track index + 1).
|
||||
|
||||
BUG: 276681
|
||||
FIXED-IN: 2.0.3
|
||||
---
|
||||
|
||||
|
||||
--- a/src/rip/k3baudiocdview.cpp
|
||||
+++ b/src/rip/k3baudiocdview.cpp
|
||||
@@ -324,7 +324,7 @@
|
||||
int trackIndex = items.first();
|
||||
|
||||
KDialog dialog( this);
|
||||
- dialog.setCaption(i18n("CDDB Track %1", trackIndex) );
|
||||
+ dialog.setCaption(i18n("CDDB Track %1", trackIndex+1) );
|
||||
dialog.setButtons(KDialog::Ok|KDialog::Cancel);
|
||||
dialog.setDefaultButton(KDialog::Ok);
|
||||
dialog.setModal(true);
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
From: Michal Malek <michalm@jabster.pl>
|
||||
Date: Wed, 27 Apr 2011 22:29:18 +0000
|
||||
Subject: Fixed Solid predicates for AudioCd and VideoDvd media. Starting ripping directly from device notifier is possible again.
|
||||
X-Git-Url: http://quickgit.kde.org/?p=k3b.git&a=commitdiff&h=031c6c4e7595c9280768f512b7f82f1681c41351
|
||||
---
|
||||
Fixed Solid predicates for AudioCd and VideoDvd media. Starting ripping directly from device notifier is possible again.
|
||||
BUG: 265819
|
||||
---
|
||||
|
||||
|
||||
--- a/src/services/k3b_audiocd_rip.desktop
|
||||
+++ b/src/services/k3b_audiocd_rip.desktop
|
||||
@@ -1,5 +1,5 @@
|
||||
[Desktop Entry]
|
||||
-X-KDE-Solid-Predicate=[StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Audio']
|
||||
+X-KDE-Solid-Predicate=OpticalDisc.availableContent & 'Audio'
|
||||
Actions=K3bRip;
|
||||
Type=Service
|
||||
X-KDE-Priority=TopLevel
|
||||
|
||||
--- a/src/services/k3b_copy_disc.desktop
|
||||
+++ b/src/services/k3b_copy_disc.desktop
|
||||
@@ -1,5 +1,5 @@
|
||||
[Desktop Entry]
|
||||
-X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'Audio|Data|VideoDvd' ]
|
||||
+X-KDE-Solid-Predicate=OpticalDisc.availableContent & 'Audio|Data|VideoDvd'
|
||||
Actions=K3bCopy;
|
||||
Type=Service
|
||||
X-KDE-Priority=TopLevel
|
||||
|
||||
--- a/src/services/k3b_videodvd_rip.desktop
|
||||
+++ b/src/services/k3b_videodvd_rip.desktop
|
||||
@@ -1,5 +1,5 @@
|
||||
[Desktop Entry]
|
||||
-X-KDE-Solid-Predicate=[StorageVolume.ignored == false AND OpticalDisc.availableContent & 'VideoDvd']
|
||||
+X-KDE-Solid-Predicate=OpticalDisc.availableContent & 'VideoDvd'
|
||||
Actions=K3bRip;
|
||||
Type=Service
|
||||
X-KDE-Priority=TopLevel
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From: Kevin Kofler <kevin.kofler@chello.at>
|
||||
Date: Sat, 17 Sep 2011 16:18:24 +0000
|
||||
Subject: K3b::IsOverburnAllowed: Increase tolerance from 10% to 25%.
|
||||
X-Git-Url: http://quickgit.kde.org/?p=k3b.git&a=commitdiff&h=b0df9e7771ac9148004187bb53ba13ac40b01cae
|
||||
---
|
||||
K3b::IsOverburnAllowed: Increase tolerance from 10% to 25%.
|
||||
|
||||
10% are not enough to allow using CD-R90 and CD-R99 media to full capacity.
|
||||
The new 25% tolerance allows using those media while still catching the common
|
||||
case of DVD ISO vs. CD media.
|
||||
|
||||
BUG: 276002
|
||||
REVIEW: 102648
|
||||
---
|
||||
|
||||
|
||||
--- a/libk3b/core/k3bglobals.cpp
|
||||
+++ b/libk3b/core/k3bglobals.cpp
|
||||
@@ -595,7 +595,7 @@
|
||||
bool K3b::IsOverburnAllowed( const Msf& projectSize, const Msf& capacity, const Msf& usedCapacity )
|
||||
{
|
||||
return( k3bcore->globalSettings()->overburn() &&
|
||||
- (projectSize + usedCapacity) <= ( capacity.lba() - usedCapacity.lba() + capacity.lba() * 10 / 100 ) ); // 10% tolerance in overburn mode
|
||||
+ (projectSize + usedCapacity) <= ( capacity.lba() - usedCapacity.lba() + capacity.lba() / 4 ) ); // 25% tolerance in overburn mode
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,142 +0,0 @@
|
||||
From: Kevin Kofler <kevin.kofler@chello.at>
|
||||
Date: Sat, 23 Apr 2011 13:44:23 +0000
|
||||
Subject: Prefer growisofs to wodim for DVD/BluRay burning.
|
||||
X-Git-Url: http://quickgit.kde.org/?p=k3b.git&a=commitdiff&h=1853eee0f15d9d5a1ab0407d5d87e36167e5c9eb
|
||||
---
|
||||
Prefer growisofs to wodim for DVD/BluRay burning.
|
||||
|
||||
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
|
||||
Jörg 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: Jörg 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
|
||||
---
|
||||
|
||||
|
||||
--- a/libk3b/jobs/k3bdvdcopyjob.cpp
|
||||
+++ b/libk3b/jobs/k3bdvdcopyjob.cpp
|
||||
@@ -169,13 +169,20 @@
|
||||
// first let's determine which application to use
|
||||
d->usedWritingApp = writingApp();
|
||||
if ( d->usedWritingApp == K3b::WritingAppAuto ) {
|
||||
- // let's default to cdrecord for the time being
|
||||
+ // prefer growisofs to wodim, which doesn't work all that great for DVDs
|
||||
+ // (and doesn't support BluRay at all)
|
||||
+ if ( k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "wodim" ) )
|
||||
+ d->usedWritingApp = K3b::WritingAppGrowisofs;
|
||||
+ // otherwise, let's default to cdrecord for the time being
|
||||
// FIXME: use growisofs for non-dao and non-auto mode
|
||||
- if ( K3b::Device::isBdMedia( d->sourceDiskInfo.mediaType() ) ) {
|
||||
- if ( k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "blu-ray" ) )
|
||||
+ else {
|
||||
+ if ( K3b::Device::isBdMedia( d->sourceDiskInfo.mediaType() ) ) {
|
||||
+ if ( k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "blu-ray" ) )
|
||||
+ d->usedWritingApp = K3b::WritingAppCdrecord;
|
||||
+ else
|
||||
+ d->usedWritingApp = K3b::WritingAppGrowisofs;
|
||||
+ } else
|
||||
d->usedWritingApp = K3b::WritingAppCdrecord;
|
||||
- else
|
||||
- d->usedWritingApp = K3b::WritingAppGrowisofs;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
--- a/libk3b/jobs/k3bmetawriter.cpp
|
||||
+++ b/libk3b/jobs/k3bmetawriter.cpp
|
||||
@@ -261,11 +261,13 @@
|
||||
bool cdrecordOnTheFly = false;
|
||||
bool cdrecordCdText = false;
|
||||
bool cdrecordBluRay = false;
|
||||
+ bool cdrecordWodim = false;
|
||||
bool growisofsBluRay = false;
|
||||
if( k3bcore->externalBinManager()->binObject("cdrecord") ) {
|
||||
cdrecordOnTheFly = k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "audio-stdin" );
|
||||
cdrecordCdText = k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "cdtext" );
|
||||
cdrecordBluRay = k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "blu-ray" );
|
||||
+ cdrecordWodim = k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "wodim" );
|
||||
}
|
||||
if( k3bcore->externalBinManager()->binObject("growisofs") ) {
|
||||
growisofsBluRay = k3bcore->externalBinManager()->binObject("growisofs")->hasFeature( "blu-ray" );
|
||||
@@ -316,10 +318,16 @@
|
||||
d->usedWritingApp = WritingAppGrowisofs;
|
||||
}
|
||||
else if( mediaType & Device::MEDIA_DVD_ALL ) {
|
||||
- d->usedWritingApp = WritingAppCdrecord;
|
||||
+ // wodim (at least on fedora) doesn't do DVDs all that well, use growisofs instead
|
||||
+ if ( cdrecordWodim ) {
|
||||
+ d->usedWritingApp = WritingAppGrowisofs;
|
||||
+ }
|
||||
+ else {
|
||||
+ d->usedWritingApp = WritingAppCdrecord;
|
||||
+ }
|
||||
}
|
||||
else if( mediaType & Device::MEDIA_BD_ALL ) {
|
||||
- if( cdrecordBluRay ) {
|
||||
+ if( cdrecordBluRay && ! cdrecordWodim ) {
|
||||
d->usedWritingApp = WritingAppCdrecord;
|
||||
}
|
||||
else if( growisofsBluRay ) {
|
||||
|
||||
--- a/libk3b/projects/datacd/k3bdatajob.cpp
|
||||
+++ b/libk3b/projects/datacd/k3bdatajob.cpp
|
||||
@@ -58,7 +58,7 @@
|
||||
{
|
||||
public:
|
||||
Private()
|
||||
- : usedWritingApp(K3b::WritingAppCdrecord),
|
||||
+ : usedWritingApp(K3b::WritingAppAuto),
|
||||
verificationJob( 0 ),
|
||||
pipe( 0 ) {
|
||||
}
|
||||
@@ -813,8 +813,12 @@
|
||||
|
||||
d->usedWritingApp = writingApp();
|
||||
// let's default to cdrecord for the time being (except for special cases below)
|
||||
+ // but prefer growisofs to wodim for DVDs
|
||||
if ( d->usedWritingApp == K3b::WritingAppAuto ) {
|
||||
- d->usedWritingApp = K3b::WritingAppCdrecord;
|
||||
+ if (k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "wodim" ))
|
||||
+ d->usedWritingApp = K3b::WritingAppGrowisofs;
|
||||
+ else
|
||||
+ d->usedWritingApp = K3b::WritingAppCdrecord;
|
||||
}
|
||||
|
||||
// -------------------------------
|
||||
@@ -930,7 +934,10 @@
|
||||
else if ( foundMedium & K3b::Device::MEDIA_BD_ALL ) {
|
||||
d->usedWritingApp = writingApp();
|
||||
if( d->usedWritingApp == K3b::WritingAppAuto ) {
|
||||
- d->usedWritingApp = K3b::WritingAppCdrecord;
|
||||
+ if (k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "wodim" ))
|
||||
+ d->usedWritingApp = K3b::WritingAppGrowisofs;
|
||||
+ else
|
||||
+ d->usedWritingApp = K3b::WritingAppCdrecord;
|
||||
}
|
||||
|
||||
if ( d->usedWritingApp == K3b::WritingAppCdrecord &&
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
From: Michal Malek <michalm@jabster.pl>
|
||||
Date: Sun, 01 May 2011 10:27:12 +0000
|
||||
Subject: Set error status when CDDB query fails. Without it the error is buing not reported and as a result all entries in audio project are cleared up.
|
||||
X-Git-Url: http://quickgit.kde.org/?p=k3b.git&a=commitdiff&h=fb10bb8fc296335488472468be107b8c4cdb9251
|
||||
---
|
||||
Set error status when CDDB query fails. Without it the error is buing not reported and as a result all entries in audio project are cleared up.
|
||||
---
|
||||
|
||||
|
||||
--- a/libk3b/tools/k3bcddb.cpp
|
||||
+++ b/libk3b/tools/k3bcddb.cpp
|
||||
@@ -116,6 +116,7 @@
|
||||
}
|
||||
}
|
||||
else {
|
||||
+ q->setError( KJob::UserDefinedError );
|
||||
q->setErrorText( KCDDB::resultToString( result ) );
|
||||
}
|
||||
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
commit fb12ab0afd49493df8d33a4e334775d9407ddfa9
|
||||
Author: Stephane Berthelot <sberthelot@emisfr.com>
|
||||
Date: Mon Aug 8 09:39:49 2011 +0200
|
||||
|
||||
Too short track info dataLen returned at least on HL-DT-ST BH10LS30
|
||||
Workaround the structure len like other drives but extend from 4
|
||||
to 6 bytes minimum check.
|
||||
This avoids a 0 byte BR-R capacity bug with this drive
|
||||
|
||||
BUG: 268307
|
||||
|
||||
diff --git a/libk3bdevice/k3bdevice_mmc.cpp b/libk3bdevice/k3bdevice_mmc.cpp
|
||||
index ab82bfa..3e7147f 100644
|
||||
--- a/libk3bdevice/k3bdevice_mmc.cpp
|
||||
+++ b/libk3bdevice/k3bdevice_mmc.cpp
|
||||
@@ -309,7 +309,7 @@ bool K3b::Device::Device::readTrackInformation( UByteArray& data, int type, int
|
||||
// DVD-DL: 48 (MMC5)
|
||||
// CD: 36 (MMC2)
|
||||
//
|
||||
- if( dataLen <= 4 ) {
|
||||
+ if( dataLen <= 6 ) {
|
||||
int m = mediaType();
|
||||
if( m & (MEDIA_DVD_R_DL|MEDIA_DVD_R_DL_SEQ|MEDIA_DVD_R_DL_JUMP) )
|
||||
dataLen = 48;
|
||||
47
k3b.changes
47
k3b.changes
@ -1,3 +1,50 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 4 17:19:29 UTC 2014 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Update to 2.0.3:
|
||||
* Fixed crash in MetaItemModel on submodel item removal
|
||||
* Fixed Solid predicates for AudioCd and VideoDvd media.
|
||||
kde#265819
|
||||
* Set error status when CDDB query fails.
|
||||
* Prefer growisofs to wodim for DVD/BluRay burning.
|
||||
* Fixed improper track number in CDDB track edit window title.
|
||||
kde#276681
|
||||
* Fixed crash on detecting writing speeds. kde#272427
|
||||
* Fix problem with HL-DT-ST BH10LS30. kde#268307
|
||||
* Fixed compilation with new FFMPEG. kde#274817 kde#300731
|
||||
* Allow using CD-R90 and CD-R99 media to full capacity.
|
||||
kde#276002
|
||||
* Refactor the FreeBSD SCSI/CAM interface.
|
||||
* Fix crash on dvd ripping
|
||||
* fix sox detection with sox >= 14.4.0. kde#301544
|
||||
* Support more media types. kde#261652
|
||||
* Fix file system detection. kde#325616 kde#262607
|
||||
* Surround output filename for transcode with double quotes.
|
||||
kde#326097
|
||||
* Fix FILE name and type detection for cue sheet images.
|
||||
kde#337201
|
||||
* Rip audio tracks in ascending numerical order.
|
||||
kde#319678
|
||||
* Upstream patches from NetBSD.
|
||||
* Make paranoia lib detection better.
|
||||
* Don't preview if called process failed. kde#268680
|
||||
* Fix Crash while remove songs in "Mixed mode CD proyect".
|
||||
kde#323117
|
||||
* Use QElapsedTimer to calculate remaining time.
|
||||
kde#330239 kde#315463
|
||||
* Fix crash in lsof wrapper. kde#340515
|
||||
- Drop patches merged upstream:
|
||||
k3b-prefer-growisofs-to-wodim-for-DVD-burning.patch,
|
||||
k3b-fixed-crash-on-detecting-writing-speeds.patch,
|
||||
k3b-fixed-solid-predicates.patch,
|
||||
k3b-2.0.2-ffmpeg011.patch,
|
||||
k3b-short-trackinfo.patch,
|
||||
k3b-increase-tolerance.patch,
|
||||
add_mimetypes_bnc661777.diff,
|
||||
k3b-fixed-improper-track-number-in-CDDB-track-edit-window-title.patch,
|
||||
k3b-set-error-status-when-CDDB-query-fails.patch and
|
||||
k3b-dont-count-used-capacity-twice.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 14 09:16:21 UTC 2014 - hrvoje.senjan@gmail.com
|
||||
|
||||
|
||||
38
k3b.spec
38
k3b.spec
@ -21,36 +21,16 @@
|
||||
%bcond_with lame
|
||||
|
||||
Name: k3b
|
||||
Version: 2.0.2
|
||||
Version: 2.0.3
|
||||
Release: 0
|
||||
Summary: CD/DVD/Blu-ray Burning Application for KDE
|
||||
License: GPL-2.0+
|
||||
Group: Productivity/Multimedia/CD/Record
|
||||
|
||||
Url: http://www.k3b.org/
|
||||
Source0: http://prdownloads.sourceforge.net/k3b/%{name}-%{version}.tar.bz2
|
||||
Source: http://download.kde.org/stable/%{name}/%{name}-%{version}a.tar.xz
|
||||
# PATCH-FIX-OPENSUSE initial-preference.diff llunak@novell.com -- Make the default handler for .iso files instead of Ark
|
||||
Patch0: initial-preference.diff
|
||||
# PATCH-FIX-OPENSUSE add_mimetypes_bnc661777.diff bnc#661777 ctrippe@gmx.net -- Add a few mimetypes to the desktop file for better integration in GNOME
|
||||
Patch1: add_mimetypes_bnc661777.diff
|
||||
# PATCH-FIX-UPSTREAM k3b-short-trackinfo.patch bko #268307 idoenmez@suse.de -- Too short track info dataLen returned at least on HL-DT-ST BH10LS30
|
||||
Patch2: k3b-short-trackinfo.patch
|
||||
# PATCH-FIX-UPSTREAM k3b-2.0.2-ffmpeg011.patch reddwarf@opensuse.org -- Make it compile with the latest ffmpeg.
|
||||
Patch3: k3b-2.0.2-ffmpeg011.patch
|
||||
# PATCH-FIX-UPSTREAM k3b-increase-tolerance.patch kde#276002 hrvoje.senjan@gmail.com -- K3b::IsOverburnAllowed: Increase tolerance
|
||||
Patch4: k3b-increase-tolerance.patch
|
||||
# PATCH-FIX-UPSTREAM k3b-fixed-crash-on-detecting-writing-speeds.patch kde#272427 hrvoje.senjan@gmail.com -- Fixed crash on detecting writing speeds
|
||||
Patch5: k3b-fixed-crash-on-detecting-writing-speeds.patch
|
||||
# PATCH-FIX-UPSTREAM k3b-fixed-improper-track-number-in-CDDB-track-edit-window-title.patch kde#276681 hrvoje.senjan@gmail.com -- Fixed improper track number in CDDB track edit window title
|
||||
Patch6: k3b-fixed-improper-track-number-in-CDDB-track-edit-window-title.patch
|
||||
# PATCH-FIX-UPSTREAM k3b-fixed-solid-predicates.patch kde#265819 hrvoje.senjan@gmail.com -- Starting ripping directly from device notifier is possible again
|
||||
Patch7: k3b-fixed-solid-predicates.patch
|
||||
# PATCH-FIX-UPSTREAM k3b-dont-count-used-capacity-twice.patch kde#276002 hrvoje.senjan@gmail.com -- Don't count used capacity twice
|
||||
Patch8: k3b-dont-count-used-capacity-twice.patch
|
||||
# PATCH-FIX-UPSTREAM k3b-prefer-growisofs-to-wodim-for-DVD-burning.patch hrvoje.senjan@gmail.com -- This patch makes K3b default to growisofs for all DVD or BluRay burning tasks if cdrecord is actually wodim.
|
||||
Patch9: k3b-prefer-growisofs-to-wodim-for-DVD-burning.patch
|
||||
# PATCH-FIX-UPSTREAM k3b-set-error-status-when-CDDB-query-fails.patch hrvoje.senjan@gmail.com -- Set error status when CDDB query fails. Without it the error is buing not reported and as a result all entries in audio project are cleared up.
|
||||
Patch10: k3b-set-error-status-when-CDDB-query-fails.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -117,20 +97,8 @@ This package contain files needed for development with k3b.
|
||||
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%if %{with ffmpeg}
|
||||
%patch3 -p1
|
||||
%endif
|
||||
|
||||
# patch image with wrong dimensions - fix rpmlint warning "wrong-icon-size"
|
||||
pushd src/icons/actions
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user