SOURCES: mpeg4ip-link.patch - updated for 1.4.1

[qboosh]

Author: qboosh                       Date: Sat Nov 19 18:53:54 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.4.1

---- Files affected:
SOURCES:
   mpeg4ip-link.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/mpeg4ip-link.patch
diff -u SOURCES/mpeg4ip-link.patch:1.5 SOURCES/mpeg4ip-link.patch:1.6
--- SOURCES/mpeg4ip-link.patch:1.5	Sun May 22 17:12:02 2005
+++ SOURCES/mpeg4ip-link.patch	Sat Nov 19 19:53:48 2005
@@ -43,21 +43,21 @@
  libmpeg4ipSDL_la_DEPENDENCIES =	\
  	@SDL_EXTRALIBS@
  
---- mpeg4ip-1.1/player/plugin/rtp/isma_audio/Makefile.am.orig	2004-05-12 23:15:24.000000000 +0200
-+++ mpeg4ip-1.1/player/plugin/rtp/isma_audio/Makefile.am	2004-10-23 18:10:59.730097416 +0200
+--- mpeg4ip-1.4.1/player/plugin/rtp/isma_audio/Makefile.am.orig	2005-09-08 19:58:24.000000000 +0200
++++ mpeg4ip-1.4.1/player/plugin/rtp/isma_audio/Makefile.am	2005-11-19 18:56:25.681346200 +0100
 @@ -15,13 +15,13 @@
  isma_rtp_plugin_la_LIBADD = \
- 	$(top_srcdir)/lib/mp4av/libmp4av.la \
- 	$(top_srcdir)/player/lib/mp4util/libmp4util.la \
+ 	$(top_builddir)/lib/mp4av/libmp4av.la \
+ 	$(top_builddir)/player/lib/mp4util/libmp4util.la \
 -	-lm 
 +	-lSDL -lm 
  
  isma_enc_rtp_plugin_la_LIBADD = \
-         $(top_srcdir)/lib/mp4av/libmp4av.la \
-         $(top_srcdir)/player/lib/mp4util/libmp4util.la \
-         @ISMACRYP_LIB@ \
+         $(top_builddir)/lib/mp4av/libmp4av.la \
+         $(top_builddir)/player/lib/mp4util/libmp4util.la \
+         $(top_builddir)/lib/ismacryp/libismacryp.la @SRTPLIB@ \
 -        -lm
-+	-lSDL -lm
++        -lSDL -lm
  
  INCLUDES = -I$(top_srcdir)/player/src \
  	   -I$(top_srcdir)/player/lib \
@@ -81,15 +81,15 @@
  
  INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4v2
  
---- mpeg4ip-1.3/player/lib/audio/celp/dec/Makefile.am.orig	2005-05-04 23:27:16.000000000 +0200
-+++ mpeg4ip-1.3/player/lib/audio/celp/dec/Makefile.am	2005-05-22 12:48:18.543059576 +0200
+--- mpeg4ip-1.4.1/player/lib/audio/celp/dec/Makefile.am.orig	2005-08-12 19:17:17.000000000 +0200
++++ mpeg4ip-1.4.1/player/lib/audio/celp/dec/Makefile.am	2005-11-19 18:57:45.808165072 +0100
 @@ -43,6 +43,8 @@
  	phi_priv.c \
  	phi_xits.c
  
 +libmpeg4ip_celp_la_LIBADD = $(top_builddir)/player/lib/audio/celp/BS/libmpeg4ip_celpbs.la -lm
 +
- INCLUDES=-I../include
+ INCLUDES=-I$(srcdir)/../include
  AM_CFLAGS = 
  
 --- mpeg4ip-1.3/player/lib/audio/faad/Makefile.am.orig	2005-05-04 22:01:36.000000000 +0200
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mpeg4ip-link.patch?r1=1.5&r2=1.6&f=u