[vlc-commits] contrib: drop wince support

Rafaël Carré git at videolan.org
Sun Jun 8 20:31:20 CEST 2014 

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Jun  8 10:39:36 2014 -0700| [735bc55408a17e3cfe1de693afeeb7f104309cfd] | committer: Rafaël Carré

contrib: drop wince support

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

 contrib/bootstrap                           |    3 ---
 contrib/src/iconv/libiconv-wince-hack.patch |   34 ---------------------------
 contrib/src/iconv/libiconv-wince.patch      |   14 -----------
 contrib/src/iconv/rules.mak                 |    4 ----
 contrib/src/live555/rules.mak               |    6 -----
 contrib/src/ogg/libogg-wince.patch          |   13 ----------
 contrib/src/ogg/rules.mak                   |    3 ---
 contrib/src/postproc/rules.mak              |    4 ----
 contrib/src/zlib/rules.mak                  |    1 -
 contrib/src/zlib/zlib-wince.patch           |   13 ----------
 10 files changed, 95 deletions(-)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 2c755df..b77a9d9 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -259,9 +259,6 @@ case "${OS}" in
 	*linux*)
 		add_make_enabled "HAVE_LINUX"
 		;;
-	*wince*)
-		add_make_enabled "HAVE_WINCE"
-		;;
 	*mingw*)
 		add_make_enabled "HAVE_WIN32"
 		;;
diff --git a/contrib/src/iconv/libiconv-wince-hack.patch b/contrib/src/iconv/libiconv-wince-hack.patch
deleted file mode 100644
index e3b39a5..0000000
--- a/contrib/src/iconv/libiconv-wince-hack.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urNp libiconv.orig/configure libiconv/configure
---- libiconv.orig/configure	2009-06-30 22:51:53.000000000 +0200
-+++ libiconv/configure	2009-11-12 04:41:02.000000000 +0100
-@@ -20344,6 +20344,7 @@ rm -f conftest*
- 
- 
- fi
-+gl_cv_header_signal_h_SIGPIPE=yes
- { $as_echo "$as_me:$LINENO: result: $gl_cv_header_signal_h_SIGPIPE" >&5
- $as_echo "$gl_cv_header_signal_h_SIGPIPE" >&6; }
- 
-@@ -23459,7 +23460,6 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <signal.h>
- /* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
- #include <sys/types.h>
- 
-diff -urNp libiconv.orig/signal.h libiconv/signal.h
---- libiconv.orig/signal.h	1970-01-01 01:00:00.000000000 +0100
-+++ libiconv/signal.h	2009-11-12 04:39:24.000000000 +0100
-@@ -0,0 +1,11 @@
-+#ifndef	_SIGNAL_H_
-+#define	_SIGNAL_H_
-+
-+#define	SIGABRT		22	/* Abnormal termination (abort) */
-+
-+typedef	void (*__p_sig_fn_t)(int);
-+#define	SIG_DFL	((__p_sig_fn_t) 0)
-+#define	SIG_IGN	((__p_sig_fn_t) 1)
-+#define	SIG_ERR ((__p_sig_fn_t) -1)
-+
-+#endif	/* Not _SIGNAL_H_ */
diff --git a/contrib/src/iconv/libiconv-wince.patch b/contrib/src/iconv/libiconv-wince.patch
deleted file mode 100644
index 3dd3c60..0000000
--- a/contrib/src/iconv/libiconv-wince.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urNp libiconv.orig/src/iconv.c libiconv/src/iconv.c
---- libiconv.orig/src/iconv.c	2009-06-21 13:17:33.000000000 +0200
-+++ libiconv/src/iconv.c	2009-11-11 05:35:58.000000000 +0100
-@@ -26,7 +26,9 @@
- #include <string.h>
- #include <iconv.h>
- #include <errno.h>
--#include <locale.h>
-+#ifdef HAVE_SETLOCALE
-+# include <locale.h>
-+#endif
- #include <fcntl.h>
- 
- /* Ensure that iconv_no_i18n does not depend on libintl.  */
diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak
index e4e4d87..3596463 100644
--- a/contrib/src/iconv/rules.mak
+++ b/contrib/src/iconv/rules.mak
@@ -21,10 +21,6 @@ iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv
 ifdef HAVE_WIN64
 	$(APPLY) $(SRC)/iconv/libiconv-win64.patch
 endif
