Author: rdieter Update of /cvs/free/rpms/k3b-extras-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv9044 Modified Files: .cvsignore k3b-extras-freeworld.spec sources Added Files: k3b-1.0.5-ffmpeg.patch k3b-lavc52.patch Removed Files: k3b-1.66.0-ffmpeg.patch Log Message: * Thu Oct 01 2009 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 1:1.0.5-7 - Epoch: 1 (F-12 revert to k3b-1.0.5) k3b-1.0.5-ffmpeg.patch: Index: k3b-1.0.5-ffmpeg.patch =================================================================== RCS file: k3b-1.0.5-ffmpeg.patch diff -N k3b-1.0.5-ffmpeg.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ k3b-1.0.5-ffmpeg.patch 1 Oct 2009 13:34:36 -0000 1.4 @@ -0,0 +1,92 @@ +diff -up k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in.ffmpeg k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in +--- k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in.ffmpeg 2008-05-27 03:23:36.000000000 -0500 ++++ k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in 2008-09-17 10:49:46.000000000 -0500 +@@ -14,44 +14,7 @@ AC_ARG_WITH( + # + have_ffmpeg=no + if test "$ac_cv_use_ffmpeg" = "yes"; then +- k3b_cxxflags_save="$CXXFLAGS" +- CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" +- AC_MSG_CHECKING(for ffmpeg >= 0.4.9) +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- AC_COMPILE_IFELSE( +- extern "C" { +- #include <ffmpeg/avformat.h> +- #include <ffmpeg/avcodec.h> +- } +- +- int main() { +- AVFormatContext* fc = 0; +- AVPacket* p = 0; +- av_register_all(); +- return av_read_frame( fc, p ); +- }, +- [ffmpeg_compiles=yes], [ffmpeg_compiles=no] ) +- OLD_LIBS=$LIBS +- LIBS="-lavformat -lavcodec $LIBS" +- AC_LINK_IFELSE( +- extern "C" { +- #include <ffmpeg/avformat.h> +- #include <ffmpeg/avcodec.h> +- } +- +- int main() { +- AVFormatContext* fc = 0; +- AVPacket* p = 0; +- av_register_all(); +- return av_read_frame( fc, p ); +- }, +- [ffmpeg_links=yes], [ffmpeg_links=no] ) +- AC_LANG_RESTORE +- LIBS=$OLD_LIBS +- have_ffmpeg=$ffmpeg_links +- AC_MSG_RESULT($have_ffmpeg) +- CXXFLAGS=$k3b_cxxflags_save ++ KDE_PKG_CHECK_MODULES(FFMPEG, libavcodec libavformat, have_ffmpeg=yes) + fi + AM_CONDITIONAL(include_FFMPEG, [test x$have_ffmpeg = xyes]) + +diff -up k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp.ffmpeg k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp +--- k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp.ffmpeg 2008-05-27 03:23:36.000000000 -0500 ++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp 2008-09-17 10:44:15.000000000 -0500 +@@ -22,7 +22,7 @@ + #include <k3bpluginfactory.h> + + extern "C" { +-#include <ffmpeg/avcodec.h> ++#include <libavcodec/avcodec.h> + } + + #include <math.h> +diff -up k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.ffmpeg k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +--- k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.ffmpeg 2008-05-27 03:23:36.000000000 -0500 ++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-09-17 10:44:15.000000000 -0500 +@@ -18,8 +18,8 @@ + #include "k3bffmpegwrapper.h" + + extern "C" { +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/avformat.h> ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> + } + + #include <string.h> +diff -up k3b-1.0.5/plugins/decoder/ffmpeg/Makefile.am.ffmpeg k3b-1.0.5/plugins/decoder/ffmpeg/Makefile.am +--- k3b-1.0.5/plugins/decoder/ffmpeg/Makefile.am.ffmpeg 2008-05-27 03:23:36.000000000 -0500 ++++ k3b-1.0.5/plugins/decoder/ffmpeg/Makefile.am 2008-09-17 10:55:02.000000000 -0500 +@@ -1,11 +1,11 @@ +-AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3b/plugin -I$(srcdir)/../../../libk3bdevice $(all_includes) ++AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3b/plugin -I$(srcdir)/../../../libk3bdevice $(FFMPEG_CFLAGS) $(all_includes) + KDE_CXXFLAGS = -D__STDC_CONSTANT_MACROS + + kde_module_LTLIBRARIES = libk3bffmpegdecoder.la + + libk3bffmpegdecoder_la_SOURCES = k3bffmpegdecoder.cpp k3bffmpegwrapper.cpp + +-libk3bffmpegdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) -lavcodec -lavformat ++libk3bffmpegdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) $(FFMPEG_LIBS) + libk3bffmpegdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) + + pluginsdir = $(kde_datadir)/k3b/plugins k3b-lavc52.patch: Index: k3b-lavc52.patch =================================================================== RCS file: k3b-lavc52.patch diff -N k3b-lavc52.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ k3b-lavc52.patch 1 Oct 2009 13:34:36 -0000 1.3 @@ -0,0 +1,27 @@ +diff -up k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.lavc52 k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +--- k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.lavc52 2008-12-15 20:47:09.000000000 +0100 ++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-12-15 21:23:34.000000000 +0100 +@@ -194,7 +194,11 @@ QString K3bFFMpegFile::typeComment() con + return i18n("Windows Media v1"); + case CODEC_ID_WMAV2: + return i18n("Windows Media v2"); ++#if LIBAVCODEC_VERSION_MAJOR < 52 + case CODEC_ID_MP3LAME: ++#else ++ case CODEC_ID_MP3: ++#endif + return i18n("MPEG 1 Layer III"); + case CODEC_ID_AAC: + return i18n("Advanced Audio Coding (AAC)"); +@@ -289,8 +293,10 @@ int K3bFFMpegFile::fillOutputBuffer() + + #ifdef FFMPEG_BUILD_PRE_4629 + int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec, +-#else ++#elif LIBAVCODEC_VERSION_MAJOR < 52 + int len = avcodec_decode_audio( d->formatContext->streams[0]->codec, ++#else ++ int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec, + #endif + (short*)d->outputBuffer, &d->outputBufferSize, + d->packetData, d->packetSize ); Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Jun 2009 15:38:31 -0000 1.3 +++ .cvsignore 1 Oct 2009 13:34:36 -0000 1.4 @@ -1 +1 @@ -k3b-1.66.0alpha2.tar.bz2 +k3b-1.0.5.tar.bz2 Index: k3b-extras-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- k3b-extras-freeworld.spec 17 Jun 2009 15:38:31 -0000 1.10 +++ k3b-extras-freeworld.spec 1 Oct 2009 13:34:36 -0000 1.11 @@ -1,42 +1,46 @@ -%define pre alpha2 +%define kdelibs3 kdelibs +%if 0%{?fedora} > 6 +%define kdelibs3 kdelibs3 +%define ffmpeg ffmpeg +%define _with_ffmpeg --with-ffmpeg +%endif + +Name: k3b-extras-freeworld +Epoch: 1 +Version: 1.0.5 +Release: 7%{?dist} +Summary: Additional codec plugins for the k3b CD/DVD burning application + +Group: Applications/Multimedia +License: GPLv2+ +URL: http://www.k3b.org +Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) + +## upstreamable +Patch50: k3b-1.0.5-ffmpeg.patch -Name: k3b-extras-freeworld -Summary: Additional codec plugins for the k3b CD/DVD burning application +## upstream +Patch100: k3b-lavc52.patch -Version: 1.66.0 -Release: 0.1.%{pre}%{?dist} +ExcludeArch: s390 s390x -Group: Applications/Archiving -License: GPLv2+ -URL: http://www.k3b.org/ -Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{pre}.tar... -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# TODO: bugzilla/document -ExcludeArch: s390 s390x - -## upstreamable patches -Patch50: k3b-1.66.0-ffmpeg.patch - -BuildRequires: cmake -BuildRequires: flac-devel -BuildRequires: gettext -BuildRequires: kdelibs4-devel -BuildRequires: kdemultimedia-devel -BuildRequires: libdvdread-devel -BuildRequires: libmpcdec-devel -BuildRequires: libmusicbrainz-devel -BuildRequires: libsamplerate-devel -BuildRequires: libsndfile-devel -BuildRequires: libvorbis-devel -# needed by k3bsetup -#BuildRequires: polkit-qt-devel -BuildRequires: taglib-devel - -BuildRequires: ffmpeg-devel +BuildRequires: %{kdelibs3}-devel BuildRequires: lame-devel BuildRequires: libdvdread-devel BuildRequires: libmad-devel +%{?ffmpeg:BuildRequires: %{ffmpeg}-devel automake} +BuildRequires: libmusicbrainz-devel +BuildRequires: gettext +BuildRequires: taglib-devel + +Obsoletes: k3b-mp3 < 0.12.10 +Provides: k3b-mp3 = %{version}-%{release} + +# livna upgrade +Obsoletes: k3b-extras-nonfree < 1.0.4-3 +Provides: k3b-extras-nonfree = %{version}-%{release} Requires: k3b >= %{version} @@ -46,56 +50,83 @@ handle CD/DVD burning application. - %prep %setup -q -n k3b-%{version} +%if 0%{?ffmpeg:1} %patch50 -p1 -b .ffmpeg +%patch100 -p1 -b .lavc52 +make -f admin/Makefile.common +%endif %build +unset QTDIR +[ -z "$QTDIR" ] && . /etc/profile.d/qt.sh -mkdir -p %{_target_platform} -pushd %{_target_platform} -%{cmake_kde4} \ - .. +%configure \ + --disable-rpath \ + --enable-new-ldflags \ + --disable-debug --disable-warnings \ + --disable-dependency-tracking --enable-final \ + --with-libdvdread \ + --with-external-libsamplerate=no \ + --without-oggvorbis \ + --without-flac \ + --without-sndfile \ + --without-hal \ + --without-musepack \ + --with-k3bsetup=no \ + %{?_with_ffmpeg} %{!?_with_ffmpeg:--without-ffmpeg} \ + --with-lame \ + --with-libmad + +%global makeflags %{?_smp_mflags}%{nil} + +# We need just a few k3b core libs. +# As FC k3b package no longer includes the libtool archives, +# we cannot simply link them anymore. +pushd libk3bdevice +#ln -s %{_libdir}/libk3bdevice.la libk3bdevice.la +make %makeflags popd -#make %{?_smp_mflags} -C %{_target_platform}/libk3bdevice -#make %{?_smp_mflags} -C %{_target_platform}/libk3b -make %{?_smp_mflags} -C %{_target_platform}/plugins/decoder/ffmpeg -make %{?_smp_mflags} -C %{_target_platform}/plugins/decoder/mp3 -make %{?_smp_mflags} -C %{_target_platform}/plugins/encoder/lame +pushd libk3b +#ln -s %{_libdir}/libk3b.la libk3b.la +make %makeflags +popd +# Now build individual plugins. +make %makeflags -C plugins/decoder/mp3 +%{?ffmpeg:make %makeflags -C plugins/decoder/ffmpeg} +make %makeflags -C plugins/encoder/lame %install -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT -make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/decoder/ffmpeg -make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/decoder/mp3 -make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/encoder/lame +make install DESTDIR=$RPM_BUILD_ROOT -C plugins/decoder/mp3 +%{?ffmpeg:make install DESTDIR=$RPM_BUILD_ROOT -C plugins/decoder/ffmpeg} +make install DESTDIR=$RPM_BUILD_ROOT -C plugins/encoder/lame %clean -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(-,root,root,-) -%{_kde4_libdir}/kde4/k3bffmpegdecoder.so -%{_kde4_libdir}/kde4/k3blameencoder.so -%{_kde4_libdir}/kde4/k3bmaddecoder.so -%{_kde4_libdir}/kde4/kcm_k3blameencoder.so -%{_kde4_datadir}/kde4/services/k3bffmpegdecoder.desktop -%{_kde4_datadir}/kde4/services/k3blameencoder.desktop -%{_kde4_datadir}/kde4/services/k3bmaddecoder.desktop -%{_kde4_datadir}/kde4/services/kcm_k3blameencoder.desktop +%{?ffmpeg:%{_libdir}/kde3/libk3bffmpegdecoder.*} +%{?ffmpeg:%{_datadir}/apps/k3b/plugins/k3bffmpegdecoder.plugin} +%{_libdir}/kde3/libk3blameencoder.* +%{_datadir}/apps/k3b/plugins/k3blameencoder.plugin +%{_libdir}/kde3/libk3bmaddecoder.* +%{_datadir}/apps/k3b/plugins/k3bmaddecoder.plugin %changelog -* Wed Jun 17 2009 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 1.66.0-0.1.alpha2 -- k3b-1.66.0 +* Thu Oct 01 2009 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 1:1.0.5-7 +- Epoch: 1 (F-12 revert to k3b-1.0.5) * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0.5-6 - rebuild for new F11 features Index: sources =================================================================== RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Jun 2009 15:38:31 -0000 1.3 +++ sources 1 Oct 2009 13:34:36 -0000 1.4 @@ -1 +1 @@ -60717ca718da93ee65f5fc2c0d9e8c71 k3b-1.66.0alpha2.tar.bz2 +e3b37d0d009af3dd149215d6ae0d54f3 k3b-1.0.5.tar.bz2 --- k3b-1.66.0-ffmpeg.patch DELETED ---