rpms/k3b-extras-freeworld/devel k3b-1.0.5-ffmpeg.patch, 1.1, 1.2 k3b-extras-freeworld.spec, 1.3, 1.4

[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 at 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 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