Packman Build Service PMBS

Changes of Revision 23

gpac.spec Changed

gpac-0.6.1-64bit-portability.patch Changed

@@ -1,7 +1,5 @@
-Index: gpac-0.6.1/applications/generators/MPEG4/main.c
-===================================================================
---- gpac-0.6.1.orig/applications/generators/MPEG4/main.c
-+++ gpac-0.6.1/applications/generators/MPEG4/main.c
+--- a/applications/generators/MPEG4/main.c
++++ b/applications/generators/MPEG4/main.c
 @@ -1037,7 +1037,7 @@ void WriteNodeCode(GF_List *BNodes)
  			}
  			//SFString
@@ -20,10 +18,8 @@
  					fprintf(f, "\tstrcpy(p->%s.vals[%d], \"%s\");\n", bf->name, j, tok);
  					j+=1;
  					CurrentLine = store;
-Index: gpac-0.6.1/applications/generators/SVG/svggen.h
-===================================================================
---- gpac-0.6.1.orig/applications/generators/SVG/svggen.h
-+++ gpac-0.6.1/applications/generators/SVG/svggen.h
+--- a/applications/generators/SVG/svggen.h
++++ b/applications/generators/SVG/svggen.h
 @@ -190,6 +190,16 @@ static _atts generic_attributes[] = {
  
  FILE *BeginFile(u32 type);
@@ -42,10 +38,8 @@
 +void generate_laser_tables_da(GF_List *atts);
  
  #endif // _SVGGEN_H_
-Index: gpac-0.6.1/applications/generators/X3D/main.c
-===================================================================
---- gpac-0.6.1.orig/applications/generators/X3D/main.c
-+++ gpac-0.6.1/applications/generators/X3D/main.c
+--- a/applications/generators/X3D/main.c
++++ b/applications/generators/X3D/main.c
 @@ -566,7 +566,7 @@ void WriteNodeCode(GF_List *BNodes, FILE
  			}
  			//SFString
@@ -64,10 +58,37 @@
  					fprintf(vrml_code, "\tstrcpy(p->%s.vals[%d], \"%s\");\n", bf->name, j, tok);
  					j+=1;
  					CurrentLine = store;
-Index: gpac-0.6.1/modules/vtt_in/vtt_dec.c
-===================================================================
---- gpac-0.6.1.orig/modules/vtt_in/vtt_dec.c
-+++ gpac-0.6.1/modules/vtt_in/vtt_dec.c
+--- a/configure
++++ b/configure
+@@ -1277,7 +1277,6 @@ cat > $TMPC << EOF
+ #include <inttypes.h>
+ #define uint32_t unsigned int
+ #define uint8_t unsigned char
+-#include <a52dec/mm_accel.h>
+ #include <a52dec/a52.h>
+ int main( void ) { return 0; }
+ EOF
+--- a/modules/ac3_in/liba52_dec.c
++++ b/modules/ac3_in/liba52_dec.c
+@@ -42,7 +42,6 @@
+ #define uint8_t u8
+ #endif
+ 
+-#include <a52dec/mm_accel.h>
+ #include <a52dec/a52.h>
+ 
+ 
+@@ -71,7 +70,7 @@ static GF_Err AC3_AttachStream(GF_BaseDe
+ 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[A52] Attaching stream %d\n", esd->ESID));
+ 
+ 	if (ctx->codec) a52_free(ctx->codec);
+-	ctx->codec = a52_init(MM_ACCEL_DJBFFT);
++	ctx->codec = a52_init();
+ 	if (!ctx->codec) {
+ 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[A52] Error initializing decoder\n"));
+ 		return GF_IO_ERR;
+--- a/modules/vtt_in/vtt_dec.c
++++ b/modules/vtt_in/vtt_dec.c
 @@ -127,6 +127,7 @@ static GF_Err VTT_ProcessData(GF_SceneDe
  		/* TODO: try to parse a cue from the given string */
  		break;