packages: mpeg4ip/mpeg4ip-ffmpeg.patch, mpeg4ip/mpeg4ip.spec - rel 13; buil...

[arekm]

Author: arekm                        Date: Fri Jul 16 06:18:43 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 13; build fixed

---- Files affected:
packages/mpeg4ip:
   mpeg4ip-ffmpeg.patch (1.3 -> 1.4) , mpeg4ip.spec (1.70 -> 1.71) 

---- Diffs:

================================================================
Index: packages/mpeg4ip/mpeg4ip-ffmpeg.patch
diff -u packages/mpeg4ip/mpeg4ip-ffmpeg.patch:1.3 packages/mpeg4ip/mpeg4ip-ffmpeg.patch:1.4
--- packages/mpeg4ip/mpeg4ip-ffmpeg.patch:1.3	Fri Oct 10 23:11:04 2008
+++ packages/mpeg4ip/mpeg4ip-ffmpeg.patch	Fri Jul 16 08:18:37 2010
@@ -38,7 +38,7 @@
       AC_MSG_NOTICE([have enable ffmpeg $enable_ffmpeg])
       FFMPEG_INC=-I${enable_ffmpeg}/libavcodec
 -     FFMPEG_LIB="${enable_ffmpeg}/libavcodec/libavcodec.a -lz"
-+     FFMPEG_LIB="-lavcodec -lz"
++     FFMPEG_LIB="-lavcodec -lavutil -lz"
       saveCFLAGS="$CFLAGS"
       CFLAGS="$CFLAGS $FFMPEG_INC"
       AC_CHECK_TYPES([AVRational], , , [#include <avcodec.h>])
@@ -50,7 +50,7 @@
          AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed])
          FFMPEG_INC=
 -        FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs"
-+        FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs $(pkg-config libswscale --libs --silence-errors)"
++        FFMPEG_LIB="-lavcodec -lavutil -lz $ffmpeg_add_libs $(pkg-config libswscale --libs --silence-errors)"
          AC_CHECK_TYPES([AVRational], , , [#include <ffmpeg/avcodec.h>])
  	AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include <ffmpeg/avcodec.h>])
  	AC_CHECK_DECLS([avcodec_decode_audio2], , ,[#include <ffmpeg/avcodec.h>])

================================================================
Index: packages/mpeg4ip/mpeg4ip.spec
diff -u packages/mpeg4ip/mpeg4ip.spec:1.70 packages/mpeg4ip/mpeg4ip.spec:1.71
--- packages/mpeg4ip/mpeg4ip.spec:1.70	Tue Jun 29 18:33:54 2010
+++ packages/mpeg4ip/mpeg4ip.spec	Fri Jul 16 08:18:37 2010
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	MPEG4IP - system kodowania, streamingu i odtwarzania dźwięku i obrazu MPEG-4
 Name:		mpeg4ip
 Version:	1.6.1
-Release:	12
+Release:	13
 Epoch:		1
 License:	MPL v1.1 (original code) and other licenses (included libraries)
 Group:		Applications
@@ -256,6 +256,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71  2010/07/16 06:18:37  arekm
+- rel 13; build fixed
+
 Revision 1.70  2010/06/29 16:33:54  sls
 - compilation fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mpeg4ip/mpeg4ip-ffmpeg.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mpeg4ip/mpeg4ip.spec?r1=1.70&r2=1.71&f=u