rpm/k3b
SHA256
1
0
Fork 0
forked from pool/k3b
Code Pull Requests Activity

Accepting request 490361 from KDE:Applications

Browse Source 
KDE Applications 17.04.0 final

OBS-URL: https://build.opensuse.org/request/show/490361
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=68
This commit is contained in:
Dominique Leuenberger
2017-05-08 16:46:57 +00:00
committed by Git OBS Bridge
parent cc94accacb
commit 4635005fff
9 changed files with 140 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
building-docs-once-is-enough.patch
View File

@@ -1,9 +0,0 @@
--- k3b-2.0.3.orig/CMakeLists.txt 2014-11-04 19:43:47.000000000 +0100
+++ k3b-2.0.3/CMakeLists.txt 2015-10-11 15:11:18.653146229 +0200
@@ -350,6 +350,3 @@ macro_display_feature_log()
include(MacroOptionalAddSubdirectory)
macro_optional_add_subdirectory( po )
-
-include(MacroOptionalAddSubdirectory)
-macro_optional_add_subdirectory( doc )

30
fix-dvd-transcoding.patch
View File

@@ -1,30 +0,0 @@
From: Martin Koller <kollix@aon.at>
Date: Mon, 26 Oct 2015 21:12:35 +0000
Subject: revert "fix" which adds literal quote chars to the filename
X-Git-Url: http://quickgit.kde.org/?p=k3b.git&a=commitdiff&h=9f109bbc7fe718135da402535f6ca7ca5c105d4d
---
revert "fix" which adds literal quote chars to the filename
commit 2786d19f added explicit quote characters around the filename,
which is wrong since the filename is passed into a QStringList,
which passes all its separate arguments to the started process.
Adding quote chars would lead to the filename having the
quote chars as part of the filename.
BUG: 350403
REVIEW: 125804
---
--- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
+++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
@@ -303,7 +303,7 @@
}
// the output filename
- *d->process << "-o" << QString("\"%1\"").arg(m_filename);
+ *d->process << "-o" << m_filename;
}
else {
// gather information about the video stream, ignore audio

7
initial-preference.diff
View File

@@ -1,7 +0,0 @@
--- src/k3b.desktop 2011-01-15 21:47:30.000000000 +0100
+++ src/k3b.desktop 2011-01-16 12:06:51.077000058 +0100
@@ -169,3 +169,4 @@
X-KDE-NativeMimeType=application/x-k3b;
Categories=KDE;Qt;AudioVideo;DiscBurning;System;Filesystem;
X-DBUS-ServiceType=Unique
+InitialPreference=5

3
k3b-17.04.0.tar.xz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:832b7a94769b4b0c33c0935adeb36e47c297eeb4801650da9b7ab1668b464a73
size 10573620

98
k3b-2.0.3-gcc6.patch
View File

@@ -1,98 +0,0 @@
From da6373a3e1ae9199ee50e326fe296c03b50625ae Mon Sep 17 00:00:00 2001
From: "P. Levine" <nsane457@gmail.com>
Date: Sat, 14 May 2016 18:57:24 +0200
Subject: [PATCH] Fix narrowing conversions from 'int' to 'const char' inside {
}.
Please provide a proper git patch including author information next time ...
BUGS: 363078
FIXED-IN: 2.0.4
---
libk3b/projects/k3bcdrdaowriter.cpp | 2 +-
libk3b/tools/k3bwavefilewriter.cpp | 22 +++++++++++-----------
plugins/encoder/external/k3bexternalencoder.cpp | 22 +++++++++++-----------
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp
index 4eebdf8..bca1407 100644
--- a/libk3b/projects/k3bcdrdaowriter.cpp
+++ b/libk3b/projects/k3bcdrdaowriter.cpp
@@ -908,7 +908,7 @@ void K3b::CdrdaoWriter::parseCdrdaoWrote( const QString& line )
void K3b::CdrdaoWriter::parseCdrdaoMessage()
{
- static const char msgSync[] = { 0xff, 0x00, 0xff, 0x00 };
+ static const char msgSync[] = { (char)0xff, (char)0x00, (char)0xff, (char)0x00 };
unsigned int avail = m_comSock->bytesAvailable();
unsigned int msgs = avail / ( sizeof(msgSync)+d->progressMsgSize );
unsigned int count = 0;
diff --git a/libk3b/tools/k3bwavefilewriter.cpp b/libk3b/tools/k3bwavefilewriter.cpp
index c51781f..6772f6c 100644
--- a/libk3b/tools/k3bwavefilewriter.cpp
+++ b/libk3b/tools/k3bwavefilewriter.cpp
@@ -111,17 +111,17 @@ void K3b::WaveFileWriter::writeEmptyHeader()
{
static const char riffHeader[] =
{
- 0x52, 0x49, 0x46, 0x46, // 0 "RIFF"
- 0x00, 0x00, 0x00, 0x00, // 4 wavSize
- 0x57, 0x41, 0x56, 0x45, // 8 "WAVE"
- 0x66, 0x6d, 0x74, 0x20, // 12 "fmt "
- 0x10, 0x00, 0x00, 0x00, // 16
- 0x01, 0x00, 0x02, 0x00, // 20
- 0x44, 0xac, 0x00, 0x00, // 24
- 0x10, 0xb1, 0x02, 0x00, // 28
- 0x04, 0x00, 0x10, 0x00, // 32
- 0x64, 0x61, 0x74, 0x61, // 36 "data"
- 0x00, 0x00, 0x00, 0x00 // 40 byteCount
+ (char)0x52, (char)0x49, (char)0x46, (char)0x46, // 0 "RIFF"
+ (char)0x00, (char)0x00, (char)0x00, (char)0x00, // 4 wavSize
+ (char)0x57, (char)0x41, (char)0x56, (char)0x45, // 8 "WAVE"
+ (char)0x66, (char)0x6d, (char)0x74, (char)0x20, // 12 "fmt "
+ (char)0x10, (char)0x00, (char)0x00, (char)0x00, // 16
+ (char)0x01, (char)0x00, (char)0x02, (char)0x00, // 20
+ (char)0x44, (char)0xac, (char)0x00, (char)0x00, // 24
+ (char)0x10, (char)0xb1, (char)0x02, (char)0x00, // 28
+ (char)0x04, (char)0x00, (char)0x10, (char)0x00, // 32
+ (char)0x64, (char)0x61, (char)0x74, (char)0x61, // 36 "data"
+ (char)0x00, (char)0x00, (char)0x00, (char)0x00 // 40 byteCount
};
m_outputStream.writeRawData( riffHeader, 44 );
diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp
index 388d181..d365905 100644
--- a/plugins/encoder/external/k3bexternalencoder.cpp
+++ b/plugins/encoder/external/k3bexternalencoder.cpp
@@ -39,17 +39,17 @@ Q_DECLARE_METATYPE( QProcess::ExitStatus )
static const char s_riffHeader[] =
{
- 0x52, 0x49, 0x46, 0x46, // 0 "RIFF"
- 0x00, 0x00, 0x00, 0x00, // 4 wavSize
- 0x57, 0x41, 0x56, 0x45, // 8 "WAVE"
- 0x66, 0x6d, 0x74, 0x20, // 12 "fmt "
- 0x10, 0x00, 0x00, 0x00, // 16
- 0x01, 0x00, 0x02, 0x00, // 20
- 0x44, 0xac, 0x00, 0x00, // 24
- 0x10, 0xb1, 0x02, 0x00, // 28
- 0x04, 0x00, 0x10, 0x00, // 32
- 0x64, 0x61, 0x74, 0x61, // 36 "data"
- 0x00, 0x00, 0x00, 0x00 // 40 byteCount
+ (char)0x52, (char)0x49, (char)0x46, (char)0x46, // 0 "RIFF"
+ (char)0x00, (char)0x00, (char)0x00, (char)0x00, // 4 wavSize
+ (char)0x57, (char)0x41, (char)0x56, (char)0x45, // 8 "WAVE"
+ (char)0x66, (char)0x6d, (char)0x74, (char)0x20, // 12 "fmt "
+ (char)0x10, (char)0x00, (char)0x00, (char)0x00, // 16
+ (char)0x01, (char)0x00, (char)0x02, (char)0x00, // 20
+ (char)0x44, (char)0xac, (char)0x00, (char)0x00, // 24
+ (char)0x10, (char)0xb1, (char)0x02, (char)0x00, // 28
+ (char)0x04, (char)0x00, (char)0x10, (char)0x00, // 32
+ (char)0x64, (char)0x61, (char)0x74, (char)0x61, // 36 "data"
+ (char)0x00, (char)0x00, (char)0x00, (char)0x00 // 40 byteCount
};
--
2.8.2

3
k3b-2.0.3a.tar.xz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2d0bb2746802c1d3ad7ddd10e29234cf2053074f376feb200306a5570c39c081
size 9864468

138
k3b-ffmpeg3.patch
View File

@@ -1,138 +0,0 @@
From 52d3d64863d2fab4128f524870851f18f5cae1fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= <oldium.pro@seznam.cz>
Date: Sat, 14 Feb 2015 15:31:07 +0100
Subject: [PATCH] Fixed compilation with newer ffmpeg/libav.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
---
plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 60 ++++++++++++++++++++++++-----
1 file changed, 50 insertions(+), 10 deletions(-)
diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
index 5451fd3..2f80fd6 100644
--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
@@ -86,8 +86,12 @@ public:
K3b::Msf length;
// for decoding. ffmpeg requires 16-byte alignment.
+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
+ ::AVFrame* frame;
+#else
char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE + 15];
char* alignedOutputBuffer;
+#endif
char* outputBufferPos;
int outputBufferSize;
::AVPacket packet;
@@ -102,14 +106,29 @@ K3bFFMpegFile::K3bFFMpegFile( const QString& filename )
d = new Private;
d->formatContext = 0;
d->codec = 0;
+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
+# if LIBAVCODEC_BUILD < AV_VERSION_INT(55,28,1)
+ d->frame = avcodec_alloc_frame();
+# else
+ d->frame = av_frame_alloc();
+# endif
+#else
int offset = 0x10 - (reinterpret_cast<intptr_t>(&d->outputBuffer) & 0xf);
d->alignedOutputBuffer = &d->outputBuffer[offset];
+#endif
}
K3bFFMpegFile::~K3bFFMpegFile()
{
close();
+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
+# if LIBAVCODEC_BUILD < AV_VERSION_INT(55,28,1)
+ av_free(d->frame);
+# else
+ av_frame_free(&d->frame);
+# endif
+#endif
delete d;
}
@@ -326,26 +345,36 @@ int K3bFFMpegFile::fillOutputBuffer()
return 0;
}
+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
+ int gotFrame = 0;
+ int len = ::avcodec_decode_audio4(
+#else
d->outputBufferPos = d->alignedOutputBuffer;
d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-
-#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
+# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
int len = ::avcodec_decode_audio3(
-#else
-# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2
- int len = ::avcodec_decode_audio2(
# else
+# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2
+ int len = ::avcodec_decode_audio2(
+# else
int len = ::avcodec_decode_audio(
+# endif
# endif
#endif
FFMPEG_CODEC(d->formatContext->streams[0]),
+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
+ d->frame,
+ &gotFrame,
+ &d->packet );
+#else
(short*)d->alignedOutputBuffer,
&d->outputBufferSize,
-#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
+# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
&d->packet );
-#else
+# else
d->packetData, d->packetSize );
+# endif
#endif
if( d->packetSize <= 0 || len < 0 )
@@ -355,6 +384,17 @@ int K3bFFMpegFile::fillOutputBuffer()
return -1;
}
+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
+ if ( gotFrame ) {
+ d->outputBufferSize = ::av_samples_get_buffer_size(
+ NULL,
+ FFMPEG_CODEC(d->formatContext->streams[0])->channels,
+ d->frame->nb_samples,
+ FFMPEG_CODEC(d->formatContext->streams[0])->sample_fmt,
+ 1 );
+ d->outputBufferPos = reinterpret_cast<char*>( d->frame->data[0] );
+ }
+#endif
d->packetSize -= len;
d->packetData += len;
}
@@ -420,9 +460,9 @@ K3bFFMpegFile* K3bFFMpegWrapper::open( const QString& filename ) const
// mp3 being one of them sadly. Most importantly: allow the libsndfile decoder to do
// its thing.
//
- if( file->type() == CODEC_ID_WMAV1 ||
- file->type() == CODEC_ID_WMAV2 ||
- file->type() == CODEC_ID_AAC )
+ if( file->type() == AV_CODEC_ID_WMAV1 ||
+ file->type() == AV_CODEC_ID_WMAV2 ||
+ file->type() == AV_CODEC_ID_AAC )
#endif
return file;
}
--
2.0.5

