SOURCES: mpeg4ip-gcc4.patch, mpeg4ip-link.patch - updated for 1.6

[qboosh]

Author: qboosh                       Date: Sun Nov  4 10:16:35 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.6

---- Files affected:
SOURCES:
   mpeg4ip-gcc4.patch (1.3 -> 1.4) , mpeg4ip-link.patch (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SOURCES/mpeg4ip-gcc4.patch
diff -u SOURCES/mpeg4ip-gcc4.patch:1.3 SOURCES/mpeg4ip-gcc4.patch:1.4
--- SOURCES/mpeg4ip-gcc4.patch:1.3	Wed Dec 13 12:54:26 2006
+++ SOURCES/mpeg4ip-gcc4.patch	Sun Nov  4 11:16:30 2007
@@ -16,9 +16,9 @@
  #define signOf(x) (((x) > 0) ? 1 : 0)
  #define invSignOf(x) ((x) > 0 ? 0 : 1)					// see p.22/H.263
  #define sign(x) ((x) > 0 ? 1 : -1)					// see p.22/H.263
---- mpeg4ip-1.5.0.1/common/video/iso-mpeg4/src/type_basic.cpp.orig	2005-05-04 19:56:00.000000000 +0000
-+++ mpeg4ip-1.5.0.1/common/video/iso-mpeg4/src/type_basic.cpp	2006-12-13 10:41:07.856930500 +0000
-@@ -317,13 +317,13 @@
+--- mpeg4ip-1.6/common/video/iso-mpeg4/src/type_basic.cpp.orig	2006-08-03 20:30:21.000000000 +0200
++++ mpeg4ip-1.6/common/video/iso-mpeg4/src/type_basic.cpp	2007-11-04 01:28:16.465905317 +0100
+@@ -317,7 +317,7 @@
  	iHalfY = m_vctTrueHalfPel.y - iMVY * 2;
  }
  
@@ -27,10 +27,3 @@
  {
  	memset (this, 0, sizeof (*this));
  }
- 
- // RRV insertion
--Void CMotionVector::scaleup (Void)
-+Void CMotionVector::scaleup ()
- {
- 	if(m_vctTrueHalfPel.x == 0){
- 		m_vctTrueHalfPel_x2.x = 0;

================================================================
Index: SOURCES/mpeg4ip-link.patch
diff -u SOURCES/mpeg4ip-link.patch:1.11 SOURCES/mpeg4ip-link.patch:1.12
--- SOURCES/mpeg4ip-link.patch:1.11	Wed Dec 13 13:05:21 2006
+++ SOURCES/mpeg4ip-link.patch	Sun Nov  4 11:16:30 2007
@@ -71,16 +71,6 @@
  
  libdir = @PLAYER_PLUGIN_DIR@
  
---- mpeg4ip-1.3/player/lib/mp4util/Makefile.am.orig	2005-04-20 00:50:01.000000000 +0200
-+++ mpeg4ip-1.3/player/lib/mp4util/Makefile.am	2005-05-22 12:50:31.236887048 +0200
-@@ -10,6 +10,7 @@
- 
- libh264util_la_SOURCES = \
- 	h264_sdp.c
-+libh264util_la_LIBADD = $(top_builddir)/lib/mp4v2/libmp4v2.la
- 
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4v2
- 
 --- 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 @@
@@ -102,9 +92,9 @@
  INCLUDES = -I$(top_srcdir)/include
  AM_CFLAGS = -O2 -Werror -Wall -fexceptions -fno-strict-aliasing
  
---- mpeg4ip-1.5.0.1/lib/srtp/Makefile.am.orig	2006-04-26 02:17:41.000000000 +0200
-+++ mpeg4ip-1.5.0.1/lib/srtp/Makefile.am	2006-07-21 22:57:01.290127750 +0200
-@@ -8,13 +8,14 @@
+--- mpeg4ip-1.6/lib/srtp/Makefile.am.orig	2007-07-24 22:32:28.000000000 +0200
++++ mpeg4ip-1.6/lib/srtp/Makefile.am	2007-11-04 01:17:33.421260290 +0100
+@@ -9,15 +9,16 @@
  
  libsrtpif_la_SOURCES = liblibsrtp.c \
  	liblibsrtp.h
@@ -121,6 +111,8 @@
  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
+ 
+ EXTRA_DIST=liblibstrp.vcproj
 --- 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 @@
@@ -195,3 +187,27 @@
  INCLUDES=@GLIB_CFLAGS@ @GTK_CFLAGS@ \
  	-I$(top_srcdir)/server/mp4live \
  	-I$(top_srcdir)/include \
+--- mpeg4ip-1.6/server/mp4live/Makefile.am.orig	2007-01-26 20:50:00.000000000 +0100
++++ mpeg4ip-1.6/server/mp4live/Makefile.am	2007-11-04 09:24:55.331661796 +0100
+@@ -156,10 +156,6 @@
+ 	-D_REENTRANT -DNOCONTROLS -fexceptions @BILLS_CPPWARNINGS@ 
+ 
+ mp4live_LDADD = \
+-	@GTK_LIBS@ @GLIB_LIBS@ \
+-	@FAAC_LIB@ \
+-	@LAME_LIB@ \
+-	@TWOLAME_LIB@ \
+ 	./h261/libmp4live_h261.la \
+ 	$(GUIADD) \
+ 	libmp4live.la \
+@@ -174,6 +170,10 @@
+ 	$(top_builddir)/lib/utils/libutils.la \
+ 	$(top_builddir)/lib/srtp/libsrtpif.la \
+ 	$(top_builddir)/lib/ffmpeg/libmpeg4ip_ffmpeg.la \
++	@GTK_LIBS@ @GLIB_LIBS@ \
++	@FAAC_LIB@ \
++	@LAME_LIB@ \
++	@TWOLAME_LIB@ \
+ 	@SRTPLIB@ \
+ 	-lpthread \
+ 	@SDL_LIBS@ $(GUILIBS) @FFMPEG_LIB@ @LIBVORBIS_LIB@ $(XVID_LIB) \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mpeg4ip-gcc4.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mpeg4ip-link.patch?r1=1.11&r2=1.12&f=u