Patch for wxWidgets and gcc-4.1.0, iconv fix and live555 compile fix

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 87355e29a6525b5051d1b3a45cec2feaaebd636b..35ec4de416eb2b00831bb48731ed3a9422d5df18 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -171,8 +171,8 @@ else
    ifdef HAVE_WINCE
 
    all: .dvbpsi .zlib .ffmpeg .ogg .tremor .faad
-   else
 
+   else
 # Standard Linux or other UNIX-like systems
    all: .iconv .intl .freetype .fribidi .zlib \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
@@ -432,7 +432,7 @@ ifdef HAVE_DARWIN_OS
        touch $@
 else
 .iconv: libiconv
-       (cd libiconv; CPPFLAGS="-Dssize_t=long" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install)
+       (cd libiconv; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install)
        $(INSTALL_NAME)
        touch $@
 endif
@@ -1055,7 +1055,8 @@ ifdef HAVE_DARWIN_OS
        (cd $<; sed -e 's%EXTRA_CFLAGS%$(EXTRA_CFLAGS)%' -e 's%EXTRA_LDFLAGS%$(EXTRA_LDFLAGS)%' -i.orig  config.macosx)
        (cd $<; ./genMakefiles macosx && make)
 else
-       (cd $<;./genMakefiles linux && make $(HOSTCC))
+       (cd $<; if [ ! -f groupsock/Makefile.head.orig ] then ; sed -e 's/=/= $$\(EXTRA_CPPFLAGS\)/'  -e 's%EXTRA_CPPFLAGS%$(EXTRA_CPPFLAGS)%' -e 's/$$\(//' -e 's/\)//' -i.orig groupsock/Makefile.head fi )
+       (cd $<; ./genMakefiles && make $(HOSTCC))
 endif
 endif
 endif
@@ -1291,6 +1292,7 @@ wxWidgets-$(WXWIDGETS_VERSION).tar.gz:
 
 wxwidgets: wxWidgets-$(WXWIDGETS_VERSION).tar.gz
        $(EXTRACT_GZ)
+       (cd wxwidgets; patch -p0 < ../Patches/wxwidgets_uri.patch)
 #      (cd wxwidgets; patch -p1 <../Patches/wxMSW-win32.patch)
 
 .wxwidgets: wxwidgets

diff --git a/extras/contrib/src/Patches/wxwidgets_uri.patch b/extras/contrib/src/Patches/wxwidgets_uri.patch
new file mode 100644 (file)
index 0000000..1c24657
--- /dev/null
+++ b/extras/contrib/src/Patches/wxwidgets_uri.patch
@@ -0,0 +1,13 @@
+--- src/common/uri.cpp.orig    2005-08-13 02:24:13.000000000 +0200
++++ src/common/uri.cpp 2006-05-14 10:49:14.000000000 +0200
+@@ -886,8 +886,8 @@
+                     op += 3;
+             }
+ 
+-            m_path = base.m_path.substr(0, bp - base.m_path.c_str()) +
+-                    m_path.substr((op - m_path.c_str()), m_path.Length());
++            m_path = (wxString)base.m_path.substr(0, bp - base.m_path.c_str()) +
++                    (wxString)m_path.substr((op - m_path.c_str()), m_path.Length());
+         }
+     }
+