Author: qboosh Date: Sun Jun 17 11:58:09 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 0.5.0 (note: new soname)
- updated amr,flags,install-is-not-clean,xulrunner patches
- removed obsolete ffmpeg,libpng,240_all_libpng15.patch,250_all_openjpeg14,
260_all_ffmpeg_bump,270_all_ffmpeg_trunk patches
- dropped outdated pic patch (--enable-pic uses -fPIC everywhere now, bleh :/)
- added apps,export,js patches
---- Files affected:
packages/gpac:
gpac-amr.patch (1.1 -> 1.2) , gpac-flags.patch (1.2 -> 1.3) ,
gpac-install-is-not-clean.patch (1.1 -> 1.2) , gpac-xulrunner.patch (1.5 ->
1.6) , gpac.spec (1.53 -> 1.54) , gpac-apps.patch (NONE -> 1.1) (NEW),
gpac-export.patch (NONE -> 1.1) (NEW), gpac-js.patch (NONE -> 1.1) (NEW),
240_all_libpng15.patch (1.1 -> NONE) (REMOVED), 250_all_openjpeg14.patch (1.1
-> NONE) (REMOVED), 260_all_ffmpeg_bump.patch (1.1 -> NONE) (REMOVED),
270_all_ffmpeg_trunk.patch (1.1 -> NONE) (REMOVED), gpac-ffmpeg.patch (1.1 ->
NONE) (REMOVED), gpac-libpng.patch (1.1 -> NONE) (REMOVED), gpac-pic.patch
(1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/gpac/gpac-amr.patch
diff -u packages/gpac/gpac-amr.patch:1.1 packages/gpac/gpac-amr.patch:1.2
--- packages/gpac/gpac-amr.patch:1.1 Mon Mar 28 19:39:49 2011
+++ packages/gpac/gpac-amr.patch Sun Jun 17 13:58:03 2012
@@ -1,5 +1,5 @@
---- gpac/modules/amr_float_dec/Makefile.orig 2007-08-28 14:51:20.000000000
+0200
-+++ gpac/modules/amr_float_dec/Makefile 2011-03-27 21:37:20.585733920
+0200
+--- gpac/modules/amr_float_dec/Makefile.orig 2011-04-21 17:06:51.000000000
+0200
++++ gpac/modules/amr_float_dec/Makefile 2012-06-15 19:19:05.988610730
+0200
@@ -18,19 +18,19 @@
#common obj
OBJS=../amr_dec/amr_in.o amr_float_dec.o
@@ -10,7 +10,7 @@
CFLAGS+=-DGPAC_HAS_AMR_FT
ifeq ($(CONFIG_AMR_NB_FT), yes)
-OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o
./amr_nb_ft/sp_enc.o
-+AMR_LIBS=-lamrnb
++AMR_LIBS+=-lamrnb
endif
@@ -20,16 +20,33 @@
-OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o
./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
- ./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o
./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
- ./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o
./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o
-+AMR_LIBS=-lamrwb
++AMR_LIBS+=-lamrwb
endif
-@@ -51,7 +51,7 @@
+@@ -45,7 +45,7 @@
- $(LIB): $(OBJSPIC)
-- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS)
-L../../bin/gcc -lgpac
-+ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS)
-L../../bin/gcc -lgpac $(AMR_LIBS)
+ $(LIB): $(OBJS)
+- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS)
-L../../bin/gcc -lgpac
++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS)
-L../../bin/gcc -lgpac $(AMR_LIBS)
%.o: %.c
+--- gpac/modules/amr_float_dec/amr_float_dec.c.orig 2012-03-28
14:43:41.000000000 +0200
++++ gpac/modules/amr_float_dec/amr_float_dec.c 2012-06-15 19:20:41.675273381
+0200
+@@ -45,12 +45,12 @@
+
+ #ifdef GPAC_HAS_AMR_FT
+ /*AMR WB*/
+-#include "amr_nb_ft/interf_dec.h"
++#include "amrnb/interf_dec.h"
+ #endif
+
+ #ifdef GPAC_HAS_AMR_FT_WB
+ /*AMR WB*/
+-#include "amr_wb_ft/dec_if.h"
++#include "amrwb/dec_if.h"
+ #endif
+
+ #endif
================================================================
Index: packages/gpac/gpac-flags.patch
diff -u packages/gpac/gpac-flags.patch:1.2 packages/gpac/gpac-flags.patch:1.3
--- packages/gpac/gpac-flags.patch:1.2 Sun Jul 24 17:07:56 2011
+++ packages/gpac/gpac-flags.patch Sun Jun 17 13:58:03 2012
@@ -1,31 +1,21 @@
---- gpac/configure.orig 2011-05-29 20:37:20.841571383 +0200
-+++ gpac/configure 2011-05-29 20:50:56.841598707 +0200
-@@ -102,7 +102,7 @@
- bigendian="no"
- SHFLAGS=-shared
- need_inet_aton="no"
--LDFLAGS="$LDFLAGS -Wl --warn-common"
-+LDFLAGS="$LDFLAGS -Wl,--warn-common"
- CFLAGS=""
- CPPFLAGS=""
- GPAC_SH_FLAGS=-lpthread
---- gpac/applications/osmo4_wx/Makefile.orig 2011-05-29 20:52:03.848267616
+0200
-+++ gpac/applications/osmo4_wx/Makefile 2011-05-29 21:08:38.408300918
+0200
-@@ -41,7 +41,7 @@
+--- gpac/applications/osmo4_wx/Makefile.orig 2012-06-17 07:51:02.389758176
+0200
++++ gpac/applications/osmo4_wx/Makefile 2012-06-17 08:25:05.746339091
+0200
+@@ -45,7 +45,7 @@
all: $(PROG)
Osmo4$(EXE): $(OBJS)
-- $(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac
$(WX_LFLAGS) -lz
-+ $(CXX) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac
$(WX_LFLAGS) `pkg-config --libs gtk+-2.0` -lz
+- $(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac
$(WX_LFLAGS) $(LINKFLAGS)
++ $(CXX) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac
$(WX_LFLAGS) `pkg-config --libs gtk+-2.0` $(LINKFLAGS)
%.o: %.cpp
- $(CXX) $(CFLAGS) $(INSTALL_FLAGS) $(WX_CFLAGS) -c -o $@ $<
---- gpac/src/Makefile~ 2011-07-24 16:46:39.000000000 +0200
-+++ gpac/src/Makefile 2011-07-24 16:53:33.607729885 +0200
-@@ -106,14 +106,6 @@
- endif
-
+ $(CXX) $(CFLAGS) $(WX_CFLAGS) -c -o $@ $<
+--- gpac/src/Makefile.orig 2012-05-23 20:57:42.000000000 +0200
++++ gpac/src/Makefile 2012-06-15 20:44:50.881728154 +0200
+@@ -195,15 +195,6 @@
+ ## libgpac compositor compilation options
+ COMPOSITOR_CFLAGS=
+-## Add prefix before every lib
-ifneq ($(prefix), /usr/local)
-EXTRALIBS+=-L$(prefix)/lib
-else
@@ -34,38 +24,17 @@
-endif
-endif
-
- ## libgpac compositor compilation options
- COMPOSITOR_CFLAGS=
- ## SVG disabled
---- gpac/applications/mp4client/Makefile~ 2011-07-24 16:54:03.000000000
+0200
-+++ gpac/applications/mp4client/Makefile 2011-07-24 16:57:28.613989434
+0200
-@@ -37,18 +37,6 @@
- PROG=MP4Client
- endif
-
--ifneq ($(CONFIG_JPEG), no)
--LINKLIBS+= -L$(prefix)/lib
--else
--ifneq ($(CONFIG_PNG), no)
--LINKLIBS+= -L$(prefix)/lib
--else
--ifneq ($(TRISCOPE_MODE), no)
--LINKLIBS+= -L$(prefix)/lib
--endif
--endif
--endif
--
- ifeq ($(CONFIG_JPEG), no)
- else
- LINKLIBS+= -ljpeg
---- gpac/modules/jack/Makefile~ 2008-11-24 10:14:19.000000000 +0100
-+++ gpac/modules/jack/Makefile 2011-07-24 17:01:53.625253667 +0200
-@@ -32,7 +32,7 @@
+ ## OpenGL available
+ ifeq ($(HAS_OPENGL),yes)
+ EXTRALIBS+= $(OGL_LIBS)
+--- gpac/modules/jack/Makefile.orig 2012-04-05 14:38:11.000000000 +0200
++++ gpac/modules/jack/Makefile 2012-06-15 20:46:05.045058375 +0200
+@@ -25,7 +25,7 @@
all: $(LIB)
- $(LIB): $(OBJSPIC)
-- $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS)
-L../../bin/gcc -lgpac -L/usr/lib -ljack
-+ $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS)
-L../../bin/gcc -lgpac -ljack
+ $(LIB): $(OBJS)
+- $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS)
-L../../bin/gcc -lgpac -L/usr/lib -ljack
++ $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS)
-L../../bin/gcc -lgpac -ljack
%.o: %.c
================================================================
Index: packages/gpac/gpac-install-is-not-clean.patch
diff -u packages/gpac/gpac-install-is-not-clean.patch:1.1
packages/gpac/gpac-install-is-not-clean.patch:1.2
--- packages/gpac/gpac-install-is-not-clean.patch:1.1 Fri Apr 1 20:39:47 2011
+++ packages/gpac/gpac-install-is-not-clean.patch Sun Jun 17 13:58:03 2012
@@ -1,21 +1,21 @@
---- gpac/applications/mp4client/Makefile.orig 2008-11-24 09:44:26.000000000
+0100
-+++ gpac/applications/mp4client/Makefile 2011-04-01 18:56:48.041739787
+0200
-@@ -87,7 +87,7 @@ MP4Client$(EXE): $(OBJS)
+--- gpac/applications/osmo4_wx/Makefile.orig 2011-10-21 14:41:56.000000000
+0200
++++ gpac/applications/osmo4_wx/Makefile 2012-06-15 20:20:49.688455299
+0200
+@@ -67,7 +67,6 @@
+ $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/MacOS
+ echo -n 'APPLOsm4' > $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/PkgInfo
+ else
+- rm -f wxOsmo4.o
+ mkdir -p $(DESTDIR)$(prefix)/bin
+ install -m 755 $(INSTFLAGS) ../../bin/gcc/Osmo4
"$(DESTDIR)$(prefix)/bin"
+ endif
+--- gpac/applications/mp4client/Makefile.orig 2011-05-20 19:11:05.000000000
+0200
++++ gpac/applications/mp4client/Makefile 2012-06-15 20:20:27.218456243
+0200
+@@ -44,7 +44,7 @@
clean:
rm -f $(OBJS) ../../bin/gcc/$(PROG)
-install: clean
+install:
- $(MAKE) -override BUILD_INSTALL=yes all
install -m 755 $(INSTFLAGS) ../../bin/gcc/MP4Client
"$(DESTDIR)$(prefix)/bin"
---- gpac/applications/osmo4_wx/Makefile.orig 2008-11-24 09:48:32.000000000
+0100
-+++ gpac/applications/osmo4_wx/Makefile 2011-04-01 18:57:49.669735597
+0200
-@@ -63,7 +63,6 @@ ifeq ($(CONFIG_DARWIN),yes)
- $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/MacOS
- echo -n 'APPLOsm4' > $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/PkgInfo
- else
-- rm -f wxOsmo4.o
- $(MAKE) -override BUILD_INSTALL=yes all
- mkdir -p $(DESTDIR)$(prefix)/bin
- install -m 755 $(INSTFLAGS) ../../bin/gcc/Osmo4
"$(DESTDIR)$(prefix)/bin"
+ uninstall:
================================================================
Index: packages/gpac/gpac-xulrunner.patch
diff -u packages/gpac/gpac-xulrunner.patch:1.5
packages/gpac/gpac-xulrunner.patch:1.6
--- packages/gpac/gpac-xulrunner.patch:1.5 Sun Jan 22 17:45:23 2012
+++ packages/gpac/gpac-xulrunner.patch Sun Jun 17 13:58:03 2012
@@ -1,265 +1,11 @@
---- 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"
-@@ -104,7 +104,7 @@
-
- // global to get plugins name & description
- NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue);
--char* NPP_GetMIMEDescription(void);
-+const char* NPP_GetMIMEDescription(void);
-
-
- //#define NO_GPAC
---- 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)
- {
-- CallNPN_InvalidateRegionProc(NPNFuncs.invalidateregion, instance,
invalidRegion);
-+ (*NPNFuncs.invalidateregion)(instance, invalidRegion);
- }
-
- void NPN_ForceRedraw(NPP instance)
- {
-- CallNPN_ForceRedrawProc(NPNFuncs.forceredraw, instance);
-+ (*NPNFuncs.forceredraw)(instance);
- }
---- gpac/configure.orig 2011-05-29 21:09:10.138301981 +0200
-+++ gpac/configure 2011-05-29 21:27:39.248339117 +0200
-@@ -1145,6 +1145,7 @@
-
- #look for GECKO support
- cat > $TMPCPP << EOF
-+#include <mozilla-config.h>
- #include <nsIServiceManager.h>
- int main( void ) { return 0; }
- EOF
---- gpac/applications/osmozilla/osmozilla.cpp~ 2012-01-22 17:15:26.902074831
+0100
-+++ gpac/applications/osmozilla/osmozilla.cpp 2012-01-22 17:17:43.514543060
+0100
-@@ -91,7 +91,7 @@
+--- gpac/applications/osmozilla/osmo_npapi.cpp.orig 2012-04-04
17:04:39.000000000 +0200
++++ gpac/applications/osmozilla/osmo_npapi.cpp 2012-06-17 07:42:36.879779391
+0200
+@@ -372,7 +372,7 @@
+ /* explicit plugin call */ \
"application/x-gpac::GPAC plugin;" \
-
--char* NPP_GetMIMEDescription(void)
-+const char* NPP_GetMIMEDescription(void)
- {
- return GPAC_PLUGIN_MIMETYPES;
- }
---- gpac/applications/osmozilla/np_entry.cpp~ 2005-07-13 16:34:30.000000000
+0200
-+++ gpac/applications/osmozilla/np_entry.cpp 2012-01-22 17:43:44.464387379
+0100
-@@ -172,7 +172,7 @@
- return NS_PluginInitialize();
- }
-
-char * NP_GetMIMEDescription(void)
+const char * NP_GetMIMEDescription(void)
{
- return NPP_GetMIMEDescription();
+ return (char *) GPAC_PLUGIN_MIMETYPES;
}
================================================================
Index: packages/gpac/gpac.spec
diff -u packages/gpac/gpac.spec:1.53 packages/gpac/gpac.spec:1.54
--- packages/gpac/gpac.spec:1.53 Wed Jun 13 21:52:57 2012
+++ packages/gpac/gpac.spec Sun Jun 17 13:58:03 2012
@@ -1,4 +1,9 @@
# $Revision$, $Date$
+# TODO:
+# - Platinum UPnP: http://www.plutinosoft.com/platinum
+# - AVCap: http://libavcap.sourceforge.net/
+# - OpenSVCDecoder: http://opensvcdecoder.sourceforge.net/
+# - libfreenect: http://openkinect.org/wiki/Main_Page
#
# Conditional build:
%bcond_with amr # AMR-NB and AMR-WB (floating-point) support
@@ -15,26 +20,24 @@
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.5
-Release: 15
+Version: 0.5.0
+Release: 1
License: LGPL v2+
Group: Applications/Multimedia
Source0: http://downloads.sourceforge.net/gpac/%{name}-%{version}.tar.gz
-# Source0-md5: 755e8c438a48ebdb13525dd491f5b0d1
+# Source0-md5: 19f7bb7c16913c22bdd453db1e653ca0
Patch0: %{name}-install.patch
-Patch1: %{name}-libpng.patch
-Patch2: %{name}-pic.patch
-Patch3: %{name}-xulrunner.patch
-Patch4: %{name}-amr.patch
-Patch5: %{name}-ffmpeg.patch
-Patch6: %{name}-install-is-not-clean.patch
-Patch7: %{name}-flags.patch
-Patch8: %{name}-idl_uuid.patch
-Patch9: 240_all_libpng15.patch
-Patch10: 250_all_openjpeg14.patch
-Patch11: 260_all_ffmpeg_bump.patch
-Patch12: 270_all_ffmpeg_trunk.patch
+Patch1: %{name}-xulrunner.patch
+Patch2: %{name}-amr.patch
+Patch3: %{name}-install-is-not-clean.patch
+Patch4: %{name}-flags.patch
+Patch5: %{name}-idl_uuid.patch
+Patch6: %{name}-js.patch
+Patch7: %{name}-apps.patch
+Patch8: %{name}-export.patch
URL: http://gpac.sourceforge.net/
+BuildRequires: DirectFB-devel
+BuildRequires: OpenGL-devel
BuildRequires: SDL-devel
BuildRequires: a52dec-libs-devel
BuildRequires: alsa-lib-devel >= 0.9
@@ -53,6 +56,7 @@
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
BuildRequires: openjpeg-devel
+BuildRequires: openssl-devel
BuildRequires: pulseaudio-devel
BuildRequires: rpmbuild(macros) >= 1.357
BuildRequires: sed >= 4.0
@@ -63,6 +67,7 @@
BuildRequires: xorg-lib-libXv-devel
BuildRequires: xulrunner-devel >= 2:9.0.0
%{?with_xvid:BuildRequires: xvid-devel}
+BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -107,6 +112,18 @@
%description devel -l pl.UTF-8
Pliki nagłówkowe biblioteki GPAC.
+%package static
+Summary: Static GPAC library
+Summary(pl.UTF-8): Statyczna biblioteka GPAC
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+Static GPAC library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka GPAC.
+
%package gui
Summary: wxWidgets-based GUI for GPAC
Summary(pl.UTF-8): Oparty na wxWidgets graficzny interfejs do GPAC
@@ -144,26 +161,19 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%if %{with amr}
-sed -i -e 's/amr_\([nw]b\)_ft/amr\1/' modules/amr_float_dec/amr_float_dec.c
-%endif
sed -i -e 's/wx-config/wx-gtk2-unicode-config/' configure
chmod a+x configure
%build
-cd applications/osmozilla
-%{_libdir}/xulrunner-sdk/sdk/bin/header.py -I /usr/share/idl/xulrunner -o
nsIOsmozilla.h nsIOsmozilla.idl
-%{_libdir}/xulrunner-sdk/sdk/bin/typelib.py -I /usr/share/idl/xulrunner -o
nsIOsmozilla.xpt nsIOsmozilla.idl
-cp -f nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
-cd ../..
-%configure \
+# not autoconf configure
+./configure \
+ --prefix=%{_prefix} \
+ --libdir=%{_lib} \
+ --mandir=%{_mandir} \
--X11-path=/usr \
--cc="%{__cc}" \
+ --cpp="%{__cxx}" \
--disable-opt \
%{!?with_wx:--disable-wx} \
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/packages/gpac/gpac-amr.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/gpac/gpac-flags.patch?r1=1.2&r2=1.3
http://cvs.pld-linux.org/packages/gpac/gpac-install-is-not-clean.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/gpac/gpac-xulrunner.patch?r1=1.5&r2=1.6
http://cvs.pld-linux.org/packages/gpac/gpac.spec?r1=1.53&r2=1.54
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
