- added flags patch (fixes build with current toolchain)

- updated xulrunner patch (mozilla-config.h needed by 2.0)
- updated xmlrpc-c BR

Changed files:
    gpac-flags.patch -> 1.1
    gpac-xulrunner.patch -> 1.2
    gpac.spec -> 1.33

diff --git a/gpac-flags.patch b/gpac-flags.patch
new file mode 100644 (file)
index 0000000..f909519
--- /dev/null
+++ b/gpac-flags.patch
@@ -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 $@ $< 

diff --git a/gpac-xulrunner.patch b/gpac-xulrunner.patch
index 235473fe380daf6042f204ffef10dae97f3f6cda..f9a9179486e5472fe51bff97a946d7c81bb475a3 100644 (file)
--- a/gpac-xulrunner.patch
+++ b/gpac-xulrunner.patch
@@ -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

diff --git a/gpac.spec b/gpac.spec
index d3d628a7adbbfb831ef031bc929a8cb95eceb01a..6246bd3396eafd62a4ec9f656042a600a297e268 100644 (file)
--- a/gpac.spec
+++ b/gpac.spec
@@ -27,6 +27,7 @@ Patch3:               %{name}-xulrunner.patch
 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
@@ -51,8 +52,7 @@ BuildRequires:        rpmbuild(macros) >= 1.357
 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
@@ -124,6 +124,7 @@ Wtyczka GPAC dla przeglądarek WWW zgodnych z Netscape.
 %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