Packman Build Service PMBS

gpac.changes Changed

gpac.spec Changed

@@ -18,18 +18,16 @@
 %define soname		3
 
 Name:           gpac
-Version:        0.5.0.svn5178
+Version:        0.5.1.svn5491
 Release:        1.pm.1
 License:        LGPL-2.1+
 Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Url:            http://gpac.sourceforge.net
-Source:		%{name}-%{version}.tar.bz2
+Source:		%{name}-%{version}.tar.xz
 Source90:       %{name}-rpmlintrc
-#PATCH-FIX-openSUSE i@marguerite.su - openSUSE only fix for sf#3574796
-Patch0:         gpac-0.5.0-smjs_call_prop_stub.patch
 #PATCH-FIX-UPSTREAM i@marguerite.su - enable osmozilla and osmo4_wx
-Patch1:		gpac-0.5.0-enable_V4Studio.patch
+Patch1:		gpac-0.5.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
@@ -40,13 +38,13 @@
 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 - 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
+Patch8:		gpac-0.5.1-bufferoverflow.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
+#PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix u32 count redelaration
+Patch10:	gpac-0.5.1-u32-count-redeclaration.patch
 BuildRequires:  DirectFB-devel
 BuildRequires:  ImageMagick
 BuildRequires:  Mesa-devel
@@ -85,13 +83,6 @@
 %if 0%{?suse_version} > 1140
 BuildRequires:  js-devel
 %endif
-%if 0%{?suse_version} <= 1140
-%if ! 0%{?sles_version}
-BuildRequires:  mozilla-xulrunner192-devel
-%endif
-%else
-BuildRequires:  xulrunner-devel
-%endif
 BuildRequires:  libopenssl-devel
 %if 0%{?suse_version} > 1140
 BuildRequires:  pkgconfig(libopenjpeg)
@@ -105,6 +96,7 @@
 BuildRequires:  wxGTK-devel
 %endif
 BuildRequires:  zlib-devel
+BuildRequires:	xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -180,32 +172,17 @@
 * applications benefiting from MPEG-7 and MPEG-21 advances: meta-data,
   encryption, watermarking, rights management
 
-%if ! 0%{?sles_version}
-%package browser-plugin
-Summary:        Osmozilla is a GPAC plugin for Mozilla-based browsers
-Group:          Productivity/Networking/Web/Utilities
-Requires:       %{name} = %{version}
-
-%description browser-plugin
-Osmozilla is a GPAC plugin for Mozilla-based browsers.
-%endif
-
 %prep
 %setup -q
-%if 0%{?suse_version} >= 1210
-%patch0 -p1
-%endif
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%if 0%{?suse_version} > 1140
-%patch7 -p1
-%endif
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 # Fix encoding warnings
 cp -p Changelog Changelog.origine
@@ -219,60 +196,10 @@
 rm -rf doc/ipmpx_syntax.bt.origine
 
 # Generate revision.h
-echo '#define GPAC_SVN_REVISION "5178"' > ./include/gpac/revision.h
+echo '#define GPAC_SVN_REVISION "5491"' > ./include/gpac/revision.h
 
 sed -i~ '1 {s@^.*$@/*@}' src/utils/xml_parser.c
 %build
-# regenerate plugin interface from IDL (see applications/osmozilla/readme.txt)
-%if 0%{?suse_version} > 1140
-pushd applications/osmozilla
-    chmod 666 nsIOsmozilla.xpt_linux; rm nsIOsmozilla.xpt_linux
-    chmod 666 nsIOsmozilla.h
-    chmod 666 nsIOsmozilla.idl
-
-    %define _IDL_DIR `pkg-config --variable=idldir libxul`
-    %define _SDK_DIR `pkg-config --variable=sdkdir libxul`
-
-    %{_SDK_DIR}/sdk/bin/header.py \
-   	-I%{_IDL_DIR} \
-        -o nsIOsmozilla.h \
-   	nsIOsmozilla.idl
-        %{_SDK_DIR}/sdk/bin/typelib.py \
-   	-I%{_IDL_DIR} \
-       -o nsIOsmozilla.xpt \
-   	nsIOsmozilla.idl
-
-    cp nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
-popd
-%else
-%if ! 0%{?sles_version}
-pushd applications/osmozilla
-    chmod 666 nsIOsmozilla.xpt_linux; rm nsIOsmozilla.xpt_linux
-    chmod 666 nsIOsmozilla.h
-    chmod 666 nsIOsmozilla.idl
-
-    %define _IDL_DIR `pkg-config --variable=idldir libxul`
-    %define _INC_DIR `pkg-config --variable=includedir libxul`
-    %define _LIB_DIR `pkg-config --variable=libdir libxul`
-
-    %{_LIB_DIR}/xpidl \
-        -m header \
-        -I%{_IDL_DIR} \
-        -I%{_INC_DIR}/xpcom/idl \
-        nsIOsmozilla.idl
-    %{_LIB_DIR}/xpidl \
-        -m typelib \
-        -I%{_IDL_DIR} \
-        -I%{_INC_DIR}/xpcom/idl \
-        nsIOsmozilla.idl
-    %{_LIB_DIR}/xpt_link \
-        nposmozilla.xpt nsIOsmozilla.xpt
-
-    cp nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
-popd
-%endif
-%endif
-
 # configure the beast
 ./configure \
     --prefix=%{_prefix} \
@@ -280,9 +207,6 @@
     --libdir=lib64 \
 %endif
     --mandir=%{_mandir} \
-%if ! 0%{?sles_version}
-    --xulsdk-path=`pkg-config --variable=sdkdir libxul` \
-%endif
     --extra-cflags="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DXP_UNIX -fPIC" 
 
 # make the beast (NO parallel build possible ...)
@@ -305,15 +229,6 @@
 make install-lib \
     DESTDIR=%{buildroot}
 
-# browser-plugin
-%if ! 0%{?sles_version}
-install -dm 755 %{buildroot}%{_libdir}/browser-plugins
-install -m 755 bin/gcc/nposmozilla.so \
-    %{buildroot}%{_libdir}/browser-plugins
-install -m 755 bin/gcc/nposmozilla.xpt \
-    %{buildroot}%{_libdir}/browser-plugins
-%endif
-
 # generated sggen binaries
 for i in MPEG4 SVG X3D; do
     install -m 755 applications/generators/$i/${i}Gen \
@@ -394,10 +309,4 @@
 %{_datadir}/pixmaps/Osmo4.png
 %{_datadir}/applications/Osmo4.desktop
 
-%if ! 0%{?sles_version}
-%files browser-plugin
-%defattr(-,root,root)
-%{_libdir}/browser-plugins/nposmozilla.*
-%endif
-
 %changelog

gpac-0.5.0-bufferoverflow.patch Deleted

gpac-0.5.0-enable_V4Studio.patch Deleted

@@ -1,55 +0,0 @@
-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
--#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.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)
--	$(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.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 Deleted

gpac-0.5.0-smjs_call_prop_stub.patch Deleted

gpac-0.5.1-bufferoverflow.patch Added

gpac-0.5.1-enable_V4Studio.patch Added

@@ -0,0 +1,55 @@
+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.5.1-u32-count-redeclaration.patch Added

gpac-0.5.0.svn5178.tar.bz2 -> gpac-0.5.1.svn5491.tar.xz Changed

Changes of Revision 12