[csw-devel] SF.net SVN: gar:[4201] csw/mgar/pkg/libfaac/trunk

Sun Apr 5 21:24:29 CEST 2009

Revision: 4201
          http://gar.svn.sourceforge.net/gar/?rev=4201&view=rev
Author:   hson
Date:     2009-04-05 19:24:29 +0000 (Sun, 05 Apr 2009)

Log Message:
-----------
libfaac: Several patches to get compiling to work

Modified Paths:
--------------
    csw/mgar/pkg/libfaac/trunk/Makefile
    csw/mgar/pkg/libfaac/trunk/checksums
    csw/mgar/pkg/libfaac/trunk/files/config.h.in.diff

Added Paths:
-----------
    csw/mgar/pkg/libfaac/trunk/files/Makefile.in.common.mp4v2.diff
    csw/mgar/pkg/libfaac/trunk/files/configure.diff

Modified: csw/mgar/pkg/libfaac/trunk/Makefile
===================================================================

--- csw/mgar/pkg/libfaac/trunk/Makefile	2009-04-05 16:31:11 UTC (rev 4200)
+++ csw/mgar/pkg/libfaac/trunk/Makefile	2009-04-05 19:24:29 UTC (rev 4201)
@@ -19,9 +19,11 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(SF_PROJ)-(\d+(?:\.\d+)*).tar.bz2
 
-PATCHFILES += Makefile.am.diff Makefile.in.diff Makefile.in.frontend.diff 
+#PATCHFILES += Makefile.am.diff Makefile.in.diff Makefile.in.frontend.diff 
+PATCHFILES += Makefile.in.frontend.diff Makefile.in.common.mp4v2.diff
 PATCHFILES += aacquant.c.diff aacquant.h.diff config.h.in.diff
-PATCHFILES += configure.in.diff faac.h.diff faaccfg.h.diff frame.h.diff
+#PATCHFILES += configure.in.diff faac.h.diff faaccfg.h.diff frame.h.diff
+PATCHFILES += configure.diff faac.h.diff faaccfg.h.diff frame.h.diff
 PATCHFILES += input.c.diff ltp.c.diff mp4property.h.diff mp4util.h.diff
 PATCHFILES += mpeg4ip.h.diff psych.h.diff
 

Modified: csw/mgar/pkg/libfaac/trunk/checksums
===================================================================
--- csw/mgar/pkg/libfaac/trunk/checksums	2009-04-05 16:31:11 UTC (rev 4200)
+++ csw/mgar/pkg/libfaac/trunk/checksums	2009-04-05 19:24:29 UTC (rev 4201)
@@ -1,11 +1,10 @@
 c5dde68840cefe46532089c9392d1df0  download/faac-1.28.tar.bz2
-dcfdb7a011ce03ea536ddb92cc7ee8e4  download/Makefile.am.diff
-62ba5e8b03a5c551ad17b149aa86e0c2  download/Makefile.in.diff
 eb7e2cee261c71ac4a8d718b5498777e  download/Makefile.in.frontend.diff
+3d7c0f7936dcc1c4833d693860720adf  download/Makefile.in.common.mp4v2.diff
 19f2eebe3df5300ab4a1a16e43593663  download/aacquant.c.diff
 2af64ce38f023774fb0c8f691b98c564  download/aacquant.h.diff
-86598bb0fb18acdf27557f65baf05f66  download/config.h.in.diff
-ffb37b75a68dd524aa3d87dc38b4b971  download/configure.in.diff
+ea8508703521e663e637382231d4c13b  download/config.h.in.diff
+027ebf052052128c67f0749e610f4acb  download/configure.diff
 56f2c5e28e1177e3b6956aaf83a10e13  download/faac.h.diff
 268d60a6a1304fa1758a962a20731c1c  download/faaccfg.h.diff
 29fe6485d9ebe7fd0892c18ed450bac5  download/frame.h.diff

Added: csw/mgar/pkg/libfaac/trunk/files/Makefile.in.common.mp4v2.diff
===================================================================
--- csw/mgar/pkg/libfaac/trunk/files/Makefile.in.common.mp4v2.diff	                        (rev 0)
+++ csw/mgar/pkg/libfaac/trunk/files/Makefile.in.common.mp4v2.diff	2009-04-05 19:24:29 UTC (rev 4201)
@@ -0,0 +1,13 @@
+--- ../build-global/faac-1.28/common/mp4v2/Makefile.in	2009-02-10 09:37:00.000000000 +0100
++++ faac-1.28/common/mp4v2/Makefile.in	2009-04-05 20:42:49.571593147 +0200
+@@ -205,8 +205,8 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-INCLUDES = -I$(top_srcdir)/include
+-AM_CXXFLAGS = -Wall
++INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
++AM_CXXFLAGS = $(CXXFLAGS)
+ noinst_LIBRARIES = libmp4v2.a 
+ noinst_HEADERS = mp4.h mpeg4ip.h mpeg4ip_version.h mpeg4ip_config.h
+ libmp4v2_a_SOURCES = \

Modified: csw/mgar/pkg/libfaac/trunk/files/config.h.in.diff
===================================================================
--- csw/mgar/pkg/libfaac/trunk/files/config.h.in.diff	2009-04-05 16:31:11 UTC (rev 4200)
+++ csw/mgar/pkg/libfaac/trunk/files/config.h.in.diff	2009-04-05 19:24:29 UTC (rev 4201)
@@ -1,7 +1,6 @@
-diff --speed-large-files --minimal -ru ../build-global/faac-1.28/config.h.in faac-1.28/config.h.in
 --- ../build-global/faac-1.28/config.h.in	2009-02-10 09:36:59.000000000 +0100
-+++ faac-1.28/config.h.in	2009-03-20 05:55:21.041828651 +0100
-@@ -1,5 +1,26 @@
++++ faac-1.28/config.h.in	2009-04-05 18:56:29.025432723 +0200
+@@ -1,5 +1,25 @@
  /* config.h.in.  Generated from configure.in by autoheader.  */
  
 +#ifndef __FAAC_CONFIG_H
@@ -9,7 +8,6 @@
 +
 +#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 +#include <sys/types.h>
-+#include <stdint.h>
 +
 +typedef uint8_t         u_int8_t;
 +typedef uint16_t        u_int16_t;
@@ -28,7 +26,7 @@
  /* Define if you want to encode for DRM */
  #undef DRM
  
-@@ -131,3 +152,5 @@
+@@ -131,3 +151,5 @@
  
  /* Define to `long int' if <sys/types.h> does not define. */
  #undef off_t

Added: csw/mgar/pkg/libfaac/trunk/files/configure.diff
===================================================================
--- csw/mgar/pkg/libfaac/trunk/files/configure.diff	                        (rev 0)
+++ csw/mgar/pkg/libfaac/trunk/files/configure.diff	2009-04-05 19:24:29 UTC (rev 4201)
@@ -0,0 +1,20 @@
+--- ../build-global/faac-1.28/configure	2009-02-10 09:36:58.000000000 +0100
++++ faac-1.28/configure	2009-04-05 20:17:04.647262929 +0200
+@@ -19731,7 +19731,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmp4v2 -lstdc++ $LIBS"
++LIBS="-lmp4v2  -lCrun -lCstd $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -19864,7 +19864,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmp4v2 -lstdc++ $LIBS"
++LIBS="-lmp4v2 -lCrun -lCstd $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF


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

