SOURCES: mpeg4ip-link.patch - few --as-needed fixes, nfy.

[pluto]

Author: pluto                        Date: Wed Dec 13 11:55:00 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- few --as-needed fixes, nfy.

---- Files affected:
SOURCES:
   mpeg4ip-link.patch (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SOURCES/mpeg4ip-link.patch
diff -u SOURCES/mpeg4ip-link.patch:1.9 SOURCES/mpeg4ip-link.patch:1.10
--- SOURCES/mpeg4ip-link.patch:1.9	Fri Jul 21 23:49:29 2006
+++ SOURCES/mpeg4ip-link.patch	Wed Dec 13 12:54:55 2006
@@ -121,3 +121,66 @@
  test_srtp_server_SOURCES = test_srtp_server.cpp
 -test_srtp_server_LDADD = ../rtp/libuclmmbase.la libsrtpif.la ../mp4v2/libmp4v2.la ../../../srtp/libsrtp.a
 +test_srtp_server_LDADD = ../rtp/libuclmmbase.la libsrtpif.la ../mp4v2/libmp4v2.la
+--- mpeg4ip-1.5.0.1/lib/mpeg2ps/Makefile.am.orig	2005-09-28 20:38:27.000000000 +0000
++++ mpeg4ip-1.5.0.1/lib/mpeg2ps/Makefile.am	2006-12-13 10:18:40.852748000 +0000
+@@ -12,10 +12,10 @@
+ 
+ bin_PROGRAMS = mpeg_ps_info mpeg_ps_extract
+ prog_libadd = \
++	libmpeg2_program.la \
+ 	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+ 	$(top_builddir)/lib/mp4av/libmp4av.la \
+-	$(top_builddir)/lib/mp4v2/libmp4v2.la \
+-	libmpeg2_program.la 
++	$(top_builddir)/lib/mp4v2/libmp4v2.la
+ 
+ mpeg_ps_info_SOURCES = ps_info.cpp
+ mpeg_ps_info_LDADD = $(prog_libadd)
+@@ -27,8 +27,7 @@
+ mpeg2ps_test_LDADD = libmpeg2_program.la \
+ 	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+ 	$(top_builddir)/lib/mp4av/libmp4av.la \
+-	$(top_builddir)/lib/mp4v2/libmp4v2.la \
+-	libmpeg2_program.la 
++	$(top_builddir)/lib/mp4v2/libmp4v2.la
+ 
+ EXTRA_DIST=libmpeg2ps.dsp
+ 
+--- mpeg4ip-1.5.0.1/player/src/Makefile.am.orig	2006-12-13 11:11:12.927981500 +0000
++++ mpeg4ip-1.5.0.1/player/src/Makefile.am	2006-12-13 11:11:16.430448500 +0000
+@@ -196,13 +196,13 @@
+ 
+ mp4player_LDFLAGS = $(SDL_AUDIO_FLAGS)
+ mp4player_LDADD = \
+-	-lm $(SDL_AUDIO_LIB) \
+ 	libmp4player.la \
+ 	libmp4syncbase.la \
+ 	libmp4syncsdl.la \
+ 	libmp4sdlvideo.la \
+ 	libmp4syncbase.la \
+ 	libmp4playerutils.la \
++	-lm $(SDL_AUDIO_LIB) \
+ 	$(top_builddir)/lib/audio/libaudio.la \
+ 	$(top_builddir)/lib/ismacryp/libismacryp.la \
+ 	$(top_builddir)/lib/srtp/libsrtpif.la \
+--- mpeg4ip-1.5.0.1/lib/ismacryp/Makefile.am.orig	2006-05-11 17:47:06.000000000 +0000
++++ mpeg4ip-1.5.0.1/lib/ismacryp/Makefile.am	2006-12-13 11:26:09.546762500 +0000
+@@ -5,6 +5,7 @@
+ libismacryp_la_SOURCES = ismacryplib.c \
+ 	ismacryplib.h \
+ 	ismacryplib_priv.h
++libismacryp_la_LIBADD = @SRTPLIB@
+ 
+ AM_CFLAGS = -D_REENTRANT @BILLS_CWARNINGS@
+ 
+--- mpeg4ip-1.5.0.1/server/mp4creator/Makefile.am.orig	2005-09-08 17:58:24.000000000 +0000
++++ mpeg4ip-1.5.0.1/server/mp4creator/Makefile.am	2006-12-13 11:27:33.087983500 +0000
+@@ -30,7 +30,6 @@
+ 	$(top_builddir)/lib/mp4av/libmp4av.la \
+ 	$(top_builddir)/lib/avi/libavi.la \
+ 	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+-	$(top_builddir)/lib/ismacryp/libismacryp.la \
+-	@SRTPLIB@ 
++	$(top_builddir)/lib/ismacryp/libismacryp.la
+ 
+ EXTRA_DIST = mp4creator60.dsp 
================================================================

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