Request 2715 (accepted)

gpac.changes Changed

gpac.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package gpac
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,9 @@
 #
 
 
-%define soname		4
+%define soname		6
 Name:           gpac
-Version:        0.5.2
+Version:        0.6.1
 Release:        0
 Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
 License:        LGPL-2.1+
@@ -27,20 +27,20 @@
 Source:         http://github.com/gpac/%{name}/archive/v%{version}.tar.gz
 Source90:       %{name}-rpmlintrc
 #PATCH-FIX-UPSTREAM i@marguerite.su - enable osmozilla and osmo4_wx
-Patch1:         gpac-0.5.1-enable_V4Studio.patch
+Patch1:         gpac-0.6.1-enable_V4Studio.patch
 #PATCH-FIX-UPSTREAM i@marguerite.su - fix SVGGen ldflags
 Patch2:         gpac-0.5.0-SVGGen_abuild.patch
 #PATCH-FIX-UPSTREAM wengxuetian@gmail.com - fix E: 64bit-portability-issue
-Patch3:         gpac-0.5.0-64bit-portability.patch
+Patch3:         gpac-0.6.1-64bit-portability.patch
 #PATCH-FIX-OPENSUSE marguerite@opensuse.org - libpng include dir fix
-Patch4:         gpac-0.5.0-libpng-version-detection.patch
+Patch4:         gpac-0.6.1-libpng-version-detection.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - use system amrnb/amrwb
 Patch5:         gpac-0.5.0-system-amr.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - no gpac.pc in devel package
-Patch6:         gpac-0.5.0-no-pc.patch
+Patch6:         gpac-0.6.1-no-pc.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix gf_isom_set_pixel_aspect_ratio
 # not available to the public
-Patch9:         gpac-0.5.0-x264-export.patch
+Patch9:         gpac-0.6.1-x264-export.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix u32 count redelaration
 Patch10:        gpac-0.5.1-u32-count-redeclaration.patch
 BuildRequires:  DirectFB-devel
@@ -56,11 +56,11 @@
 BuildRequires:  graphviz
 BuildRequires:  liba52-devel
 BuildRequires:  libfaad-devel
-BuildRequires:  pkgconfig(libavcodec) = 56.60.100
-BuildRequires:  pkgconfig(libavformat) = 56.40.101
-BuildRequires:  pkgconfig(libswscale) = 3.1.101
-BuildRequires:  pkgconfig(libavdevice) = 56.4.100
-BuildRequires:  pkgconfig(libavutil) = 54.31.100
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libswscale)
+BuildRequires:  pkgconfig(libavdevice)
+BuildRequires:  pkgconfig(libavutil)
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmad-devel
 BuildRequires:  libogg-devel
@@ -193,11 +193,11 @@
 touch -r doc/ipmpx_syntax.bt.origine doc/ipmpx_syntax.bt
 rm -rf doc/ipmpx_syntax.bt.origine
 
-# Generate revision.h
-echo '#define GPAC_SVN_REVISION "5491"' > ./include/gpac/revision.h
-
 sed -i~ '1 {s@^.*$@/*@}' src/utils/xml_parser.c
 
+### corrects typo
+sed -e 's|nb_droped|nb_dropped|g' -i applications/osmo4_wx/fileprops.cpp
+
 %build
 # configure the beast
 ./configure \
@@ -210,6 +210,7 @@
 
 # make the beast (NO parallel build possible ...)
 # fix I: File is compiled without RPM_OPT_FLAGS gpac doesn't respect any flags at all
+cp config.h include/gpac/configuration.h
 make %{?_smp_mflags} all CFLAG="%{optflags}"
 make %{?_smp_mflags} sggen
 make %{?_smp_mflags} -C applications/generators/SVG
@@ -274,7 +275,7 @@
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS BUGS Changelog COPYING README TODO
+%doc AUTHORS BUGS Changelog COPYING README.md TODO
 %doc doc/configuration.html
 %{_bindir}/DashCast
 %{_bindir}/MP42TS

gpac-0.5.0-64bit-portability.patch Deleted

