3:38 p.m.
Author: rdieter
Update of /cvs/free/rpms/k3b-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4056
Modified Files:
.cvsignore k3b-extras-freeworld.spec sources
Added Files:
k3b-1.66.0-ffmpeg.patch
Removed Files:
k3b-1.0.5-ffmpeg.patch k3b-lavc52.patch
Log Message:
* Wed Jun 17 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.66.0-0.1.alpha2
- k3b-1.66.0
k3b-1.66.0-ffmpeg.patch:
--- NEW FILE k3b-1.66.0-ffmpeg.patch ---
diff -up k3b-1.66.0/plugins/decoder/ffmpeg/CMakeLists.txt.ffmpeg
k3b-1.66.0/plugins/decoder/ffmpeg/CMakeLists.txt
--- k3b-1.66.0/plugins/decoder/ffmpeg/CMakeLists.txt.ffmpeg 2008-09-27 01:33:36.000000000
-0500
+++ k3b-1.66.0/plugins/decoder/ffmpeg/CMakeLists.txt 2009-06-17 10:21:55.349002048 -0500
@@ -3,14 +3,14 @@
########### next target ###############
-find_file(newffmpegavcodecpath avcodec.h /usr/include/libavcodec)
-
-if(newffmpegavcodecpath)
+if(FFMPEG_INCLUDE_DIR_OLD_STYLE)
+ message(STATUS "didn't find new ffmpegcodecpath")
+ include_directories (${FFMPEG_INCLUDE_DIR_OLD_STYLE})
+else(FFMPEG_INCLUDE_DIR_OLD_STYLE)
message(STATUS "found new ffmpegcodecpath")
add_definitions(-DNEWFFMPEGAVCODECPATH)
-else(newffmpegavcodecpath)
- message(STATUS "didn't find new ffmpegcodecpath")
-endif(newffmpegavcodecpath)
+ include_directories (${FFMPEG_INCLUDE_DIR})
+endif(FFMPEG_INCLUDE_DIR_OLD_STYLE)
set(k3bffmpegdecoder_PART_SRCS k3bffmpegdecoder.cpp k3bffmpegwrapper.cpp )
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 15 Sep 2008 15:53:13 -0000 1.2
+++ .cvsignore 17 Jun 2009 15:38:31 -0000 1.3
@@ -1 +1 @@
-k3b-1.0.5.tar.bz2
+k3b-1.66.0alpha2.tar.bz2
Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- k3b-extras-freeworld.spec 29 Mar 2009 13:17:01 -0000 1.9
+++ k3b-extras-freeworld.spec 17 Jun 2009 15:38:31 -0000 1.10
@@ -1,42 +1,42 @@
-%define kdelibs3 kdelibs
-%if 0%{?fedora} > 6
-%define kdelibs3 kdelibs3
-%define ffmpeg ffmpeg
-%define _with_ffmpeg --with-ffmpeg
-%endif
-
-Name: k3b-extras-freeworld
-Version: 1.0.5
-Release: 6%{?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)
+%define pre alpha2
-Patch1: k3b-1.0.5-ffmpeg.patch
-Patch2: k3b-lavc52.patch
+Name: k3b-extras-freeworld
+Summary: Additional codec plugins for the k3b CD/DVD burning application
-ExcludeArch: s390 s390x
+Version: 1.66.0
+Release: 0.1.%{pre}%{?dist}
-BuildRequires: %{kdelibs3}-devel
+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: 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,81 +46,57 @@
handle CD/DVD burning application.
+
%prep
%setup -q -n k3b-%{version}
-%if 0%{?ffmpeg:1}
-%patch1 -p1 -b .ffmpeg
-%patch2 -p1 -b .lavc52
-make -f admin/Makefile.common
-%endif
+%patch50 -p1 -b .ffmpeg
%build
-unset QTDIR
-[ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
-%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
-
-%define 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
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} \
+ ..
popd
-pushd libk3b
-#ln -s %{_libdir}/libk3b.la libk3b.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
-# 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 $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-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
+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
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-%files
+%files
%defattr(-,root,root,-)
-%{?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
+%{_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
%changelog
+* 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
Index: sources
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 15 Sep 2008 15:53:13 -0000 1.2
+++ sources 17 Jun 2009 15:38:31 -0000 1.3
@@ -1 +1 @@
-e3b37d0d009af3dd149215d6ae0d54f3 k3b-1.0.5.tar.bz2
+60717ca718da93ee65f5fc2c0d9e8c71 k3b-1.66.0alpha2.tar.bz2
--- k3b-1.0.5-ffmpeg.patch DELETED ---
--- k3b-lavc52.patch DELETED ---