Request 944 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 944 (accepted)

update version 5178

Created by marguerite over 10 years ago
In state accepted

Submit gpac

Submit package home:marguerite:branches:Essentials / gpac to package Essentials / gpac

gpac.changes Changed

gpac.spec Changed

@@ -15,10 +15,10 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define soname		2
+%define soname		3
 
 Name:           gpac
-Version:        0.5.0.svn4668
+Version:        0.5.0.svn5178
 Release:        1.pm.1
 License:        LGPL-2.1+
 Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
@@ -40,17 +40,20 @@
 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
-#PATCH-FIX-UPSTREAM marguerite@opensuse.org - export functions needed by x264
-Patch7:		gpac-0.5.0-x264-export.patch
+#PATCH-FIX-UPSTREAM marguerite@opensuse.org - too many arguments for JS_GetParent
+Patch7:		gpac-0.5.0-js_getparent.patch
+#PATCH-FIX-UPSTREAM marguerite@opensuse.org - I:Statement is overflowing a buffer
+Patch8:		gpac-0.5.0-bufferoverflow.patch
 BuildRequires:  DirectFB-devel
 BuildRequires:  ImageMagick
 BuildRequires:  Mesa-devel
 BuildRequires:  alsa-devel
 BuildRequires:  dos2unix
 BuildRequires:  doxygen
-BuildRequires:	 fdupes
+BuildRequires:	fdupes
 BuildRequires:  freeglut-devel
 BuildRequires:  freetype2-devel
+BuildRequires:	graphviz
 BuildRequires:  gcc-c++
 %if 0%{?suse_version} >= 1140
 BuildRequires:  libSDL-devel
@@ -195,7 +198,10 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%if 0%{?suse_version} <= 1140
 %patch7 -p1
+%endif
+%patch8 -p1
 
 # Fix encoding warnings
 cp -p Changelog Changelog.origine
@@ -208,6 +214,9 @@
 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 "5178"' > ./include/gpac/revision.h
+
 %build
 # regenerate plugin interface from IDL (see applications/osmozilla/readme.txt)
 %if 0%{?suse_version} > 1140
@@ -370,7 +379,6 @@
 %files -n libgpac-devel
 %defattr(-,root,root)
 %doc doc/CODING_STYLE doc/ipmpx_syntax.bt
-%doc doc/html/*
 %{_includedir}/%{name}/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc

gpac-0.5.0-bufferoverflow.patch Added

gpac-0.5.0-enable_V4Studio.patch Changed

@@ -1,7 +1,8 @@
-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 @@
+Index: gpac-0.5.0.svn5178/applications/Makefile
+===================================================================
+--- gpac-0.5.0.svn5178.orig/applications/Makefile
++++ gpac-0.5.0.svn5178/applications/Makefile
+@@ -25,15 +25,15 @@ V4STUDIODIR=
  INSTDIRS=mp4client
  ifeq ($(CONFIG_XUL),no)
  else
@@ -22,10 +23,11 @@
  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 @@
+Index: gpac-0.5.0.svn5178/applications/osmo4_wx/Makefile
+===================================================================
+--- gpac-0.5.0.svn5178.orig/applications/osmo4_wx/Makefile
++++ gpac-0.5.0.svn5178/applications/osmo4_wx/Makefile
+@@ -46,7 +46,7 @@ SRCS := $(OBJS:.o=.cpp)
  all: $(PROG)
  
  Osmo4$(EXE): $(OBJS)
@@ -34,69 +36,20 @@
  
  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();
+Index: gpac-0.5.0.svn5178/applications/osmozilla/osmo_npapi.cpp
+===================================================================
+--- gpac-0.5.0.svn5178.orig/applications/osmozilla/osmo_npapi.cpp
++++ gpac-0.5.0.svn5178/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.5.0-js_getparent.patch Added

gpac-0.5.0-x264-export.patch Deleted

gpac-0.5.0.svn4668.tar.bz2 -> gpac-0.5.0.svn5178.tar.bz2 Changed

Build Results
RPM Lint

Refresh

Comments for request 944 0

Request History

marguerite created request over 10 years ago

update version 5178

marguerite accepted request over 10 years ago

thanks