Author: qboosh Date: Sun Mar 20 13:40:51 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 0.4.5 - updated install patch - removed obsolete amd64,libdir patches - added libpng,pic,xulrunner patches
---- Files affected: packages/gpac: gpac-install.patch (1.5 -> 1.6) , gpac.spec (1.28 -> 1.29) , gpac-libpng.patch (NONE -> 1.1) (NEW), gpac-pic.patch (NONE -> 1.1) (NEW), gpac-xulrunner.patch (NONE -> 1.1) (NEW), gpac-amd64.patch (1.1 -> NONE) (REMOVED), gpac-libdir.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/gpac/gpac-install.patch diff -u packages/gpac/gpac-install.patch:1.5 packages/gpac/gpac-install.patch:1.6 --- packages/gpac/gpac-install.patch:1.5 Sun Mar 19 13:43:43 2006 +++ packages/gpac/gpac-install.patch Sun Mar 20 14:40:46 2011 @@ -1,49 +1,38 @@ ---- gpac/Makefile.orig 2006-03-17 22:16:39.000000000 +0100 -+++ gpac/Makefile 2006-03-17 22:17:29.000000000 +0100 -@@ -71,8 +71,8 @@ +--- gpac/Makefile.orig 2008-10-23 17:40:38.000000000 +0200 ++++ gpac/Makefile 2011-02-05 07:18:41.996686361 +0100 +@@ -59,9 +59,6 @@ ifeq ($(CONFIG_WIN32),yes) - install -s -m 755 bin/gcc/libgpac.dll $(prefix)/lib + install $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(prefix)/$(libdir) else -- install -s -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) -- ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX) -+ install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) -+ ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac.$(DYN_LIB_SUFFIX) - #not sure wether darwin uses ldconfig or not... +-ifeq ($(DEBUGBUILD),no) +- $(STRIP) bin/gcc/libgpac.$(DYN_LIB_SUFFIX) +-endif ifeq ($(CONFIG_DARWIN),yes) + install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) + ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX) +--- gpac/applications/osmozilla/Makefile.orig 2008-11-24 09:54:12.000000000 +0100 ++++ gpac/applications/osmozilla/Makefile 2011-02-05 07:20:46.968690551 +0100 +@@ -6,10 +6,6 @@ + USER_NAME=root else ---- gpac/Makefile.orig 2006-03-17 22:27:49.000000000 +0100 -+++ gpac/Makefile 2006-03-17 22:27:58.000000000 +0100 -@@ -64,7 +64,7 @@ - install -c -s -m 755 bin/gcc/MP4Box "$(prefix)/bin" - install -c -s -m 755 bin/gcc/MP42Avi "$(prefix)/bin" - $(MAKE) -C applications install -- install -d "$(moddir)" -+ install -d "$(libdir)/gpac" - install -c bin/gcc/*.$(DYN_LIB_SUFFIX) "$(moddir)" - rm -f $(moddir)/libgpac.$(DYN_LIB_SUFFIX) - rm -f $(moddir)/nposmozilla.$(DYN_LIB_SUFFIX) ---- gpac/applications/osmozilla/Makefile.orig 2006-03-17 22:47:48.000000000 +0100 -+++ gpac/applications/osmozilla/Makefile 2006-03-17 22:54:03.000000000 +0100 -@@ -5,10 +5,6 @@ - GECKO_PATH=$(SRC_PATH)/extra_lib/include/gecko-sdk - USER_NAME=$(shell whoami) -ifeq ($(USER_NAME), root) -else -MOZILLA_DIR=local -endif + endif - CFLAGS= $(OPTFLAGS) -Wall -I$(SRC_PATH)/include \ - -I$(GECKO_PATH) \ -@@ -71,18 +67,8 @@ + CFLAGS=$(CPPFLAGS) $(XUL_CFLAGS) -I$(SRC_PATH)/include +@@ -75,19 +71,8 @@ endif - install: $(LIB) + install: -ifeq ($(MOZILLA_DIR), local) -ifeq ($(USER_NAME), root) - @echo "*** Root cannot install local mozilla plugins! ***" - @echo "*** Exit root mode and reinstall mozilla plugin! ***" -else +- $(MAKE) $(LIB) - install -D -m 755 ../../bin/gcc/$(LIB) "$(HOME)/.mozilla/plugins/$(LIB)" - install -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(HOME)/.mozilla/components/nposmozilla.xpt" -endif @@ -54,20 +43,5 @@ + install -D -m 755 ../../bin/gcc/$(LIB) "$(MOZILLA_DIR)/$(LIB)" + install -D -m 755 ../../bin/gcc/nposmozilla.xpt "$(MOZILLA_DIR)/nposmozilla.xpt" - dep: depend - ---- gpac/Makefile.orig 2006-03-17 22:55:15.000000000 +0100 -+++ gpac/Makefile 2006-03-17 22:56:22.000000000 +0100 -@@ -65,9 +65,9 @@ - install -c -s -m 755 bin/gcc/MP42Avi "$(prefix)/bin" - $(MAKE) -C applications install - install -d "$(libdir)/gpac" -- install -c bin/gcc/*.$(DYN_LIB_SUFFIX) "$(moddir)" -- rm -f $(moddir)/libgpac.$(DYN_LIB_SUFFIX) -- rm -f $(moddir)/nposmozilla.$(DYN_LIB_SUFFIX) -+ install -c bin/gcc/*.$(DYN_LIB_SUFFIX) "$(libdir)/gpac" -+ rm -f $(libdir)/libgpac.$(DYN_LIB_SUFFIX) -+ rm -f $(libdir)/nposmozilla.$(DYN_LIB_SUFFIX) - ifeq ($(CONFIG_WIN32),yes) - install -s -m 755 bin/gcc/libgpac.dll $(prefix)/lib - else + uninstall: + ifeq ($(MOZILLA_DIR), local) ================================================================ Index: packages/gpac/gpac.spec diff -u packages/gpac/gpac.spec:1.28 packages/gpac/gpac.spec:1.29 --- packages/gpac/gpac.spec:1.28 Sun May 16 16:13:56 2010 +++ packages/gpac/gpac.spec Sun Mar 20 14:40:46 2011 @@ -1,66 +1,66 @@ # $Revision$, $Date$ # TODO -# - soname for libm4systems(?) -# - use system mozilla includes -# - ./configure[692]: wx-config: not found -# - ./configure[693]: wx-config: not found -# - CC, CFLAGS -# - Xiph Theora: no +# - amr-nb/amr-wb/amr-nb-fixed ? +# - FFMPEG: local +# - which: no wx-config in ... # # Conditional build: -%bcond_with amr -%bcond_without faad -%bcond_without ffmpeg -%bcond_without freetype -%bcond_without jpeg -%bcond_without js -%bcond_without mad -%bcond_without png -%bcond_without xvid -%bcond_with wx +%bcond_with amr # AMR-NB support +%bcond_without faad # AAC decoding support +%bcond_without ffmpeg # ffmpeg support +%bcond_without freetype # freetype support +%bcond_without jpeg # JPEG support +%bcond_without js # JavaScript support +%bcond_without mad # MP3 support +%bcond_without png # PNG support +%bcond_without xvid # xvid support +%bcond_with wx # wxWidgets support # Summary: GPAC - an implementation of the MPEG-4 Systems standard (ISO/IEC 14496-1) Summary(pl.UTF-8): GPAC - implementacja standardu MPEG-4 Systems (ISO/IEC 14496-1) Name: gpac -Version: 0.4.0 -Release: 4 -License: LGPL -Group: Applications -Source0: http://dl.sourceforge.net/gpac/%{name}-%{version}.tar.gz -# Source0-md5: a8b4b3206cabda946850240f1e7aea93 +Version: 0.4.5 +Release: 0.1 +License: LGPL v2+ +Group: Applications/Multimedia +Source0: http://downloads.sourceforge.net/gpac/%{name}-%{version}.tar.gz +# Source0-md5: 755e8c438a48ebdb13525dd491f5b0d1 Source1: http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/26073-530.zip # Source1-md5: 705f6993fbf890e92eb7a331e7c716d1 Patch0: %{name}-install.patch Patch1: %{name}-wxWidgets.patch -Patch2: %{name}-amd64.patch -Patch3: %{name}-libdir.patch +Patch2: %{name}-libpng.patch +Patch3: %{name}-pic.patch +Patch4: %{name}-xulrunner.patch URL: http://gpac.sourceforge.net/ BuildRequires: SDL-devel +BuildRequires: a52dec-libs-devel +BuildRequires: alsa-lib-devel >= 0.9 %{?with_faad:BuildRequires: faad2-devel} %{?with_ffmpeg:BuildRequires: ffmpeg-devel} %{?with_freetype:BuildRequires: freetype-devel} +BuildRequires: jack-audio-connection-kit-devel %{?with_js:BuildRequires: js-devel} %{?with_jpeg:BuildRequires: libjpeg-devel} %{?with_mad:BuildRequires: libmad-devel} +BuildRequires: libogg-devel %{?with_png:BuildRequires: libpng-devel} +BuildRequires: libtheora-devel +BuildRequires: libvorbis-devel BuildRequires: libxml2-devel +BuildRequires: openjpeg-devel +BuildRequires: pulseaudio-devel BuildRequires: rpmbuild(macros) >= 1.357 BuildRequires: unzip %{?with_wx:BuildRequires: wxGTK2-devel >= 2.5.4} +# -server +BuildRequires: xmlrpc-c-devel +BuildRequires: xorg-lib-libXext-devel +BuildRequires: xorg-lib-libXv-devel +BuildRequires: xulrunner-devel >= 1.9.1 %{?with_xvid:BuildRequires: xvid-devel} -Requires: SDL -%{?with_faad:Requires: faad2} -%{?with_ffmpeg:Requires: ffmpeg} -%{?with_freetype:Requires: freetype} -%{?with_js:Requires: js} -%{?with_jpeg:Requires: libjpeg} -%{?with_mad:Requires: libmad} -%{?with_png:Requires: libpng} -%{?with_xvid:Requires: xvid} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreq libm4systems.so - %description GPAC is an implementation of the MPEG-4 Systems standard (ISO/IEC 14496-1) developed from scratch in ANSI C. @@ -111,6 +111,8 @@ %{?with_wx:%patch1 -p1} %patch2 -p1 %patch3 -p1 +%patch4 -p1 + %if %{with amr} mkdir -p Plugins/amr_dec/AMR_NB cd Plugins/amr_dec/AMR_NB @@ -120,39 +122,41 @@ %endif chmod a+x configure -# files for w32 and Linux were swapped -rm -rf applications/osmozilla/nsIOsmozilla.xpt_linux -mv applications/osmozilla/nsIOsmozilla.xpt_w32 applications/osmozilla/nsIOsmozilla.xpt_linux - %build +cd applications/osmozilla +xpidl -m header -I /usr/share/idl/xulrunner nsIOsmozilla.idl +xpidl -m typelib -I /usr/share/idl/xulrunner nsIOsmozilla.idl +cp -f nsIOsmozilla.xpt nsIOsmozilla.xpt_linux +cd ../.. %configure \ - --extra-cflags="-fPIC" \ - --extra-ldflags="-fPIC" \ - --enable-oss-audio \ + --X11-path=/usr \ + --cc="%{__cc}" \ + --disable-opt \ %{?with_amr:--enable-amr-nb} \ - %{!?with_faad:--disable-faad} \ - %{!?with_ffmpeg:--disable-ffmpeg} \ - %{!?with_freetype:--disable-ft} \ - %{!?with_jpeg:--disable-jpeg} \ - %{!?with_js:--disable-js} \ - %{!?with_mad:--disable-mad} \ - %{!?with_png:--disable-png} \ - %{!?with_xvid:--disable-xvid} + --enable-joystick \ + --enable-pic \ + --extra-cflags="%{rpmcflags}" \ + --extra-ldflags="%{rpmldflags}" \ + --mozdir=%{_browserpluginsdir} \ + %{!?with_faad:--use-faad=no} \ + %{!?with_ffmpeg:--use-ffmpeg=no} \ + %{!?with_freetype:--use-ft=no} \ + %{!?with_jpeg:--use-jpeg=no} \ + %{!?with_js:--use-js=no} \ + %{!?with_mad:--use-mad=no} \ + %{!?with_png:--use-png=no} \ + %{!?with_xvid:--use-xvid=no} \ + --xulsdk-path="/usr/include/xulrunner -I/usr/include/nspr" %{__make} -j1 \ - XLIBDIR="/usr/X11R6/%{_lib}" \ - DESTDIR=$RPM_BUILD_ROOT + libdir=%{_lib} %install rm -rf $RPM_BUILD_ROOT %{__make} install \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - plugdir=$RPM_BUILD_ROOT%{_libdir}/gpac \ - real_plugdir=%{_libdir}/gpac \ - prefix=$RPM_BUILD_ROOT%{_prefix} \ + DESTDIR=$RPM_BUILD_ROOT \ + libdir=%{_lib} \ MOZILLA_DIR=$RPM_BUILD_ROOT%{_browserpluginsdir} %clean @@ -172,11 +176,16 @@ %files %defattr(644,root,root,755) %doc AUTHORS BUGS Changelog README TODO -%attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_libdir}/lib*.so +%attr(755,root,root) %{_bindir}/MP4Box +%attr(755,root,root) %{_bindir}/MP4Client +%attr(755,root,root) %{_libdir}/libgpac-%{version}.so +%attr(755,root,root) %{_libdir}/libgpac.so %dir %{_libdir}/gpac -%attr(755,root,root) %{_libdir}/gpac/*.so -%{_mandir}/man1/* +%attr(755,root,root) %{_libdir}/gpac/gm_*.so +%{_datadir}/gpac +%{_mandir}/man1/gpac.1* +%{_mandir}/man1/mp4box.1* +%{_mandir}/man1/mp4client.1* %files -n browser-plugin-%{name} %defattr(644,root,root,755) @@ -189,6 +198,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.29 2011/03/20 13:40:46 qboosh +- up to 0.4.5 +- updated install patch +- removed obsolete amd64,libdir patches +- added libpng,pic,xulrunner patches + Revision 1.28 2010/05/16 14:13:56 sparky - BR: unzip ================================================================ Index: packages/gpac/gpac-libpng.patch diff -u /dev/null packages/gpac/gpac-libpng.patch:1.1 --- /dev/null Sun Mar 20 14:40:51 2011 +++ packages/gpac/gpac-libpng.patch Sun Mar 20 14:40:46 2011 @@ -0,0 +1,11 @@ +--- gpac/src/media_tools/img.c.orig 2008-12-01 18:39:36.000000000 +0100 ++++ gpac/src/media_tools/img.c 2011-02-05 08:34:05.764692227 +0100 +@@ -551,7 +551,7 @@ + /* Allocate/initialize the image information data. REQUIRED */ + info_ptr = png_create_info_struct(png_ptr); + if (info_ptr == NULL) { +- png_destroy_write_struct(&png_ptr, png_infopp_NULL); ++ png_destroy_write_struct(&png_ptr, NULL); + return GF_IO_ERR; + } + ================================================================ Index: packages/gpac/gpac-pic.patch diff -u /dev/null packages/gpac/gpac-pic.patch:1.1 --- /dev/null Sun Mar 20 14:40:52 2011 +++ packages/gpac/gpac-pic.patch Sun Mar 20 14:40:46 2011 @@ -0,0 +1,42 @@ +--- gpac/src/Makefile.orig 2008-12-02 15:01:08.000000000 +0100 ++++ gpac/src/Makefile 2011-02-09 16:26:58.340693904 +0100 +@@ -174,6 +174,10 @@ + endif + + ifeq ($(WANT_PIC),yes) ++LIBGPAC_MCRYPT_PIC=$(LIBGPAC_MCRYPT:.o=.opic) ++LIBGPAC_SCENE_PIC=$(LIBGPAC_SCENE:.o=.opic) ++LIBGPAC_MEDIATOOLS_PIC=$(LIBGPAC_MEDIATOOLS:.o=.opic) ++LIBGPAC_COMPOSITOR_PIC=$(LIBGPAC_COMPOSITOR:.o=.opic) + OBJSPIC=$(OBJS:.o=.opic) + else + OBJSPIC=$(OBJS) +@@ -192,23 +196,19 @@ + lib: $(LIB) + + #there's a bunch of warnings in there, get rid of them +-mcrypt: CFLAGS= $(OPTFLAGS) -w -I$(SRC_PATH)/include +-mcrypt: $(LIBGPAC_MCRYPT) ++$(LIBGPAC_MCRYPT) $(LIBGPAC_MCRYPT_PIC): CFLAGS= $(OPTFLAGS) -w -I$(SRC_PATH)/include + +-scenegraph: CFLAGS += $(SCENEGRAPH_CFLAGS) +-scenegraph: $(LIBGPAC_SCENE) ++$(LIBGPAC_SCENE) $(LIBGPAC_SCENE_PIC): CFLAGS += $(SCENEGRAPH_CFLAGS) + +-mediatools: CFLAGS += $(MEDIATOOLS_CFLAGS) +-mediatools: $(LIBGPAC_MEDIATOOLS) ++$(LIBGPAC_MEDIATOOLS) $(LIBGPAC_MEDIATOOLS_PIC): CFLAGS += $(MEDIATOOLS_CFLAGS) + +-compositor: CFLAGS+=$(COMPOSITOR_CFLAGS) +-compositor: $(LIBGPAC_COMPOSITOR) ++$(LIBGPAC_COMPOSITOR) $(LIBGPAC_COMPOSITOR_PIC): CFLAGS+=$(COMPOSITOR_CFLAGS) + + %.o: %.c + $(CC) $(CFLAGS) -c -o $@ $< + + +-$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph mediatools mcrypt $(OBJSPIC) ++$(LIB): $(OBJS) $(OBJSPIC) + ar cr ../bin/gcc/libgpac_static.a $(OBJS) + ranlib ../bin/gcc/libgpac_static.a + $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) ================================================================ Index: packages/gpac/gpac-xulrunner.patch diff -u /dev/null packages/gpac/gpac-xulrunner.patch:1.1 --- /dev/null Sun Mar 20 14:40:52 2011 +++ packages/gpac/gpac-xulrunner.patch Sun Mar 20 14:40:46 2011 @@ -0,0 +1,224 @@ +--- gpac/applications/osmozilla/npplat.h.orig 2005-07-13 16:34:30.000000000 +0200 ++++ gpac/applications/osmozilla/npplat.h 2011-03-20 09:34:57.624712082 +0100 +@@ -49,7 +49,7 @@ + #endif + + #include "npapi.h" +-#include "npupp.h" ++#include "npfunctions.h" + + /**************************************************/ + /* */ +--- gpac/applications/osmozilla/osmozilla.h.orig 2008-10-06 17:17:57.000000000 +0200 ++++ gpac/applications/osmozilla/osmozilla.h 2011-03-20 10:04:41.876713758 +0100 +@@ -39,6 +39,7 @@ + #define __PLUGIN_H__ + + #include <nsIClassInfo.h> ++#include <nsIProgrammingLanguage.h> + + #include "npplat.h" + #include "nsIOsmozilla.h" +--- gpac/applications/osmozilla/osmozilla.cpp.orig 2008-10-06 17:17:57.000000000 +0200 ++++ gpac/applications/osmozilla/osmozilla.cpp 2011-03-20 10:12:46.068709568 +0100 +@@ -856,19 +856,19 @@ + return NS_ERROR_NULL_POINTER; + + if (aIID.Equals(kIZillaPluginIID)) { +- *aInstancePtr = NS_STATIC_CAST(nsIOsmozilla *, this); ++ *aInstancePtr = static_cast<nsIOsmozilla *>(this); + AddRef(); + return NS_OK; + } + + if (aIID.Equals(kIClassInfoIID)) { +- *aInstancePtr = NS_STATIC_CAST(nsIClassInfo *, this); ++ *aInstancePtr = static_cast<nsIClassInfo *>(this); + AddRef(); + return NS_OK; + } + + if (aIID.Equals(kISupportsIID)) { +- *aInstancePtr = NS_STATIC_CAST(nsISupports *, (NS_STATIC_CAST (nsIOsmozilla *, this))); ++ *aInstancePtr = static_cast<nsISupports *>((static_cast<nsIOsmozilla *>(this))); + AddRef(); + return NS_OK; + } +--- gpac/applications/osmozilla/npn_gate.cpp.orig 2005-07-13 16:34:29.000000000 +0200 ++++ gpac/applications/osmozilla/npn_gate.cpp 2011-03-20 10:24:21.496702863 +0100 +@@ -58,7 +58,7 @@ + NPError rv = NPERR_NO_ERROR; + + if( navMinorVers >= NPVERS_HAS_NOTIFICATION ) +- rv = CallNPN_GetURLNotifyProc(NPNFuncs.geturlnotify, instance, url, target, notifyData); ++ rv = (*NPNFuncs.geturlnotify)(instance, url, target, notifyData); + else + rv = NPERR_INCOMPATIBLE_VERSION_ERROR; + +@@ -67,32 +67,32 @@ + + NPError NPN_GetURL(NPP instance, const char *url, const char *target) + { +- NPError rv = CallNPN_GetURLProc(NPNFuncs.geturl, instance, url, target); ++ NPError rv = (*NPNFuncs.geturl)(instance, url, target); + return rv; + } + +-NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData) ++NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData) + { + int navMinorVers = NPNFuncs.version & 0xFF; + NPError rv = NPERR_NO_ERROR; + + if( navMinorVers >= NPVERS_HAS_NOTIFICATION ) +- rv = CallNPN_PostURLNotifyProc(NPNFuncs.posturlnotify, instance, url, window, len, buf, file, notifyData); ++ rv = (*NPNFuncs.posturlnotify)(instance, url, window, len, buf, file, notifyData); + else + rv = NPERR_INCOMPATIBLE_VERSION_ERROR; + + return rv; + } + +-NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file) ++NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file) + { +- NPError rv = CallNPN_PostURLProc(NPNFuncs.posturl, instance, url, window, len, buf, file); ++ NPError rv = (*NPNFuncs.posturl)(instance, url, window, len, buf, file); + return rv; + } + + NPError NPN_RequestRead(NPStream* stream, NPByteRange* rangeList) + { +- NPError rv = CallNPN_RequestReadProc(NPNFuncs.requestread, stream, rangeList); ++ NPError rv = (*NPNFuncs.requestread)(stream, rangeList); + return rv; + } + +@@ -103,20 +103,20 @@ + NPError rv = NPERR_NO_ERROR; + + if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) +- rv = CallNPN_NewStreamProc(NPNFuncs.newstream, instance, type, target, stream); ++ rv = (*NPNFuncs.newstream)(instance, type, target, stream); + else + rv = NPERR_INCOMPATIBLE_VERSION_ERROR; + + return rv; + } + +-int32 NPN_Write(NPP instance, NPStream *stream, int32 len, void *buffer) ++int32_t NPN_Write(NPP instance, NPStream *stream, int32_t len, void *buffer) + { + int navMinorVersion = NPNFuncs.version & 0xFF; +- int32 rv = 0; ++ int32_t rv = 0; + + if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) +- rv = CallNPN_WriteProc(NPNFuncs.write, instance, stream, len, buffer); ++ rv = (*NPNFuncs.write)(instance, stream, len, buffer); + else + rv = -1; + +@@ -129,7 +129,7 @@ + NPError rv = NPERR_NO_ERROR; + + if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) +- rv = CallNPN_DestroyStreamProc(NPNFuncs.destroystream, instance, stream, reason); ++ rv = (*NPNFuncs.destroystream)(instance, stream, reason); + else + rv = NPERR_INCOMPATIBLE_VERSION_ERROR; + +@@ -138,78 +138,78 @@ + + void NPN_Status(NPP instance, const char *message) + { +- CallNPN_StatusProc(NPNFuncs.status, instance, message); ++ (*NPNFuncs.status)(instance, message); + } + + const char* NPN_UserAgent(NPP instance) + { + const char * rv = NULL; +- rv = CallNPN_UserAgentProc(NPNFuncs.uagent, instance); ++ rv = (*NPNFuncs.uagent)(instance); + return rv; + } + +-void* NPN_MemAlloc(uint32 size) ++void* NPN_MemAlloc(uint32_t size) + { + void * rv = NULL; +- rv = CallNPN_MemAllocProc(NPNFuncs.memalloc, size); ++ rv = (*NPNFuncs.memalloc)(size); + return rv; + } + + void NPN_MemFree(void* ptr) + { +- CallNPN_MemFreeProc(NPNFuncs.memfree, ptr); ++ (*NPNFuncs.memfree)(ptr); + } + +-uint32 NPN_MemFlush(uint32 size) ++uint32_t NPN_MemFlush(uint32_t size) + { +- uint32 rv = CallNPN_MemFlushProc(NPNFuncs.memflush, size); ++ uint32_t rv = (*NPNFuncs.memflush)(size); + return rv; + } + + void NPN_ReloadPlugins(NPBool reloadPages) + { +- CallNPN_ReloadPluginsProc(NPNFuncs.reloadplugins, reloadPages); ++ (*NPNFuncs.reloadplugins)(reloadPages); + } + + #ifdef OJI + JRIEnv* NPN_GetJavaEnv(void) + { + JRIEnv * rv = NULL; +- rv = CallNPN_GetJavaEnvProc(NPNFuncs.getJavaEnv); ++ rv = (*NPNFuncs.getJavaEnv)(); + return rv; + } + + jref NPN_GetJavaPeer(NPP instance) + { + jref rv; +- rv = CallNPN_GetJavaPeerProc(NPNFuncs.getJavaPeer, instance); ++ rv = (*NPNFuncs.getJavaPeer)(instance); + return rv; + } + #endif + + NPError NPN_GetValue(NPP instance, NPNVariable variable, void *value) + { +- NPError rv = CallNPN_GetValueProc(NPNFuncs.getvalue, instance, variable, value); ++ NPError rv = (*NPNFuncs.getvalue)(instance, variable, value); + return rv; + } + + NPError NPN_SetValue(NPP instance, NPPVariable variable, void *value) + { +- NPError rv = CallNPN_SetValueProc(NPNFuncs.setvalue, instance, variable, value); ++ NPError rv = (*NPNFuncs.setvalue)(instance, variable, value); + return rv; + } + + void NPN_InvalidateRect(NPP instance, NPRect *invalidRect) + { +- CallNPN_InvalidateRectProc(NPNFuncs.invalidaterect, instance, invalidRect); ++ (*NPNFuncs.invalidaterect)(instance, invalidRect); + } + + void NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion) + { <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpac/gpac-install.patch?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpac/gpac.spec?r1=1.28&r2=1.29&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
