rpms/k3b-extras-freeworld/F-8 k3b-1.0.5-ffmpeg.patch, NONE, 1.1 k3b-extras-freeworld.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k3b-extras-freeworld/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29199
Modified Files:
.cvsignore sources
Added Files:
k3b-1.0.5-ffmpeg.patch k3b-extras-freeworld.spec
Log Message:
import
k3b-1.0.5-ffmpeg.patch:
--- NEW FILE k3b-1.0.5-ffmpeg.patch ---
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
--- NEW FILE k3b-extras-freeworld.spec ---
%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: 4%{?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)
Patch1: k3b-1.0.5-ffmpeg.patch
ExcludeArch: s390 s390x
BuildRequires: %{kdelibs3}-devel
BuildRequires: lame-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}
%description
Additional decoder/encoder plugins for k3b, a feature-rich and easy to
handle CD/DVD burning application.
%prep
%setup -q -n k3b-%{version}
%if 0%{?ffmpeg:1}
%patch1 -p1 -b .ffmpeg
make -f admin/Makefile.common
%endif
%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-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
popd
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 $RPM_BUILD_ROOT
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 $RPM_BUILD_ROOT
%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
%changelog
* 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.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:51:38 -0000 1.1
+++ .cvsignore 17 Sep 2008 16:22:34 -0000 1.2
@@ -0,0 +1 @@
+k3b-1.0.5.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:51:38 -0000 1.1
+++ sources 17 Sep 2008 16:22:34 -0000 1.2
@@ -0,0 +1 @@
+e3b37d0d009af3dd149215d6ae0d54f3 k3b-1.0.5.tar.bz2
16 years, 2 months
rpms/k3b-extras-freeworld/F-9 k3b-1.0.5-ffmpeg.patch, NONE, 1.1 k3b-extras-freeworld.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k3b-extras-freeworld/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28790
Modified Files:
.cvsignore sources
Added Files:
k3b-1.0.5-ffmpeg.patch k3b-extras-freeworld.spec
Log Message:
import
k3b-1.0.5-ffmpeg.patch:
--- NEW FILE k3b-1.0.5-ffmpeg.patch ---
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
--- NEW FILE k3b-extras-freeworld.spec ---
%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: 4%{?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)
Patch1: k3b-1.0.5-ffmpeg.patch
ExcludeArch: s390 s390x
BuildRequires: %{kdelibs3}-devel
BuildRequires: lame-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}
%description
Additional decoder/encoder plugins for k3b, a feature-rich and easy to
handle CD/DVD burning application.
%prep
%setup -q -n k3b-%{version}
%if 0%{?ffmpeg:1}
%patch1 -p1 -b .ffmpeg
make -f admin/Makefile.common
%endif
%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-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
popd
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 $RPM_BUILD_ROOT
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 $RPM_BUILD_ROOT
%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
%changelog
* 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.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:51:38 -0000 1.1
+++ .cvsignore 17 Sep 2008 16:20:05 -0000 1.2
@@ -0,0 +1 @@
+k3b-1.0.5.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:51:38 -0000 1.1
+++ sources 17 Sep 2008 16:20:05 -0000 1.2
@@ -0,0 +1 @@
+e3b37d0d009af3dd149215d6ae0d54f3 k3b-1.0.5.tar.bz2
16 years, 2 months
rpms/k3b-extras-freeworld/devel k3b-1.0.5-ffmpeg.patch, 1.1, 1.2 k3b-extras-freeworld.spec, 1.3, 1.4
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k3b-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28295
Modified Files:
k3b-1.0.5-ffmpeg.patch k3b-extras-freeworld.spec
Log Message:
* Wed Sep 17 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0.5-4
- better pkgconfig-based ffmpeg patch
- optimize configure
- License: GPLv2+
k3b-1.0.5-ffmpeg.patch:
Index: k3b-1.0.5-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-1.0.5-ffmpeg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k3b-1.0.5-ffmpeg.patch 16 Sep 2008 20:45:34 -0000 1.1
+++ k3b-1.0.5-ffmpeg.patch 17 Sep 2008 16:15:27 -0000 1.2
@@ -1,31 +1,55 @@
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-16 15:24:53.000000000 -0500
-@@ -21,8 +21,8 @@ if test "$ac_cv_use_ffmpeg" = "yes"; the
- AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(
- extern "C" {
++++ 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>
-+ #include <libavformat/avformat.h>
-+ #include <libavcodec/avcodec.h>
- }
-
- int main() {
-@@ -36,8 +36,8 @@ if test "$ac_cv_use_ffmpeg" = "yes"; the
- LIBS="-lavformat -lavcodec $LIBS"
- AC_LINK_IFELSE(
- extern "C" {
+- }
+-
+- 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>
-+ #include <libavformat/avformat.h>
-+ #include <libavcodec/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])
- int main() {
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-16 15:21:12.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>
@@ -37,7 +61,7 @@
#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-16 15:23:01.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"
@@ -49,3 +73,20 @@
}
#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
Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- k3b-extras-freeworld.spec 16 Sep 2008 20:45:34 -0000 1.3
+++ k3b-extras-freeworld.spec 17 Sep 2008 16:15:27 -0000 1.4
@@ -8,11 +8,11 @@
Name: k3b-extras-freeworld
Version: 1.0.5
-Release: 2%{?dist}
+Release: 4%{?dist}
Summary: Additional codec plugins for the k3b CD/DVD burning application
Group: Applications/Multimedia
-License: GPL
+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)
@@ -57,10 +57,11 @@
unset QTDIR
[ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
-%{?ffmpeg:export CPPFLAGS=-I%{_includedir}/ffmpeg}
-
%configure \
--disable-rpath \
+ --enable-new-ldflags \
+ --disable-debug --disable-warnings \
+ --disable-dependency-tracking --enable-final \
--with-external-libsamplerate=no \
--without-oggvorbis \
--without-flac \
@@ -116,6 +117,11 @@
%changelog
+* 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
16 years, 2 months
rpms/akode-extras/EL-5 akode-2.0.2-ffmpeg.patch,1.1,1.2
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/akode-extras/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26727/EL-5
Modified Files:
akode-2.0.2-ffmpeg.patch
Log Message:
fixed/better ffmpeg patch
akode-2.0.2-ffmpeg.patch:
Index: akode-2.0.2-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/akode-extras/EL-5/akode-2.0.2-ffmpeg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- akode-2.0.2-ffmpeg.patch 16 Sep 2008 20:14:39 -0000 1.1
+++ akode-2.0.2-ffmpeg.patch 17 Sep 2008 15:43:02 -0000 1.2
@@ -8,9 +8,9 @@
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avio.h>
-+#include <ffmpeg/libavcodec/avcodec.h>
-+#include <ffmpeg/libavformat/avformat.h>
-+#include <ffmpeg/libavformat/avio.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libavformat/avio.h>
#include "ffmpeg_decoder.h"
#include <iostream>
16 years, 2 months
rpms/akode-extras/F-8 akode-2.0.2-ffmpeg.patch,1.1,1.2
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/akode-extras/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26727/F-8
Modified Files:
akode-2.0.2-ffmpeg.patch
Log Message:
fixed/better ffmpeg patch
akode-2.0.2-ffmpeg.patch:
Index: akode-2.0.2-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/akode-extras/F-8/akode-2.0.2-ffmpeg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- akode-2.0.2-ffmpeg.patch 4 Sep 2008 16:45:08 -0000 1.1
+++ akode-2.0.2-ffmpeg.patch 17 Sep 2008 15:43:03 -0000 1.2
@@ -8,9 +8,9 @@
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avio.h>
-+#include <ffmpeg/libavcodec/avcodec.h>
-+#include <ffmpeg/libavformat/avformat.h>
-+#include <ffmpeg/libavformat/avio.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libavformat/avio.h>
#include "ffmpeg_decoder.h"
#include <iostream>
16 years, 2 months
rpms/k3b-extras-freeworld/devel k3b-1.0.5-ffmpeg.patch, NONE, 1.1 k3b-extras-freeworld.spec, 1.2, 1.3
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k3b-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30199
Modified Files:
k3b-extras-freeworld.spec
Added Files:
k3b-1.0.5-ffmpeg.patch
Log Message:
* Tue Sep 16 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.0.5-3
- re-enable ffmpeg support
k3b-1.0.5-ffmpeg.patch:
--- NEW FILE k3b-1.0.5-ffmpeg.patch ---
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-16 15:24:53.000000000 -0500
@@ -21,8 +21,8 @@ if test "$ac_cv_use_ffmpeg" = "yes"; the
AC_LANG_CPLUSPLUS
AC_COMPILE_IFELSE(
extern "C" {
- #include <ffmpeg/avformat.h>
- #include <ffmpeg/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
}
int main() {
@@ -36,8 +36,8 @@ if test "$ac_cv_use_ffmpeg" = "yes"; the
LIBS="-lavformat -lavcodec $LIBS"
AC_LINK_IFELSE(
extern "C" {
- #include <ffmpeg/avformat.h>
- #include <ffmpeg/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
}
int main() {
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-16 15:21:12.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-16 15:23:01.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>
Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- k3b-extras-freeworld.spec 15 Sep 2008 16:17:11 -0000 1.2
+++ k3b-extras-freeworld.spec 16 Sep 2008 20:45:34 -0000 1.3
@@ -1,5 +1,10 @@
-#define ffmpeg 1
+%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
@@ -12,12 +17,14 @@
Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+Patch1: k3b-1.0.5-ffmpeg.patch
+
ExcludeArch: s390 s390x
-BuildRequires: kdelibs3-devel
+BuildRequires: %{kdelibs3}-devel
BuildRequires: lame-devel
BuildRequires: libmad-devel
-%{?ffmpeg:BuildRequires: ffmpeg-devel}
+%{?ffmpeg:BuildRequires: %{ffmpeg}-devel automake}
BuildRequires: libmusicbrainz-devel
BuildRequires: gettext
BuildRequires: taglib-devel
@@ -40,18 +47,30 @@
%prep
%setup -q -n k3b-%{version}
+%if 0%{?ffmpeg:1}
+%patch1 -p1 -b .ffmpeg
+make -f admin/Makefile.common
+%endif
+
%build
unset QTDIR
[ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
-%configure --disable-rpath \
- --with-external-libsamplerate=no \
- --without-oggvorbis \
- --without-flac \
- --without-sndfile \
- --without-hal \
- --without-musepack \
- --with-k3bsetup=no
+
+%{?ffmpeg:export CPPFLAGS=-I%{_includedir}/ffmpeg}
+
+%configure \
+ --disable-rpath \
+ --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}
@@ -97,6 +116,9 @@
%changelog
+* 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)
16 years, 2 months
rpms/k9copy/F-9 k9copy-2.0.2-ffmpeg.patch, 1.2, 1.3 k9copy.spec, 1.4, 1.5
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k9copy/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29393
Modified Files:
k9copy-2.0.2-ffmpeg.patch k9copy.spec
Log Message:
revert inadvertant/botched ffmpeg patch
k9copy-2.0.2-ffmpeg.patch:
Index: k9copy-2.0.2-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-9/k9copy-2.0.2-ffmpeg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- k9copy-2.0.2-ffmpeg.patch 16 Sep 2008 20:37:29 -0000 1.2
+++ k9copy-2.0.2-ffmpeg.patch 16 Sep 2008 20:41:12 -0000 1.3
@@ -1,42 +1,6 @@
-diff -up k9copy-2.0.2-Source/cmake/FindFFmpeg.cmake.ffmpeg k9copy-2.0.2-Source/cmake/FindFFmpeg.cmake
---- k9copy-2.0.2-Source/cmake/FindFFmpeg.cmake.ffmpeg 2008-07-05 01:08:53.000000000 -0500
-+++ k9copy-2.0.2-Source/cmake/FindFFmpeg.cmake 2008-09-16 15:04:11.000000000 -0500
-@@ -1,6 +1,6 @@
- MACRO (FINDFFMPEG _include _lib)
-
--FIND_PATH(FFMPEG_INCLUDE_DIR ${_include} PATHS)
-+FIND_PATH(FFMPEG_INCLUDE_DIR ${_include}/ffmpeg PATHS)
- FIND_LIBRARY(FFMPEG_LIBRARY NAMES ${_lib} PATHS )
-
- IF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY)
-@@ -16,4 +16,4 @@ IF (INC_FOUND)
- ELSE (INC_FOUND)
- MESSAGE(FATAL_ERROR "Could not find ${_lib}")
- ENDIF (INC_FOUND)
--ENDMACRO (FINDFFMPEG _include _lib )
-\ No newline at end of file
-+ENDMACRO (FINDFFMPEG _include _lib )
-diff -up k9copy-2.0.2-Source/cmake/FindFFmpegScale.cmake.ffmpeg k9copy-2.0.2-Source/cmake/FindFFmpegScale.cmake
---- k9copy-2.0.2-Source/cmake/FindFFmpegScale.cmake.ffmpeg 2008-07-05 01:08:53.000000000 -0500
-+++ k9copy-2.0.2-Source/cmake/FindFFmpegScale.cmake 2008-09-16 15:04:33.000000000 -0500
-@@ -1,6 +1,6 @@
- MACRO (FINDFFMPEGSCALE _include _lib)
-
--FIND_PATH(FFMPEGSCALE_INCLUDE_DIR ${_include} PATHS)
-+FIND_PATH(FFMPEGSCALE_INCLUDE_DIR ${_include}/ffmpeg PATHS)
- FIND_LIBRARY(FFMPEGSCALE_LIBRARY NAMES ${_lib} PATHS )
-
- IF (FFMPEGSCALE_INCLUDE_DIR AND FFMPEGSCALE_LIBRARY)
-@@ -17,4 +17,4 @@ ELSE (HAVE_SWSCALE)
- MESSAGE(STATUS "k9copy will be built without swscale support")
- #MESSAGE(FATAL_ERROR "Could not find ${_lib}")
- ENDIF (HAVE_SWSCALE)
--ENDMACRO (FINDFFMPEGSCALE _include _lib )
-\ No newline at end of file
-+ENDMACRO (FINDFFMPEGSCALE _include _lib )
diff -up k9copy-2.0.2-Source/CMakeLists.txt.ffmpeg k9copy-2.0.2-Source/CMakeLists.txt
--- k9copy-2.0.2-Source/CMakeLists.txt.ffmpeg 2008-07-05 01:08:53.000000000 -0500
-+++ k9copy-2.0.2-Source/CMakeLists.txt 2008-09-16 15:02:43.000000000 -0500
++++ k9copy-2.0.2-Source/CMakeLists.txt 2008-09-16 14:50:22.000000000 -0500
@@ -94,7 +94,7 @@ CHECK_INCLUDE_FILES(sys/types.h HAVE
CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H) # simapi.h
CHECK_INCLUDE_FILES(malloc.h HAVE_MALLOC_H) # simapi.h
@@ -64,8 +28,8 @@
)
diff -up k9copy-2.0.2-Source/src/import/k9avidecode.cpp.ffmpeg k9copy-2.0.2-Source/src/import/k9avidecode.cpp
---- k9copy-2.0.2-Source/src/import/k9avidecode.cpp.ffmpeg 2008-09-16 15:02:43.000000000 -0500
-+++ k9copy-2.0.2-Source/src/import/k9avidecode.cpp 2008-09-16 15:02:43.000000000 -0500
+--- k9copy-2.0.2-Source/src/import/k9avidecode.cpp.ffmpeg 2008-09-16 14:46:48.000000000 -0500
++++ k9copy-2.0.2-Source/src/import/k9avidecode.cpp 2008-09-16 14:46:48.000000000 -0500
@@ -11,14 +11,14 @@
//
#include "k9avidecode.h"
@@ -85,7 +49,7 @@
diff -up k9copy-2.0.2-Source/src/import/k9avidecode.h.ffmpeg k9copy-2.0.2-Source/src/import/k9avidecode.h
--- k9copy-2.0.2-Source/src/import/k9avidecode.h.ffmpeg 2008-07-05 01:08:53.000000000 -0500
-+++ k9copy-2.0.2-Source/src/import/k9avidecode.h 2008-09-16 15:02:43.000000000 -0500
++++ k9copy-2.0.2-Source/src/import/k9avidecode.h 2008-09-16 14:46:48.000000000 -0500
@@ -14,12 +14,12 @@
#include "k9common.h"
Index: k9copy.spec
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-9/k9copy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- k9copy.spec 16 Sep 2008 20:37:29 -0000 1.4
+++ k9copy.spec 16 Sep 2008 20:41:12 -0000 1.5
@@ -57,10 +57,10 @@
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-%{cmake_kde4} ..
-# -DFFMPEG_INCLUDE_DIR=%{_includedir}/ffmpeg \
-# -DFFMPEGSCALE_INCLUDE_DIR=%{_includedir}/ffmpeg \
-
+%{cmake_kde4} \
+ -DFFMPEG_INCLUDE_DIR=%{_includedir}/ffmpeg \
+ -DFFMPEGSCALE_INCLUDE_DIR=%{_includedir}/ffmpeg \
+ ..
popd
make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
16 years, 2 months
rpms/k9copy/F-9 k9copy-2.0.2-ffmpeg.patch, 1.1, 1.2 k9copy.spec, 1.3, 1.4
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k9copy/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29199
Modified Files:
k9copy-2.0.2-ffmpeg.patch k9copy.spec
Log Message:
hack missing BR
k9copy-2.0.2-ffmpeg.patch:
Index: k9copy-2.0.2-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-9/k9copy-2.0.2-ffmpeg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k9copy-2.0.2-ffmpeg.patch 16 Sep 2008 20:01:09 -0000 1.1
+++ k9copy-2.0.2-ffmpeg.patch 16 Sep 2008 20:37:29 -0000 1.2
@@ -1,6 +1,42 @@
+diff -up k9copy-2.0.2-Source/cmake/FindFFmpeg.cmake.ffmpeg k9copy-2.0.2-Source/cmake/FindFFmpeg.cmake
+--- k9copy-2.0.2-Source/cmake/FindFFmpeg.cmake.ffmpeg 2008-07-05 01:08:53.000000000 -0500
++++ k9copy-2.0.2-Source/cmake/FindFFmpeg.cmake 2008-09-16 15:04:11.000000000 -0500
+@@ -1,6 +1,6 @@
+ MACRO (FINDFFMPEG _include _lib)
+
+-FIND_PATH(FFMPEG_INCLUDE_DIR ${_include} PATHS)
++FIND_PATH(FFMPEG_INCLUDE_DIR ${_include}/ffmpeg PATHS)
+ FIND_LIBRARY(FFMPEG_LIBRARY NAMES ${_lib} PATHS )
+
+ IF (FFMPEG_INCLUDE_DIR AND FFMPEG_LIBRARY)
+@@ -16,4 +16,4 @@ IF (INC_FOUND)
+ ELSE (INC_FOUND)
+ MESSAGE(FATAL_ERROR "Could not find ${_lib}")
+ ENDIF (INC_FOUND)
+-ENDMACRO (FINDFFMPEG _include _lib )
+\ No newline at end of file
++ENDMACRO (FINDFFMPEG _include _lib )
+diff -up k9copy-2.0.2-Source/cmake/FindFFmpegScale.cmake.ffmpeg k9copy-2.0.2-Source/cmake/FindFFmpegScale.cmake
+--- k9copy-2.0.2-Source/cmake/FindFFmpegScale.cmake.ffmpeg 2008-07-05 01:08:53.000000000 -0500
++++ k9copy-2.0.2-Source/cmake/FindFFmpegScale.cmake 2008-09-16 15:04:33.000000000 -0500
+@@ -1,6 +1,6 @@
+ MACRO (FINDFFMPEGSCALE _include _lib)
+
+-FIND_PATH(FFMPEGSCALE_INCLUDE_DIR ${_include} PATHS)
++FIND_PATH(FFMPEGSCALE_INCLUDE_DIR ${_include}/ffmpeg PATHS)
+ FIND_LIBRARY(FFMPEGSCALE_LIBRARY NAMES ${_lib} PATHS )
+
+ IF (FFMPEGSCALE_INCLUDE_DIR AND FFMPEGSCALE_LIBRARY)
+@@ -17,4 +17,4 @@ ELSE (HAVE_SWSCALE)
+ MESSAGE(STATUS "k9copy will be built without swscale support")
+ #MESSAGE(FATAL_ERROR "Could not find ${_lib}")
+ ENDIF (HAVE_SWSCALE)
+-ENDMACRO (FINDFFMPEGSCALE _include _lib )
+\ No newline at end of file
++ENDMACRO (FINDFFMPEGSCALE _include _lib )
diff -up k9copy-2.0.2-Source/CMakeLists.txt.ffmpeg k9copy-2.0.2-Source/CMakeLists.txt
--- k9copy-2.0.2-Source/CMakeLists.txt.ffmpeg 2008-07-05 01:08:53.000000000 -0500
-+++ k9copy-2.0.2-Source/CMakeLists.txt 2008-09-16 14:50:22.000000000 -0500
++++ k9copy-2.0.2-Source/CMakeLists.txt 2008-09-16 15:02:43.000000000 -0500
@@ -94,7 +94,7 @@ CHECK_INCLUDE_FILES(sys/types.h HAVE
CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H) # simapi.h
CHECK_INCLUDE_FILES(malloc.h HAVE_MALLOC_H) # simapi.h
@@ -28,8 +64,8 @@
)
diff -up k9copy-2.0.2-Source/src/import/k9avidecode.cpp.ffmpeg k9copy-2.0.2-Source/src/import/k9avidecode.cpp
---- k9copy-2.0.2-Source/src/import/k9avidecode.cpp.ffmpeg 2008-09-16 14:46:48.000000000 -0500
-+++ k9copy-2.0.2-Source/src/import/k9avidecode.cpp 2008-09-16 14:46:48.000000000 -0500
+--- k9copy-2.0.2-Source/src/import/k9avidecode.cpp.ffmpeg 2008-09-16 15:02:43.000000000 -0500
++++ k9copy-2.0.2-Source/src/import/k9avidecode.cpp 2008-09-16 15:02:43.000000000 -0500
@@ -11,14 +11,14 @@
//
#include "k9avidecode.h"
@@ -49,7 +85,7 @@
diff -up k9copy-2.0.2-Source/src/import/k9avidecode.h.ffmpeg k9copy-2.0.2-Source/src/import/k9avidecode.h
--- k9copy-2.0.2-Source/src/import/k9avidecode.h.ffmpeg 2008-07-05 01:08:53.000000000 -0500
-+++ k9copy-2.0.2-Source/src/import/k9avidecode.h 2008-09-16 14:46:48.000000000 -0500
++++ k9copy-2.0.2-Source/src/import/k9avidecode.h 2008-09-16 15:02:43.000000000 -0500
@@ -14,12 +14,12 @@
#include "k9common.h"
Index: k9copy.spec
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-9/k9copy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- k9copy.spec 16 Sep 2008 20:01:09 -0000 1.3
+++ k9copy.spec 16 Sep 2008 20:37:29 -0000 1.4
@@ -21,7 +21,7 @@
BuildRequires: ffmpeg-devel
BuildRequires: gettext
BuildRequires: hal-devel
-BuildRequires: kdelibs4-devel
+BuildRequires: kdelibs4-devel libutempter-devel
BuildRequires: libdvdread-devel
BuildRequires: xine-lib-devel
@@ -57,10 +57,10 @@
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-%{cmake_kde4} \
- -DFFMPEG_INCLUDE_DIR=%{_includedir}/ffmpeg \
- -DFFMPEGSCALE_INCLUDE_DIR=%{_includedir}/ffmpeg \
- ..
+%{cmake_kde4} ..
+# -DFFMPEG_INCLUDE_DIR=%{_includedir}/ffmpeg \
+# -DFFMPEGSCALE_INCLUDE_DIR=%{_includedir}/ffmpeg \
+
popd
make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
16 years, 2 months
rpms/akode-extras/EL-5 akode-2.0.2-ffmpeg.patch, NONE, 1.1 akode-2.0.2-gcc43.patch, NONE, 1.1
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/akode-extras/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27797
Added Files:
akode-2.0.2-ffmpeg.patch akode-2.0.2-gcc43.patch
Log Message:
import awol patches
akode-2.0.2-ffmpeg.patch:
--- NEW FILE akode-2.0.2-ffmpeg.patch ---
diff -up akode-2.0.2/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp.ffmpeg akode-2.0.2/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp
--- akode-2.0.2/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp.ffmpeg 2008-09-04 11:20:15.000000000 -0500
+++ akode-2.0.2/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp 2008-09-04 11:40:31.000000000 -0500
@@ -29,9 +29,9 @@
#include "decoder.h"
#include <assert.h>
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avio.h>
+#include <ffmpeg/libavcodec/avcodec.h>
+#include <ffmpeg/libavformat/avformat.h>
+#include <ffmpeg/libavformat/avio.h>
#include "ffmpeg_decoder.h"
#include <iostream>
akode-2.0.2-gcc43.patch:
--- NEW FILE akode-2.0.2-gcc43.patch ---
diff -up akode-2.0.2/akode/akodeplay/akodeplay.cpp.gcc43 akode-2.0.2/akode/akodeplay/akodeplay.cpp
--- akode-2.0.2/akode/akodeplay/akodeplay.cpp.gcc43 2006-11-06 07:20:52.000000000 -0600
+++ akode-2.0.2/akode/akodeplay/akodeplay.cpp 2008-02-12 17:28:00.000000000 -0600
@@ -25,6 +25,7 @@
#include "../lib/sink.h"
#include "../lib/decoder.h"
+#include <stdlib.h>
#ifdef HAVE_GNU_GETOPT
#include <getopt.h>
#else
diff -up akode-2.0.2/akode/lib/player.cpp.gcc43 akode-2.0.2/akode/lib/player.cpp
--- akode-2.0.2/akode/lib/player.cpp.gcc43 2006-11-05 08:37:48.000000000 -0600
+++ akode-2.0.2/akode/lib/player.cpp 2008-02-12 17:10:58.000000000 -0600
@@ -21,6 +21,7 @@
#include <pthread.h>
#include <semaphore.h>
#include <assert.h>
+#include <string.h>
#include "audioframe.h"
#include "audiobuffer.h"
diff -up akode-2.0.2/akode/lib/magic.cpp.gcc43 akode-2.0.2/akode/lib/magic.cpp
--- akode-2.0.2/akode/lib/magic.cpp.gcc43 2008-02-12 16:52:26.000000000 -0600
+++ akode-2.0.2/akode/lib/magic.cpp 2008-02-12 17:16:54.000000000 -0600
@@ -21,6 +21,8 @@
#include "akodelib.h"
#include "magic.h"
#include "file.h"
+#include <stdlib.h>
+#include <string.h>
#include <iostream>
using std::cerr;
diff -up akode-2.0.2/akode/lib/akode_export.h.in.gcc43 akode-2.0.2/akode/lib/akode_export.h.in
diff -up akode-2.0.2/akode/lib/auto_sink.cpp.gcc43 akode-2.0.2/akode/lib/auto_sink.cpp
--- akode-2.0.2/akode/lib/auto_sink.cpp.gcc43 2005-10-26 08:50:29.000000000 -0500
+++ akode-2.0.2/akode/lib/auto_sink.cpp 2008-02-12 16:57:18.000000000 -0600
@@ -21,6 +21,7 @@
#include "audioframe.h"
#include "auto_sink.h"
+#include <stdlib.h>
#include <iostream>
namespace aKode {
16 years, 2 months
rpms/akode-extras/EL-5 akode-extras.spec,1.1,1.2
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/akode-extras/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27649
Modified Files:
akode-extras.spec
Log Message:
* Thu Sep 04 2008 Rex Dieter <rdieter(a)fedoraproject.org> 2.0.2-3
- fix build
- spec cosmetics
Index: akode-extras.spec
===================================================================
RCS file: /cvs/free/rpms/akode-extras/EL-5/akode-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- akode-extras.spec 22 Aug 2008 19:53:22 -0000 1.1
+++ akode-extras.spec 16 Sep 2008 20:12:45 -0000 1.2
@@ -1,12 +1,13 @@
%if 0%{?fedora} > 2
%define _with_ffmpeg --with-ffmpeg
+%define ffmpeg ffmpeg
%endif
Summary: Extra decoder plugins for akode
Name: akode-extras
Version: 2.0.2
-Release: 1%{?dist}
+Release: 3%{?dist}
License: GPLv2+%{?_with_ffmpeg:/LGPLv2+ (see description)}
Group: System Environment/Libraries
@@ -15,11 +16,14 @@
Source0: http://www.kde-apps.org/CONTENT/content-files/30375-akode-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: akode-2.0.2-ffmpeg-int64_c.patch
+Patch4: akode-2.0.2-gcc43.patch
+Patch10: akode-2.0.2-ffmpeg-int64_c.patch
+# for newer ffmpeg's that move headers around
+Patch11: akode-2.0.2-ffmpeg.patch
BuildRequires: automake
BuildRequires: libmad-devel
-%{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9 }
+%{?_with_ffmpeg:BuildRequires: %{ffmpeg}-devel >= 0.4.9 }
# Be mindful of these, since kdemultimedia-extras-nonfree needs to be rebuilt when/if anything
# is added/removed -- Rex
Provides: %{name}-mpeg_decoder = %{version}-%{release}
@@ -37,7 +41,10 @@
%prep
%setup -q -n akode-%{version}%{?beta}
-%patch1 -p1 -b .ffmpeg-int64_c
+%patch4 -p1 -b .gcc43
+
+%patch10 -p1 -b .ffmpeg-int64_c
+%patch11 -p1 -b .ffmpeg
#[ ! -f configure ] && \
make -f Makefile.cvs
@@ -48,6 +55,13 @@
--disable-static \
--disable-debug --disable-warnings --disable-dependency-tracking \
--without-libltdl \
+ --without-flac \
+ --without-oss \
+ --without-jack \
+ --without-libsamplerate \
+ --without-pulseaudio \
+ --without-speex \
+ --without-vorbis \
--with-libmad \
%{?_with_ffmpeg} %{!?_with_ffmpeg:--without-ffmpeg} \
@@ -61,17 +75,17 @@
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make -C akode/plugins/mpeg_decoder install DESTDIR=$RPM_BUILD_ROOT
-%{?_with_ffmpeg:make -C akode/plugins/ffmpeg_decoder install DESTDIR=$RPM_BUILD_ROOT}
+make -C akode/plugins/mpeg_decoder install DESTDIR=%{buildroot}
+%{?_with_ffmpeg:make -C akode/plugins/ffmpeg_decoder install DESTDIR=%{buildroot}}
# unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_libdir}/lib*.la
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
@@ -81,6 +95,13 @@
%changelog
+* Thu Sep 04 2008 Rex Dieter <rdieter(a)fedoraproject.org> 2.0.2-3
+- fix build
+- spec cosmetics
+
+* Sun Aug 10 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.0.2-2
+- rebuild for RPM Fusion
+
* Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-1
- akode-2.0.2
16 years, 2 months