83
k3b.changes
View File

@@ -1,3 +1,44 @@
-------------------------------------------------------------------
Sun Apr 16 10:44:48 CEST 2017 - lbeltrame@kde.org
- Update to 17.04.0
* New feature release
* For more details please see:
* https://www.kde.org/announcements/announce-applications-17.04.0.php
- Changes since 17.03.90:
* tests: Use QTEST_GUILESS_MAIN
-------------------------------------------------------------------
Wed Apr 12 20:25:18 CEST 2017 - lbeltrame@kde.org
- Update to 17.03.90
* New bugfix release
* For more details please see:
* https://www.kde.org/announcements/announce-applications-17.04-rc.php
- Changes since 17.03.80:
* None
-------------------------------------------------------------------
Sun Mar 26 09:54:19 CEST 2017 - lbeltrame@kde.org
- Update to 17.03.80
* New feature release (KF5 based)
* For more details please see:
* https://www.kde.org/announcements/announce-applications-17.03.80.php
- Changes since 2.0.3:
* Too many changes to list here
- Dropped patches (upstreamed or no longer applicable to the KF5 version):
* building-docs-once-is-enough.patch
* initial-preference.diff
* fix-dvd-transcoding.patch
* k3b-ffmpeg3.patch
* k3b-2.0.3-gcc6.patch
-------------------------------------------------------------------
Thu Dec 8 19:57:52 UTC 2016 - fabian@ritter-vogt.de
- Revert kde4_runtime_requires change
-------------------------------------------------------------------
Wed Nov 30 18:31:00 UTC 2016 - wbauer@tmo.at
@@ -36,8 +77,8 @@ Wed May 25 10:44:19 UTC 2016 - dimstar@opensuse.org
-------------------------------------------------------------------
Sun Jan 4 14:02:32 UTC 2016 - tittiatcoke@gmail.com
- Use the internal ffmpeg package to build.
This would prevent to swap k3b with the one from packman to have
- Use the internal ffmpeg package to build.
This would prevent to swap k3b with the one from packman to have
mp3 support
-------------------------------------------------------------------
@@ -183,12 +224,12 @@ Wed Jul 25 21:52:32 UTC 2012 - reddwarf@opensuse.org
-------------------------------------------------------------------
Sun Apr 15 20:36:11 UTC 2012 - dmueller@suse.com
- update buildrequires (taglib->libtag)
- update buildrequires (taglib->libtag)
-------------------------------------------------------------------
Wed Aug 31 09:44:15 UTC 2011 - idonmez@suse.com
- Add k3b-short-trackinfo.patch: Too short track info dataLen
- Add k3b-short-trackinfo.patch: Too short track info dataLen
returned at least on HL-DT-ST BH10LS30 , bko #268307
-------------------------------------------------------------------
@@ -236,26 +277,26 @@ Fri Jan 28 09:15:56 UTC 2011 - embar@super.lt
Sun Jan 16 10:59:26 UTC 2011 - tittiatcoke@gmail.com
- Update to 2.0.2:
* Changes:
* Changes:
- Added K3B_ENABLE_HAL_SUPPORT option to the build configuration.
It allows to disable any direct calls to HAL (bko#253388)
- Using Oxygen sounds for events (bko#242395)
* Bugfixes:
* Bugfixes:
- Crash on start when checking device capabilities (bko#246822)
- Search paths on "Programs" options are not saved (bko#248648)
- Crash on generation of DVD previews in DVD ripping list
- Crash on generation of DVD previews in DVD ripping list
(bko#249941, bko#253639)
- Crash on closing dialog after succesful audio CD ripping
- Crash on closing dialog after succesful audio CD ripping
(bko#241630)
- Crash on device detection (bko#249371)
- Crash when showing settings window (bko#238819)
- Fixed playlist sort order (bko#249395)
- Show K3b also in "System" category in KDE launch menus
- Show K3b also in "System" category in KDE launch menus
(bko#250749)
- Crash when multiple instances start at the same time
- Crash when multiple instances start at the same time
(bko#253794)
- Crash after track splitting (bko#261188)
- Inline editing of tracks in CD ripping view no longer works
- Inline editing of tracks in CD ripping view no longer works
(bko#250600)
-------------------------------------------------------------------
@@ -356,7 +397,7 @@ Wed Mar 17 09:03:17 UTC 2010 - coolo@novell.com
Wed Mar 10 11:27:51 UTC 2010 - tittiatcoke@gmail.com
- update to 1.91 (2.0rc2)
+ New:
+ New:
* K3bSetup ported to KAuth framework
+ Bugfixes:
* Crash on start of Audio Ripping Dialog (bko#226595)
@@ -365,11 +406,11 @@ Wed Mar 10 11:27:51 UTC 2010 - tittiatcoke@gmail.com
* Crash when creating image files for AudioCD project (bko#219500)
* Crash when manipulating VCD project items (bko#227855)
* Mixed-up metadata in files created with external encoder (bko#227927)
* Cannot edit time values in "Split Audio Track" and "Edit Audio Track"
* Cannot edit time values in "Split Audio Track" and "Edit Audio Track"
dialog (bko#229042)
* Empty Bly-ray mediam not detected properly (bko#227339, bko#229039)
* Crash during splitting/editing audio tracks
* Entry fields doesn't work in burn window when "Only Create Image"
* Entry fields doesn't work in burn window when "Only Create Image"
option is checked (bko#220970)
* Layout issues in settings window (bko#227733)
@@ -379,23 +420,23 @@ Tue Feb 9 16:37:40 UTC 2010 - tittiatcoke@gmail.com
- update to 1.70 (2.0 Beta 1)
Changes:
* Added Blu-ray support
* Added "Options" button to file browser toolbar with view options menu
* Added "Options" button to file browser toolbar with view options menu
(e.g. "Show Hidden Files") (bko#196992)
* Image and project files can be opened directly from K3b file browser
* Using Oxygen icons (many thanks for Oxygen Team!)
Bugfixes:
* Fixed visual glitch when panes are in "locked" state.
* Fixed visual glitch when panes are in "locked" state.
Patch by Craig Drummond <craig@kde.org>
* Fixed hang up when "Create Image" option is checked (bko#217301)
* "Hide main window while writing" option is working again
* "Show OSD progress" option is working again
* Improved message when ISO with incorrect size is detected (bko#216812)
* Improved consistency: K3b now uses system-wide
Positive/Neutral/Negative colors where possible instead of
* Improved consistency: K3b now uses system-wide
Positive/Neutral/Negative colors where possible instead of
hard-coded green/yellow/red
* Fixed incorrect default value "4gb." in "Custom Size" dialog (bko#215539)
* Fixed usability issues with project size menu:
* Fixed usability issues with project size menu:
"Custom..." and "From Medium..." menu entries are non-checkable now (bko#215539)
* Show correct message at the end of CD-RW erasing (bko#207972)
* Fixed issue with too small configuration dialog for external encoder (bko#218613)
@@ -414,10 +455,10 @@ Tue Feb 9 16:37:40 UTC 2010 - tittiatcoke@gmail.com
* Custom widgets are now properly rendered for Right-to-Left languages
* Progress bar in image writing dialog is shown again
* Fixed crash while analysing invalid medium (bko#223362)
* Acquire lock also on storage interface. This prevents HAL from
* Acquire lock also on storage interface. This prevents HAL from
polling medium during burning which might disrupt burning process.
* Fixed bug in external programs detection (bko#221638)
* Improved usability: don't show popups when clicking on DVD, VCD or
* Improved usability: don't show popups when clicking on DVD, VCD or
audio discs. Added appriopriate actions on toolbars instead.
* Fixed crash while analysing invalid medium (bko#195436)

149
k3b.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package k3b
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,39 +16,53 @@
#
%bcond_without lang
%bcond_without ffmpeg
%bcond_with lame
%bcond_with mad
Name: k3b
Version: 2.0.3
Version: 17.04.0
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/
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 building-docs-once-is-enough.patch -- Fix build when CMP002 policy is set to NEW
Patch1: building-docs-once-is-enough.patch
# PATCH-FIX-UPSTREAM fix-dvd-transcoding.patch kde#350403 -- Fix transcoding of DVD titles
Patch2: fix-dvd-transcoding.patch
# PATCH-FIX-UPSTREAM k3b-2.0.3-gcc6.patch dimstar@opensuse.org -- Fix build with GCC 6
Patch3: k3b-2.0.3-gcc6.patch
# PATCH-FIX arch linux k3b-ffmpeg3.patch - fix build with ffmpeg 3x abi
Patch4: k3b-ffmpeg3.patch
Url: http://www.kde.org
Source: %{name}-%{version}.tar.xz
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
BuildRequires: flac-devel
BuildRequires: libdvdread-devel
BuildRequires: libkcddb4-devel
BuildRequires: libkcddb-devel
BuildRequires: libmpcdec-devel
BuildRequires: libmusicbrainz-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel
BuildRequires: update-desktop-files
BuildRequires: cmake(KF5Archive) >= 5.21.0
BuildRequires: cmake(KF5Config) >= 5.21.0
BuildRequires: cmake(KF5CoreAddons) >= 5.21.0
BuildRequires: cmake(KF5DocTools) >= 5.21.0
BuildRequires: cmake(KF5FileMetaData) >= 5.21.0
BuildRequires: cmake(KF5I18n) >= 5.21.0
BuildRequires: cmake(KF5IconThemes) >= 5.21.0
BuildRequires: cmake(KF5JobWidgets) >= 5.21.0
BuildRequires: cmake(KF5KCMUtils) >= 5.21.0
BuildRequires: cmake(KF5KIO) >= 5.21.0
BuildRequires: cmake(KF5NewStuff) >= 5.21.0
BuildRequires: cmake(KF5Notifications) >= 5.21.0
BuildRequires: cmake(KF5NotifyConfig) >= 5.21.0
BuildRequires: cmake(KF5Service) >= 5.21.0
BuildRequires: cmake(KF5Solid) >= 5.21.0
BuildRequires: cmake(KF5WidgetsAddons) >= 5.21.0
BuildRequires: cmake(KF5XmlGui) >= 5.21.0
BuildRequires: cmake(Qt5Core) >= 5.5.0
BuildRequires: cmake(Qt5DBus) >= 5.5.0
BuildRequires: cmake(Qt5Gui) >= 5.5.0
BuildRequires: cmake(Qt5Test) >= 5.5.0
BuildRequires: pkgconfig(taglib)
%if %{with ffmpeg}
BuildRequires: pkgconfig(libavcodec)
@@ -73,13 +87,12 @@ Requires(postun): shared-mime-info
Recommends: %{_bindir}/normalize
Recommends: %{_bindir}/sox
Recommends: %{_bindir}/transcode
Recommends: %{name}-lang = %{version}
Recommends: vcdimager
Provides: kde4-k3b = 4.2.2.svn951754
Obsoletes: kde4-k3b < 4.2.2.svn951754
Obsoletes: k3b-codecs
Obsoletes: kde4-k3b < 4.2.2.svn951754
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?kde4_runtime_requires}
%description
Featuring a simple, yet powerful graphical interface, k3b provides various
@@ -97,44 +110,29 @@ Requires: %{name} = %{version}
%description devel
This package contain files needed for development with k3b.
%if %{with lang}
%lang_package
%endif
%prep
%setup -q
%patch0
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
CXXFLAGS="%{optflags} -fno-strict-aliasing"
%cmake_kde4 -d build -- -DK3B_ENABLE_HAL_SUPPORT=OFF
%cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir}
%make_jobs
%install
%kde4_makeinstall -C build
%kf5_makeinstall -C build
%if %{with lang}
%find_lang %{name} --with-man --all-name
%kf5_find_htmldocs
%endif
%suse_update_desktop_file -r k3b Qt KDE AudioVideo DiscBurning
# symlink solid actions into place known to Plasma 5, remove once k3b is KF5-based
mkdir -p %{buildroot}%{_datadir}/solid/actions
pushd %{buildroot}%{_kde4_appsdir}/solid/actions/
for i in k3b_*.desktop; do
ln -s %{_kde4_appsdir}/solid/actions/$i %{buildroot}%{_datadir}/solid/actions/
done
popd
%suse_update_desktop_file -r org.kde.k3b Qt KDE AudioVideo DiscBurning
%fdupes -s %{buildroot}
%find_lang k3b k3b.lang
%find_lang k3bsetup k3b.lang
%find_lang libk3b k3b.lang
%find_lang libk3bdevice k3b.lang
%find_lang kio_videodvd k3b.lang
%kde_post_install
%post
/sbin/ldconfig
%desktop_database_post
@@ -147,44 +145,47 @@ popd
%files
%defattr(-,root,root,-)
%doc COPYING* ChangeLog FAQ PERMISSIONS README
%{_kde4_bindir}/k3b
%{_kde4_bindir}/k3bsetup
%{_kde4_modulesdir}/k3b*.so
%{_kde4_modulesdir}/kcm_k3b*.so
%{_kde4_modulesdir}/kio_videodvd.so
%{_kde4_libexecdir}/k3bsetuphelper
%{_kde4_libdir}/libk3bdevice.so.*
%{_kde4_libdir}/libk3blib.so.*
%{_kde4_applicationsdir}/k3b.desktop
%doc %{_kde4_htmldir}/en/k3b/
%{_kde4_iconsdir}/hicolor/*/apps/k3b.*
%{_kde4_appsdir}/k3b/
%{_kde4_appsdir}/konqsidebartng/virtual_folders/services/videodvd.desktop
%dir %{_kde4_appsdir}/solid
%dir %{_kde4_appsdir}/solid/actions
%{_kde4_appsdir}/solid/actions/k3b_*.desktop
%doc COPYING* ChangeLog FAQ.txt PERMISSIONS.txt README.txt
%{_kf5_bindir}/k3b
%config %{_kf5_configdir}/k3btheme.knsrc
%{_kf5_plugindir}/k3b*.so
%{_kf5_plugindir}/kcm_k3b*.so
%{_kf5_plugindir}/kio_videodvd.so
%{_kf5_libdir}/libk3bdevice.so.*
%{_kf5_libdir}/libk3blib.so.*
%{_kf5_applicationsdir}/org.kde.k3b.desktop
%{_kf5_appstreamdir}/org.kde.k3b.appdata.xml
%doc %{_kf5_htmldir}/en/k3b/
%{_kf5_iconsdir}/hicolor/*/apps/k3b.*
%{_kf5_iconsdir}/hicolor/*/mimetypes/application-x-k3b.*
%dir %{_datadir}/konqsidebartng
%dir %{_datadir}/konqsidebartng/virtual_folders
%dir %{_datadir}/konqsidebartng/virtual_folders/services
%{_datadir}/konqsidebartng/virtual_folders/services/videodvd.desktop
%dir %{_datadir}/solid
%dir %{_datadir}/solid/actions
%{_datadir}/solid/actions/k3b_*.desktop
%{_kde4_servicesdir}/ServiceMenus/k3b_*.desktop
%{_kde4_servicesdir}/k3b*.desktop
%{_kde4_servicesdir}/kcm_k3b*.desktop
%{_kde4_servicesdir}/videodvd.protocol
%{_kde4_servicetypesdir}/k3bplugin.desktop
%{_kde4_datadir}/mime/packages/x-k3b.xml
%config %{_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.k3bsetup.conf
%{_kde4_datadir}/dbus-1/system-services/org.kde.kcontrol.k3bsetup.service
%{_kde4_datadir}/polkit-1/actions/org.kde.kcontrol.k3bsetup.policy
%{_datadir}/k3b
%dir %{_kf5_servicesdir}/ServiceMenus
%{_kf5_servicesdir}/ServiceMenus/k3b_*.desktop
%{_kf5_servicesdir}/k3b*.desktop
%{_kf5_servicesdir}/kcm_k3b*.desktop
%{_kf5_servicesdir}/videodvd.protocol
%{_kf5_servicetypesdir}/k3bplugin.desktop
%{_kf5_notifydir}/k3b.notifyrc
%{_kf5_kxmlguidir}/k3b
%{_datadir}/mime/packages/x-k3b.xml
%files devel
%defattr(-,root,root,-)
%{_kde4_includedir}/k3b*.h
%{_kde4_libdir}/libk3bdevice.so
%{_kde4_libdir}/libk3blib.so
%doc COPYING*
%{_includedir}/k3b*.h
%{_libdir}/libk3bdevice.so
%{_libdir}/libk3blib.so
%files lang -f k3b.lang
%defattr(-,root,root,-)
%exclude %{_kde4_htmldir}/en/k3b/
%if %{with lang}
%files lang -f %{name}.lang
%doc COPYING*
%endif
%changelog