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

Wed Sep 17 18:20:06 CEST 2008

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 at fedoraproject.org> - 1.0.5-4
- better pkgconfig-based ffmpeg patch
- optimize configure
- License: GPLv2+

* Tue Sep 16 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.5-3
- re-enable ffmpeg support

* Mon Sep 15 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.5-2
- omit ffmpeg support (for now)

* Mon Sep 15 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.5-1
- k3b-extras-freeworld for rpmfusion

* Thu Jan 31 2008 Rex Dieter <rdieter at 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

