File gpac-0.5.0-enable_V4Studio.patch of Package gpac

File gpac-0.5.0-enable_V4Studio.patch of Package gpac (Revision 1240c4d13cdb599568e6e88f98f4b3c5)

Currently displaying revision 1240c4d13cdb599568e6e88f98f4b3c5 , Show latest

diff -urN gpac-0.5.0.svn4192.orig/applications/Makefile gpac-0.5.0.svn4192/applications/Makefile
--- gpac-0.5.0.svn4192.orig/applications/Makefile	2012-11-01 07:44:25.050487961 +0800
+++ gpac-0.5.0.svn4192/applications/Makefile	2012-11-01 07:45:17.704267823 +0800
@@ -17,15 +17,15 @@
 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)
diff -urN gpac-0.5.0.svn4192.orig/applications/osmo4_wx/Makefile gpac-0.5.0.svn4192/applications/osmo4_wx/Makefile
--- gpac-0.5.0.svn4192.orig/applications/osmo4_wx/Makefile	2012-11-01 07:44:25.011488147 +0800
+++ gpac-0.5.0.svn4192/applications/osmo4_wx/Makefile	2012-11-01 08:07:33.914532090 +0800
@@ -46,7 +46,7 @@
 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)
diff -urN gpac-0.5.0.svn4192.orig/applications/osmozilla/osmo_npapi.cpp gpac-0.5.0.svn4192/applications/osmozilla/osmo_npapi.cpp
--- gpac-0.5.0.svn4192.orig/applications/osmozilla/osmo_npapi.cpp	2012-11-01 07:44:25.049487966 +0800
+++ gpac-0.5.0.svn4192/applications/osmozilla/osmo_npapi.cpp	2012-11-01 07:46:04.823168413 +0800
@@ -373,10 +373,10 @@
 	/* 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)
diff -urN gpac-0.5.0.svn4192.orig/src/terminal/object_browser.c gpac-0.5.0.svn4192/src/terminal/object_browser.c
--- gpac-0.5.0.svn4192.orig/src/terminal/object_browser.c	2012-11-01 07:44:25.105487684 +0800
+++ gpac-0.5.0.svn4192/src/terminal/object_browser.c	2012-11-01 07:47:37.788217060 +0800
@@ -103,6 +103,7 @@
 }
 
 /*select given object when stream selection is available*/
+GF_EXPORT
 void gf_term_select_object(GF_Terminal *term, GF_ObjectManager *odm)
 {
 	if (!term || !odm) return;
diff -urN gpac-0.5.0.svn4192.orig/src/terminal/terminal.c gpac-0.5.0.svn4192/src/terminal/terminal.c
--- gpac-0.5.0.svn4192.orig/src/terminal/terminal.c	2012-11-01 07:44:25.105487684 +0800
+++ gpac-0.5.0.svn4192/src/terminal/terminal.c	2012-11-01 07:47:11.843174648 +0800
@@ -1868,6 +1868,7 @@
 	return 0;
 }
 
+GF_EXPORT
 const char *gf_term_get_text_selection(GF_Terminal *term, Bool probe_only)
 {
 	Bool has_text;
@@ -1878,7 +1879,7 @@
 	return gf_sc_get_selected_text(term->compositor);
 }
 
-
+GF_EXPORT
 GF_Err gf_term_paste_text(GF_Terminal *term, const char *txt, Bool probe_only)
 {
 	if (!term) return GF_BAD_PARAM;
diff -urN gpac-0.5.0.svn4192.orig/src/utils/os_divers.c gpac-0.5.0.svn4192/src/utils/os_divers.c
--- gpac-0.5.0.svn4192.orig/src/utils/os_divers.c	2012-11-01 07:44:25.063487899 +0800
+++ gpac-0.5.0.svn4192/src/utils/os_divers.c	2012-11-01 07:49:08.178526744 +0800
@@ -315,6 +315,7 @@
 #endif
 }
 
+GF_EXPORT
 void gf_rand_init(Bool Reset)
 {
 	if (Reset) {
@@ -328,6 +329,7 @@
 	}
 }
 
+GF_EXPORT
 u32 gf_rand()
 {
 	return rand();