packages: gpac/gpac-xulrunner.patch, gpac/gpac.spec, gpac/gpac-flags.patch ...

[qboosh]

Author: qboosh                       Date: Sun May 29 19:55:06 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added flags patch (fixes build with current toolchain)
- updated xulrunner patch (mozilla-config.h needed by 2.0)
- updated xmlrpc-c BR

---- Files affected:
packages/gpac:
   gpac-xulrunner.patch (1.1 -> 1.2) , gpac.spec (1.32 -> 1.33) , gpac-flags.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gpac/gpac-xulrunner.patch
diff -u packages/gpac/gpac-xulrunner.patch:1.1 packages/gpac/gpac-xulrunner.patch:1.2
--- packages/gpac/gpac-xulrunner.patch:1.1	Sun Mar 20 14:40:46 2011
+++ packages/gpac/gpac-xulrunner.patch	Sun May 29 21:55:01 2011
@@ -222,3 +222,13 @@
 -  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

================================================================
Index: packages/gpac/gpac.spec
diff -u packages/gpac/gpac.spec:1.32 packages/gpac/gpac.spec:1.33
--- packages/gpac/gpac.spec:1.32	Fri Apr  1 20:39:47 2011
+++ packages/gpac/gpac.spec	Sun May 29 21:55:01 2011
@@ -28,6 +28,7 @@
 Patch4:		%{name}-amr.patch
 Patch5:		%{name}-ffmpeg.patch
 Patch6:		%{name}-install-is-not-clean.patch
+Patch7:		%{name}-flags.patch
 URL:		http://gpac.sourceforge.net/
 BuildRequires:	SDL-devel
 BuildRequires:	a52dec-libs-devel
@@ -52,8 +53,7 @@
 BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
 %{?with_wx:BuildRequires:	wxGTK2-devel >= 2.6.0}
-# -server
-BuildRequires:	xmlrpc-c-devel
+BuildRequires:	xmlrpc-c-server-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXv-devel
 BuildRequires:	xulrunner-devel >= 1.9.1
@@ -125,6 +125,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %if %{with amr}
 sed -i -e 's/amr_\([nw]b\)_ft/amr\1/' modules/amr_float_dec/amr_float_dec.c
@@ -215,6 +216,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2011/05/29 19:55:01  qboosh
+- added flags patch (fixes build with current toolchain)
+- updated xulrunner patch (mozilla-config.h needed by 2.0)
+- updated xmlrpc-c BR
+
 Revision 1.32  2011/04/01 18:39:47  qboosh
 - added install-is-not-clean patch, pass BUILD_INSTALL - now nothing gets recompiled on make install
 - release 1

================================================================
Index: packages/gpac/gpac-flags.patch
diff -u /dev/null packages/gpac/gpac-flags.patch:1.1
--- /dev/null	Sun May 29 21:55:06 2011
+++ packages/gpac/gpac-flags.patch	Sun May 29 21:55:01 2011
@@ -0,0 +1,22 @@
+--- 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 @@
+ 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
+ 
+ %.o: %.cpp
+ 	$(CXX) $(CFLAGS) $(INSTALL_FLAGS) $(WX_CFLAGS) -c -o $@ $< 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpac/gpac-xulrunner.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpac/gpac.spec?r1=1.32&r2=1.33&f=u