Commit 735bc554 authored by Rafaël Carré's avatar Rafaël Carré

contrib: drop wince support

parent f1db53bb
...@@ -259,9 +259,6 @@ case "${OS}" in ...@@ -259,9 +259,6 @@ case "${OS}" in
*linux*) *linux*)
add_make_enabled "HAVE_LINUX" add_make_enabled "HAVE_LINUX"
;; ;;
*wince*)
add_make_enabled "HAVE_WINCE"
;;
*mingw*) *mingw*)
add_make_enabled "HAVE_WIN32" add_make_enabled "HAVE_WIN32"
;; ;;
......
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 -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. */
...@@ -21,10 +21,6 @@ iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv ...@@ -21,10 +21,6 @@ iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv
ifdef HAVE_WIN64 ifdef HAVE_WIN64
$(APPLY) $(SRC)/iconv/libiconv-win64.patch $(APPLY) $(SRC)/iconv/libiconv-win64.patch
endif endif
ifdef HAVE_WINCE
$(APPLY) $(SRC)/iconv/libiconv-wince.patch
$(APPLY) $(SRC)/iconv/libiconv-wince-hack.patch
endif
ifdef HAVE_ANDROID ifdef HAVE_ANDROID
$(APPLY) $(SRC)/iconv/libiconv-android-ios.patch $(APPLY) $(SRC)/iconv/libiconv-android-ios.patch
endif endif
......
...@@ -20,9 +20,6 @@ endif ...@@ -20,9 +20,6 @@ endif
ifdef HAVE_WIN32 ifdef HAVE_WIN32
LIVE_TARGET := mingw LIVE_TARGET := mingw
endif endif
ifdef HAVE_WINCE
LIVE_TARGET := mingw
endif
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
LIVE_TARGET := macosx LIVE_TARGET := macosx
else else
...@@ -37,9 +34,6 @@ live555: $(LIVE555_FILE) .sum-live555 ...@@ -37,9 +34,6 @@ live555: $(LIVE555_FILE) .sum-live555
rm -Rf live rm -Rf live
$(UNPACK) $(UNPACK)
chmod -R u+w live 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 -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 -e s/"libtool -s -o"/"ar cr"/g config.macosx*
cd live && sed -i.orig \ cd live && sed -i.orig \
......
--- 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>
...@@ -19,9 +19,6 @@ $(TARBALLS)/libogg-$(OGG_VERSION).tar.xz: ...@@ -19,9 +19,6 @@ $(TARBALLS)/libogg-$(OGG_VERSION).tar.xz:
libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
$(UNPACK) $(UNPACK)
$(APPLY) $(SRC)/ogg/libogg-1.1.patch $(APPLY) $(SRC)/ogg/libogg-1.1.patch
ifdef HAVE_WINCE
$(APPLY) $(SRC)/ogg/libogg-wince.patch
endif
$(APPLY) $(SRC)/ogg/libogg-disable-check.patch $(APPLY) $(SRC)/ogg/libogg-disable-check.patch
$(UPDATE_AUTOCONFIG) $(UPDATE_AUTOCONFIG)
$(MOVE) $(MOVE)
......
...@@ -75,10 +75,6 @@ else ...@@ -75,10 +75,6 @@ else
POSTPROCCONF += --enable-pthreads POSTPROCCONF += --enable-pthreads
endif endif
ifdef HAVE_WINCE
POSTPROCCONF += --target-os=mingw32ce --arch=armv4l --cpu=armv4t
endif
# Build # Build
ifdef GPL ifdef GPL
......
...@@ -20,7 +20,6 @@ $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz: ...@@ -20,7 +20,6 @@ $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz:
zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
$(UNPACK) $(UNPACK)
$(APPLY) $(SRC)/zlib/zlib-wince.patch
$(MOVE) $(MOVE)
.zlib: zlib .zlib: zlib
......
--- 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment