[csw-devel] SF.net SVN: gar:[10681] csw/mgar/pkg/mpeg4ip/trunk

[dmichelsen at users.sourceforge.net]

Revision: 10681
          http://gar.svn.sourceforge.net/gar/?rev=10681&view=rev
Author:   dmichelsen
Date:     2010-08-02 13:29:46 +0000 (Mon, 02 Aug 2010)

Log Message:
-----------
mpeg4ip: Add some more patches

Modified Paths:
--------------
    csw/mgar/pkg/mpeg4ip/trunk/Makefile
    csw/mgar/pkg/mpeg4ip/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/mpeg4ip/trunk/files/0002-Move-external-function-definition-out-of-function.patch
    csw/mgar/pkg/mpeg4ip/trunk/files/0003-Change-type-from-Void-to-void.patch
    csw/mgar/pkg/mpeg4ip/trunk/files/0004-Add-one-more-scratch-channel-or-compilation-fails.patch

Modified: csw/mgar/pkg/mpeg4ip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mpeg4ip/trunk/Makefile	2010-08-02 11:33:01 UTC (rev 10680)
+++ csw/mgar/pkg/mpeg4ip/trunk/Makefile	2010-08-02 13:29:46 UTC (rev 10681)
@@ -23,6 +23,10 @@
 
 # PATCHFILES += 0001-Bootstrap-again.patch
 
+PATCHFILES  = 0002-Move-external-function-definition-out-of-function.patch
+PATCHFILES += 0003-Change-type-from-Void-to-void.patch
+PATCHFILES += 0004-Add-one-more-scratch-channel-or-compilation-fails.patch
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 

Modified: csw/mgar/pkg/mpeg4ip/trunk/checksums
===================================================================
--- csw/mgar/pkg/mpeg4ip/trunk/checksums	2010-08-02 11:33:01 UTC (rev 10680)
+++ csw/mgar/pkg/mpeg4ip/trunk/checksums	2010-08-02 13:29:46 UTC (rev 10681)
@@ -1,3 +1,4 @@
-a4a8aebe0781d30df528d53fea11fdcf  SDL_sunaudio.c.diff
-0ae174e13da77a783e636aa2904b7c90  mpeg4ip-1.6.1-mjj.patch
+9b430ffe944b42f73dce89c0d9b03b07  0002-Move-external-function-definition-out-of-function.patch
+d05631e273402d4b1f7a99bb96099cf8  0003-Change-type-from-Void-to-void.patch
+9379c5f5331a18f163f64ff32f6feffd  0004-Add-one-more-scratch-channel-or-compilation-fails.patch
 cd81b566cf2fafc7318f58be8998182c  mpeg4ip-1.6.1.tar.gz

Added: csw/mgar/pkg/mpeg4ip/trunk/files/0002-Move-external-function-definition-out-of-function.patch
===================================================================
--- csw/mgar/pkg/mpeg4ip/trunk/files/0002-Move-external-function-definition-out-of-function.patch	                        (rev 0)
+++ csw/mgar/pkg/mpeg4ip/trunk/files/0002-Move-external-function-definition-out-of-function.patch	2010-08-02 13:29:46 UTC (rev 10681)
@@ -0,0 +1,27 @@
+From cc938eabcd2d71d827d01250f843b11becd8e385 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 2 Aug 2010 15:25:06 +0200
+Subject: [PATCH 2/4] Move external function definition out of function
+
+---
+ lib/SDLAudio/src/audio/sun/SDL_sunaudio.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c b/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c
+index 670aeb2..5a321d5 100644
+--- a/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c
++++ b/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c
+@@ -163,9 +163,9 @@ void DSP_WaitAudio(_THIS)
+ #endif
+ }
+ 
++static Uint8 snd2au(int sample);
+ void DSP_PlayAudio(_THIS)
+ {
+-	static Uint8 snd2au(int sample);
+ 	/* Write the audio data */
+ 	if ( ulaw_only ) {
+ 		/* Assuming that this->spec.freq >= 8000 Hz */
+-- 
+1.7.1
+

Added: csw/mgar/pkg/mpeg4ip/trunk/files/0003-Change-type-from-Void-to-void.patch
===================================================================
--- csw/mgar/pkg/mpeg4ip/trunk/files/0003-Change-type-from-Void-to-void.patch	                        (rev 0)
+++ csw/mgar/pkg/mpeg4ip/trunk/files/0003-Change-type-from-Void-to-void.patch	2010-08-02 13:29:46 UTC (rev 10681)
@@ -0,0 +1,25 @@
+From d2a7cdb5c15f21c7a6d8bf3f8ea18255579afe56 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 2 Aug 2010 15:26:10 +0200
+Subject: [PATCH 3/4] Change type from Void to void
+
+---
+ common/video/iso-mpeg4/src/type_basic.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/common/video/iso-mpeg4/src/type_basic.cpp b/common/video/iso-mpeg4/src/type_basic.cpp
+index 8739ad6..7ef1575 100644
+--- a/common/video/iso-mpeg4/src/type_basic.cpp
++++ b/common/video/iso-mpeg4/src/type_basic.cpp
+@@ -317,7 +317,7 @@ Void CMotionVector::computeMV ()
+ 	iHalfY = m_vctTrueHalfPel.y - iMVY * 2;
+ }
+ 
+-Void CMotionVector::setToZero (Void)
++Void CMotionVector::setToZero (void)
+ {
+ 	memset (this, 0, sizeof (*this));
+ }
+-- 
+1.7.1
+

Added: csw/mgar/pkg/mpeg4ip/trunk/files/0004-Add-one-more-scratch-channel-or-compilation-fails.patch
===================================================================
--- csw/mgar/pkg/mpeg4ip/trunk/files/0004-Add-one-more-scratch-channel-or-compilation-fails.patch	                        (rev 0)
+++ csw/mgar/pkg/mpeg4ip/trunk/files/0004-Add-one-more-scratch-channel-or-compilation-fails.patch	2010-08-02 13:29:46 UTC (rev 10681)
@@ -0,0 +1,25 @@
+From 71226a11a4f50d7f8466e9cf4b12c81fbd914e01 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 2 Aug 2010 15:27:04 +0200
+Subject: [PATCH 4/4] Add one more scratch channel or compilation fails
+
+---
+ player/lib/audio/faad/all.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/player/lib/audio/faad/all.h b/player/lib/audio/faad/all.h
+index 95e3379..eed2896 100644
+--- a/player/lib/audio/faad/all.h
++++ b/player/lib/audio/faad/all.h
+@@ -67,7 +67,7 @@ enum
+     BChans	= 1,	/* back channels: left surround, right surround */
+     BCenter	= 0,	/* 1 if decoder has back center channel */
+     LChans	= 1,	/* LFE channels */
+-    XChans	= 1,	/* scratch space for parsing unused channels */  
++    XChans	= 2,	/* scratch space for parsing unused channels */  
+ #endif
+     
+     Chans	= FChans + SChans + BChans + LChans + XChans
+-- 
+1.7.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.