@@ -1,119 +0,0 @@
----
- applications/generators/MPEG4/main.c |    4 ++--
- applications/generators/SVG/svggen.h |   12 +++++++++++-
- applications/generators/X3D/main.c   |    4 ++--
- modules/vtt_in/vtt_dec.c             |    2 ++
- src/bifs/field_encode.c              |    1 +
- src/scene_manager/encode_isom.c      |    1 +
- 6 files changed, 19 insertions(+), 5 deletions(-)
-
-Index: gpac-0.5.2/applications/generators/MPEG4/main.c
-===================================================================
---- gpac-0.5.2.orig/applications/generators/MPEG4/main.c
-+++ gpac-0.5.2/applications/generators/MPEG4/main.c
-@@ -1037,7 +1037,7 @@ void WriteNodeCode(GF_List *BNodes)
- 			}
- 			//SFString
- 			else if (!strcmp(bf->familly, "SFString")) {
--				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
-+				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, (int)strlen(bf->def)+1);
- 				fprintf(f, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
- 			}
- 
-@@ -1208,7 +1208,7 @@ void WriteNodeCode(GF_List *BNodes)
- 					store = CurrentLine;
- 					CurrentLine = token;
- 					GetNextToken(tok, " \"");
--					fprintf(f, "\tp->%s.vals%d = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
-+					fprintf(f, "\tp->%s.vals%d = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, (int)strlen(tok)+1);
- 					fprintf(f, "\tstrcpy(p->%s.vals%d, \"%s\");\n", bf->name, j, tok);
- 					j+=1;
- 					CurrentLine = store;
-Index: gpac-0.5.2/applications/generators/SVG/svggen.h
-===================================================================
---- gpac-0.5.2.orig/applications/generators/SVG/svggen.h
-+++ gpac-0.5.2/applications/generators/SVG/svggen.h
-@@ -190,6 +190,16 @@ static _atts generic_attributes = {
- 
- FILE *BeginFile(u32 type);
- void EndFile(FILE *f, u32 type);
--
-+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
-+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
-+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
-+void generate_laser_tables(GF_List *svg_elements);
-+void generate_table(GF_List *elements);
-+void generateSVGCode_V1(GF_List *svg_elements);
-+void generateSVGCode_V2(GF_List *svg_elements);
-+void generateSVGCode_V3(GF_List *svg_elements);
-+void svgNameToImplementationName(xmlChar *svg_name, char implementation_name50);
-+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
-+void generate_laser_tables_da(GF_List *atts);
- 
- #endif // _SVGGEN_H_
-Index: gpac-0.5.2/applications/generators/X3D/main.c
-===================================================================
---- gpac-0.5.2.orig/applications/generators/X3D/main.c
-+++ gpac-0.5.2/applications/generators/X3D/main.c
-@@ -566,7 +566,7 @@ void WriteNodeCode(GF_List *BNodes, FILE
- 			}
- 			//SFString
- 			else if (!strcmp(bf->familly, "SFString")) {
--				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
-+				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, (int)strlen(bf->def)+1);
- 				fprintf(vrml_code, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
- 			}
- 
-@@ -808,7 +808,7 @@ void WriteNodeCode(GF_List *BNodes, FILE
- 					store = CurrentLine;
- 					CurrentLine = token;
- 					GetNextToken(tok, " \"");
--					fprintf(vrml_code, "\tp->%s.vals%d = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
-+					fprintf(vrml_code, "\tp->%s.vals%d = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, (int)strlen(tok)+1);
- 					fprintf(vrml_code, "\tstrcpy(p->%s.vals%d, \"%s\");\n", bf->name, j, tok);
- 					j+=1;
- 					CurrentLine = store;
-Index: gpac-0.5.2/modules/vtt_in/vtt_dec.c
-===================================================================
---- gpac-0.5.2.orig/modules/vtt_in/vtt_dec.c
-+++ gpac-0.5.2/modules/vtt_in/vtt_dec.c
-@@ -126,6 +126,7 @@ static GF_Err VTT_ProcessData(GF_SceneDe
- 		/* TODO: try to parse a cue from the given string */
- 		break;
- 
-+#ifdef GPAC_HAS_SPIDERMONKEY
- 	case GPAC_OTI_SCENE_VTT_MP4:
- 	{
- 		char start100, end100;
-@@ -144,6 +145,7 @@ static GF_Err VTT_ProcessData(GF_SceneDe
- 		gf_list_del(cues);
- 	}
- 	break;
-+#endif
- 
- 	default:
- 		return GF_BAD_PARAM;
-Index: gpac-0.5.2/src/bifs/field_encode.c
-===================================================================
---- gpac-0.5.2.orig/src/bifs/field_encode.c
-+++ gpac-0.5.2/src/bifs/field_encode.c
-@@ -27,6 +27,7 @@
- 
- #include <gpac/internal/bifs_dev.h>
- #include <gpac/internal/bifs_tables.h>
-+#include <gpac/network.h>
- #include "quant.h"
- #include "script.h"
- 
-Index: gpac-0.5.2/src/scene_manager/encode_isom.c
-===================================================================
---- gpac-0.5.2.orig/src/scene_manager/encode_isom.c
-+++ gpac-0.5.2/src/scene_manager/encode_isom.c
-@@ -27,6 +27,7 @@
- #include <gpac/constants.h>
- #include <gpac/media_tools.h>
- #include <gpac/bifs.h>
-+#include <gpac/network.h>
- #ifndef GPAC_DISABLE_LASER
- #include <gpac/laser.h>
- #include <gpac/nodes_svg.h>

gpac-0.5.0-libpng-version-detection.patch Deleted

@@ -1,72 +0,0 @@
-Index: gpac-0.5.0.svn4668/configure
-===================================================================
---- gpac-0.5.0.svn4668.orig/configure
-+++ gpac-0.5.0.svn4668/configure
-@@ -1149,27 +1149,40 @@ int main( void ) { return 0; }
- EOF
- 
- if test "$cross_prefix" = "" ; then
--    png_cflags="-I$prefix/include"
--    png_lflags="-L$prefix/lib -lpng -lz"
-+    png_flavor=""
-+    if  -d /usr/include/libpng16  ; then \
-+	png_flavor="png16"
-+    elif  -d /usr/include/libpng15  ; then \
-+	png_flavor="png15"
-+    elif  -d /usr/include/libpng14  ; then \
-+	png_flavor="png14"
-+    elif  -d /usr/include/libpng12  ; then \
-+        png_flavor="png12"
-+    else
-+	png_flavor="png"
-+    fi
-+
-+    png_cflags="-I$prefix/include/lib$png_flavor"
-+    png_lflags="-L$prefix/$libdir -l$png_flavor -lz"
-     #-nostdlib prevents from searching standard compiler libraries
-     #if $cc -o $TMPO $TMPC -nostdlib $png_cflags $png_lflags 2> /dev/null  ; then
-     if $cc -o $TMPO $TMPC $png_cflags $png_lflags $LDFLAGS 2> /dev/null  ; then
-         has_png="system"
--    elif $cc -o $TMPO $TMPC $LDFLAGS -lpng -lz 2> /dev/null  ; then
-+    elif $cc -o $TMPO $TMPC $LDFLAGS -l$png_flavor -lz 2> /dev/null  ; then
-         has_png="system"
-     elif test "$alt_macosx_dir" != "" ; then
--        if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lpng 2> /dev/null ; then
-+        if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include/lib$png_flavor -L$alt_macosx_dir/$libdir $LDFLAGS -l$png_flavor 2> /dev/null ; then
-             has_png="system"
-         fi
-     fi
- fi
- if test "$has_png" = "no" ; then
--    if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng 2> /dev/null  ; then
-+    if $cc -o $TMPO $TMPC -I$local_inc/$png_flavor -L$local_lib -l$png_flavor 2> /dev/null  ; then
-         has_png="local"
-     fi
- fi
- 
--
-+sed -i "s/png.h/lib$png_flavor\/png.h/" src/media_tools/img.c
- 
- #look for MAD support
- cat > $TMPC << EOF
-@@ -2823,6 +2836,7 @@ if test "$has_jpeg" != "no" ; then
- fi
- 
- echo "CONFIG_PNG=$has_png" >> config.mak
-+echo "png_flavor=$png_flavor" >> config.mak
- if test "$has_png" != "no" ; then
-     echo "#define GPAC_HAS_PNG" >> $TMPH
- fi
-Index: gpac-0.5.0.svn4668/src/Makefile
-===================================================================
---- gpac-0.5.0.svn4668.orig/src/Makefile
-+++ gpac-0.5.0.svn4668/src/Makefile
-@@ -495,7 +495,7 @@ endif
- #5 - PNG support
- ifeq ($(CONFIG_PNG), no)
- else
--LINKLIBS+= -lpng
-+LINKLIBS+= -l$(png_flavor)
- ifeq ($(CONFIG_PNG), local)
- NEED_LOCAL_LIB="yes"
- MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"

gpac-0.5.0-no-pc.patch Deleted

gpac-0.5.0-x264-export.patch Deleted

gpac-0.5.1-enable_V4Studio.patch Deleted

@@ -1,55 +0,0 @@
-Index: gpac-0.5.1.svn5491/applications/Makefile
-===================================================================
---- gpac-0.5.1.svn5491.orig/applications/Makefile
-+++ gpac-0.5.1.svn5491/applications/Makefile
-@@ -27,15 +27,15 @@ V4STUDIODIR=
- INSTDIRS=mp4client
- ifeq ($(CONFIG_XUL),no)
- else
--#INSTDIRS+=osmozilla
--#APPDIRS+=osmozilla
-+INSTDIRS+=osmozilla
-+APPDIRS+=osmozilla
- endif
- 
- #disable due to version incompatibilities
- ifeq ($(USE_WXWIDGETS), yes)
--#APPDIRS+=osmo4_wx
--#V4STUDIODIR=V4Studio
--#INSTDIRS+=osmo4_wx
-+APPDIRS+=osmo4_wx
-+V4STUDIODIR=V4Studio
-+INSTDIRS+=osmo4_wx
- endif
- 
- ALLDIRS=$(APPDIRS)
-Index: gpac-0.5.1.svn5491/applications/osmo4_wx/Makefile
-===================================================================
---- gpac-0.5.1.svn5491.orig/applications/osmo4_wx/Makefile
-+++ gpac-0.5.1.svn5491/applications/osmo4_wx/Makefile
-@@ -46,7 +46,7 @@ SRCS := $(OBJS:.o=.cpp)
- all: $(PROG)
- 
- Osmo4$(EXE): $(OBJS)
--	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) $(LINKFLAGS)
-+	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac -lX11 -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lm $(WX_LFLAGS) $(LINKFLAGS)
- 
- clean: 
- 	rm -f $(OBJS) ../../bin/gcc/$(PROG)
-Index: gpac-0.5.1.svn5491/applications/osmozilla/osmo_npapi.cpp
-===================================================================
---- gpac-0.5.1.svn5491.orig/applications/osmozilla/osmo_npapi.cpp
-+++ gpac-0.5.1.svn5491/applications/osmozilla/osmo_npapi.cpp
-@@ -372,10 +372,11 @@ NPError NS_PluginGetValue(NPPVariable aV
- 	/* explicit plugin call */ \
- 	"application/x-gpac::GPAC plugin;" \
-  
--char * NP_GetMIMEDescription(void)
-+/*char * NP_GetMIMEDescription(void)
- {
- 	return (char *) GPAC_PLUGIN_MIMETYPES;
- }
-+*/
- 
- 
- NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)

gpac-0.6.1-64bit-portability.patch Added

@@ -0,0 +1,86 @@
+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
+@@ -1037,7 +1037,7 @@ void WriteNodeCode(GF_List *BNodes)
+ 			}
+ 			//SFString
+ 			else if (!strcmp(bf->familly, "SFString")) {
+-				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
++				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, (int)strlen(bf->def)+1);
+ 				fprintf(f, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
+ 			}
+ 
+@@ -1208,7 +1208,7 @@ void WriteNodeCode(GF_List *BNodes)
+ 					store = CurrentLine;
+ 					CurrentLine = token;
+ 					GetNextToken(tok, " \"");
+-					fprintf(f, "\tp->%s.vals%d = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
++					fprintf(f, "\tp->%s.vals%d = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, (int)strlen(tok)+1);
+ 					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
+@@ -190,6 +190,16 @@ static _atts generic_attributes = {
+ 
+ FILE *BeginFile(u32 type);
+ void EndFile(FILE *f, u32 type);
+-
++SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
++void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
++u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
++void generate_laser_tables(GF_List *svg_elements);
++void generate_table(GF_List *elements);
++void generateSVGCode_V1(GF_List *svg_elements);
++void generateSVGCode_V2(GF_List *svg_elements);
++void generateSVGCode_V3(GF_List *svg_elements);
++void svgNameToImplementationName(xmlChar *svg_name, char implementation_name50);
++u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
++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
+@@ -566,7 +566,7 @@ void WriteNodeCode(GF_List *BNodes, FILE
+ 			}
+ 			//SFString
+ 			else if (!strcmp(bf->familly, "SFString")) {
+-				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
++				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, (int)strlen(bf->def)+1);
+ 				fprintf(vrml_code, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
+ 			}
+ 
+@@ -808,7 +808,7 @@ void WriteNodeCode(GF_List *BNodes, FILE
+ 					store = CurrentLine;
+ 					CurrentLine = token;
+ 					GetNextToken(tok, " \"");
+-					fprintf(vrml_code, "\tp->%s.vals%d = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
++					fprintf(vrml_code, "\tp->%s.vals%d = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, (int)strlen(tok)+1);
+ 					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
+@@ -127,6 +127,7 @@ static GF_Err VTT_ProcessData(GF_SceneDe
+ 		/* TODO: try to parse a cue from the given string */
+ 		break;
+ 
++#ifdef GPAC_HAS_SPIDERMONKEY
+ 	case GPAC_OTI_SCENE_VTT_MP4:
+ 	{
+ #ifndef GPAC_DISABLE_MEDIA_IMPORT
+@@ -147,6 +148,7 @@ static GF_Err VTT_ProcessData(GF_SceneDe
+ #endif
+ 	}
+ 	break;
++#endif
+ 
+ 	default:
+ 		return GF_BAD_PARAM;

gpac-0.6.1-enable_V4Studio.patch Added

@@ -0,0 +1,57 @@
+Index: gpac-0.6.1/applications/Makefile
+===================================================================
+--- gpac-0.6.1.orig/applications/Makefile
++++ gpac-0.6.1/applications/Makefile
+@@ -33,15 +33,15 @@ V4STUDIODIR=
+ INSTDIRS=mp4client
+ ifeq ($(CONFIG_XUL),no)
+ else
+-#INSTDIRS+=osmozilla
+-#APPDIRS+=osmozilla
++INSTDIRS+=osmozilla
++APPDIRS+=osmozilla
+ endif
+ 
+ #disable due to version incompatibilities
+ ifeq ($(USE_WXWIDGETS), yes)
+-#APPDIRS+=osmo4_wx
+-#V4STUDIODIR=V4Studio
+-#INSTDIRS+=osmo4_wx
++APPDIRS+=osmo4_wx
++V4STUDIODIR=V4Studio
++INSTDIRS+=osmo4_wx
+ endif
+ 
+ #MP4BOX_STATIC
+Index: gpac-0.6.1/applications/osmo4_wx/Makefile
+===================================================================
+--- gpac-0.6.1.orig/applications/osmo4_wx/Makefile
++++ gpac-0.6.1/applications/osmo4_wx/Makefile
+@@ -46,8 +46,7 @@ SRCS := $(OBJS:.o=.cpp)
+ all: $(PROG)
+ 
+ Osmo4$(EXE): $(OBJS)
+-	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) $(LINKFLAGS)
+-
++	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac -lX11 -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lm $(WX_LFLAGS) $(LINKFLAGS)
+ clean: 
+ 	rm -f $(OBJS) ../../bin/gcc/$(PROG)
+ 
+Index: gpac-0.6.1/applications/osmozilla/osmo_npapi.cpp
+===================================================================
+--- gpac-0.6.1.orig/applications/osmozilla/osmo_npapi.cpp
++++ gpac-0.6.1/applications/osmozilla/osmo_npapi.cpp
+@@ -372,11 +372,11 @@ NPError NS_PluginGetValue(NPPVariable aV
+ 	/* explicit plugin call */ \
+ 	"application/x-gpac::GPAC plugin;" \
+  
+-char * NP_GetMIMEDescription(void)
++/*char * NP_GetMIMEDescription(void)
+ {
+ 	return (char *) GPAC_PLUGIN_MIMETYPES;
+ }
+-
++*/
+ 
+ NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)
+ {

gpac-0.6.1-libpng-version-detection.patch Added

@@ -0,0 +1,70 @@
+Index: gpac-0.6.1/configure
+===================================================================
+--- gpac-0.6.1.orig/configure
++++ gpac-0.6.1/configure
+@@ -1222,11 +1222,26 @@ cat > $TMPC << EOF
+ int main( void ) { return 0; }
+ EOF
+ 
+-png_cflags="-I$prefix/include"
+-png_lflags="-L$prefix/lib -lpng -lz"
++png_flavor=""
++if  -d /usr/include/libpng16  ; then \
++   png_flavor="png16"
++elif  -d /usr/include/libpng15  ; then \
++   png_flavor="png15"
++elif  -d /usr/include/libpng14  ; then \
++   png_flavor="png14"
++elif  -d /usr/include/libpng12  ; then \
++   png_flavor="png12"
++else
++   png_flavor="png"
++fi
++
++png_cflags="-I$prefix/include/lib$png_flavor"
++png_lflags="-L$prefix/$libdir -l$png_flavor -lz"
++
+ if docc $png_cflags $png_lflags $LDFLAGS ; then
+     has_png="system"
+-elif docc $LDFLAGS -lpng -lz ; then
++elif docc $LDFLAGS -l$png_flavor -lz 2> /dev/null  ; then
++
+     has_png="system"
+ fi
+ if test "$cross_prefix" = "" ; then
+@@ -1239,12 +1254,12 @@ if test "$cross_prefix" = "" ; then
+     fi
+ fi
+ if test "$has_png" = "no" ; then
+-    if docc -I$local_inc/png -L$local_lib -lpng ; then
++    if docc -I$local_inc/$png_flavor -L$local_lib -l$png_flavor 2> /dev/null  ; then
+         has_png="local"
+     fi
+ fi
+ 
+-
++sed -i "s/png.h/lib$png_flavor\/png.h/" src/media_tools/img.c
+ 
+ #look for MAD support
+ cat > $TMPC << EOF
+@@ -3024,6 +3039,7 @@ if test "$has_jpeg" != "no" ; then
+ fi
+ 
+ echo "CONFIG_PNG=$has_png" >> config.mak
++echo "png_flavor=$png_flavor" >> config.mak
+ if test "$has_png" != "no" ; then
+     echo "#define GPAC_HAS_PNG" >> $TMPH
+ fi
+Index: gpac-0.6.1/static.mak
+===================================================================
+--- gpac-0.6.1.orig/static.mak
++++ gpac-0.6.1/static.mak
+@@ -45,7 +45,7 @@ endif
+ #5 - PNG support
+ ifeq ($(CONFIG_PNG), no)
+ else
+-LINKLIBS+= -lpng
++LINKLIBS+= -l$(png_flavor)
+ ifeq ($(CONFIG_PNG), local)
+ NEED_LOCAL_LIB="yes"
+ MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"

gpac-0.6.1-no-pc.patch Added

gpac-0.6.1-x264-export.patch Added

v0.5.2.tar.gz -> v0.6.1.tar.gz Changed

Overview

Request 2715 (accepted)

Request History