-ifdef HAVE_WINCE
-	$(APPLY) $(SRC)/iconv/libiconv-wince.patch
-	$(APPLY) $(SRC)/iconv/libiconv-wince-hack.patch
-endif
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/iconv/libiconv-android-ios.patch
 endif
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 014f290..3e303fc 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -20,9 +20,6 @@ endif
 ifdef HAVE_WIN32
 LIVE_TARGET := mingw
 endif
-ifdef HAVE_WINCE
-LIVE_TARGET := mingw
-endif
 ifdef HAVE_DARWIN_OS
 LIVE_TARGET := macosx
 else
@@ -37,9 +34,6 @@ live555: $(LIVE555_FILE) .sum-live555
 	rm -Rf live
 	$(UNPACK)
 	chmod -R u+w live
-ifdef HAVE_WINCE
-	cd live && sed -e 's/-lws2_32/-lws2/g' -i.orig config.mingw
-endif
 	cd live && sed -e 's%cc%$(CC)%' -e 's%c++%$(CXX)%' -e 's%LIBRARY_LINK =.*ar%LIBRARY_LINK = $(AR)%' -i.orig config.$(LIVE_TARGET)
 	cd live && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx*
 	cd live && sed -i.orig \
diff --git a/contrib/src/ogg/libogg-wince.patch b/contrib/src/ogg/libogg-wince.patch
deleted file mode 100644
index 7e280bc..0000000
--- a/contrib/src/ogg/libogg-wince.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libogg/include/ogg/os_types.h	2005-11-22 23:01:12.000000000 +0000
-+++ libogg/include/ogg/os_types.h	2005-11-22 23:05:11.000000000 +0000
-@@ -55,6 +55,10 @@
-      typedef unsigned __int16 ogg_uint16_t;
- #  endif
- 
-+#  if defined(UNDER_CE)
-+#     define exit(a)
-+#  endif
-+
- #elif defined(__MACOS__)
- 
- #  include <sys/types.h>
diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
index b0160ca..1573f72 100644
--- a/contrib/src/ogg/rules.mak
+++ b/contrib/src/ogg/rules.mak
@@ -19,9 +19,6 @@ $(TARBALLS)/libogg-$(OGG_VERSION).tar.xz:
 libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
 	$(UNPACK)
 	$(APPLY) $(SRC)/ogg/libogg-1.1.patch
-ifdef HAVE_WINCE
-	$(APPLY) $(SRC)/ogg/libogg-wince.patch
-endif
 	$(APPLY) $(SRC)/ogg/libogg-disable-check.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
diff --git a/contrib/src/postproc/rules.mak b/contrib/src/postproc/rules.mak
index ed20e17..727cd83 100644
--- a/contrib/src/postproc/rules.mak
+++ b/contrib/src/postproc/rules.mak
@@ -75,10 +75,6 @@ else
 POSTPROCCONF += --enable-pthreads
 endif
 
-ifdef HAVE_WINCE
-POSTPROCCONF += --target-os=mingw32ce --arch=armv4l --cpu=armv4t
-endif
-
 # Build
 
 ifdef GPL
diff --git a/contrib/src/zlib/rules.mak b/contrib/src/zlib/rules.mak
index d92c3a1..b198aee 100644
--- a/contrib/src/zlib/rules.mak
+++ b/contrib/src/zlib/rules.mak
@@ -20,7 +20,6 @@ $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz:
 
 zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
 	$(UNPACK)
-	$(APPLY) $(SRC)/zlib/zlib-wince.patch
 	$(MOVE)
 
 .zlib: zlib
diff --git a/contrib/src/zlib/zlib-wince.patch b/contrib/src/zlib/zlib-wince.patch
deleted file mode 100644
index 0daf76c..0000000
--- a/contrib/src/zlib/zlib-wince.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- zlib-1.2.6/zutil.h.orig	2011-12-18 19:39:45.000000000 +0100
-+++ zlib-1.2.6/zutil.h	2012-04-30 23:29:05.787740053 +0200
-@@ -161,6 +161,10 @@
- #  endif
- #endif
- 
-+#if defined(_WIN32_WCE)
-+#    define fdopen(fd,mode) NULL /* No fdopen() */
-+#endif
-+
- #if defined(__BORLANDC__) && !defined(MSDOS)
-   #pragma warn -8004
-   #pragma warn -8008

More information about the vlc-commits mailing list