[vlc-devel] commit: contribs: WxWidgets is history ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Jun  7 23:36:52 2009 +0200| [ad0075d843e082455f10e5f421a803c094d8333e] | committer: Felix Paul Kühne 

contribs: WxWidgets is history

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ad0075d843e082455f10e5f421a803c094d8333e
---

 extras/contrib/src/Distributions/debian.mak    |    2 +-
 extras/contrib/src/Distributions/unix.mak      |    2 +-
 extras/contrib/src/Makefile                    |   20 --------------------
 extras/contrib/src/Patches/wxwidgets_uri.patch |   13 -------------
 4 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/extras/contrib/src/Distributions/debian.mak b/extras/contrib/src/Distributions/debian.mak
index 7258fee..5b433ae 100644
--- a/extras/contrib/src/Distributions/debian.mak
+++ b/extras/contrib/src/Distributions/debian.mak
@@ -4,7 +4,7 @@ all: .iconv .intl .freetype .fribidi .zlib \
 	.flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
 	.live .goom2k4 .caca .mod .x264  .xml .twolame \
 	.png .gpg-error .gcrypt .gnutls .mpcdec \
-	.dvdnav .dvbpsi .wxwidgets .dirac \
+	.dvdnav .dvbpsi .dirac \
 	.dca .raw1394 .dc1394 .lua .zvbi \
 	.kate .tiger \
 	.aclocal 
diff --git a/extras/contrib/src/Distributions/unix.mak b/extras/contrib/src/Distributions/unix.mak
index 5eafb05..682e15d 100644
--- a/extras/contrib/src/Distributions/unix.mak
+++ b/extras/contrib/src/Distributions/unix.mak
@@ -4,7 +4,7 @@ all: .iconv .intl .freetype .fribidi .zlib \
 	.flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
 	.live .goom2k4 .caca .mod .x264  .xml .twolame \
 	.png .gpg-error .gcrypt .gnutls .mpcdec \
-	.dvdnav .dvbpsi .wxwidgets .dirac \
+	.dvdnav .dvbpsi .dirac \
 	.dca .raw1394 .dc1394 .lua .zvbi \
 	.kate .tiger \
 	.aclocal
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 9cc78b9..a1d820e 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1548,26 +1548,6 @@ CLEAN_PKG += libcdio
 DISTCLEAN_PKG += libcdio-$(CDIO_VERSION).tar.gz
 
 # ***************************************************************************
-# wxWidgets
-# ***************************************************************************
-
-wxWidgets-$(WXWIDGETS_VERSION).tar.gz:
-	$(WGET) $(WXWIDGETS_URL)
-
-wxwidgets: wxWidgets-$(WXWIDGETS_VERSION).tar.gz
-	$(EXTRACT_GZ)
-	(cd wxwidgets; patch -p0 < ../Patches/wxwidgets_uri.patch)
-
-.wxwidgets: wxwidgets
-	(cd wxwidgets; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --enable-unicode --disable-threads --disable-gif --disable-pcx --disable-iff --disable-pnm --without-zlib  --without-libpng --without-libjpeg --without-libtiff --without-regex  --disable-zipstream --disable-fs_zip --enable-no_rtti  --enable-no_exceptions --disable-exceptions --disable-stl --disable-html --without-expat --disable-protocols --disable-protocol --disable-xrc --disable-sound --disable-dialupman --disable-mediactrl  --disable-joystick --disable-grid --disable-datepick --disable-postscript--disable-filesystem --disable-fileproto --disable-ipc --disable-sockets --disable-precomp-headers && make && make install)
-	$(INSTALL_NAME)
-	touch $@
-
-CLEAN_FILE += .wxwidgets
-CLEAN_PKG += wxwidgets
-DISTCLEAN_PKG += wxWidgets-$(WXWIDGETS_VERSION).tar.gz
-
-# ***************************************************************************
 # qt4 (win32 binary)
 # ***************************************************************************
 
diff --git a/extras/contrib/src/Patches/wxwidgets_uri.patch b/extras/contrib/src/Patches/wxwidgets_uri.patch
deleted file mode 100644
index 1c24657..0000000
--- a/extras/contrib/src/Patches/wxwidgets_uri.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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());
-         }
-     }
-