9:09 a.m.
commit 13ee66c9f13f1437fea95c18bedba1409acef8e2
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Jul 10 10:09:20 2017 +0100
Update to 17.04.1
.gitignore | 1 +
k3b-2.0.3-gcc6.patch | 73 -------------
k3b-2.0.3-gcc7.patch | 57 ----------
k3b-extras-freeworld.spec | 268 +++++++---------------------------------------
k3b-ffmpeg3.patch | 138 ------------------------
sources | 2 +-
6 files changed, 40 insertions(+), 499 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5db2b7e..1277ae8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
k3b-2.0.2.tar.bz2
k3b-2.0.3.tar.xz
+/k3b-17.04.1.tar.xz
diff --git a/k3b-extras-freeworld.spec b/k3b-extras-freeworld.spec
index 0eac94c..8d31d3f 100644
--- a/k3b-extras-freeworld.spec
+++ b/k3b-extras-freeworld.spec
@@ -1,110 +1,84 @@
-
-# undefine these to disable
-%define ffmpeg_decoder 1
-%define lame_encoder 1
-%define mad_decoder 1
-
Name: k3b-extras-freeworld
-Summary: Additional codec plugins for the k3b CD/DVD burning application
+Summary: Provides ffmpeg decoder plugin for the k3b CD/DVD burning application
Epoch: 1
-Version: 2.0.3
-Release: 6%{?dist}
+Version: 17.04.1
+Release: 1%{?dist}
License: GPLv2+
URL: http://www.k3b.org/
-Source0: http://download.kde.org/stable/k3b/k3b-%{version}.tar.xz
+Source0:
https://download.kde.org/stable/applications/%{version}/src/k3b-%{version...
# TODO: bugzilla/document
ExcludeArch: s390 s390x
-# https://git.reviewboard.kde.org/r/113295/
-# see also http://bugs.kde.org/325486
-Patch500: k3b-ffmpeg3.patch
-Patch501: k3b-2.0.3-gcc6.patch
-Patch502: k3b-2.0.3-gcc7.patch
-
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: kdelibs4-devel phonon-backend-gstreamer
-%if 0%{?fedora} > 16 || 0%{?rhel} > 6
-BuildRequires: libkcddb-devel
-%else
-BuildRequires: kdemultimedia-devel
-%endif
+BuildRequires: cmake(Qt5Gui)
+BuildRequires: extra-cmake-modules
+BuildRequires: kf5-rpm-macros
+BuildRequires: cmake(KF5Archive)
+BuildRequires: cmake(KF5Archive)
+BuildRequires: cmake(KF5Config)
+BuildRequires: cmake(KF5CoreAddons)
+BuildRequires: cmake(KF5DocTools)
+BuildRequires: cmake(KF5FileMetaData)
+BuildRequires: cmake(KF5I18n)
+BuildRequires: cmake(KF5IconThemes)
+BuildRequires: cmake(KF5JobWidgets)
+BuildRequires: cmake(KF5KCMUtils)
+BuildRequires: cmake(KF5KIO)
+BuildRequires: cmake(KF5Notifications)
+BuildRequires: cmake(KF5NewStuff)
+BuildRequires: cmake(KF5NotifyConfig)
+BuildRequires: cmake(KF5Service)
+BuildRequires: cmake(KF5Solid)
+BuildRequires: cmake(KF5WidgetsAddons)
+BuildRequires: cmake(KF5XmlGui)
+
+BuildRequires: kf5-libkcddb-devel
+
BuildRequires: libmpcdec-devel
BuildRequires: pkgconfig(dvdread)
BuildRequires: pkgconfig(flac++)
-# needed by k3bsetup
-#BuildRequires: pkgconfig(polkit-qt-1)
BuildRequires: pkgconfig(samplerate)
BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(taglib)
BuildRequires: pkgconfig(vorbisenc) pkgconfig(vorbisfile)
-BuildRequires: pkgconfig(taglib)
-
-%if 0%{?ffmpeg_decoder}
BuildRequires: pkgconfig(libavcodec) pkgconfig(libavformat)
-%endif
-%if 0%{?mad_decoder}
-BuildRequires: pkgconfig(mad)
-%endif
-%if 0%{?lame_encoder}
-BuildRequires: lame-devel
-%endif
Requires: k3b >= %{epoch}:%{version}
%description
-Additional decoder/encoder plugins for k3b, a feature-rich and easy to
+Provides ffmpeg decoder plugin for k3b, a feature-rich and easy to
handle CD/DVD burning application.
%prep
%autosetup -p1 -n k3b-%{version}
-# hack around cmake-related FTBFS
-sed -i.cmakehack -e "s|^cmake_minimum_required|#cmake_minimum_required|"
CMakeLists.txt
-
-
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-%{cmake_kde4} \
- -DK3B_BUILD_FFMPEG_DECODER_PLUGIN:BOOL=%{?ffmpeg_decoder:ON}%{!?ffmpeg_decoder:OFF} \
- -DK3B_BUILD_LAME_ENCODER_PLUGIN:BOOL=%{?lame_encoder:ON}%{!?lame_encoder:OFF} \
- -DK3B_BUILD_MAD_DECODER_PLUGIN:BOOL=%{?mad_decoder:ON}%{!?mad_decoder:OFF} \
- ..
+%{cmake_kf5} .. \
+ -DK3B_BUILD_FFMPEG_DECODER_PLUGIN:BOOL=ON
popd
-%{?ffmpeg_decoder:make %{?_smp_mflags} -C %{_target_platform}/plugins/decoder/ffmpeg}
-%{?mad_decoder:make %{?_smp_mflags} -C %{_target_platform}/plugins/decoder/mp3}
-%{?lame_encoder:make %{?_smp_mflags} -C %{_target_platform}/plugins/encoder/lame}
+%make_build -C %{_target_platform}/plugins/decoder/ffmpeg
%install
-%{?ffmpeg_decoder:make install/fast DESTDIR=%{buildroot} -C
%{_target_platform}/plugins/decoder/ffmpeg}
-%{?mad_decoder:make install/fast DESTDIR=%{buildroot} -C
%{_target_platform}/plugins/decoder/mp3}
-%{?lame_encoder:make install/fast DESTDIR=%{buildroot} -C
%{_target_platform}/plugins/encoder/lame}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/decoder/ffmpeg
%files
-%if 0%{?ffmpeg_decoder}
-%{_kde4_libdir}/kde4/k3bffmpegdecoder.so
-%{_kde4_datadir}/kde4/services/k3bffmpegdecoder.desktop
-%endif
-%if 0%{?lame_encoder}
-%{_kde4_libdir}/kde4/k3blameencoder.so
-%{_kde4_libdir}/kde4/kcm_k3blameencoder.so
-%{_kde4_datadir}/kde4/services/k3blameencoder.desktop
-%{_kde4_datadir}/kde4/services/kcm_k3blameencoder.desktop
-%endif
-%if 0%{?mad_decoder}
-%{_kde4_libdir}/kde4/k3bmaddecoder.so
-%{_kde4_datadir}/kde4/services/k3bmaddecoder.desktop
-%endif
+%{_kf5_qtplugindir}/k3bffmpegdecoder.so
+%{_kf5_datadir}/kservices5/k3bffmpegdecoder.desktop
%changelog
+* Mon Jul 10 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:17.04.1-1
+- Update to 17.04.1
+
* Sat Apr 29 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:2.0.3-6
- Rebuild for ffmpeg update
@@ -190,169 +164,3 @@ popd
* Thu Sep 29 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1:2.0.2-2
- fix build with FFmpeg 0.8 (#1960)
-* Sat Sep 17 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1:2.0.2-1
-- update to 2.0.2
-- Requires: k3b >= %{epoch}:%{version} rather than just %{version}
-
-* Wed Oct 13 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:2.0.1-2
-- rebuild (gcc)
-
-* Mon Sep 13 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:2.0.1-1
-- k3b-2.0.1
-
-* Sat Jul 10 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:2.0.0-1
-- k3b-2.0.0
-
-* Sun May 23 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:1.92.0-1
-- k3b-1.92.0 (rc3)
-
-* Sat May 15 2010 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1:1.91.0-1
-- k3b-1.91.0 (rc2)
-- fix build with Qt 4.7 (upstream patch by cfeck)
-- fix build with FFmpeg 0.6 snapshots (define __STDC_CONSTANT_MACROS)
-
-* Fri Mar 05 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:1.90.0-1
-- k3b-1.90.0 (rc1)
-
-* Mon Feb 01 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:1.70.0-1
-- k3b-1.70.0 (beta1)
-
-* Fri Dec 18 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1:1.69.0-1
-- k3b-1.69.0 (alpha4)
-
-* Thu Oct 01 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1:1.0.5-7
-- Epoch: 1 (F-12 revert to k3b-1.0.5)
-
-* Wed Jun 17 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.66.0-0.1.alpha2
-- k3b-1.66.0
-
-* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0.5-6
-- rebuild for new F11 features
-
-* Mon Dec 15 2008 Dominik Mierzejewski <rpm(a)greysector.net> - 1.0.5-5
-- fix build with current ffmpeg
-
-* Wed Sep 17 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0.5-4
-- better pkgconfig-based ffmpeg patch
-- optimize configure
-- License: GPLv2+
-
-* Tue Sep 16 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0.5-3
-- re-enable ffmpeg support
-
-* Mon Sep 15 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0.5-2
-- omit ffmpeg support (for now)
-
-* Mon Sep 15 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0.5-1
-- k3b-extras-freeworld for rpmfusion
-
-* Thu Jan 31 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0.4-2
-- BR: kdelibs3-devel
-
-* Mon Nov 26 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.4-1
-- Update to 1.0.4 (no relevant changes, however).
-
-* Sat Nov 24 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.0.3-2
-- rebuilt
-
-* Tue Jul 24 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-1
-- Update to 1.0.3 (fix for mp3 without tags).
-
-* Mon Jun 25 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.2-1
-- Update to 1.0.2.
-
-* Wed May 30 2007 Rex Dieter <rexdieter[AT]users.sf.net>
-- drop extraneous BR's
-
-* Fri Apr 27 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.1-1
-- Update to 1.0.1 (LAME encoder plugin fix).
-
-* Sat Mar 17 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0-1
-- Upgrade to 1.0 final.
-
-* Sun Feb 18 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0-0.2.rc6
-- Upgrade to 1.0rc6 (which has appeared in Rawhide).
-
-* Tue Feb 6 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12.17-3
-- Rebuild for new ffmpeg.
-
-* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.12.17-2
-- rebuilt for unwind info generation, broken in gcc-4.1.1-21
-
-* Sun Sep 24 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.12.17-1
-- Update to 0.12.17.
-
-* Fri Mar 31 2006 Michael Schwendt <mschwendt[AT]users.sf.net> 0.12.14-2
-- Don't build libsndfile plugin anymore, since it moves to k3b-extras.
-
-* Wed Mar 15 2006 Michael Schwendt <mschwendt[AT]users.sf.net> 0.12.14-1
-- Update to 0.12.14.
-- The oh-so-clever build speed-up trick cannot be used anymore,
- since libtool archives have been dropped from FC k3b package.
-
-* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- switch to new release field
-
-* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- add dist
-
-* Sat Dec 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.12.10-0.lvn.1
-- Update to 0.12.10.
-- Rename package to k3b-extras-nonfree.
-
-* Sun Jul 17 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0.12.2-0.lvn.1
-- Update to 0.12.2 (for FC Development).
-- Rename package to k3b-extras.
-- Add plugins: ffmpeg decoder, libsndfile decoder, lame encoder.
-- Use BR k3b to speed up build.
-- Drop explicit Epoch 0.
-
-* Fri May 20 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> 0:0.11.24-0.lvn.2
-- Use configure-parm "--with-qt-libraries=$QTDIR/lib" to fix FC4-x86_64 build
-
-* Wed May 11 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.11.24-0.lvn.1
-- Update to 0.11.24 (advertised as handling mp3 errors better).
-- Remove GCC version check which blacklists FC4's GCC (d'oh!).
-- Explicity disable external libsamplerate, which is in FE and
- hence FC's k3b doesn't use it either.
-- Merge statfs patch from FC's k3b package.
-
-* Thu Mar 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.11.22-0.lvn.1
-- Update to 0.11.22 (MAD decoder update).
-- Use new switches to disable OggVorbis and FLAC explicitly.
-
-* Wed Jan 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.11.19-0.lvn.1
-- Update to 0.11.19 (for another mp3 detection fix).
-
-* Tue Aug 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.11.14-0.lvn.1
-- Update to 0.11.14 (which obsoletes patches again).
-
-* Tue Aug 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.11.13-0.lvn.1
-- Add patch from CVS to fix mp3 decoder.
-
-* Sat Aug 7 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.11.13-0.lvn.1
-- Updated to 0.11.13 (includes new mp3 backport).
-- Patch for k3bdiskinfo.cpp is obsolete.
-- Now k3bdevice.cpp needs patch for Qt 3.1.
-- Remove a few more unneeded BR.
-
-* Thu May 27 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.11.10-0.lvn.1
-- Update to 0.11.10 (includes mp3 fixes).
-- Fix k3bdiskinfo.cpp for Qt 3.1.
-- Remove redundant BR qt-devel.
-- Disable RPATH (seems to work now).
-- Rename package to k3b-mp3, build just the plugin and all depending targets.
-- Delete old changelog entries which are no longer relevant to this package.
-
-* Mon Mar 29 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.11.9-0.fdr.1
-- Update to 0.11.9.
-
-* Mon Mar 29 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.11.8-0.fdr.1
-- Update to 0.11.8.
-
-* Sun Mar 28 2004 Michael Schwendt <mschwendt[AT]users.sf.net>
-- Rewrite the conditional code sections, although they work fine in
- normal build environments and the fedora.us build system. But 'mach'
- makes some weird assumptions about build requirements in spec files
- and causes unexpected results.
-
diff --git a/sources b/sources
index 6b28e13..28b9cd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52e78aabe8e483347d04e88be0aed150 k3b-2.0.3.tar.xz
+1fbcc432f87da8d16fe276d352e60d26 k3b-17.04.1.tar.xz