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

[wbonnet at users.sourceforge.net]

Revision: 8807
          http://gar.svn.sourceforge.net/gar/?rev=8807&view=rev
Author:   wbonnet
Date:     2010-02-25 01:09:47 +0000 (Thu, 25 Feb 2010)

Log Message:
-----------
Fix some compilation issues. Does not compile fully yet

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

Added Paths:
-----------
    csw/mgar/pkg/mpeg4ip/trunk/files/SDL_sunaudio.c.diff
    csw/mgar/pkg/mpeg4ip/trunk/files/type_basic.cpp

Modified: csw/mgar/pkg/mpeg4ip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mpeg4ip/trunk/Makefile	2010-02-24 21:17:30 UTC (rev 8806)
+++ csw/mgar/pkg/mpeg4ip/trunk/Makefile	2010-02-25 01:09:47 UTC (rev 8807)
@@ -13,9 +13,14 @@
 # SF doesn't have the latest version as it was removed due to some breakage
 # So we get it from another place and patch the flaw away
 MASTER_SITES = http://download.m0k.org/handbrake/contrib/
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTNAME = $(GARNAME)
-PATCHFILES = mpeg4ip-1.6.1-mjj.patch
+
+
+DISTFILES   = $(GARNAME)-$(GARVERSION).tar.gz
+DISTNAME    = $(GARNAME)
+PATCHFILES  = mpeg4ip-1.6.1-mjj.patch 
+# PATCHFILES += SDL_sunaudio.c.diff
+# PATCHFILES += type_basic.cpp.diff
+
 # PATCHFILES += 0001-Bootstrap-again.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -24,7 +29,8 @@
 GARCOMPILER = GNU
 BUILD64 = 1
 
-EXTRA_CPPFLAGS = -D_GETOPT_H=1
+# EXTRA_CPPFLAGS = -D_GETOPT_H=1 -DHAVE_GETOPT_H
+EXTRA_CPPFLAGS = -DHAVE_GETOPT_H -D__GNU_LIBRARY__
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/cvs_bootstrap
 
@@ -38,6 +44,13 @@
 CONFIGURE_ARGS_isa-sparc = --disable-mmx
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_isa-$(ISA))
 
+PACKAGES = CSWmpeg4ip
+CATALOGNAME_CSWmpeg4ip = mpeg4ip
+SPKG_DESC_CSWmpeg4ip = $(DESCRIPTION)
+
+BUILD_DEP_PKGS_CSWmpeg4ip = CSWlibgnugetopt
+
+
 include gar/category.mk
 
 post-extract-modulated:

Modified: csw/mgar/pkg/mpeg4ip/trunk/checksums
===================================================================
--- csw/mgar/pkg/mpeg4ip/trunk/checksums	2010-02-24 21:17:30 UTC (rev 8806)
+++ csw/mgar/pkg/mpeg4ip/trunk/checksums	2010-02-25 01:09:47 UTC (rev 8807)
@@ -1,2 +1,3 @@
+a4a8aebe0781d30df528d53fea11fdcf  SDL_sunaudio.c.diff
 0ae174e13da77a783e636aa2904b7c90  mpeg4ip-1.6.1-mjj.patch
 cd81b566cf2fafc7318f58be8998182c  mpeg4ip-1.6.1.tar.gz

Added: csw/mgar/pkg/mpeg4ip/trunk/files/SDL_sunaudio.c.diff
===================================================================
--- csw/mgar/pkg/mpeg4ip/trunk/files/SDL_sunaudio.c.diff	                        (rev 0)
+++ csw/mgar/pkg/mpeg4ip/trunk/files/SDL_sunaudio.c.diff	2010-02-25 01:09:47 UTC (rev 8807)
@@ -0,0 +1,14 @@
+diff --speed-large-files --minimal -Nru mpeg4ip.orig/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c mpeg4ip/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c
+--- mpeg4ip.orig/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c 2010-02-25 01:29:55.025447000 +0100
++++ mpeg4ip/lib/SDLAudio/src/audio/sun/SDL_sunaudio.c      2010-02-25 01:32:11.778312000 +0100
+@@ -163,9 +163,9 @@
+ #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 */

Added: csw/mgar/pkg/mpeg4ip/trunk/files/type_basic.cpp
===================================================================
--- csw/mgar/pkg/mpeg4ip/trunk/files/type_basic.cpp	                        (rev 0)
+++ csw/mgar/pkg/mpeg4ip/trunk/files/type_basic.cpp	2010-02-25 01:09:47 UTC (rev 8807)
@@ -0,0 +1,13 @@
+diff --speed-large-files --minimal -Nru mpeg4ip.orig/common/video/iso-mpeg4/src/type_basic.cpp mpeg4ip/common/video/iso-mpeg4/src/type_basic.cpp
+--- mpeg4ip.orig/common/video/iso-mpeg4/src/type_basic.cpp 2010-02-25 01:59:55.429555000 +0100
++++ mpeg4ip/common/video/iso-mpeg4/src/type_basic.cpp      2010-02-25 02:00:17.779765000 +0100
+@@ -317,7 +317,7 @@
+        iHalfY = m_vctTrueHalfPel.y - iMVY * 2;
+ }
+
+-Void CMotionVector::setToZero (Void)
++Void CMotionVector::setToZero ()
+ {
+        memset (this, 0, sizeof (*this));
+ }
+


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